heyang 1 anno fa
parent
commit
198bcfecc8
5 ha cambiato i file con 51 aggiunte e 43 eliminazioni
  1. 21 0
      README.md
  2. 4 4
      src/api/http.js
  3. 2 2
      src/utils/request.js
  4. 14 24
      src/views/home.vue
  5. 10 13
      src/views/inspectDetail.vue

+ 21 - 0
README.md

@@ -22,3 +22,24 @@ npm run lint
 
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
+
+
+
+### 2.版本分支关系
+>##### 修改时务必注意版本分支关系,从底层开始迭代
+    ├─lab-big-data-vue2 (v2之前的版本)-使用后台pre库
+    ├─jiNanDaXue-big-data (旧版本的安全检查)-使用后台pre库
+    ├─3.3.3-aqjc (新版本安全检查)-使用后台pre库
+    ├─dongbeiDX (新增校级大屏)-使用后台pre库
+    │  └─ (东北大学-当前线上版本)-使用后台pre库
+    │
+    │
+    │
+    │
+    ├─lab-big-data-v2 (当前正在开发版本)-使用后台dev库
+    │    ├─ (安全学院-当前线上版本)-使用后台pre库
+    │    ├─ (化工学院/能动学院-当前线上版本)-使用后台pre库
+    │    └─ (苏州大学-当前线上版本)-使用后台pre库
+    │
+    │
+    ├─lab-big-data-v2-pro (当前正在测试版本)-使用后台dev库

+ 4 - 4
src/api/http.js

@@ -39,7 +39,7 @@ export const listCollegeJh = data => get("/laboratory/notifyplan/listCollegeTz",
 //安全检查
 export const safetyInspectTitle = data => get("/zd-security/DataStatistics/bigViewCount",data)
 //安全检查
-export const indexCollegeListCheck = data => get("/zd-security/DataStatistics/bigViewList",data)
+export const indexCollegeListCheck = data => get("/laboratory/checkRecord/indexCollegeListCheck",data)
 
 //获取报警信息
 export const groupGetList = data => get("/laboratory/plan/group/getList",data)
@@ -66,9 +66,9 @@ 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("/zd-security/DataStatistics/rectificationList",data)
+export const indexCheckDetalsWzg = data => get("/laboratory/checkRecordDetails/indexCheckDetalsWzg",data)
+//安全检查-遗留问题
+export const indexCheckDetalsYzg = data => get("/laboratory/checkRecordDetails/indexCheckDetalsYzg",data)
 //进入实验室人员
 export const onlineByBigView = data => get("/laboratory/bigview/sub/onlineByBigView",data)
 //进入实验室人员tip列表查询

+ 2 - 2
src/utils/request.js

@@ -37,8 +37,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 9ebffc61-4461-4d8e-a457-03878eedcf5e';//`Bearer ${localStorage.getItem('access_token')`;
-axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+axios.defaults.headers.common["Authorization"] = 'Bearer 0bf8f561-1750-416d-922d-ef479b282847';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

+ 14 - 24
src/views/home.vue

@@ -81,11 +81,11 @@
                   </div>
                   <div class="left_t_r2_b" v-if="inspectList">
                     <li v-for='(item,index3) in inspectList' :key="index3">
-                      <i class="over">{{item.subjectName}}</i>
+                      <i class="over">{{item.laboratoryName}}</i>
                       <i>{{item.typeName}}</i>
-                      <i>{{item.levelName}}</i>
-                      <i>{{item.dangerNum}}</i>
-                      <i>{{item.amount}}</i>
+                      <i>{{item.typeLevel}}</i>
+                      <i>{{item.checkZs}}</i>
+                      <i>{{item.checkYzg}}</i>
                     </li>
                   </div>
                    <div v-if="inspectList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
@@ -299,7 +299,7 @@ import {
   queryHazardColumnar,
   workInfo,
   getUrlConfig,
-  requestUrl, getTypeCount, getFiedCount, safetyInspectTitle
+  requestUrl, getTypeCount, getFiedCount,
 } from "../api/http"
 import Swiper from 'swiper'
 import $ from 'jquery'
@@ -402,7 +402,7 @@ export default {
     },
     //安全检查
     openinspectUrl(){
-      this.$router.push({path:'./inspectDetail',query:{key:this.planId}})
+      this.$router.push({path:'./inspectDetail',query:{key:this.laboratoryId}})
 
     },
     //安全检查批次
@@ -736,29 +736,20 @@ export default {
         }
       })
     },
-    //安全检查头部信息
-    safetyInspectTitle:function () {
-      safetyInspectTitle().then((res) =>{
-        if(res.code==200){
-          let _this=this;
-          let data=res.data;
-          _this.inspecremark=data.title;
-          _this.inspeccheckWzg=data.ylTotal;
-          _this.inspeccheckYzg=data.yzgTotal;
-          _this.inspeccheckZs=data.yhTotal;
-          _this.planId=data.planId;
-
-        }
-      })
-    },
     //安全检查
     safetyInspectFun:function(){
       let _this=this;
-      indexCollegeListCheck({pageNum:1,pageSize:7}).then((res) =>{
+      indexCollegeListCheck({pageNum:1,pageSize:10}).then((res) =>{
         if(res.code==200){
           let data=res.rows;
           _this.inspectList=data
-
+          for (var i = 0; i < data.length; i++) {
+            _this.inspecremark=data[0].remark;
+            _this.inspeccheckWzg=data[0].listVo[0].checkWzg;
+            _this.inspeccheckYzg=data[0].listVo[0].checkYzg;
+            _this.inspeccheckZs=data[0].listVo[0].checkZs;
+            _this.laboratoryId=data[0].id;
+          }
         }
       })
 
@@ -1401,7 +1392,6 @@ export default {
     _this.infoFun();
     _this.workPlanFun();
     _this.safetyInspectFun();
-    _this.safetyInspectTitle();
     _this.initSwiper();
     _this.subscriptionMQTT();
     _this.timer = setInterval(() => {

+ 10 - 13
src/views/inspectDetail.vue

@@ -31,11 +31,11 @@
       <!--列表-->
       <el-table :data="tableData"  style="width: 100%" height="250" :row-class-name="tableRowClassName">
         <el-table-column align="center" header-align='center' type="index" :index="indexMethod" label="序号" width="60"></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="laboratoryName" 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="hazardCheckPoint" label="隐患名称"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="title" 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="remark" label="检查批次"></el-table-column>
       </el-table>
       <el-pagination
           style="margin-top: 14px"
@@ -70,19 +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="subjectName" label="实验室"></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="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="hazardCheckPoint" label="隐患名称"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="rectifyStatus" label="整改状态">
+        <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="整改状态">
           <template #default="{row}">
-            <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>
+            <span v-if="row.isZg == 0">已整改</span>
+            <span v-if="row.isZg != 0">未整改</span>
           </template>
         </el-table-column>
-
       </el-table>
       <el-pagination
           style="margin-top: 14px"