lchao vor 11 Monaten
Ursprung
Commit
4ea75fe30f

+ 6 - 6
songhua-admin/src/main/resources/application-druid.yml

@@ -10,16 +10,16 @@ spring:
                 username: sooka
                 password: sooka1a2b3c4d%...
             # 生产库数据源
-#                url: jdbc:mysql://172.30.0.5:8888/shh_fuse?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://172.30.0.6:53306/shh_fuse?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -43,7 +43,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -62,4 +62,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

+ 7 - 5
songhua-ui/src/components/FileUpload/index1.vue

@@ -50,7 +50,7 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 1,
     },
     // 大小限制(MB)
     fileSize: {
@@ -62,13 +62,15 @@ export default {
       type: Array,
       default: () => [
         // 图片
-        "bmp", "gif", "jpg", "psd", "png",
+        "bmp", "gif", "jpg", "jpeg", "png",
         // word excel powerpoint
-        "doc", "docx", "xls", "xlsx", "pdf", "wps","txt","mp3",
+        "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
         // 压缩文件
-        "rar", "zip", "z",
+        "rar", "zip","gz", "bz2",
         // 视频格式
-        "wmv","asf","rm", "rmvb","mov","mp4","avi",
+        "mp4", "avi", "rmvb","mp3",
+        // pdf
+        "pdf"
         ],
     },
     // 是否显示提示

+ 13 - 4
songhua-ui/src/views/system/management/index.vue

@@ -89,16 +89,16 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="景点名称" prop="scenicName">
-          <el-input v-model="form.scenicName" placeholder="请输入景点名称" />
+          <el-input v-model="form.scenicName" placeholder="请输入景点名称" maxlength="20"/>
         </el-form-item>
         <el-form-item label="景点半径" prop="radius">
-          <el-input v-model="form.radius" placeholder="请输入景点半径" />
+          <el-input v-model="form.radius" placeholder="请输入景点半径" maxlength="20"/>
         </el-form-item>
         <el-form-item label="景点经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入景点坐标" />
+          <el-input v-model="form.longitude" placeholder="请输入景点坐标" maxlength="20"/>
         </el-form-item>
         <el-form-item label="景点纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入景点坐标" />
+          <el-input v-model="form.latitude" placeholder="请输入景点坐标" maxlength="20"/>
         </el-form-item>
         <el-form-item label="文件" prop="scenicFile">
           <scenic-file-upload v-model="form.scenicFile"/>
@@ -115,6 +115,7 @@
 <script>
 import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/system/management";
 import ScenicFileUpload from "@/components/FileUpload/index1.vue";
+import {checkLat,checkLon} from "@/api/system/rules";
 
 export default {
   name: "Management",
@@ -153,6 +154,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        longitude: [
+          { required: true, message: "经度不能为空", trigger: "change" },
+          {validator: checkLon, trigger: 'blur'}
+        ],
+        latitude: [
+          { required: true, message: "纬度不能为空", trigger: "change" },
+          {validator: checkLat, trigger: 'blur'}
+        ],
       }
     };
   },