heyang

.env.production

@@ -6,9 +6,9 @@ ENV = 'production'
 
 # ####################版本差异字段####################
 
-# VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
+ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # VUE_APP_VERSION_DIFFERENCE_FIELD = 'suZhouDaXue'
-VUE_APP_VERSION_DIFFERENCE_FIELD = 'xiBeiNongLinDaXue'
+#VUE_APP_VERSION_DIFFERENCE_FIELD = 'xiBeiNongLinDaXue'
 
 # ####################外网接口配置####################
 

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

@@ -98,7 +98,7 @@
     </div>
     <div class="for-max-box">
       <div class="for-big-box" v-for="(item,index) in listSpjk" :key="index">
-        <p class="camera">抓拍</p>
+        <p class="camera" v-if="item.isArrest">抓拍</p>
         <p class="for-title-p" style="background: none;color: #333;margin-top: 12px;">{{subjectData.room}}-{{item.type.name}}{{index+1}}</p>
         <div class="for-text-box">
           <p>摄像头编号：</p>
@@ -223,10 +223,42 @@
           </el-form-item>
         </div>
         <div v-if="upType == 4 || upType == 8">
+          <el-form-item label="硬件名称" prop="name">
+            <el-input
+              v-model="form.name"
+              placeholder="请输入硬件名称"
+              clearable
+              size="small"
+              maxLength="8"
+              style="width:320px;"
+            />
+          </el-form-item>
           <el-form-item label="摄像头编号" prop="hardwareNum">
             <el-input v-model="form.hardwareNum" placeholder="摄像头编号"
                       maxlength="30" style="width:320px;"/>
           </el-form-item>
+          <el-form-item label="硬件IP" prop="ipAddress">
+            <el-input
+              v-model="form.ipAddress"
+              placeholder="请输入硬件IP"
+              clearable
+              size="small"
+              maxLength="20"
+              style="width:320px;"
+            />
+          </el-form-item>
+          <el-form-item label="类型" >
+<!--            <el-radio-group v-model="form.pcType">-->
+<!--              <el-radio :label="0">火焰算法</el-radio>-->
+<!--              <el-radio :label="1">穿戴识别</el-radio>-->
+<!--              <el-radio :label="2">违规带离抓拍</el-radio>-->
+<!--            </el-radio-group>-->
+            <el-checkbox-group v-model="form.subType">
+              <el-checkbox label="0">火焰算法</el-checkbox>
+              <el-checkbox label="1">穿戴识别</el-checkbox>
+              <el-checkbox label="2">违规带离抓拍</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
         </div>
         <div v-if="upType == 'addEntrance'||  upType=='editEntrance'">
           <el-form-item label="门禁编号" prop="hardwareNum">
