09-15

src/api/system/device.js

@@ -98,3 +98,10 @@ export function setDeviceInterval(data) {
     data: data
   })
 }
+export function addFence(data) {
+  return request({
+    url: '/system/electronic/fence',
+    method: 'post',
+    data: data
+  })
+}

src/views/system/region/index.vue

@@ -161,19 +161,19 @@
         <!-- <el-form-item label="父区域id" prop="parentId">
           <el-input v-model="form.parentId" placeholder="请输入父区域id" />
         </el-form-item> -->
-        <el-form-item label="*父区划名称" prop="deptName">
+        <el-form-item label="父区划名称" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入父区划名称" />
         </el-form-item>
-        <el-form-item label="*父区划编号" prop="deptNum" style="width: 280px;">
+        <el-form-item label="父区划编号" prop="deptNum" style="width: 280px;">
           <el-input v-model="form.deptNum" placeholder="请输入父区划编号" />
         </el-form-item>
-        <el-form-item label="*区域名称" prop="zoneName">
+        <el-form-item label="区域名称" prop="zoneName">
           <el-input v-model="form.zoneName" placeholder="请输入区域名称" />
         </el-form-item>
-        <el-form-item label="*区域编号" prop="zoneNum">
+        <el-form-item label="区域编号" prop="zoneNum">
           <el-input v-model="form.zoneNum" placeholder="请输入区域编号" />
         </el-form-item>
-        <el-form-item label="*区域等级" prop="kind">
+        <el-form-item label="区域等级" prop="kind">
 
           <el-radio-group v-model="form.kind">
             <el-radio :label="1">国家</el-radio>
@@ -289,7 +289,28 @@ export default {
         address: null
       },
       // 表单校验
-      rules: {},
+      rules: {
+        deptName: [
+          { required: true, message: '请输入父区划名称', trigger: 'blur' },
+        ],
+        deptNum: [
+          {required: true, message: '请输入父区划编号', trigger: 'blur'},
+          {type: 'number', message: '父区划编号必须为数字'}
+        ],
+        zoneName: [
+          { required: true, message: '请输入区划名称', trigger: 'blur' }
+        ],
+        zoneNum: [
+          {required: true, message: '请输入区划编号', trigger: 'blur'},
+          {type: 'number', message: '区划编号必须为数字'}
+        ],
+        kind: [
+          {required: true, message: '请选择区域等级', trigger: 'change'},
+        ],
+        orderNum: [
+          {required: true, message: '请输入区域排序', trigger: 'blur'}
+        ]
+      },
       selectArea: {},
       mapView: false,
       map: null
@@ -429,14 +450,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if (this.form.deptName == null ||
-        this.form.deptNum == null ||
-        this.form.zoneName == null ||
-        this.form.zoneNum == null ||
-        this.form.kind == null ||
-        this.form.orderNum == null) {
-        return this.$message.error('请输入完整信息');
-      }
       this.regionList.map(item => {
         if (item.deptName == this.form.deptName) {
           this.form.id == item.id