Merge branch 'sceneFix' into 'master'

坐标位置格式错误提醒

See merge request tian-group/skyeye-admin-fe!77

src/views/system-config/scene-manage/CompanyDrawer.vue

@@ -74,13 +74,12 @@
             ></div>
           </div>
         </el-form-item>
-        <el-form-item label="坐标位置" prop="location">
-          <el-input
-            v-model="ruleForm.location"
-            style="width: 200px"
-            placeholder="经度:121.53 ；纬度:31.22"
-          />
-        </el-form-item>
+        <el-form-item label="坐标经度" prop="longitude"
+          ><el-input v-model="ruleForm.longitude" type="number" style="width: 200px"></el-input
+        ></el-form-item>
+        <el-form-item label="坐标纬度" prop="latitude"
+          ><el-input v-model="ruleForm.latitude" type="number" style="width: 200px"></el-input
+        ></el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="ruleForm.remark" style="width: 200px" />
         </el-form-item>
@@ -136,7 +135,6 @@
       addEnable?: ENABLED;
       selectItems?: SelectItemType[];
       remark?: string;
-      location?: string;
       longitude?: number; //经度
       latitude?: number; //纬度
     };
@@ -156,7 +154,7 @@
   //表格中的规则
   const ruleFormRef = ref<FormInstance>();
   //匹配规则
-  const pattern = /经度\s*[:：]\s*([0-9.]+)\s*[;；]\s*纬度\s*[:：]\s*([0-9.]+)/;
+  // const pattern = /经度\s*[:：]\s*([0-9.]+)\s*[;；]\s*纬度\s*[:：]\s*([0-9.]+)/;
 
   interface RuleForm {
     name: string; //名称
@@ -170,7 +168,6 @@
     selectItems?: SelectItemType[];
     addEnable?: ENABLED;
     remark?: string; //备注，可用于添加经纬度，非必要
-    location?: string; //坐标位置
     longitude?: number; //经度
     latitude?: number; //纬度
   }
@@ -187,7 +184,6 @@
     selectItems: [{ tag: '', template: '' }],
     addEnable: ENABLED.TRUE,
     remark: '',
-    location: '',
     longitude: undefined, //经度
     latitude: undefined, //纬度
   });
@@ -201,10 +197,6 @@
       { required: true, message: '公司代码不能为空', trigger: 'blur' },
       { min: 1, max: 100, message: '长度在1-100之间', trigger: 'blur' },
     ],
-    location: [
-      { required: true, message: '坐标位置不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: '长度在1-100之间', trigger: 'blur' },
-    ],
   });
 
   //增加空的场景&模板
@@ -225,9 +217,8 @@
       ruleForm.addEnable = data.addEnable;
       ruleForm.selectItems = data.selectItems;
       ruleForm.remark = data.remark;
-      if (data.longitude && data.latitude) {
-        ruleForm.location = `经度:${data.longitude} ；纬度:${data.latitude}`;
-      }
+      ruleForm.latitude = data.latitude;
+      ruleForm.longitude = data.longitude;
     },
     { immediate: true },
   );
@@ -286,8 +277,6 @@
             console.log('取消删除物件');
           });
       } else {
-        const matchResult = ruleForm.location?.match(pattern)!;
-        // 经度：43.22；纬度：34234
         const newComData = {
           name: ruleForm.name,
           code: ruleForm.code,
@@ -296,8 +285,8 @@
           parentId: 0,
           serial: 0,
           remark: ruleForm.remark,
-          longitude: Number(matchResult[1]),
-          latitude: Number(matchResult[2]),
+          longitude: ruleForm.longitude,
+          latitude: ruleForm.latitude,
         };
         //提交数据并重置关闭el-draw
         addCompany(newComData)
@@ -357,9 +346,6 @@
       ruleForm.selectItems = ruleForm.selectItems!.filter((item) => {
         return item.tag && item.template;
       });
-
-      const matchResult = ruleForm.location?.match(pattern)!;
-
       //新增的数据
       const editNewCom = {
         id: props.detail.id,
@@ -367,8 +353,8 @@
         code: ruleForm.code,
         status: Number(ruleForm.addEnable),
         remark: ruleForm.remark,
-        longitude: Number(matchResult[1]),
-        latitude: Number(matchResult[2]),
+        longitude: ruleForm.longitude,
+        latitude: ruleForm.latitude,
       };
       // 编辑上传
       editCompany(editNewCom)