告警组+门禁设备调整

src/views/device/doordevice.vue

@@ -94,6 +94,39 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label:'',
+            prop:'mapSelect',
+            // row: true,
+            // span: 20,
+            viewDisplay: false,
+            formslot: true,
+            hide: true,
+          },
+          {
+            label: "经度",
+            prop: "longitude",
+            width: 100,
+            overHidden: true,
+            hide:true,
+            rules: [{
+              required: true,
+              message: "请输入经度",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "纬度",
+            prop: "latitude",
+            width: 100,
+            overHidden: true,
+            hide:true,
+            rules: [{
+              required: true,
+              message: "请输入纬度",
+              trigger: "blur"
+            }]
+          },
           {
             label: "Mac编码",
             prop: "macAddress",
@@ -104,6 +137,22 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "设备厂商",
+            prop: "deviceFactory",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=door_device_factory",
+            props:{
+              label: "dictValue",
+              value: "dictKey"
+            },
+            width: 135,
+            rules: [{
+              required: true,
+              message: "请选择设备厂商",
+              trigger: "blur"
+            }]
+          },
           {
             label: "所属小区",
             prop: "residentialId",
@@ -158,39 +207,7 @@ export default {
             }],
             display: false
           },
-          {
-            label:'',
-            prop:'mapSelect',
-            // row: true,
-            // span: 20,
-            viewDisplay: false,
-            formslot: true,
-            hide: true,
-          },
-          {
-            label: "经度",
-            prop: "longitude",
-            width: 100,
-            overHidden: true,
-            hide:true,
-            rules: [{
-              required: true,
-              message: "请输入经度",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "纬度",
-            prop: "latitude",
-            width: 100,
-            overHidden: true,
-            hide:true,
-            rules: [{
-              required: true,
-              message: "请输入纬度",
-              trigger: "blur"
-            }]
-          },
+
           // {
           //   label: "门禁设备",
           //   prop: "id",
@@ -202,22 +219,7 @@ export default {
           //     trigger: "blur"
           //   }]
           // },
-          // {
-          //   label: "设备厂商",
-          //   prop: "deviceFactory",
-          //   type: "select",
-          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=door_device_factory",
-          //   props:{
-          //     label: "dictValue",
-          //     value: "dictKey"
-          //   },
-          //   width: 135,
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入设备编号",
-          //     trigger: "blur"
-          //   }]
-          // },
+
 
           // {
           //   label: "所属省",
@@ -312,11 +314,13 @@ export default {
   created() {
     const tenantType = localStorage.getItem("tenantType");
     if (tenantType == 0){
-      this.option.column[2].label = "所属小区"
-      this.option.column[2].rules[0].message = "请选择所属小区"
+      this.findObject(this.option.column, 'residentialId').label = "所属小区";
+      this.findObject(this.option.column, 'residentialId').rules[0].message = "请选择所属小区";
+      // this.option.column[2].label = "所属小区"
     }else if (tenantType == 1){
-      this.option.column[2].label = "所属区域"
-      this.option.column[2].rules[0].message = "请选择所属区域"
+      // this.option.column[2].label = "所属区域"
+      this.findObject(this.option.column, 'residentialId').label = "所属区域";
+      this.findObject(this.option.column, 'residentialId').rules[0].message = "请选择所属区域";
     }
   },
   /*mounted() {

src/views/device/iotalarmgroup.vue

@@ -35,6 +35,10 @@
                        @click="handleDeleteChild">删 除
             </el-button>
           </template>
+          <template slot="isHandler" slot-scope="scope">
+            <el-switch v-model="scope.row.isHandler" disabled>
+            </el-switch>
+          </template>
         </avue-crud>
       </basic-container>
     </el-col>
@@ -55,7 +59,7 @@ import {
   getList as getUserList,
   getDetail as getUserDetail,
   add as addUser,
-  updata as updateUser,
+  update as updateUser,
   remove as removeUser
 } from "@/api/device/iotalarmgroupuser";
 import {
@@ -215,30 +219,23 @@ export default {
             label: "是否为处理人",
             prop: "isHandler",
             type: "switch",
-            row: true,
+            slot: true,
             span: 20,
             labelWidth: 120,
-            // dicData: DIC.yes_no,
-            // mock: {
-            //   type: 'dic'
-            // },
-            dicData:[
-              {
-                label:'是',
-                value:1
-              },
-              {
-                label:'否',
-                value: 0
-              }
-            ],
-            displayAs: 'switch',
+            dicData: [{
+              label: '否',
+              value: 0
+            }, {
+              label: '是',
+              value: 1
+            }],
             rules: [{
               required: false,
               message: "请输入是否为处理人",
               trigger: "blur"
             }]
           },
+
         ]
       },
       dataChild: []
@@ -351,9 +348,9 @@ export default {
     },
     beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
-        getDetail(this.formParent.id).then(res => {
+        /*getDetail(this.formParent.id).then(res => {
           this.formParent = res.data.data;
-        });
+        });*/
       }
       done();
     },
@@ -430,6 +427,7 @@ export default {
     },
     rowUpdateChild(row, index, done, loading) {
       // row.groupId = this.parentId;
+      debugger
       updateUser(row).then(() => {
         this.onLoadChild(this.pageChild);
         this.$message({
@@ -522,6 +520,7 @@ export default {
         const data = res.data.data;
         this.pageChild.total = data.total;
         this.dataChild = data.records;
+        // debugger
         this.dataChild.forEach(item => {
           item.isHandler = item.isHandler == 1;
         })