heyang

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

@@ -91,7 +91,7 @@
           <!--传感器-->
           <div class="bottom-max-box" :class="rightButtonType == 4?'overflow-box':''">
             <div class="bottom-sensor-box" v-if="rightButtonType == 1">
-              <p class="top-title">当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
+              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
               <div class="sensor-for-max-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
@@ -128,7 +128,7 @@
               <p class="bottom-text" v-if="checkedSubject.sensorFunctionStatusList[0]">数据上报时间：{{checkedSubject.sensorFunctionStatusList[0].sendDate}}</p>
             </div>
             <div class="bottom-switch-box" v-if="rightButtonType == 2">
-              <p class="top-title">当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
+              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
               <div class="switch-for-max-box" v-show="checkedSubject.VOlist[0]" v-hasPermi="['laboratory:subcontrol:set']">
                 <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.VOlist" :key="index">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
@@ -181,7 +181,7 @@
               <p class="null-text-p" v-show="!checkedSubject.VOlist[0]">暂无物联控制信息，请在更多操作-物联设备配置中进行添加</p>
             </div>
             <div class="bottom-video-box" v-if="rightButtonType == 3">
-              <p class="top-title">当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
+              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
               <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
                 <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index">
                   <video :id="item.divId" ref="videoRef" autoplay controls  muted width="490px" height="262px"></video>
@@ -192,6 +192,7 @@
               <p class="null-text-p" v-if="!checkedSubject.videoData[0]">暂无视频监控信息，请在更多操作-物联设备配置中进行添加</p>
             </div>
             <div class="bottom-alarm-box" v-if="rightButtonType == 4">
+              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
               <div class="alarm-max-box" :class="hardwareData[0]?hardwareData[0].status==3||hardwareData[0].status==4?'BGcolorTypeA':'BGcolorTypeB':''">
                 <img  v-if="hardwareData[0]?hardwareData[0].status == 3:''" src="@/assets/ZDimages/medicUniversity-3_1/img_syslb_znsgbjzx.png" class="alarm-img">
                 <div class="alarm-big-box" v-if="hardwareData[0]">
@@ -236,6 +237,7 @@
               />
             </div>
             <div class="bottom-entrance-box" v-if="rightButtonType == 5">
+              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
               <div class="entrance" :class="item.operate.code==2?'BGentrance_l_yes':'BGentrance_l_no'" v-for="(item,index) in entranceList" v-if="item.operate">
                 <img class="entrance_c" v-if="item.operate.code==2" src="@/assets/ZDimages/icon_znmj_zx.png">
                 <img class="entrance_c" v-if="item.operate.code!=2"  src="@/assets/ZDimages/icon_znmj_lx.png">
