Merge branch 'nhkd-web' into beiJingAnKeYuan-web

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

@@ -171,6 +171,7 @@
                     <img src="@/assets/ZDimages/subject/lvqi.png" v-if="item.funNum == 'lvqi'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
+                    <img src="@/assets/ZDimages/subject/yique.png" v-if="item.funNum == 'c2h2'">
                     <div>
                       <el-tooltip class="item" effect="dark" :content="item.describe" placement="bottom">
                         <p>{{item.describe|ellipsis}}</p>

src/views/medicUniversity-3_1/chemicalManagement/chemicalInventory/index.vue

@@ -192,5 +192,6 @@
         padding:20px;
       }
     }
+
   }
 </style>

src/views/newEvacuationBigData.vue

@@ -2234,6 +2234,8 @@
           huoyan_yc : require('@/assets/ZDimages/bigData3_2/icon_zdmh_hyjc_yc.png'),
           hwcw_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw.png'),
           hwcw_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw_yc.png'),
+          yique_zc : require('@/assets/ZDimages/bigData3_2/yique_zc.png'),
+          yique_yc : require('@/assets/ZDimages/bigData3_2/yique_yc.png'),
           nullClass : require('@/assets/ZDimages/evacuation3_2/icon_znwl_sybz.png'),
           });
         }
@@ -2340,6 +2342,10 @@
               obj.zcImg = this.sensorIconData.hwcw_zc;
               obj.ycImg = this.sensorIconData.hwcw_yc;
               break;
+            case 'c2h2':
+              obj.zcImg = this.sensorIconData.yique_zc;
+              obj.ycImg = this.sensorIconData.yique_yc;
+              break;
             default:
               obj.zcImg = this.sensorIconData.nullClass;
               obj.ycImg = this.sensorIconData.nullClass;

src/views/safetyEducationExam/trainingCourse/addDialog.vue

@@ -92,7 +92,7 @@
         </el-form-item>
         <p class="inquire-button-one"
            style="margin-left:20px;width:140px;border-radius:4px;" @click="subTypeClick">
-          {{dialogForm.selectType==1?'手动输入上课场所':(dialogForm.selectType==2?'选择学校':'')}}
+          {{dialogForm.selectType==1?'手动输入上课场所':(dialogForm.selectType==2?'选择实验室':'')}}
         </p>
       </div>
       <div class="dialogFormFlex">
@@ -292,7 +292,7 @@
           position:"",
           selectType:1,
           content:"",
-          courseTime:["00:00","00:00"],
+          courseTime:["00:00","23:00"],
           courseDate:[],
         },
         //验证