heyang

.env.development

@@ -9,11 +9,11 @@ VUE_APP_ENV = 'development'
 # 韩
 # VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
- VUE_APP_BASE_API =  '192.168.1.17:8080'
+# VUE_APP_BASE_API =  '192.168.1.17:8080'
 # 88服务器
 # VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # 43服务器
-# VUE_APP_BASE_API = '192.168.1.43/labSystem/'
+ VUE_APP_BASE_API = '192.168.1.43/labSystem/'
 # 柴
 # VUE_APP_BASE_API = '192.168.1.9:8080'
 # 暨大
@@ -31,6 +31,6 @@ VUE_APP_ENV = 'development'
 # ####################内网接口配置####################
 
 #VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem/'
-VUE_APP_BASE_LOCAL_API = '192.168.1.17:8080'
+
 
 

src/api/http.js

@@ -67,8 +67,8 @@ export const detailColumnar = data => get("/laboratory/violation/bigData/detail/
 export const getDictViolation = data => get("/laboratory/violationScoreSite/getDictViolation",data)
 //安全检查-遗留问题
 export const indexCheckDetalsWzg = data => get("/zd-security/DataStatistics/remainList",data)
-//安全检查-遗留问题
-export const indexCheckDetalsYzg = data => get("/laboratory/checkRecordDetails/indexCheckDetalsYzg",data)
+//安全检查-本次检查问题
+export const indexCheckDetalsYzg = data => get("/zd-security/DataStatistics/rectificationList",data)
 //进入实验室人员
 export const onlineByBigView = data => get("/laboratory/bigview/sub/onlineByBigView",data)
 //进入实验室人员tip列表查询

src/utils/request.js

@@ -37,7 +37,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 8e833652-030e-4264-b0ca-ca8fc5121faa';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer c05515a4-e4ab-4086-b39d-52d9f2e0f705';//`Bearer ${localStorage.getItem('access_token')`;
 axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

src/views/inspectDetail.vue

@@ -34,8 +34,8 @@
         <el-table-column align="center" header-align='center' prop="subjectName" label="实验室"></el-table-column>
         <el-table-column align="center" header-align='center' prop="typeName" label="安全分类"></el-table-column>
         <el-table-column align="center" header-align='center' prop="levelName" label="安全分级"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="yhMs" label="隐患名称"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="remark" label="检查批次"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="hazardCheckPoint" label="隐患名称"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="title" label="检查批次"></el-table-column>
       </el-table>
       <el-pagination
           style="margin-top: 14px"
@@ -70,14 +70,16 @@
       <!--列表-->
       <el-table :data="tableData2"  style="width: 100%" height="250" :row-class-name="tableRowClassName">
         <el-table-column align="center" header-align='center' type="index" :index="indexMethod2" label="序号" width="60"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="laboratoryName" label="实验室"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="subjectName" label="实验室"></el-table-column>
         <el-table-column align="center" header-align='center' prop="typeName" label="安全分类"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="typeLevel" label="安全分级"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="yhMs" label="隐患名称"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="isZg" label="整改状态">
+        <el-table-column align="center" header-align='center' prop="levelName" label="安全分级"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="hazardCheckPoint" label="隐患名称"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="rectifyStatus" label="整改状态">
           <template #default="{row}">
-            <span v-if="row.isZg == 0">已整改</span>
-            <span v-if="row.isZg != 0">未整改</span>
+            <span v-if="row.rectifyStatus == 1">已完成</span>
+            <span v-if="row.rectifyStatus == 2">待整改</span>
+            <span v-if="row.rectifyStatus == 3">待复核</span>
+            <span v-if="row.rectifyStatus == 4">暂无法整改</span>
           </template>
         </el-table-column>