zc

src/README.md

@@ -24,5 +24,9 @@ views
     laboratoryManagement
       subject
         deviceListOne.vue
+        indexOne.vue
+    personnel
+      teacher
+        indexOne.vue
 
 # 部分牵扯前端页面跳转写死部分

src/assets/styles/ZDelement.scss

@@ -460,3 +460,15 @@ background: rgba(255,255,255,0);
     padding:0 15px;
   }
 }
+.input-number-none-box-left{
+  .el-input-number__decrease{
+    display: none;
+  }
+  .el-input-number__increase{
+    display: none;
+  }
+  .el-input__inner{
+    padding:0 15px;
+    text-align: left;
+  }
+}

src/layout/components/AppMain.vue

@@ -138,16 +138,18 @@ export default {
       const { data } = await getListStatus();
       console.log("getListStatusgetListStatusgetListStatusgetListStatus",data);
       if(data.code==200){
-        if(data.data[0].floorId != 7){
-          self.text = data.data[0].buildName + data.data[0].floorName + data.data[0].roomName + data.data[0].subjectName + '发生应急预案';
-          self.textName = data.data[0].subjectName;
-          self.subjectId = data.data[0].subjectId;
-          self.textType = self.userType != '22';
-          self.closePlan =data.data[0].closePlan;
-          self.closeId = data.data[0].id;
-          self.buttonId = data.data[0].floorId;
-          self.buildingId = data.data[0].buildId;
-          self.address = data.data[0].deptName +'-'+data.data[0].buildName+''+data.data[0].floorName;
+        if(data.data[0]){
+          if(data.data[0].floorId != 7){
+            self.text = data.data[0].buildName + data.data[0].floorName + data.data[0].roomName + data.data[0].subjectName + '发生应急预案';
+            self.textName = data.data[0].subjectName;
+            self.subjectId = data.data[0].subjectId;
+            self.textType = self.userType != '22';
+            self.closePlan =data.data[0].closePlan;
+            self.closeId = data.data[0].id;
+            self.buttonId = data.data[0].floorId;
+            self.buildingId = data.data[0].buildId;
+            self.address = data.data[0].deptName +'-'+data.data[0].buildName+''+data.data[0].floorName;
+          }
         }
       }
     },

src/router/index.js

@@ -44,10 +44,10 @@ export const constantRoutes = [
       /*
       前端测试用
       */
-      // {
-      //   path: '/demo',
-      //   component: (resolve) => require(['@/views/emergencyManagement/evacuation/emergencyEvacuation/performEvacuationOne'], resolve),
-      // },
+      {
+        path: '/demo',
+        component: (resolve) => require(['@/views/comprehensive/laboratoryManagement/subject/index'], resolve),
+      },
     ]
   },
   {

src/views/comprehensive/laboratoryManagement/accessAuthorization/addPage.vue

@@ -137,6 +137,7 @@ import { subjectVo,openDoorApply } from "@/api/laboratory/subject";
           this.$set(this.newObj,'subjectId',response.data.id);
           this.$set(this.newObj,'safeUserName',response.data.safeUserName);
           this.$set(this.newObj,'safeUserId',response.data.safeUserId);
+          this.$set(this.newObj,'safeUserPhone',response.data.safeUserPhone);
         });
       },
       //人员选中

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

@@ -18,22 +18,16 @@
         </div>
       </div>
       <div class="carousel" v-if="rightDataList[0]">
-        <p class="button-box el-icon-arrow-left cursor_hover" @click="minMapButton('left')"></p>
+        <p class="button-box el-icon-arrow-left cursor_hover" @click="minMapButton('left')" v-if="rightDataList[1]"></p>
         <div class="for-max-box">
           <div class="for-min-box"  v-for="(item,index) in rightDataList" :key="index" @click="">
             <div class="img-box" :class="fatherIndex==index?'border-solid-color-one':'border-solid-color-99'" @click="minMapClick(index)">
