Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

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

@@ -149,8 +149,8 @@
           </el-form-item>
         </div>
         <div class="bottom-form-box">
-          <el-form-item :label="item.classifyName" prop="safeSigns" class="form-item" v-for="(item,index) in  safetyInfoList" label-width="180px">
-            <el-select v-model="item.privateList" multiple  placeholder="请选择安全警示标识" style="width:500px;">
+          <el-form-item v-if="item.publicList.length>0" :label="item.classifyName" prop="safeSigns" class="form-item" v-for="(item,index) in  safetyInfoList" label-width="180px">
+            <el-select v-if="item.publicList.length>0" v-model="item.privateList" multiple  placeholder="请选择" style="width:500px;">
               <el-option
                 v-for="dict in item.publicList"
                 :key="dict.id"

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

@@ -294,7 +294,7 @@
               style="width:320px;"
               v-model="form.cardNum"
               placeholder="请输入设备编号"
-              maxlength="20"
+              maxlength="30"
               size="small"
             />
           </el-form-item>

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

@@ -34,36 +34,15 @@
             </div>
           </div>
           <div class="info-max-box">
-            <div class="left-box">
-              <div class="for-text-box">
-                <p class="info-title">主要危险类别：</p>
-                <div class="for-box" v-for="(item,index1) in newData.hazardCategory" :key="index1">
-                  <p class="for-info-p" v-for="(minItem,index2) in hazardCategory" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
-                </div>
-              </div>
-              <div class="for-text-box">
-                <p class="info-title">灭火要点：</p>
-                <div class="for-box" v-for="(item,index1) in newData.outfire" :key="index1">
-                  <p class="for-info-p" v-for="(minItem,index2) in extinguishingKeyPoints" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
-                </div>
+            <div class="for-text-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  newData.classifyList">
+              <p class="info-title">{{item.classifyName}}:</p>
+              <div class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">
+                <p class="for-info-p">● {{item2.infoName}}</p>
               </div>
             </div>
-            <div class="right-box">
-              <div class="for-text-box">
-                <p class="info-title">风险防控措施：</p>
-                <div class="for-box" v-for="(item,index1) in newData.riskMeasure" :key="index1">
-                  <p class="for-info-p" v-for="(minItem,index2) in riskMeasure" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
-                </div>
-              </div>
-              <div class="for-img-box">
-                <p class="info-title" style="margin-bottom:7px;">安全警示标识：</p>
-                <img src="@/assets/newImages/icon_aqxxp_jzxy.png" v-if="item == 'xiyan'" v-for="(item,index) in newData.safeSigns" :key="index">
-                <img src="@/assets/newImages/icon_aqxxp_jzys.png" v-if="item == 'yinshi'" v-for="(item,index) in newData.safeSigns" :key="index">
-                <img src="@/assets/newImages/icon_aqxxp_dxaq.png" v-if="item == 'anquan'" v-for="(item,index) in newData.safeSigns" :key="index">
-                <img src="@/assets/newImages/icon_aqxxp_gzf.png" v-if="item == 'gongzuofu'" v-for="(item,index) in newData.safeSigns" :key="index">
-                <img src="@/assets/newImages/icon_aqxxp_gbmc.png" v-if="item == 'menchuang'" v-for="(item,index) in newData.safeSigns" :key="index">
-                <img src="@/assets/newImages/icon_aqxxp_gbsd.png" v-if="item == 'shuidian'" v-for="(item,index) in newData.safeSigns" :key="index">
-              </div>
+            <div class="for-img-box" v-if="item.privateList.length>0 && item.classifyType==2" v-for="(item,index) in  newData.classifyList">
+              <p class="info-title" style="margin-bottom:7px;">{{item.classifyName}}:</p>
+              <img :src="item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
             </div>
           </div>
         </div>
@@ -256,6 +235,7 @@
             ],
           },
           videoList:[],
+          safetyInfoList:[],
         }
       },
       created() {
@@ -277,6 +257,7 @@
         setTimeout(function(){
           self.videoFunction();
         },500);
+
       },
       methods:{
         //视频方法
@@ -545,59 +526,38 @@
         .info-max-box{
           margin-top:7px;
           display: flex;
-          .left-box{
+          flex-wrap: wrap;
+          .for-text-box{
             width:420px;
-            .for-text-box{
-              .info-title{
+            .info-title{
+              font-size:14px;
+              color:#333;
+              line-height:40px;
+              font-weight:700;
+            }
+            .for-box{
+              overflow: hidden;
+              .for-info-p{
+                line-height:16px;
                 font-size:14px;
-                color:#333;
-                line-height:40px;
-                font-weight:700;
-              }
-              .for-box{
+                color:#999;
+                margin:7px 0;
                 overflow: hidden;
-                .for-info-p{
-                  line-height:16px;
-                  font-size:14px;
-                  color:#999;
-                  margin:7px 0;
-                  overflow: hidden;
-                }
               }
             }
           }
-          .right-box{
-            flex:1;
-            .for-text-box{
-              .info-title{
-                font-size:14px;
-                color:#333;
-                line-height:40px;
-                font-weight:700;
-              }
-              .for-box{
-                overflow: hidden;
-                .for-info-p{
-                  line-height:16px;
-                  font-size:14px;
-                  color:#999;
-                  margin:7px 0;
-                  overflow: hidden;
-                }
-              }
+          .for-img-box{
+            width:420px;
+            .info-title{
+              font-size:14px;
+              color:#333;
+              line-height:40px;
+              font-weight:700;
             }
-            .for-img-box{
-              .info-title{
-                font-size:14px;
-                color:#333;
-                line-height:40px;
-                font-weight:700;
-              }
-              img{
-                width:37px;
-                height:50px;
-                margin:0 14px 14px 0;
-              }
+            img{
+              width:37px;
+              height:50px;
+              margin:0 14px 14px 0;
             }
           }
         }