zc

src/components/UEditor/index.vue

@@ -28,7 +28,7 @@
           // 上传文件接口（这个地址是我为了方便各位体验文件上传功能搭建的临时接口，请勿在生产环境使用！！！）
           // serverUrl: '//ueditor.szcloudplus.com/cos',
           // serverUrl: '//192.168.1.8:9300/exec',
-          serverUrl: '//'+this.judgmentNetworkReturnAddress()+'/base/exec',
+          serverUrl: '//'+this.judgmentNetworkReturnAddress()+'/system/editor/exec',
           // UEditor 资源文件的存放路径，如果你使用的是 vue-cli 生成的项目，通常不需要设置该选项，vue-ueditor-wrap 会自动处理常见的情况，如果需要特殊配置，参考下方的常见问题2
           UEDITOR_HOME_URL: './UEditor/'
         },

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

@@ -106,6 +106,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="实验室面积" prop="subArea" class="form-item">
+          <el-input
+            style="width:320px;"
+            v-model="form.subArea"
+            placeholder="请输入面积"
+            oninput="value=value.replace(/[^0-9.]/g,'')"
+            maxlength="4"
+            size="small">
+            <template slot="append">M²</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="准入设备"  class="form-item">
           <el-select v-model="form.hardwareType" placeholder="请选择整改类型" style="width:320px;" @change="hardwareTypeFun()" >
             <el-option label="无"  :value="0" />
@@ -161,7 +172,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="风控防控措施" prop="riskMeasure" class="form-item" label-width="150px">
-                <el-select v-model="form.riskMeasure" multiple  placeholder="请选择风险防控措施" style="width:500px;">
+                <el-select v-model="form.riskMeasure" multiple collapse-tags placeholder="请选择风险防控措施" style="width:500px;">
                   <el-option
                     v-for="dict in riskMeasure"
                     :key="dict.value"
@@ -194,7 +205,8 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="主要危险类别" prop="hazardCategory" class="form-item" label-width="150px">
-                <el-select v-model="form.hazardCategory" multiple  placeholder="请选择主要危险类别" style="width:500px;">
+                <el-select v-model="form.hazardCategory"
+                           multiple collapse-tags placeholder="请选择主要危险类别" style="width:500px;">
                   <el-option
                     v-for="dict in hazardCategory"
                     :key="dict.value"
@@ -204,7 +216,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="灭火要点" prop="outFire" class="form-item" label-width="150px">
-                <el-select v-model="form.outFire" multiple  placeholder="请选择灭火要点" style="width:500px;">
+                <el-select v-model="form.outFire" multiple collapse-tags placeholder="请选择灭火要点" style="width:500px;">
                   <el-option
                     v-for="dict in extinguishingKeyPoints"
                     :key="dict.value"
@@ -262,7 +274,8 @@
             <div class="bottom-form-box">
               <el-form-item v-if="item.publicList.length>0" :label="item.brandName" prop="safeSigns" class="form-item"
                             v-for="(item,index) in  safetyInfoList" label-width="150px">
-                <el-select v-if="item.publicList.length>0" v-model="item.privateList" multiple  placeholder="请选择" style="width:500px;">
+                <el-select v-if="item.publicList.length>0" v-model="item.privateList"
+                           multiple collapse-tags placeholder="请选择" style="width:500px;">
                   <el-option
                     v-for="dict in item.publicList"
                     :key="dict.detailId"
@@ -384,6 +397,7 @@
           this.$set(this.form,'buildId',this.subjectData.buildId)
           this.$set(this.form,'floorId',this.subjectData.floorId)
           this.$set(this.form,'dynamicLeveling',this.subjectData.dynamicLeveling)