-              <img src="@/assets/ZDimages/one.png" v-if="item.id==2">
-              <img src="@/assets/ZDimages/two.png" v-if="item.id==3">
-              <img src="@/assets/ZDimages/three.png" v-if="item.id==4">
-              <img src="@/assets/ZDimages/four.png" v-if="item.id==5">
-              <img src="@/assets/ZDimages/six.png" v-if="item.id==6">
-              <img src="@/assets/ZDimages/seven.png" v-if="item.id==7">
-              <img src="@/assets/ZDimages/five.png" v-if="item.id==8">
+              <img src="@/assets/ZDimages/icon_bj_syspmtcy_jinan.png">
             </div>
             <p>{{item.name}}</p>
           </div>
         </div>
-        <p class="button-box el-icon-arrow-right cursor_hover" @click="minMapButton('right')"></p>
+        <p class="button-box el-icon-arrow-right cursor_hover" @click="minMapButton('right')" v-if="rightDataList[1]"></p>
       </div>
       <img class="null-p-img" src="@/assets/ZDimages/null-data.png" v-if="!rightDataList[0]">
       <p class="null-p-text" v-if="!rightDataList[0]">暂无数据</p>

src/views/comprehensive/laboratoryManagement/building/indexOne.vue

@@ -18,7 +18,7 @@
         </div>
       </div>
       <div class="carousel" v-if="rightDataList[0]">
-        <p class="button-box el-icon-arrow-left cursor_hover" @click="minMapButton('left')"></p>
+        <p class="button-box el-icon-arrow-left cursor_hover" @click="minMapButton('left')" v-if="rightDataList[1]"></p>
         <div class="for-max-box">
           <div class="for-min-box"  v-for="(item,index) in rightDataList" :key="index">
             <div class="img-box" :class="fatherIndex==index?'border-solid-color-one':'border-solid-color-99'" @click="minMapClick(index)">
@@ -29,7 +29,7 @@
             <p>{{item.name}}</p>
           </div>
         </div>
-        <p class="button-box el-icon-arrow-right cursor_hover" @click="minMapButton('right')"></p>
+        <p class="button-box el-icon-arrow-right cursor_hover" @click="minMapButton('right')" v-if="rightDataList[1]"></p>
       </div>
       <img class="null-p-img" src="@/assets/ZDimages/null-data.png" v-if="!rightDataList[0]">
       <p class="null-p-text" v-if="!rightDataList[0]">暂无数据</p>

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

@@ -284,11 +284,19 @@
             this.$set(this.form,'adminId',this.subjectData.adminId)
             this.userSelectList(this.subjectData.adminName);
           }
-          this.$set(this.form,'safeSigns',this.subjectData.safeSigns.split(','))
-          this.$set(this.form,'riskMeasure',this.subjectData.riskMeasure.split(','))
+          if(this.subjectData.safeSigns){
+            this.$set(this.form,'safeSigns',this.subjectData.safeSigns.split(','))
+          }
+          if(this.subjectData.riskMeasure){
+            this.$set(this.form,'riskMeasure',this.subjectData.riskMeasure.split(','))
+          }
+          if(this.subjectData.hazardCategory){
+            this.$set(this.form,'hazardCategory',this.subjectData.hazardCategory.split(','))
+          }
+          if(this.subjectData.outfire){
+            this.$set(this.form,'outfire',this.subjectData.outfire.split(','))
+          }
           if(this.subjectData.safeUserId){
-
-
             let list = [];
             let safeUserIdList = [];
             let nameList = "";
@@ -310,8 +318,6 @@
             this.optionsUserOne = list;
             this.$set(this.form, 'safeUserId', safeUserIdList);
           }
