zc

src/api/iotDevice/index.js

@@ -33,6 +33,14 @@ export function iotAttributeGetByTypeId(query) {
     params: query
   })
 }
+//通过设备typeKey查询设备属性
+export function iotAttributeGetByTypeKey(query) {
+  return request({
+    url: '/iot/attribute/getByTypeKey',
+    method: 'get',
+    params: query
+  })
+}
 
 //新增设备
 export function iotDeviceAdd(data) {

src/views/emergencyManagement/plan/addPlan.vue

@@ -101,20 +101,6 @@
               <el-radio :label="4">高风险</el-radio>
             </el-radio-group>
           </el-form-item>
-          <div style="display: flex">
-            <el-form-item label="执行疏散：" prop="ifExit">
-              <el-radio-group  v-model="dialogForm.ifExit" style="width:500px;">
-                <el-radio :label="true">否</el-radio>
-                <el-radio :label="false">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <!--<el-form-item label="火灾预案：" prop="name" style="margin-left:220px;">-->
-              <!--<el-radio-group v-model="dialogForm.type3">-->
-                <!--<el-radio :label="1">否</el-radio>-->
-                <!--<el-radio :label="2">是</el-radio>-->
-              <!--</el-radio-group>-->
-            <!--</el-form-item>-->
-          </div>
           <el-form-item label="报警通知方式:" prop="alarmType">
             <el-checkbox-group v-model="dialogForm.alarmType" @change="alarmChange">
               <el-checkbox label="1">电话报警</el-checkbox>
@@ -139,7 +125,7 @@
             </el-input>
             <p  class="autoClose_l5">以后预案自动关闭</p>
           </div>
-          <div style="border-top:1px solid #e0e0e0;">
+          <div style="border-top:1px solid #e0e0e0;overflow: hidden;">
             <p style="line-height:60px;font-size:14px;margin-left:19px;">启动条件：</p>
             <div style="display: flex" v-for="(item,index) in dialogForm.bindingSensor" :key="index">
               <div style="flex:1;">
@@ -172,7 +158,7 @@
             <p style="cursor: pointer;width:200px;line-height:30px;border-radius:4px;border: 1px dashed #E0E0E0;color:#333333;text-align: center;margin:20px auto;"
                @click="addMinData(1)" :class="dialogForm.bindingSensor.length>8?'add-plan-max-button-color':''">+ 新增监测规则</p>
           </div>
-          <div style="border-top:1px solid #e0e0e0;">
+          <div style="border-top:1px solid #e0e0e0;overflow: hidden;">
             <p style="line-height:60px;font-size:14px;margin-left:19px;">执行动作：</p>
             <div style="display: flex" v-for="(item,index) in dialogForm.bindingDevice" :key="index">
               <div style="flex:1;display: flex">
@@ -231,7 +217,7 @@
 <script>
   import { laboratoryMusicFindByType,laboratoryRiskDeviceTypeGetList,laboratoryRiskPlanLevelGetRiskPlanLeveList,
     laboratoryPlanUpdate,laboratoryRiskPlanLevelAdd,laboratoryRiskPlanLevelUpdate,laboratoryRiskPlanLevelDelete } from "@/api/emergencyManagement/index";
-  import { iotAttributeGetByTypeId } from "@/api/iotDevice/index";
+  import { iotAttributeGetByTypeKey } from "@/api/iotDevice/index";
   import { iotAlarmTemplateFindList } from "@/api/commonality/permission";
   export default {
     name: "newAddPlan",
@@ -337,7 +323,7 @@
       initialization(){
         this.iotAlarmTemplateFindList();
         this.laboratoryMusicFindByType();
-        this.iotAttributeGetByTypeId();
+        this.iotAttributeGetByTypeKey();
         this.laboratoryRiskDeviceTypeGetList();
         this.laboratoryRiskPlanLevelGetRiskPlanLeveList(1);
       },
@@ -418,7 +404,7 @@
         for(let o=0;o<self.hardwareList.length;o++){
           let num =0;
           for(let i=0;i<self.dialogForm.bindingDevice.length;i++){
-            if(self.dialogForm.bindingDevice[i].typeKey  == self.hardwareList[o].hardwareTypeEnum.code){
+            if(self.dialogForm.bindingDevice[i].typeKey  == self.hardwareList[o].typeKey){
               num++
               age++
             }
@@ -455,7 +441,7 @@
       controlTypeList(val,index) {
         let self = this;
           for(let i=0;i<self.hardwareList.length;i++){
-            if(self.hardwareList[i].hardwareTypeEnum.code == val){
+            if(self.hardwareList[i].typeKey == val){
               this.$set(self.dialogForm.bindingDevice[index],'hardwareList',self.hardwareList[i].functionStatusList);
               this.actionFiltration()
               return
@@ -810,8 +796,8 @@
         });
       },
       //传感器
-      iotAttributeGetByTypeId(){
-        iotAttributeGetByTypeId({typeId:1}).then(response => {
+      iotAttributeGetByTypeKey(){
+        iotAttributeGetByTypeKey({typeKey:'sensor'}).then(response => {
           this.$set(this,'sensorList',response.data)
           this.$set(this,'sensorListData',response.data)
         });

src/views/emergencyManagement/plan/index.vue

@@ -110,7 +110,7 @@
 //                        V3
 import { laboratoryMusicFindByType,laboratoryPlanList,laboratoryPlanAdd,
   laboratoryPlanDelete } from "@/api/emergencyManagement/index";
-import { iotAttributeGetByTypeId } from "@/api/iotDevice/index";
+import { iotAttributeGetByTypeKey } from "@/api/iotDevice/index";
 import addPlanPage from "./addPlan.vue";
 import associationPage from "./associatedPage.vue";
 
@@ -179,7 +179,7 @@ export default {
     };
   },
   mounted(){
-    this.iotAttributeGetByTypeId();
+    this.iotAttributeGetByTypeKey();
 
     this.getList();
     this.laboratoryMusicFindByType();
@@ -255,8 +255,8 @@ export default {
       this.pageType=0
     },
     /** 查询启动条件 */
-    iotAttributeGetByTypeId() {
-      iotAttributeGetByTypeId({typeId:1}).then(response => {
+    iotAttributeGetByTypeKey() {
+      iotAttributeGetByTypeKey({typeKey:'sensor'}).then(response => {
         this.$set(this, 'attributeOptions', response.data)
       });
     },