zc 3.3.3 开始

.env.production

@@ -8,7 +8,7 @@ ENV = 'production'
 
 # VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # VUE_APP_VERSION_DIFFERENCE_FIELD = 'suZhouDaXue'
-VUE_APP_VERSION_DIFFERENCE_FIELD = 'public'
+VUE_APP_VERSION_DIFFERENCE_FIELD = 'xiBeiNongLinDaXue'
 
 # ####################外网接口配置####################
 

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

@@ -85,7 +85,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="准入设备"  class="form-item">
+      <el-form-item label="准入设备"  class="form-item"  v-if="versionField() != 'xiBeiNongLinDaXue'">
         <el-select v-model="form.hardwareType" placeholder="请选择整改类型" style="width:320px;" @change="hardwareTypeFun()" >
           <el-option label="无"  :value="0" />
           <el-option label="海康智能门禁" :value="1" />

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

@@ -1,7 +1,7 @@
 <!--关联配置-->
 <template>
   <div class="associationConfiguration scrollbar-box">
-    <el-form ref="form" :model="form" label-width="160px" :rules="rules">
+    <el-form v-if="versionField() != 'xiBeiNongLinDaXue'" ref="form" :model="form" label-width="160px" :rules="rules">
       <div class="title-box">
         <p class="left-title">检查项信息</p>
       </div>
@@ -147,6 +147,60 @@
         <p class="inquire-button-one right-button" @click="upData">提交</p>
       </div>
     </el-form>
+    <el-form v-if="versionField() == 'xiBeiNongLinDaXue'" ref="form" :model="form" label-width="160px" :rules="rules">
+      <div class="title-box">
+        <p class="left-title">危险源信息</p>
+      </div>
+      <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item input-number-none-box-left">
+        <el-input
+          oninput="value=value.replace(/[^0-9.]/g,'')"
+          style="width:320px;"
+          v-model="form.bottleTotal"
+          placeholder="请输入数量"
+          maxLength="3"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item input-number-none-box-left">
+        <el-input
+          oninput="value=value.replace(/[^0-9.]/g,'')"
+          style="width:320px;"
+          v-model="form.bottleUserTotal"
+          placeholder="请输入数量"
+          clearable
+          maxLength="3"
+        />
+      </el-form-item>
+      <div>
+        <el-form-item label="危险源"  prop="hazardId" class="form-item">
+          <el-select placeholder="请选择危险源" v-model="hazardId" style="width:320px;" @change="hazardClick">
+            <el-option
+              v-for="dict in hazardList"
+              :key="dict.id"
+              :label="dict.text"
+              :value="dict.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </div>
+      <div class="hazard-for-box" v-for="(item,index) in form.hazardRelations">
+        <el-form-item label="危险源名称" :prop="'hazardRelations.'+ index +'.anotherName'" :rules="rules.anotherName"
+                      class="form-item" label-width="160px">
+          <el-input placeholder="请输入危险源名称" maxlength="20" v-model="item.anotherName"/>
+        </el-form-item>
+        <el-form-item label="型号" :prop="'hazardRelations.'+ index +'.anotherCode'" :rules="rules.anotherCode"
+                      class="form-item" label-width="60px">
+          <el-input placeholder="请输入型号"  maxlength="10" v-model="item.anotherCode"/>
+        </el-form-item>
+        <el-form-item label="" class="form-item" label-width="20px">
+          <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
+        </el-form-item>
+      </div>
+      <div class="bottom-button-box">
+        <p class="reset-button-one left-button" @click="backPage">取消</p>
+        <p class="inquire-button-one right-button" @click="upData">提交</p>
+      </div>
+    </el-form>
   </div>
 </template>
 

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

@@ -2,7 +2,7 @@
   <div class="subject">
     <div class="subject-page" v-if="pageType == 1">
       <div class="subject-page-min">
-        <div class="left-subject-list" >
+        <div :class="versionField() == 'xiBeiNongLinDaXue'?'left-subject-list-flex':''" class="left-subject-list" >
           <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" style="border-bottom:1px solid #D8D8D8">
             <el-form-item label="学院" prop="deptId" label-width="60px">
               <el-select v-model="queryParams.deptId" placeholder="请选择学院" clearable size="small">
@@ -44,6 +44,7 @@
               </el-table-column>
               <el-table-column label="实验室名称" align="left" prop="name"  show-overflow-tooltip/>
               <el-table-column label="房间号" align="left" prop="room" width="120" show-overflow-tooltip/>
+              <el-table-column label="学院" align="left" prop="deptName" width="200" show-overflow-tooltip v-if="versionField() == 'xiBeiNongLinDaXue'"/>
               <el-table-column label="分类/分级" align="left" prop="levelName" width="150" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span >{{scope.row.typeName}}/</span>
