告警值 使用alarmValue； 离行式加钞间出入口数量 这个只要监控中心有 其他机构类型不需要；网点配备保安人员为“是”，内部保安人数与外聘保安人数不可均为0，请修改

src/views/system/dept/extend.vue

@@ -210,10 +210,9 @@
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-descriptions-item>
-
           </el-descriptions>
 
-          <el-descriptions v-if="type === org_type.yewd"  class="margin-top" :column="3" size="medium" border>
+          <el-descriptions v-if="type === org_type.yewd || type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
             <el-descriptions-item label="穿墙式设备" labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="wallPenetratingEquipment"
@@ -234,7 +233,7 @@
               ></el-input-number>
             </el-descriptions-item>
           </el-descriptions>
-          <el-descriptions v-if="type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
+          <!-- <el-descriptions v-if="type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
             <el-descriptions-item label="穿墙式设备"  labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="wallPenetratingEquipment"
@@ -253,7 +252,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-          </el-descriptions>
+          </el-descriptions> -->
 
           <el-descriptions class="margin-top" :column="3" v-if="type === org_type.yewd" size="medium" border>
             <el-descriptions-item label="是否设立网点业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
@@ -353,7 +352,7 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.lhzz" :contentStyle='contentStyle' :labelStyle='labelStyle'
+            <el-descriptions-item v-if="type === org_type.jkzx" :contentStyle='contentStyle' :labelStyle='labelStyle'
                                   labelClassName="info_label_required" label="离行式加钞间出入口数量">
               <el-input-number
                 v-model="cashAddingRoom"
@@ -830,12 +829,12 @@ export default {
         this.reqmsg = false;
       }
     },
-    selfServiceBank(newValue){
-      if (newValue==0){
-        this.wallPenetratingEquipment=null;
-        this.lobbyEquipment=null;
-      }
-    },
+    // selfServiceBank(newValue){
+      // if (newValue==0){
+      //   this.wallPenetratingEquipment=null;
+      //   this.lobbyEquipment=null;
+      // }
+    // },
     businessLibrary(newValue){
       if (newValue==0){
         this.businessLibraryType=null;
@@ -1502,10 +1501,10 @@ export default {
         orgType: this.orgType,
         remoteCount: this.remoteCount,
         weatherAreaCode: this.weatherAreaCode,
-        askariCertificate:
-          this.imgs.length > 0
-            ? this.imgs[this.imgs.length - 1].toString(",")
-            : null,
+        askariCertificate:this.askariCertificate,
+          // this.imgs.length > 0
+          //   ? this.imgs[this.imgs.length - 1].toString(",")
+          //   : null,
         premisesArea: this.premisesArea,
         ownership: this.ownership,
         outsideArea: this.outsideArea,
@@ -1569,11 +1568,11 @@ export default {
         this.$modal.msgError("是否设立在行式自助银行不能为空，请选择是否设立在行式自助银行");
         return false;
       }
-      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.wallPenetratingEquipment==null) {
+      if (this.type === this.org_type.yewd && this.wallPenetratingEquipment==null) {
         this.$modal.msgError("穿墙式设备数量不能为空，请输入穿墙式设备数量");
         return false;
       }
-      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.lobbyEquipment==null) {
+      if (this.type === this.org_type.yewd && this.lobbyEquipment==null) {
         this.$modal.msgError("大堂设备数量不能为空，请输入大堂设备数量");
         return false;
       }
@@ -1589,6 +1588,10 @@ export default {
         this.$modal.msgError("出入口远程控制与授权不能为空，请选择出入口远程控制与授权");
         return false;
       }
+      if ((this.type === this.org_type.jkzx)&&this.cashAddingRoom==null) {
+        this.$modal.msgError("离行式加钞间出入口数量不能为空，请输入离行式加钞间出入口数量");
+        return false;
+      }
       if ((this.type === this.org_type.jkzx || this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&&this.businessLibrary==1&&this.remoteCount==null) {
         this.$modal.msgError("业务库防控隔离门出入口数量不能为空，请输入业务库防控隔离门出入口数量");
         return false;
@@ -1597,14 +1600,20 @@ export default {
         this.$modal.msgError("是否配备保安人员不能为空，请选择是否配备保安人员");
         return false;
       }
-      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.innerCount==null) {
-        this.$modal.msgError("内部保安人数不能为空，请输入内部保安人数");
-        return false;
-      }
-      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.outsideCount==null) {
-        this.$modal.msgError("外聘保安人数不能为空，请输入外聘保安人数");
+
+      if ((this.type === this.org_type.yewd)&&this.askari==1&& !this.innerCount && !this.outsideCount) {
+        this.$modal.msgError("网点配备保安人员为“是”，内部保安人数与外聘保安人数不可均为0，请修改");
         return false;
       }
+
+      // if ((this.type === this.org_type.yewd)&&this.askari==1&&this.innerCount==null) {
+      //   this.$modal.msgError("内部保安人数不能为空，请输入内部保安人数");
+      //   return false;
+      // }
+      // if ((this.type === this.org_type.yewd)&&this.askari==1&&this.outsideCount==null) {
+      //   this.$modal.msgError("外聘保安人数不能为空，请输入外聘保安人数");
+      //   return false;
+      // }
       if ((this.type === this.org_type.yewd)&&this.askari==1&&this.isAskariCertificate==1&&this.askariCertificate==null) {
         this.$modal.msgError("保安人员证书不能为空，请上传保安人员证书");
         return false;

src/views/warn/dialog.dealAlarm.vue

@@ -24,7 +24,7 @@
           {{alarmData.endTime}}
         </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警值" >
-          {{valueText()}}
+          {{alarmData.alarmValue}}
         </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警内容" >
           {{alarmData.content}}

src/views/warn/dialog.info.vue

@@ -20,7 +20,7 @@
             {{formData.endTime}}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警值" >
-            {{valueText()}}
+            {{formData.alarmValue}}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警内容" >
             {{formData.content}}

src/views/warn/index.vue

@@ -62,7 +62,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="是否处理" prop="isDoStr">
+              <el-form-item label="处置状态" prop="isDoStr">
                 <el-select
                   v-model="isDoStr"
                   clearable
@@ -70,7 +70,7 @@
                   @change="isDoChanged"
                 >
                   <el-option
-                    v-for="item in dict.type.sys_yes_no"
+                    v-for="item in dict.type.alarm_deal_status"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -278,7 +278,7 @@ import {alarmList} from "@/api/iot/alarmRule";
 export default {
   components: { OrgTree,DataRangePicker,DialogInfo,DialogDealAlarm },
   name: "AlarmData",
-  dicts: ["sys_access_cycle",'sys_yes_no'],
+  dicts: ["sys_access_cycle",'sys_yes_no','alarm_deal_status'],
   data() {
     return {
       isDoStr:null,
@@ -310,7 +310,11 @@ export default {
         type: '0',
       }, {
         value: '41885',
-        label: '燃气报警器告警',
+        label: '燃气告警',
+        type: '0',
+      }, {
+        value: '41881',
+        label: '盗情告警',
         type: '0',
       }
       , {
@@ -419,7 +423,7 @@ export default {
     {
       if(this.isDoStr)
       {
-        this.queryParams.isDo=this.isDoStr=='Y'? 1:0;
+        this.queryParams.isDo=this.isDoStr=='1'? 1:0;
       }
       else{
         this.queryParams.isDo=null;