Merge branch '3.3.4-kdyh' into changAnDaXue-web

src/api/evacuation3_2/index.js

@@ -122,7 +122,7 @@ export function lineVertex(data) {
 //获取预案详情
 export function selectRiskPlanLeveList(data) {
   return request({
-    url: '/zd-laboratory/plan/lists/',
+    url: '/laboratory/plan/lists/',
     method: 'post',
     data: data
   })
@@ -130,7 +130,7 @@ export function selectRiskPlanLeveList(data) {
 //获取预案详情
 export function setPlanData(data) {
   return request({
-    url: '/zd-laboratory/plan',
+    url: '/laboratory/plan',
     method: 'post',
     data: data
   })
@@ -138,7 +138,7 @@ export function setPlanData(data) {
 //新增预案(名称)
 export function addPlan(data) {
   return request({
-    url: '/zd-laboratory/plan/add',
+    url: '/laboratory/plan/add',
     method: 'post',
     data:data
   })
@@ -146,7 +146,7 @@ export function addPlan(data) {
 //修改预案(名称)
 export function putPlan(data) {
   return request({
-    url: '/zd-laboratory/plan/update',
+    url: '/laboratory/plan/update',
     method: 'put',
     data:data
   })
@@ -155,7 +155,7 @@ export function putPlan(data) {
 //删除预案
 export function delPlanData(data) {
   return request({
-    url: '/zd-laboratory/plan/delete/'+data,
+    url: '/laboratory/plan/delete/'+data,
     method: 'delete',
   })
 }
@@ -163,14 +163,14 @@ export function delPlanData(data) {
 //根据ID查询分级列表
 export function selectRiskPlanLeveListRiskPlanId(id) {
   return request({
-    url: '/zd-laboratory/planLevel/selectRiskPlanLeveList/'+id,
+    url: '/laboratory/planLevel/selectRiskPlanLeveList/'+id,
     method: 'get',
   })
 }
 //新增预案分级数据
 export function planLevelAdd(data) {
   return request({
-    url: '/zd-laboratory/planLevel/add',
+    url: '/laboratory/planLevel/add',
     method: 'post',
     data:data
   })
@@ -178,7 +178,7 @@ export function planLevelAdd(data) {
 //编辑预案分级数据
 export function planLevelPut(data) {
   return request({
-    url: '/zd-laboratory/planLevel/update',
+    url: '/laboratory/planLevel/update',
     method: 'put',
     data:data
   })
@@ -186,7 +186,7 @@ export function planLevelPut(data) {
 //编辑预案分级数据
 export function planLevelDel(data) {
   return request({
-    url: '/zd-laboratory/planLevel/delete/',
+    url: '/laboratory/planLevel/delete/',
     method: 'delete',
     data:data
   })
@@ -195,7 +195,7 @@ export function planLevelDel(data) {
 //获取关联预案实验室列表
 export function getLabRiskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/getLabRiskPlanJoinSub',
+    url: '/laboratory/plan/getLabRiskPlanJoinSub',
     method: 'post',
     data: data
   })
@@ -203,7 +203,7 @@ export function getLabRiskPlanJoinSub(data) {
 //获取非关联预案实验室列表
 export function getLabRiskPlanNoJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/getLabRiskPlanNoJoinSub',
+    url: '/laboratory/plan/getLabRiskPlanNoJoinSub',
     method: 'post',
     data: data
   })
@@ -211,7 +211,7 @@ export function getLabRiskPlanNoJoinSub(data) {
 //删除关联实验室
 export function deleteRiskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/deleteRiskPlanJoinSub',
+    url: '/laboratory/plan/deleteRiskPlanJoinSub',
     method: 'delete',
     data: data
   })
@@ -219,7 +219,7 @@ export function deleteRiskPlanJoinSub(data) {
 //新增关联实验室
 export function riskPlanJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/riskPlanJoinSub',
+    url: '/laboratory/plan/riskPlanJoinSub',
     method: 'post',
     data: data
   })
@@ -227,7 +227,7 @@ export function riskPlanJoinSub(data) {
 //批量关联实验室
 export function riskPlanBatchJoinSub(data) {
   return request({
-    url: '/zd-laboratory/plan/riskPlanBatchJoinSub',
+    url: '/laboratory/plan/riskPlanBatchJoinSub',
     method: 'post',
     data: data
   })

src/api/evacuationBigData/index.js

@@ -167,7 +167,7 @@ export function isCancelOutFile(query) {
 //查询当前用户下的预案触发数据
 export function selectTriggerInfo(query) {
   return request({
-    url: '/zd-laboratory/plan/selectTriggerInfo',
+    url: '/laboratory/plan/selectTriggerInfo',
     method: 'get',
     params: query
   })
@@ -175,7 +175,7 @@ export function selectTriggerInfo(query) {
 //标记查看的预案
 export function riskPlanId(query) {
   return request({
-    url: '/zd-laboratory/plan/writerEnterRiskPlan',
+    url: '/laboratory/plan/writerEnterRiskPlan',
     method: 'get',
     params: query
   })

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -29,24 +29,24 @@
           <span>秒</span>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="签到/离开示意图：" prop="signMap">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'signMap')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.signMap" :src="form.signMap" class="avatar">-->
-            <!--<i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="签到/离开示意图：" prop="signMap">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'signMap')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.signMap" :src="form.signMap" class="avatar">
+            <i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>
+          </el-upload>
+          <i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
       <div class="form-max-box">
         <el-form-item label="视频封面：" prop="videoCover">
           <el-upload
@@ -65,24 +65,24 @@
             height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="操作指南：" prop="operationGuide">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">-->
-            <!--<i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="操作指南：" prop="operationGuide">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">
+            <i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
     </el-form>
     <div class="sub_btn">
       <p class="null-p"></p>

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -236,13 +236,30 @@
         console.log('rule',rule)
         const list = rule.field.split('.');
         let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
         let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].list[index2].tare);
         if(value>max){
           callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
         }else{
           callback();
         }
       };
+      const computingTare = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
+
       return {
         //限制时间范围
         pickerBeginOption: {
@@ -284,11 +301,12 @@
           chemicalAmount:[
             { required: true, message: '请输入容器容量', trigger: 'blur' },
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
-            { required: true, message: "超出该机柜可存放量", validator: computingCapacity, trigger: "blur" },
+            { required: true, validator: computingCapacity, trigger: "blur" },
           ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
-            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTare, trigger: "blur" },
           ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },