zc

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

@@ -114,6 +114,7 @@
                     <img src="@/assets/ZDimages/subject/icon_bj_yg.png" v-if="item.funNum == 'yanwu'">
                     <img src="@/assets/ZDimages/subject/icon_sy_dqy.png" v-if="item.funNum == 'daqiya'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_voc.png" v-if="item.funNum == 'voc'">
+                    <img src="@/assets/ZDimages/subject/icon_syspz_voc.png" v-if="item.funNum == 'fbvoc'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_tvoc.png" v-if="item.funNum == 'tvoc'">
                     <img src="@/assets/ZDimages/subject/icon_sy_mcnd.png" v-if="item.funNum == 'so2'">
                     <img src="@/assets/ZDimages/subject/icon_bj_yyhd.png" v-if="item.funNum == 'no1'">

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/addPage.vue

@@ -21,7 +21,7 @@
           <div class="for-big-box" v-for="(item,index) in formData.hxpAlarmConfigList">
             <div class="for-left-box">
               <p class="top-null"></p>
-              <p class="center-num">{{index+1}}</p>
+              <p class="center-num">{{item.sort}}</p>
               <p class="bottom-null"></p>
             </div>
             <div class="for-right-box" :class="index==0?'for-right-box-none-border':''">
@@ -157,7 +157,8 @@
             for(let i=0;i<self.formData.hxpAlarmConfigList.length;i++){
               let minObj = {
                 // alarmMode:self.formData.hxpAlarmConfigList[i].alarmMode,
-                alarmMode:3,
+                sort:i+1,
+                alarmMode:4,
                 timeInterval:self.formData.hxpAlarmConfigList[i].timeInterval,
                 alarmContent:self.formData.hxpAlarmConfigList[i].alarmContent,
               }

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/infoPage.vue

@@ -41,7 +41,7 @@
           <p>{{propsInfoData.operate}}</p>
         </div>
       </div>
-      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 3" @click="handle">处理</p>
+      <p class="bottom-button" v-if="propsInfoData.handlingStatus == 1 && propsInfoData.alarmModeStatus == 4" @click="handle">处理</p>
     </div>
   </div>
 </template>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue

@@ -175,7 +175,7 @@ export default {
       // table操作按钮校验
       tableButtonType:this.hasPermiDom(['laboratory:hardware6:edit','laboratory:hardware6:remove']),
       //上传相关配置
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/hardware/importData", // 上传地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/hardware/importData", // 上传地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -251,11 +251,11 @@
             <template slot="append">秒</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="处理时长：" prop="dealTime">
-          <el-input v-model="setUpForm.dealTime" placeholder="请输入处理时长" maxlength="3" style="width:360px;">
-            <template slot="append">分钟</template>
-          </el-input>
-        </el-form-item>
+        <!--<el-form-item label="处理时长：" prop="dealTime">-->
+          <!--<el-input v-model="setUpForm.dealTime" placeholder="请输入处理时长" maxlength="3" style="width:360px;">-->
+            <!--<template slot="append">分钟</template>-->
+          <!--</el-input>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="setUpSubmitForm">确 定</el-button>

src/views/mine/index.vue

@@ -303,8 +303,8 @@ export default {
     };
     return{
       buttonType:'1',
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
-      uploadImgUrlTwo: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
+      uploadImgUrlTwo: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/file/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/newEvacuationBigData.vue

@@ -2268,6 +2268,10 @@
               obj.zcImg = this.sensorIconData.voc_zc;
               obj.ycImg = this.sensorIconData.voc_yc;
               break;
+            case 'fbvoc':
+              obj.zcImg = this.sensorIconData.voc_zc;
+              obj.ycImg = this.sensorIconData.voc_yc;
+              break;
             case 'tvoc':
               obj.zcImg = this.sensorIconData.tvoc_zc;
               obj.ycImg = this.sensorIconData.tvoc_yc;

src/views/system/apkfileList/index.vue

@@ -313,7 +313,7 @@ import {
       },
       handleClick(index,row,doType){
         if(doType=='download'){
-          window.open(window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + row.apkFileUpload)
+          window.open(window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + row.apkFileUpload)
         }else if(doType=='edit'){
           this.upForm.id=row.id
           this.upForm.versionName=row.versionName