-          this.$set(this.form,'hazardCategory',this.subjectData.hazardCategory.split(','))
-          this.$set(this.form,'outfire',this.subjectData.outfire.split(','))
           //根据学院获取楼栋
           listbuildings(this.form.deptId).then(response => {
             this.buildings = response.data;

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

@@ -1,12 +1,12 @@
 <!--关联配置-->
 <template>
   <div class="associationConfiguration scrollbar-box">
-    <el-form ref="form" :model="form" label-width="160px" :rules="rules" >
+    <el-form ref="form" :model="form" label-width="160px" :rules="rules">
       <div class="title-box">
         <p class="left-title">检查项信息</p>
       </div>
       <div>
-        <el-form-item label="穿戴检查项"  prop="checkIn" class="form-item">
+        <el-form-item label="穿戴检查项"  prop="checkIn" class="form-item" v-if="form.checkIn">
           <el-select v-model="form.checkIn" multiple placeholder="请选择穿戴检查项目" @change="radioChange" style="width:320px;">
             <el-option
               v-for="dict in onepcOutcheckIn"
@@ -56,24 +56,22 @@
       <div class="title-box">
         <p class="left-title">危险源信息</p>
       </div>
-      <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item">
-        <el-input
+      <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item input-number-none-box-left">
+        <el-input-number
           style="width:320px;"
           v-model="form.bottleTotal"
           placeholder="请输入数量"
-          maxLength="3"
+          :max="999"
           clearable
-          size="small"
         />
       </el-form-item>
-      <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item">
-        <el-input
+      <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item input-number-none-box-left">
+        <el-input-number
           style="width:320px;"
           v-model="form.bottleUserTotal"
           placeholder="请输入数量"
           clearable
-          maxLength="3"
-          size="small"
+          :max="999"
         />
       </el-form-item>
       <div>
@@ -161,6 +159,8 @@
         let list = this.subjectData.checkIn.split(",");
         this.$set(this.form,'checkIn',list);
         // this.form.checkIn = this.subjectData.checkIn.split(",");
+      }else{
+        this.$set(this.form,'checkIn',[]);
       }
       if(this.subjectData.checkOut){
         let list = this.subjectData.checkOut.split(",");

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

@@ -56,24 +56,22 @@
       <div class="title-box">
         <p class="left-title">危险源信息</p>
       </div>
-      <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item">
-        <el-input
+      <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item input-number-none-box-left">
+        <el-input-number
           style="width:320px;"
           v-model="form.bottleTotal"
           placeholder="请输入数量"
-          maxLength="3"
+          :max="999"
           clearable
-          size="small"
         />
       </el-form-item>
-      <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item">
-        <el-input
+      <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item input-number-none-box-left">
+        <el-input-number
           style="width:320px;"
           v-model="form.bottleUserTotal"
           placeholder="请输入数量"
           clearable
-          maxLength="3"
-          size="small"
+          :max="999"
         />
       </el-form-item>
       <div>

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

@@ -233,7 +233,7 @@
             </div>
             <div class="bottom-door-box" v-if="rightButtonType == 5">
               <p style="line-height:120px;color:#999;text-align: center;flex:1;"
-                 v-if="!checkedSubject.doorList[0]">暂未配置门禁</p>
+                 v-if="!checkedSubject.doorList">暂未配置门禁</p>
               <div class="for-door-box" v-for="(item,index) in checkedSubject.doorList" :key="index">
                 <img v-if="item.onLineStatus==1" src="@/assets/ZDimages/medicUniversity-3_1/img_syslb_znmjzx.png" class="alarm-img">
                 <img v-if="item.onLineStatus!=1" src="@/assets/ZDimages/medicUniversity-3_1/img_syslb_znmjlx.png" class="alarm-img">

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue

@@ -287,6 +287,7 @@
           this.msdsPropsData.id = item.id;
           this.pageType = 4;
         }
+        this.handleSelectionChangeDel();
       },
       moreClick(data){
         let self = this;
@@ -439,6 +440,12 @@
         this.single = selection.length != 1;
         this.multiple = !selection.length;
       },
+      handleSelectionChangeDel(){
+        this.selectedNum = 0;
+        this.ids = [];
+        this.single = true;
+        this.multiple = true;
+      },
       /*===记录勾选数据===
         需要再el-table 添加  :row-key="getRowKeys"
         需要在selection 添加 :reserve-selection="true"