Merge branch '3.3.7-scxjy' into web-v2

.env.production

@@ -12,12 +12,12 @@ ENV = 'production'
 
 # ####################外网接口配置####################
 
-VUE_APP_BASE_API = 'lab.zjznai.com/labAppTest'
+VUE_APP_BASE_API = 'lab.zjznai.com/appTest'
 
 
 
 # ####################内网接口配置####################
 
-VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem'
+VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 
 

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

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

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:[],
         },
         //验证