@@ -569,7 +601,10 @@ export default {
     addHardwareThree(){
       let obj = {
         type:4,
+        name:this.form.name,
         hardwareNum:this.form.hardwareNum,
+        ipAddress:this.form.ipAddress,
+        subType:this.form.subType.toString(),
         subjectId:this.subjectData.id,
         deptId:this.subjectData.deptId,
         deptName:this.subjectData.deptName,
@@ -584,7 +619,10 @@ export default {
     putHardwareThree(){
       let obj = {
         id:this.form.id,
+        name:this.form.name,
         hardwareNum:this.form.hardwareNum,
+        ipAddress:this.form.ipAddress,
+        subType:this.form.subType.toString(),
         subjectId:this.form.subjectId,
         deptId:this.form.deptId,
         deptName:this.form.deptName,
@@ -887,6 +925,7 @@ export default {
         this.title = '新增摄像头';
         this.$set(this,'form',{
           hardwareNum:"",
+          subType:[],
         });
       }else if(type == 'addEntrance'){
         this.title = '新增智能门禁';
@@ -932,6 +971,11 @@ export default {
       }else if(type == 8){
         this.title = '编辑摄像头';
         this.$set(this,'form',JSON.parse(JSON.stringify(row)));
+        if(this.form.subType!='' && this.form.subType!=null ){
+          this.form.subType=this.form.subType.split(',')
+        }else{
+          this.form.subType=[];
+        }
       }else if(type == 'editEntrance'){
         this.title = '编辑智能门禁';
         this.$set(this,'form',JSON.parse(JSON.stringify(row)));
@@ -966,7 +1010,12 @@ export default {
           this.$set(this,'listkzsb',response.data.listkzsb);
         }
         if(response.data.listSpjk){
+          //判断是否是抓拍摄像头
+          for(let i=0; i< response.data.listSpjk.length;i++){
+            response.data.listSpjk[i].isArrest=(response.data.listSpjk[i].subType!=''&& response.data.listSpjk[i].subType!=null);
+          }
           this.$set(this,'listSpjk',response.data.listSpjk);
+
         }
         if(response.data.listHK){
           this.$set(this,'listHK',response.data.listHK);
@@ -1024,7 +1073,7 @@ export default {
       display: inline-block;
       overflow: hidden;
       width:280px;
-      min-height:130px;
+      min-height:158px;
       padding-bottom:10px;
       border-radius: 6px;
       margin:0 20px 20px 0;

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

@@ -71,15 +71,7 @@
             </template>
           </el-table-column>
           <el-table-column label="预警内容" align="center" prop="warningContent" show-overflow-tooltip width="300"/>
-          <el-table-column label="预警方式" align="center" prop="warningWay" show-overflow-tooltip width="300">
-            <template slot-scope="scope">
-              <div class="table-button-box">
-                <span v-if="scope.row.warningWay==1">系统通知</span>
-                <span v-if="scope.row.warningWay==2">短信通知</span>
-                <span v-if="scope.row.warningWay==3">声光报警</span>
-              </div>
-            </template>
-          </el-table-column>
+          <el-table-column label="预警方式" align="center" prop="warningWay" show-overflow-tooltip width="300"/>
           <el-table-column label="实验室" sortable="custom" align="center" prop="subName" show-overflow-tooltip width="300"/>
           <el-table-column label="操作" align="center" prop="deptName" width="150">
             <template slot-scope="scope">
@@ -173,6 +165,25 @@
         }
         warningNoticeLogList(obj).then(response => {
           this.total = response.data.total;
+          //处理预警方式
+          for(let i=0;i<response.data.records.length;i++){
+            if(response.data.records[i].warningWay!='' && response.data.records[i].warningWay!=null){
+              response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/1/, "系统通知")
+              response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/2/, "短信通知")
+              if( response.data.records[i].warningType==1){
+                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "语音播报")
+              }else{
+                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/3/, "声光报警")
+              }
+              if (response.data.records[i].warningWay.endsWith(',')) {
+                response.data.records[i].warningWay=response.data.records[i].warningWay.replace(/,/, " ")
+              }
+              response.data.records[i].warningWay= response.data.records[i].warningWay.replace(/,/g, "+");
+
+            }else{
+              response.data.records[i].warningWay='-'
+            }
+          }
           this.tableList = response.data.records;
         });
       },

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

@@ -53,18 +53,6 @@
                          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="化学品已过期">
-          <el-checkbox-group v-model="addForm2.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>
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item class="form-item-check-box" label="化学品即将过期">
-          <el-checkbox-group v-model="addForm2.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>
-          </el-checkbox-group>
-        </el-form-item>
       </el-form>
     </div>
     <div class="bottom-button-max-box">

src/views/emergencyManagement/smartLoT/hardware/videoSurveillance.vue

@@ -112,11 +112,11 @@
           />
         </el-form-item>
         <el-form-item label="类型" >
-          <el-radio-group v-model="form.type" :disabled="disabledType">
-            <el-radio :label="1">火焰算法</el-radio>
-            <el-radio :label="2">穿戴识别</el-radio>
-            <el-radio :label="3">违规带离抓拍</el-radio>
-          </el-radio-group>
+          <el-checkbox-group v-model="subType">
+            <el-checkbox label="0">火焰算法</el-checkbox>
+            <el-checkbox label="1">穿戴识别</el-checkbox>
+            <el-checkbox label="2">违规带离抓拍</el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -190,7 +190,10 @@
         // },
         hardTypeOptions:{},
         // 表单参数
-        form: {},
+        form: {
+
+        },
+        subType:[],
         // 表单校验
         rules: {
             name: [
@@ -537,6 +540,7 @@
         }];
         this.isUpdate=true;
         this.form.type=this.pageType;
+        this.subType=[];
         this.dialogVisible = true;
 
         this.dialogTitle = "添加硬件";
@@ -550,6 +554,7 @@
         this.mapData.list = [];
         this.isUpdate=true;
         this.form.type=this.pageType;
+
         this.getHardTypeList();
         this.getLabList();
         const id = row.id || this.ids
@@ -561,6 +566,9 @@
           this.$forceUpdate;
           this.dialogTitle = "修改硬件";
           this.dialogVisible = true;
+          if(response.data.subType){
+            this.subType=response.data.subType.split(',');
+          }
         });
       },
       /** 查看按钮操作 */
@@ -608,6 +616,7 @@
           verticalAxis:''
         }
         this.form.type=this.pageType;
+        this.form.subType=this.subType.toString();
         // this.form.hardwarePosition.horizontalAxis=this.mapData.list[0].top;
         // this.form.hardwarePosition.verticalAxis=this.mapData.list[0].left;
         this.$refs["form"].validate(valid => {