heyang

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/api/safetyCheck/index.js

@@ -329,7 +329,7 @@ export function hideHistoryPlanTitle(query) {
 //检查计划-查询当前学校下实验室数量
 export function getAllSubNum(query) {
   return request({
-    url: '/zd-laboratory/subject/getAllSubNum',
+    url: '/laboratory/subject/getAllSubNum',
     method: 'get',
     params: query
   })
@@ -338,7 +338,7 @@ export function getAllSubNum(query) {
 //检查计划-查询当前学校下学院列表与实验室数量
 export function conditionCollegeInfo(query) {
   return request({
-    url: '/zd-laboratory/subject/conditionCollegeInfo',
+    url: '/laboratory/subject/conditionCollegeInfo',
     method: 'get',
     params: query
   })
@@ -347,7 +347,7 @@ export function conditionCollegeInfo(query) {
 //检查计划-查询选中院系下的实验室列表
 export function findSubInfoByDeptIds(data) {
   return request({
-    url: '/zd-laboratory/subject/findSubInfoByDeptIds',
+    url: '/laboratory/subject/findSubInfoByDeptIds',
     method: 'post',
     data: data
   })
@@ -356,7 +356,7 @@ export function findSubInfoByDeptIds(data) {
 //检查计划-查询实验室(已过滤/未选)
 export function conditionSubjectInfo(data) {
   return request({
-    url: '/zd-laboratory/subject/conditionSubjectInfo',
+    url: '/laboratory/subject/conditionSubjectInfo',
     method: 'post',
     data: data
   })
@@ -622,7 +622,7 @@ export function getCheckPlanBySubId(query) {
 //通用接口-根据名称查询实验室列表
 export function buildBySubList(query) {
   return request({
-    url: '/zd-laboratory/subject/buildBySub/list',
+    url: '/laboratory/subject/buildBySub/list',
     method: 'get',
     params: query
   })
@@ -683,7 +683,7 @@ export function hiddenDataItemsSubListTop(query) {
 //工作台跳转后-按名称搜索权限下实验室列表
 export function listSubAdmin(query){
   return request({
-    url: '/zd-laboratory/subject/list/listSubAdmin',
+    url: '/laboratory/subject/list/listSubAdmin',
     method: 'get',
     params: query
   })

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

@@ -429,7 +429,7 @@ export default {
   },
   data(){
     return{
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/zd-laboratory/subject/importSubData", // 上传地址
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/laboratory/subject/importSubData", // 上传地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -1370,7 +1370,7 @@ export default {
     importButton(item){
       if(item.command == 1){
         //  下载模板
-        this.download('/zd-laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
+        this.download('/laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
       }else if(item.command == 2){
         //  导入数据
         console.log('导入数据');
@@ -1379,11 +1379,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('/zd-laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
+      this.download('/laboratory/subject/exportSubTemplate', {}, `实验室导入模板.xlsx`)
     },
     /*下载失败列表*/
     failureExcel(){
-      this.download('/zd-laboratory/subject/exportProblemData', {}, `实验室导入模板失败报表.xlsx`)
+      this.download('/laboratory/subject/exportProblemData', {}, `实验室导入模板失败报表.xlsx`)
     },
   },
   beforeDestroy() {

src/views/safetyCheck/startInspection/index.vue

@@ -78,7 +78,7 @@
               </el-form-item>
               <el-form-item label="检查类型" prop="checkType">
                 <el-select v-model="addForm.checkType" placeholder="请选择检查类型"
-                           :disabled="planType == 2" style="width: 500px">
+                           disabled style="width: 500px">
                   <el-option :key="1" label="校院巡查" :value="1"></el-option>
                   <el-option :key="2" label="实验室自查" :value="2"></el-option>
                 </el-select>
@@ -254,7 +254,7 @@
           title:"",
           checkResult:"",
           rectifyNotice:"",
-          checkType:"",
+          checkType:2,
           dateRange:[],
           rectifyDeadline:"",
           checkHazardDtoList:[],
@@ -591,6 +591,10 @@
       planButton(type){
         this.initializationAddFormData();
         this.$set(this,'planType',type);
+        //判断如果是手动输入-检查类型为实验室自查
+        if(this.planType==1){
+          this.addForm.checkType=2;
+        }
       },
       //查询详情
       findCheckManage(id){
@@ -626,7 +630,7 @@
         this.$set(this.addForm,'checkPlanId','');
         this.$set(this.addForm,'title','');
         this.$set(this.addForm,'checkRange',3);
-        this.$set(this.addForm,'checkType','');
+        this.$set(this.addForm,'checkType',2);
         this.$set(this.addForm,'dateRange',[]);
         this.$set(this.addForm,'checkResult','');
         this.$set(this.addForm,'rectifyNotice','');