Merge branch '3.3.5-BaoJingZhuaPai&DianHuaBaoJing' into web-v2-temp

src/views/comprehensive/message/warningNotice/index.vue

@@ -114,7 +114,7 @@
       return{
         pageType:1,
         selectListA:[{key:'0',value:"全部"},{key:"1",value:"算法识别"},{key:"2",value:"化学品"},{key:"3",value:"气瓶"}],
-        selectListB:[{key:"",value:"全部"},{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},{key:"4",value:"语音播报"}],
+        selectListB:[{key:"",value:"全部"},{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},{key:"4",value:"语音播报"},{key:"5",value:"电话通知"}],
         queryParams:{
           pageNum: 1,
           pageSize:20,
@@ -172,6 +172,7 @@
               response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/2/, "短信通知")
               response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
               response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/4/, "语音播报")
+              response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/5/, "电话通知")
               if (response.data.records[i].warningWay.endsWith(',')) {
                 response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/,/, " ")
               }

src/views/comprehensive/message/warningNotice/infoPage.vue

@@ -202,8 +202,9 @@
               if(this.infoData.warningWay!='' && this.infoData.warningWay!=null){
                 this.infoData.warningWay=this.infoData.warningWay.replace(/1/, "系统通知")
                 this.infoData.warningWay=this.infoData.warningWay.replace(/2/, "短信通知")
-                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
-                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/4/, "语音播报")
+                this.infoData.warningWay=this.infoData.warningWay.replace(/3/, "声光报警")
+                this.infoData.warningWay=this.infoData.warningWay.replace(/4/, "语音播报")
+                this.infoData.warningWay=this.infoData.warningWay.replace(/5/, "电话通知")
                 if (this.infoData.warningWay.endsWith(',')) {
                   this.infoData.warningWay=this.infoData.warningWay.replace(/,/, " ")
                 }

src/views/comprehensive/message/warningNotice/sourceOfDangerForewarning.vue

@@ -25,26 +25,26 @@
         <el-form-item class="form-item-check-box" label="超时未归还">
           <el-checkbox-group v-model="addForm.timeout">
             <el-checkbox style="width:100px;margin-top:2px;"
-                         v-for="item in checkListB" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
+                         v-for="item in checkListA" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item class="form-item-check-box" label="化学品已过期">
           <el-checkbox-group v-model="addForm.expired">
             <el-checkbox style="width:100px;margin-top:2px;"
-                         v-for="item in checkListB" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
+                         v-for="item in checkListC" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item class="form-item-check-box" label="化学品即将过期">
           <el-checkbox-group v-model="addForm.unexpired">
             <el-checkbox style="width:100px;margin-top:2px;"
-                         v-for="item in checkListB" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
+                         v-for="item in checkListC" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <p class="form-title-p" style="margin-top:20px;margin-bottom:10px;">气瓶预警规则</p>
         <el-form-item class="form-item-check-box" label="违规带离">
           <el-checkbox-group v-model="addForm2.illegalRemoval">
             <el-checkbox style="width:100px;margin-top:2px;"
-                         v-for="item in checkListA" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
+                         v-for="item in checkListB" :value="item.key" :label="item.key" :key="item.key">{{item.value}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item class="form-item-check-box" label="超时未归还">
@@ -71,8 +71,9 @@ import { warningConfigAdd, warningConfigList } from '@/api/laboratory/warningNot
     name: 'sourceOfDangerForewarning',
     data(){
       return{
-        checkListA:[{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},],
-        checkListB:[{key:"1",value:"系统通知"},{key:"2",value:"短信通知"}],
+        checkListA:[{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},{key:"5",value:"电话通知"},],
+        checkListB:[{key:"1",value:"系统通知"},{key:"2",value:"短信通知"},{key:"3",value:"声光报警"},],
+        checkListC:[{key:"1",value:"系统通知"},{key:"2",value:"短信通知"}],
         addForm:{//化学品
           id:'',
           unexpiredWarnDays:7,

src/views/emergencyManagement/plan/newAddPlan.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="newAddPlan">
     <div class="newAddPlan-title-box">
-      <p>定制预案</p>
+      <p>定制预案1</p>
       <p class="add-button-two-90" @click="backButton">返回</p>
       <!--<p class="inquire-button-one" @click="upDataButton(1)">不关联仅保存</p>-->
       <p class="inquire-button-one" @click="associatedDialogClick">关联实验室</p>
@@ -29,9 +29,12 @@
             <div class="for-plan-img-box">
               <p class="for-plan-img-null-p"></p>
               <div class="for-plan-img-box-big">
-                <div class="for-plan-img-box-one" v-if="item.ifExit == 1">
-                  <img src="@/assets/ZDimages/evacuation3_2/img_dzya_ldss.png">
-                  <p>联动疏散</p>
+                <div class="for-plan-img-box-one">
+                  <img v-if="item.riskPlanLevel==1" src="@/assets/ZDimages/evacuation3_2/icon_dzya_dfx.png">
+                  <img v-if="item.riskPlanLevel==2" src="@/assets/ZDimages/evacuation3_2/icon_dzya_zfx.png">
+                  <img v-if="item.riskPlanLevel==3" src="@/assets/ZDimages/evacuation3_2/icon_dzya_jgfx.png">
+                  <img v-if="item.riskPlanLevel==4" src="@/assets/ZDimages/evacuation3_2/icon_dzya_gfx.png">
+<!--                  <p>联动疏散</p>-->
                 </div>
                 <!--<div class="for-plan-img-box-two">-->
                 <!--<img src="@/assets/ZDimages/evacuation3_2/img_dzya_hzyj.png">-->
@@ -937,7 +940,7 @@
           background:  rgba(248,206,205);;
         }
         .for-plan-img-box{
-          width:284px;
+          width:220px;
           display: flex;
           flex-direction: column;
           .for-plan-img-null-p{
@@ -946,12 +949,12 @@
           .for-plan-img-box-big{
             display: flex;
             .for-plan-img-box-one{
-              margin-left:81px;
+              margin-left:100px;
               width:168px;
               display: flex;
               img{
-                height:50px;
-                width:50px;
+                height:60px;
+                width:60px;
               }
               p{
                 margin-left:20px;