zc

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -559,12 +559,12 @@ export default {
           if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data.data[0]){
+                if(!res.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
                 }else{
-                  let newData = res.data.data;
+                  let newData = res.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
                     let obj = {
@@ -583,12 +583,12 @@ export default {
           }else{
             startUrl(obj).then(res => {
               if(res.code == 200){
-                if(!res.data.data[0]){
+                if(!res.data[0]){
                   this.msgError("视频配置异常请联系管理员")
                   this.newData.videoData = [];
                   this.pageType = 6;
                 }else{
-                  let newData = res.data.data;
+                  let newData = res.data;
                   let videoList = [];
                   for(let i=0;i<newData.length;i++){
                     let text = localStorage.getItem('cameraUrl');
@@ -673,11 +673,11 @@ export default {
                 startUrl(obj).then(res => {
                   console.log('res',res)
                   if(res.code == 200){
-                    if(!res.data.data[0]){
+                    if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
                       return
                     }
-                    let newData = res.data.data;
+                    let newData = res.data;
                     let videoList = [];
                     for(let i=0;i<newData.length;i++){
                       let obj = {
@@ -700,11 +700,11 @@ export default {
                 startUrl(obj).then(res => {
                   console.log('res',res)
                   if(res.code == 200){
-                    if(!res.data.data[0]){
+                    if(!res.data[0]){
                       this.msgError("视频配置异常请联系管理员")
                       return
                     }
-                    let newData = res.data.data;
+                    let newData = res.data;
                     let videoList = [];
                     for(let i=0;i<newData.length;i++){
                       let text = localStorage.getItem('cameraUrl');

src/views/emergencyManagement/plan/index.vue

@@ -125,6 +125,13 @@ export default {
   },
   name: "Plan",
   data() {
+    const exportconstvalidateContacts  = (rule, value, callback) => {
+      if(!/^[\u0391-\uFFE50-9]+$/.test(value)) {
+        callback(new Error("只可输入中文与数字"));
+      } else {
+        callback()
+      }
+    };
     return {
       tableButtonType:this.hasPermiDom(['laboratory:plan:query','laboratory:planjoin:edit','laboratory:distribution:list','laboratory:plan:query','laboratory:plan:edit','laboratory:plan:remove']),
       //页面状态
@@ -162,7 +169,8 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入预案名称", trigger: "change" },
-          { required: true, message: "请输入预案名称", validator: this.spaceJudgment, trigger: "change" }
+          { required: true, message: "请输入预案名称", validator: this.spaceJudgment, trigger: "change" },
+          { required: true, validator: exportconstvalidateContacts, trigger: "blur" },
         ],
       },
       //关联页面传参数据

src/views/emergencyManagement/plan/newAddPlan.vue

@@ -119,11 +119,13 @@
               </div>
               <div style="flex:1;display: flex">
                 <el-form-item label="监测区间：" :prop="'riskPlanSensorList.'+index+'.minMonitor'" :rules="rules.minMonitor">
-                  <el-input-number  v-model="item.minMonitor" style="width:90px;" :min="1" :max="99999" :controls="false" placeholder="监测区间"></el-input-number>
+                  <el-input-number  v-model="item.minMonitor" style="width:90px;" :disabled="item.suoType"
+                                    :min="1" :max="99999" :controls="false" placeholder="监测区间"></el-input-number>
                 </el-form-item>
                 <p style="width:30px;text-align: center;line-height:40px;">-</p>
                 <el-form-item label="" :prop="'riskPlanSensorList.'+index+'.maxMonitor'" :rules="rules.maxMonitor" label-width="0">
-                  <el-input-number  v-model="item.maxMonitor" style="width:90px;" :min="1" :max="99999" :controls="false" placeholder="监测区间"></el-input-number>
+                  <el-input-number  v-model="item.maxMonitor" style="width:90px;" :disabled="item.suoType"
+                                    :min="1" :max="99999" :controls="false" placeholder="监测区间"></el-input-number>
                 </el-form-item>
                 <p class="el-icon-delete"
                    @click="delMinData(1,index)"
@@ -131,7 +133,7 @@
               </div>
             </div>
             <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)">+ 新增监测规则</p>
+               @click="addMinData(1)" :class="dialogForm.riskPlanSensorList.length>8?'add-plan-max-button-color':''">+ 新增监测规则</p>
           </div>
           <div style="border-top:1px solid #e0e0e0;">
             <p style="line-height:60px;font-size:14px;margin-left:19px;">执行动作：</p>
@@ -173,7 +175,7 @@
               </div>
             </div>
             <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(2)">+ 新增执行动作</p>
+               @click="addMinData(2)" :class="dialogForm.riskPlanHardwareList.length>8?'add-plan-max-button-color':''">+ 新增执行动作</p>
           </div>
         </el-form>
       </div>
@@ -201,6 +203,13 @@
       addPlanData:{},
     },
     data() {
+      const exportconstvalidateContacts  = (rule, value, callback) => {
+        if(!/^[\u0391-\uFFE50-9]+$/.test(value)) {
+          callback(new Error("只可输入中文与数字"));
+        } else {
+          callback()
+        }
+      };
       return {
         form:{
           name:"",
@@ -214,7 +223,8 @@
         rules: {
           name: [
             { required: true, message: "请输入预案名称", trigger: "change" },
-            { required: true, message: "请输入预案名称", validator: this.spaceJudgment, trigger: "change" }
+            { required: true, message: "请输入预案名称", validator: this.spaceJudgment, trigger: "change" },
+            { required: true, validator: exportconstvalidateContacts, trigger: "blur" },
           ],
           riskPlanLevel: [
             { required: true, message: "请选择预案等级", trigger: "change" },
@@ -275,6 +285,17 @@
         for(let i=0;i<self.sensorList.length;i++){
           if(self.sensorList[i].hardwareTypeCode == val){
             this.$set(self.dialogForm.riskPlanSensorList[index],'funNum',self.sensorList[i].hardwareTypeName);
+            if(self.sensorList[i].enumName == "FLAME"){
+              console.log('self.sensorList[i].enumName',self.sensorList[i].enumName)
+              self.dialogForm.riskPlanSensorList[index].minMonitor = 1;
+              self.dialogForm.riskPlanSensorList[index].maxMonitor = 2;
+              self.$set(self.dialogForm.riskPlanSensorList[index],'minMonitor',1);
+              self.$set(self.dialogForm.riskPlanSensorList[index],'maxMonitor',2);
+              self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',true);
+              console.log('self.dialogForm.riskPlanSensorList.riskPlanSensorList',self.dialogForm.riskPlanSensorList)
+            }else{
+              self.$set(self.dialogForm.riskPlanSensorList[index],'suoType',false);
+            }
           }
         }
       },
@@ -287,10 +308,14 @@
           this.$set(this,'inputType',true);
           this.$set(this.form,'name',this.inputName);
         }else if(type == 3){
-          putPlan({ id:this.addPlanData.id, name:this.form.name }).then((response) => {
-            this.msgSuccess(response.msg)
-            this.$set(this,'inputType',true);
-          });
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                putPlan({ id:this.addPlanData.id, name:this.form.name }).then((response) => {
+                  this.msgSuccess(response.msg)
+                  this.$set(this,'inputType',true);
+                });
+              }
+          })
         }
       },
       //提交
@@ -395,6 +420,9 @@
       //提交
       submitForm(){
         let self = this;
+
+        this.$refs["dialogForm"].validate(valid => {
+          if (valid) {
         if(!this.dialogForm.riskPlanSensorList[0]){
           this.msgError('请添加至少一个启动条件')
           return
@@ -499,8 +527,8 @@
             }
           }
         }
-        this.$refs["dialogForm"].validate(valid => {
-          if (valid) {
+        // this.$refs["dialogForm"].validate(valid => {
+        //   if (valid) {
             if(this.dialogIndex != null){
               //修改预案级别数据
               let text = [];
@@ -565,6 +593,8 @@
                 this.$set(this,'dialogOpen',false);
               });
             }
+        //   }
+        // })
           }
         })
       },
@@ -576,10 +606,25 @@
       buttonClick(type,item,index){
         let self = this;
         if(type == 1){
+          let a = 0;
+          let b = 0;
+          let c = 0;
+          let d = 0;
+          for(let i=0;i<self.form.labRiskPlanLevels.length;i++){
+            if(self.form.labRiskPlanLevels[i].riskPlanLevel == 1){
+              a++
+            }else if(self.form.labRiskPlanLevels[i].riskPlanLevel == 2){
+              b++
+            }else if(self.form.labRiskPlanLevels[i].riskPlanLevel == 3){
+              c++
+            }else if(self.form.labRiskPlanLevels[i].riskPlanLevel == 4){
+              d++
+            }
+          }
           this.$set(this,'dialogIndex',null);
           this.$set(this,'dialogTitle','新增预案规则');
           this.$set(this,'dialogForm',{
-            riskPlanLevel:null,
+            riskPlanLevel:a==0?1:(b==0?2:(c==0?3:(d==0?4:''))),
             ifExit:null,
             riskPlanSensorList:[],
             riskPlanHardwareList:[],
@@ -649,7 +694,11 @@
     }
   }
 </script>
-
+<style lang="scss">
+  .add-plan-max-button-color{
+    color:#dedede!important;
+  }
+</style>
 <style scoped lang="scss">
   .newAddPlan {
     flex: 1;

src/views/emergencyManagement/plan/newAssociatedPage.vue

@@ -69,7 +69,7 @@
         <el-table-column label="危险源" align="left" prop="labSensorHazardRelationsList" show-overflow-tooltip>
           <template slot-scope="scope">
             <span style="margin-right:10px;" v-for="(item,index) in scope.row.labSensorHazardRelationsList" :key="index">
-              {{item.hazardName}}-{{item.sensorName}}
+              {{item.hazardName}} - {{item.sensorName}}
             </span>
           </template>
         </el-table-column>
@@ -402,11 +402,13 @@
         }else if(type == 2){
           item.buttonType = 0;
         }else if(type == 3){
-          if(item.sensorId == null){
+          console.log('sensorId',item.sensorId)
+          console.log('hazardSubjectId',item.hazardSubjectId)
+          if(item.hazardSubjectId == null){
             this.msgError('请选择要添加的危险源')
             return
           }
-          if(item.hazardSubjectId == null){
+          if(item.sensorId == null){
             this.msgError('请选择要添加的传感器')
             return
           }
@@ -459,7 +461,7 @@
       //删除关联实验室
       handleDelete(item){
         let self = this;
-        this.$confirm('确定要删除该预案规则吗?', "警告", {
+        this.$confirm('您确定要移除该实验室吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/newEvacuationBigData.vue

@@ -314,7 +314,8 @@
           <div class="user-max-box scrollbar-box" id="user-max-box">
             <div class="user-box" v-for="(item,index) in userList" :key="index">
               <div>
-                <img :src="item.avatar">
+                <img v-if="item.avatar" :src="item.avatar">
+                <img v-if="!item.avatar" src="@/assets/ZDimages/tx_cion.png">
                 <p>{{item.nickName}}</p>
               </div>
             </div>
@@ -1165,14 +1166,12 @@
       subOnlineUser(id){
         let self = this;
         subOnlineUser({subId:this.subId}).then(response => {
-          if(response.rows[0]){
-            this.$set(this,'userList',response.rows);
-            if(id){
-              for(let i=0;i<self.mapList.length;i++){
-                if(self.mapList[i].type == '1'){
-                  if(self.mapList[i].subId == id){
-                    this.$set(self.mapList[i],'online',response.rows.length);
-                  }
+          this.$set(this,'userList',response.rows);
+          if(id){
+            for(let i=0;i<self.mapList.length;i++){
+              if(self.mapList[i].type == '1'){
+                if(self.mapList[i].subId == id){
+                  this.$set(self.mapList[i],'online',response.rows.length);
                 }
               }
             }
@@ -1406,8 +1405,8 @@
         };
         const { data } = await startUrl(obj);
         console.log('data',data);
-        if(data.data){
-          let newData = data.data;
+        if(data){
+          let newData = data;
           let urlText = window.location.href;
           if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){
             console.log('本地');

src/views/newEvacuationBigDataHome.vue

@@ -755,8 +755,8 @@
             deviceIds:this.monitorNumList[index].hardwareList+'',
           };
           const { data } = await startUrl(obj);
-          if(data.data){
-            let newData = data.data;
+          if(data){
+            let newData = data;
             let urlText = window.location.href;
             let videoList = [];
             if(urlText.indexOf(localStorage.getItem('ipIdentify')) != -1){