@@ -60,8 +61,8 @@
                       <p class="table-min-button">更多<i class="el-icon-d-arrow-right"></i></p>
                       <el-dropdown-menu slot="dropdown" style="margin:0!important;">
                         <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="1" v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">关联配置</el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="2">物联配置</el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="3" v-hasPermi="['laboratory:subjectmaterial:add']">准入配置</el-dropdown-item>
+                        <el-dropdown-item v-if="versionField() != 'xiBeiNongLinDaXue'" style="height:36px;line-height:36px;width:90px;text-align: center" command="2">物联配置</el-dropdown-item>
+                        <el-dropdown-item v-if="versionField() != 'xiBeiNongLinDaXue'" style="height:36px;line-height:36px;width:90px;text-align: center" command="3" v-hasPermi="['laboratory:subjectmaterial:add']">准入配置</el-dropdown-item>
                         <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="4" v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">编辑</el-dropdown-item>
                         <!--<el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="5"-->
                         <!--v-hasPermi="['laboratory:subject:remove']">删除</el-dropdown-item>-->
@@ -81,7 +82,8 @@
             />
           </div>
         </div>
-        <div class="right-subject-box scrollbar-box" :class="rightButtonType == 4?'overflow-box':''" v-if="checkedSubject.id">
+        <div class="right-subject-box scrollbar-box" v-if="checkedSubject.id && versionField() != 'xiBeiNongLinDaXue'"
+             :class="rightButtonType == 4?'overflow-box':''">
           <div class="top-button-box">
             <div :class="rightButtonType == 1 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(1)">传感器监测</div>
             <div :class="rightButtonType == 2 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(2)">物联控制</div>
@@ -663,6 +665,11 @@ export default {
           }
         }
         this.$set(this.newData,'labHardwareVOListTwo',listTwo);
+        if(this.versionField() == 'xiBeiNongLinDaXue'){
+          this.$set(this.newData,'videoData',[]);
+          this.pageType = 6;
+          return
+        }
         if(list[0]){
           let obj = {
             count:"100",
@@ -882,6 +889,9 @@ export default {
     //选中实验室
     handleCurrentChange(val){
       let self = this;
+      if(this.versionField() == 'xiBeiNongLinDaXue'){
+        return
+      }
       if(val.id != this.checkedSubject.id){
         this.videoOff();
         this.offMQTT();
@@ -1242,6 +1252,9 @@ export default {
       padding: 2px 0 10px 10px;
       box-sizing: border-box;
     }
+    .left-subject-list-flex{
+      flex:1;
+    }
     .left-subject-list{
       /*flex:1;*/
       width:1143px;

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

@@ -1,10 +1,11 @@
 <template>
     <div class="infoPage" v-if="newData.id">
-      <div class="left-max-box scrollbar-box">
-        <div class="top-max-box" style="position: relative">
+      <div :class="versionField() == 'xiBeiNongLinDaXue'?'left-max-box-flex':''" class="left-max-box scrollbar-box">
+        <div :class="versionField() == 'xiBeiNongLinDaXue'?'top-max-box-flex':''" class="top-max-box" style="position: relative">
           <div class="all-title-box">
             <p></p>
-            <p>实验室安全信息牌</p>
+            <p style="flex:1;">实验室安全信息牌</p>
+            <div v-if="versionField() == 'xiBeiNongLinDaXue'" class="reset-button-one" style="margin-top:-5px;width:80px!important;height:30px!important;line-height:30px!important;" @click="backPage">返回</div>
           </div>
           <div class="left-top-title-box">
             <div class="left-box">
@@ -46,28 +47,8 @@
             </div>
           </div>
         </div>
-        <div class="bottom-max-box">
-          <div class="all-title-box">
-            <p></p>
-            <p>关联预案</p>
-          </div>
-          <div class="for-list-box">
-            <div class="title-box">
-              <p>预案名称</p>
-              <p>启动次数</p>
-              <p>最近启动时间</p>
-            </div>
-            <div class="list-box" v-for="(item,index) in newData.riskPlanList" :key="index">
-              <p>{{item.planName}}</p>
-              <p>{{item.planCount}}</p>
-              <p>{{item.lastTime}}</p>
-            </div>
-            <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-if="!newData.riskPlanList[0]">
-            <p class="null-p" v-if="!newData.riskPlanList[0]" >暂未关联预案信息，请在应急管理-预案管理中进行配置</p>
-          </div>
-        </div>
       </div>
-      <div class="right-max-box scrollbar-box">
+      <div class="right-max-box scrollbar-box" v-if="versionField() != 'xiBeiNongLinDaXue'">
         <div class="all-title-box" style="height:40px;">
           <p></p>
           <p>传感器监测</p>
@@ -434,11 +415,17 @@
       font-size:14px;
       color:#999;
     }
+    .left-max-box-flex{
+      flex:1;
+    }
     .left-max-box{
       font-weight:500;
       width:1035px;
       display: flex;
       flex-direction: column;
+      .top-max-box-flex{
+        flex:1;
+      }
       .top-max-box{
         border-radius:10px!important;
         box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1) !important;