@@ -1170,9 +1172,15 @@ export default {
          // border: 1px solid #E0E0E0;
           //border-radius: 0 10px 10px 10px;
           .top-title{
-            line-height:18px;
-            font-size:16px;
             margin:16px 26px;
+            display: flex;
+            justify-content: space-between;
+            >i{
+              font-style: normal;
+              line-height:18px;
+              font-size:16px;
+              color: #333;
+            }
           }
           .null-text-p{
             text-align: center;
@@ -1239,9 +1247,15 @@ export default {
           width:424px;
           flex: 1;
           .top-title{
-            line-height:18px;
-            font-size:16px;
-            margin:23px 10px;
+            margin:16px 26px;
+            display: flex;
+            justify-content: space-between;
+            >i{
+              font-style: normal;
+              line-height:18px;
+              font-size:16px;
+              color: #333;
+            }
           }
           .null-text-p{
             text-align: center;
@@ -1325,9 +1339,15 @@ export default {
           border-radius: 0 10px 10px 10px;
           flex: 1;
           .top-title{
-            line-height:18px;
-            font-size:16px;
-            margin:23px 10px;
+            margin:16px 26px;
+            display: flex;
+            justify-content: space-between;
+            >i{
+              font-style: normal;
+              line-height:18px;
+              font-size:16px;
+              color: #333;
+            }
           }
           .null-text-p{
             text-align: center;
@@ -1366,6 +1386,17 @@ export default {
           overflow-x: hidden;
           padding: 0 27px 0 23px;
           box-sizing: border-box;
+          .top-title{
+            margin:16px 0px;
+            display: flex;
+            justify-content: space-between;
+            >i{
+              font-style: normal;
+              line-height:18px;
+              font-size:16px;
+              color: #333;
+            }
+          }
           .alarm-max-box{
             width:374px;
             height:60px;
@@ -1455,6 +1486,17 @@ export default {
           background: #fff;
           width:424px;
           border-radius: 0 10px 10px 10px;
+          .top-title{
+            margin:16px 26px;
+            display: flex;
+            justify-content: space-between;
+            >i{
+              font-style: normal;
+              line-height:18px;
+              font-size:16px;
+              color: #333;
+            }
+          }
           .entrance{
             width: 374px;
             height: 60px;

src/views/emergencyManagement/plan/newAddPlan.vue

@@ -102,6 +102,29 @@
               <!--</el-radio-group>-->
             <!--</el-form-item>-->
           </div>
+          <el-form-item label="报警通知方式:" prop="expandType">
+            <el-checkbox-group v-model="dialogForm.alarmList">
+              <el-checkbox label="11">电话报警</el-checkbox>
+              <el-checkbox label="22">短信报警</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <div class="autoClose">
+            <p class="autoClose_l">自动关闭:</p>
+            <p class="autoClose_l2">传感器监测数值恢复正常</p>
+            <el-form-item  prop="close">
+              <el-select v-model="dialogForm.close" placeholder="请选择" style="width: 100px" class="autoClose_l3">
+                <el-option
+                  v-for="item in autoClose"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              <p  class="autoClose_l4">分钟</p>
+            </el-form-item>
+
+            <p  class="autoClose_l5">以后预案自动关闭</p>
+          </div>
           <div style="border-top:1px solid #e0e0e0;">
             <p style="line-height:60px;font-size:14px;margin-left:19px;">启动条件：</p>
             <div style="display: flex" v-for="(item,index) in dialogForm.riskPlanSensorList" :key="index">
@@ -218,7 +241,9 @@
         dialogTitle:'',
         dialogIndex:null,
         dialogOpen:false,
-        dialogForm:{},
+        dialogForm:{
+        },
+        autoClose:[{ value: '1',label: '1'},{ value: '2',label: '2'},{ value: '3',label: '3'},{ value: '4',label: '4'},{ value: '5',label: '5'},{ value: '6',label: '6'},{ value: '7',label: '7'},{ value: '8',label: '8'},{ value: '9',label: '9'},{ value: '10',label: '10'},],
         // 表单校验
         rules: {
           name: [
@@ -250,6 +275,9 @@
           overAct: [
             { required: true, message: "请选择结束操作", trigger: "change" },
           ],
+          close:[
+            { required: true, message: "请选择关闭时间", trigger: "change" },
+          ]
         },
         //检测设备列表
         options:[{value: '选项1', label: '黄金糕'},{value: '选项1', label: '黄金糕'},],
@@ -626,6 +654,7 @@
           this.$set(this,'dialogForm',{
             riskPlanLevel:a==0?1:(b==0?2:(c==0?3:(d==0?4:''))),
             ifExit:null,
+            alarmList:[],
             riskPlanSensorList:[],
             riskPlanHardwareList:[],
           });
@@ -698,8 +727,65 @@
   .add-plan-max-button-color{
     color:#dedede!important;
   }
+  .el-form-item__content{
+    margin-left: 0px!important;
+    display: flex;
+  }
 </style>
 <style scoped lang="scss">
+  .autoClose{
+    display: flex;
+    align-items: center;
+    margin-bottom: 24px;
+    .autoClose_l{
+      width: 100px;
+      color: #333;
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 40px !important;
+      text-align: right;
+      padding: 0 12px 0 0;
+      box-sizing: border-box;
+    }
+    .autoClose_l:before{
+      content: "*";
+      color: #ff4949;
+      margin-right: 4px;
+    }
+
+    .autoClose_l2{
+      color: #333;
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 40px !important;
+      margin-right: 8px;
+    }
+    .el-form-item{
+      margin: 0px!important;
+    }
+
+    .autoClose_l3{
+
+    }
+    .autoClose_l4{
+      color: #333;
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 40px;
+      background: #f5f7fa;
+      border: 1px solid #DCDFE6;
+      border-left: none;
+      width: 40px;
+      height: 40px;
+      text-align: center;
+    }
+    .autoClose_l5{
+      color: #333;
+      font-weight: 500;
+      font-size: 14px;
+      margin-left: 8px;
+    }
+  }
   .newAddPlan {
     flex: 1;
     display: flex !important;