告警规则bug修改

src/views/iot/deviceInfo/index.vue

@@ -31,7 +31,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="网络状态" prop="netStatus" label-width="80">
+            <el-form-item label="网络状态" prop="netStatus" label-width="80" v-if="activeName!='fsu' ">
               <el-select style="width: 100%;"  v-model="queryParams.netStatus" placeholder="网络状态"
                          @change="searchChangeSelectNetStatus" clearable>
                 <el-option v-for="dict in netStatusList" :key="dict.value" :label="dict.label"

src/views/warnRule/addRelvance.vue

@@ -221,6 +221,7 @@ export default {
       treeList: [],
       deptOptions:[],
       boundDevicesClone:JSON.parse(JSON.stringify(this.currentTempList)),
+      iotCode:null,
       left: {
         condition: {
           orgId: this.$store.getters.orgId,
@@ -286,7 +287,6 @@ export default {
         else {
           this.treeList = this.$store.getters.orgTree;
         }
-        console.log(this.treeList)
       }
     },
     getChildIds(orgTree,parentId){
@@ -397,6 +397,7 @@ export default {
         orgId:condition.orgId,
         deviceName:condition.deviceName,
         type:this.deviceType,
+        iotCode:this.iotCode,
         includeSub:condition.searchChild,
         page:0,
         size:9999
@@ -405,7 +406,6 @@ export default {
           this.searchDevices = result.data.records;
           this.boundDeviceIds = this.boundDevicesClone.map((d) => d.deviceId);
           let data = result.data.records.filter((row) => this.boundDeviceIds.indexOf(row.deviceId) < 0);
-        console.log("data",data)
           this.left.data = data;
         });
     },

src/views/warnRule/index.vue

@@ -216,8 +216,6 @@ export default {
           })
         }
       })
-
-      console.log(this.alarmRules);
       this.loading = false;
     },
     ConvertToSourceTypeDics(sourceTypeList) {
@@ -290,7 +288,7 @@ export default {
     },
     /** 关联按钮操作 */
     lookView(row) {
-      this.$refs["relevanceDialog"].show(row.iotAlarmRule.id, {});
+      this.$refs["relevanceDialog"].show(row.iotAlarmRule.id,row.iotAlarmRule.iotCode, {});
     },
     getDeviceNumber(row) {
       let text = "";

src/views/warnRule/relevanceDialog.vue

@@ -68,8 +68,10 @@ export default {
         deviceTempList: [],
         type: -1,
         typeText: "",
+        iotCode: "",
       },
       data: defaultDetail,
+      iotCode: null,
       queryParams: {},
     };
   },
@@ -77,8 +79,9 @@ export default {
   },
 
   methods: {
-    show(ruleId) {
+    show(ruleId,iotCode) {
       this.isShow = true;
+      this.iotCode = iotCode;
       this.init(ruleId);
     },
     init(ruleId) {

src/views/warnRule/relevanceDialogCom.vue

@@ -68,6 +68,7 @@ export default {
     handleAddDevice() {
       this.$refs.addrelvance.visible = true
       this.$refs.addrelvance.deviceType = this.currentDevice.type;
+      this.$refs.addrelvance.iotCode = this.currentDevice.iotCode;
       this.$refs.addrelvance.orgTree();
     },
     addDevice(data) {