+          this.$set(this.form,'subArea',this.subjectData.subArea != 0 ? this.subjectData.subArea:'')
           //根据楼栋获取楼层
           this.systemBuildingGetOptList(3,this.form.buildId);
           if(this.subjectData.roomId){
@@ -432,17 +446,17 @@
           //安全信息牌
           if(this.subjectData.labInfoBrandModels){
             //循环取安全信息牌信息
-            let list=this.subjectData.labInfoBrandModels
+            let list = JSON.parse(JSON.stringify(this.subjectData.labInfoBrandModels))
             for(let i=0;i<list.length;i++){
               let list2=[];
-              if(list[i].publicList.length>0){
-                for(let b=0;b<list[i].publicList.length;b++){
-                  list2.push(list[i].publicList[b].detailId)
+              if(list[i].privateList.length>0){
+                for(let b=0;b<list[i].privateList.length;b++){
+                  list2.push(list[i].privateList[b].detailId)
                 }
                 list[i].privateList=list2
               }
             }
-            this.safetyInfoList=list
+            this.$set(this,'safetyInfoList',list);
           }
           //实验室简介
           this.$set(this.form,'details',this.subjectData.details)
@@ -731,12 +745,12 @@
       margin-bottom:0;
     }
     .bottom-form-box{
-      display: flex;
+      /*display: flex;*/
       .top-form-box{
-        width:650px;
+        /*width:650px;*/
       }
       .bottom-form-box{
-        width:650px;
+        /*width:650px;*/
       }
       .form-item{
         display: inline-block;

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

@@ -25,11 +25,11 @@
           </el-form-item>
           <el-form-item label="穿戴检查可跳过：" prop="skipped" class="form-item">
             <el-radio-group v-model="form.skipped" style="width:250px;" @change="radioChange">
-              <el-radio :label="1" style="width:70px;margin-top:4px;">是</el-radio>
-              <el-radio :label="0" style="width:70px;margin-top:4px;">否</el-radio>
+              <el-radio :label="true" style="width:70px;margin-top:4px;">是</el-radio>
+              <el-radio :label="false" style="width:70px;margin-top:4px;">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="穿戴检查识别上限："  prop="checkCount" class="form-item" v-if="form.skipped == 1 && form.checkIn[0]">
+          <el-form-item label="穿戴检查识别上限："  prop="checkCount" class="form-item" v-if="form.skipped && form.checkIn[0]">
             <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
                       v-model="form.checkCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
@@ -41,7 +41,7 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="离开检查项："  prop="checkOutArr" class="form-item">
+          <el-form-item label="离开检查项："  prop="checkOut" class="form-item">
             <el-select v-model="form.checkOut" multiple placeholder="请选择离开检查项" style="width:250px;">
               <el-option
                 v-for="dict in onepcOutcheck"
@@ -51,6 +51,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="离开检查是否上传照片：" prop="checkOutUpload" class="form-item">
+            <el-radio-group v-model="form.checkOutUpload" style="width:250px;" @change="radioChange">
+              <el-radio :label="true" style="width:70px;margin-top:4px;">是</el-radio>
+              <el-radio :label="false" style="width:70px;margin-top:4px;">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="签到有效时间："  prop="signTime" class="form-item">
             <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
                       v-model="form.signTime" style="width:250px;">
@@ -79,11 +85,11 @@
           </el-form-item>
           <el-form-item label="穿戴检查可跳过：" prop="inspectSkipped" class="form-item">
             <el-radio-group v-model="form.inspectSkipped" style="width:250px;" @change="radioChange2">
-              <el-radio :label="1" style="width:70px;margin-top:4px;">是</el-radio>
-              <el-radio :label="0" style="width:70px;margin-top:4px;">否</el-radio>
+              <el-radio :label="true" style="width:70px;margin-top:4px;">是</el-radio>
+              <el-radio :label="false" style="width:70px;margin-top:4px;">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="穿戴检查识别上限："  prop="inspectCheckCount" class="form-item" v-if="form.inspectSkipped == 1 && form.inspectCheckIn[0]">
+          <el-form-item label="穿戴检查识别上限："  prop="inspectCheckCount" class="form-item" v-if="form.inspectSkipped && form.inspectCheckIn[0]">
             <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
                       v-model="form.inspectCheckCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
@@ -283,7 +289,12 @@
         if(this.subjectData.skipped && this.subjectData.skipped!=null){
           this.$set(this.form,'skipped',this.subjectData.skipped)
         }else{
-          this.$set(this.form,'skipped',0)
+          this.$set(this.form,'skipped',false)
+        }
+        if(this.subjectData.checkOutUpload && this.subjectData.checkOutUpload!=null){
+          this.$set(this.form,'checkOutUpload',this.subjectData.checkOutUpload)
+        }else{
+          this.$set(this.form,'checkOutUpload',false)
         }
         if(this.subjectData.checkCount){
           this.$set(this.form,'checkCount',this.subjectData.checkCount)
@@ -300,7 +311,7 @@
         if(this.subjectData.inspectSkipped && this.subjectData.inspectSkipped!=null){
           this.$set(this.form,'inspectSkipped',this.subjectData.inspectSkipped)
         }else{
-          this.$set(this.form,'inspectSkipped',0)
+          this.$set(this.form,'inspectSkipped',false)
         }
         if(this.subjectData.inspectSignTime) {
           this.$set(this.form,'inspectSignTime',this.subjectData.inspectSignTime);
@@ -418,14 +429,14 @@
       },
       //穿戴检查可跳过
       radioChange(){
-        if(this.form.skipped == 0){
+        if(!this.form.skipped){
           let obj = {
             checkIn:[
               {required: true, message: '请选择穿戴检查项目', trigger: 'blur'}
             ]
           };
           this.$set(this,'rules',obj);
-        }else if(this.form.skipped == 1){
+        }else if(this.form.skipped){
           if(this.form.checkIn[0]){
             let obj = {
               checkIn:[
@@ -441,14 +452,14 @@
       },
       /**巡检人员  */
       radioChange2(){
-        if(this.form.inspectSkipped == 0){
+        if(!this.form.inspectSkipped){
           let obj = {
             inspectCheckIn:[
               {required: true, message: '请选择穿戴检查项目', trigger: 'blur'}
             ]
           };
           this.$set(this,'rules',obj);
-        }else if(this.form.inspectSkipped == 1){
+        }else if(this.form.inspectSkipped){
           if(this.form.inspectCheckIn[0]){
             let obj = {
               inspectCheckIn:[
@@ -499,11 +510,11 @@
         let self = this;
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if(self.form.skipped == 1 && self.form.checkCount<2 && self.form.checkIn[0]){
+            if(self.form.skipped && self.form.checkCount<2 && self.form.checkIn[0]){
               this.msgError('穿戴检查识别上限不能小于2')
               return
             }
-            if(self.form.inspectSkipped == 1 && self.form.inspectCheckCount<2 && self.form.inspectCheckIn[0]){
+            if(self.form.inspectSkipped && self.form.inspectCheckCount<2 && self.form.inspectCheckIn[0]){
               this.msgError('穿戴检查识别上限不能小于2')
               return
             }
@@ -534,11 +545,12 @@
         let obj = {
           id:self.form.id,
           skipped:self.form.skipped,
+          checkOutUpload:self.form.checkOutUpload,
           inspectSkipped:self.form.inspectSkipped,
           infoId:self.form.infoId,
           subId:self.form.subId,
         }
-        if(self.form.skipped == 1 && self.form.checkIn[0]){
+        if(self.form.skipped && self.form.checkIn[0]){
           obj.checkCount = self.form.checkCount
         }
         if(self.form.checkIn) {
@@ -553,7 +565,7 @@
           obj.checkOut = self.form.checkOut.join() ;
         }
         /**巡检人员  */
-        if(self.form.inspectSkipped == 1 && self.form.inspectCheckIn[0]){
+        if(self.form.inspectSkipped && self.form.inspectCheckIn[0]){
           obj.inspectCheckCount = self.form.inspectCheckCount
         }
         if(self.form.inspectCheckIn) {

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

@@ -272,7 +272,6 @@
 
           let classifyList = [];
           for(let i=0;i<response.data.labInfoBrandModels.length;i++){
-            console.log(response.data.labInfoBrandModels[i])
             if(response.data.labInfoBrandModels[i].privateList.length>0 && (response.data.labInfoBrandModels[i].brandType==1||response.data.labInfoBrandModels[i].brandType==2)){
               classifyList.push(response.data.labInfoBrandModels[i]);
             }

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

@@ -1,7 +1,7 @@
 <template>
     <div class="infoPage" v-if="subjectData.infoId">
       <!--左侧数据展示-->
-      <div class="left-max-box">
+      <div class="left-max-box scrollbar-box">
         <div class="all-title-box">
           <p></p>
           <p style="flex:1;">实验室安全信息牌</p>
@@ -11,6 +11,7 @@
             <div class="lv-name-box">
               <p :style="'color:'+subjectData.levelColor+';border:1px solid '+subjectData.levelColor+';'">{{subjectData.levelName}}</p>
               <p>{{subjectData.subName}}</p>
+              <p class="subArea-p" v-if="subjectData.subArea != 0">({{subjectData.subArea}}M²)</p>
             </div>
             <div class="type-address-box">
               <p class="type-p" v-for="(item,index) in subjectData.labClassTypeList">{{item.typeName}}</p>
@@ -69,7 +70,9 @@
             </div>
           </div>
         </div>
+        <p class="info-max-title-p">电子信息牌信息</p>
         <div class="info-max-box">
+          <p class="null-text-p" v-if="!subjectData.classifyList[0]">电子信息牌未配置</p>
           <div class="for-text-box" v-if="item.privateList.length>0 && item.brandType==1" v-for="(item,index) in  subjectData.classifyList">
             <p class="info-title">{{item.brandName}}:</p>
             <div class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">
@@ -417,6 +420,13 @@
               line-height:34px;
               color:#333;
             }
+            .subArea-p{
+              font-size:14px;
+              height:34px;
+              line-height:34px;
+              color:#333;
+              margin-left:10px;
+            }
           }
           .type-address-box{
             padding:5px 0 10px 0;
@@ -488,6 +498,13 @@
         margin-top:7px;
         display: flex;
         flex-wrap: wrap;
+        .null-text-p{
+          flex:1;
+          font-size:16px;
+          color:#999;
+          text-align: center;
+          line-height:60px;
+        }
         .for-text-box{
           width:420px;
           .info-title{