heyang

src/api/safetyCheck/index.js

@@ -1,4 +1,102 @@
 import request from '@/utils/request'
+/***************************工作台***************************/
+
+//工作台-校级巡查数据
+export function schoolWorkCheck(query) {
+  return request({
+    url: '/security/schoolWork/check',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-实验室巡查数据
+export function schoolWorkSubCheck(query) {
+  return request({
+    url: '/security/schoolWork/subCheck',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-待办事项列表
+export function todoList(query) {
+  return request({
+    url: '/security/schoolWork/todoList',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-待办事项列表-待复核
+export function tobeReviewed(query) {
+  return request({
+    url: '/security/schoolWork/tobeReviewed',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-存在隐患
+export function hiddenCount(query) {
+  return request({
+    url: '/security/schoolWork/hiddenCount',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-检查覆盖率
+export function yearRate(query) {
+  return request({
+    url: '/security/schoolWork/yearRate',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-检查统计
+export function checkStatistics(query) {
+  return request({
+    url: '/security/schoolWork/checkStatistics',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-已处理隐患
+export function hiddenDangerRectify(query) {
+  return request({
+    url: '/security/schoolWork/hiddenDangerRectify',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台-指标统计(校级)
+export function hiddenCountByType(query) {
+  return request({
+    url: '/security/schoolWork/hiddenCountByType',
+    method: 'get',
+    params: query
+  })
+}
+//工作台-指标统计(院级)
+export function collegCheckHiddenCountByType(query) {
+  return request({
+    url: '/security/collegCheck/hiddenCountByType',
+    method: 'get',
+    params: query
+  })
+}
+//附件列表查询-通过计划ID查询附件列表
+export function getFindByCheckPlanId(query) {
+  return request({
+    url: '/zd-security/upload/findByCheckPlanId',
+    method: 'get',
+    params: query
+  })
+}
 /***************************数据统计***************************/
 
 //数据统计-实验室列表头部数据汇总

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/listPage.vue

@@ -109,6 +109,9 @@
               <span v-if="scope.row.useStatus==0" style="color: #0183FA">{{scope.row.useStatusName}}</span>
               <span v-if="scope.row.useStatus==1" style="color: #11932F">{{scope.row.useStatusName}}</span>
               <span v-if="scope.row.useStatus==2" style="color: #E80000">{{scope.row.useStatusName}}</span>
+              <span v-if="scope.row.useStatus==3" style="color: #E80000">{{scope.row.useStatusName}}</span>
+              <span v-if="scope.row.useStatus==4" style="color: #E80000">{{scope.row.useStatusName}}</span>
+              <span v-if="scope.row.useStatus==5" style="color: #E80000">{{scope.row.useStatusName}}</span>
             </template>
           </el-table-column>
         </el-table>

src/views/safetyCheck/worktable/coverageRateEcharts.vue

@@ -5,7 +5,7 @@
 
 <script>
   import echarts from 'echarts'
-  import { yearRate } from '@/apiDemo/safetyCheck/index'
+  import { yearRate } from '@/api/safetyCheck/index'
   export default {
     name: 'coverageRateEcharts',
     data(){

src/views/safetyCheck/worktable/hiddenDangerStatisticsEcharts.vue

@@ -13,7 +13,7 @@
 
 <script>
   import echarts from 'echarts'
-  import { hiddenCountByType, collegCheckHiddenCountByType,isSCollege } from '@/apiDemo/safetyCheck/index'
+  import { hiddenCountByType, collegCheckHiddenCountByType,isSCollege } from '@/api/safetyCheck/index'
   export default {
     name: 'hiddenDangerStatisticsEcharts',
     data(){
@@ -68,13 +68,13 @@
           }else{
             this.$set(this,'nullType',false);
           }
-          response.rows.sort(this.compare('sumTotal', true))
-          for(let i=0;i<response.rows.length;i++){
-            data.name.push(response.rows[i].subjectName.length>8?response.rows[i].subjectName.substring(0,8)+'..':response.rows[i].subjectName)
-            data.nameText.push(response.rows[i].subjectName)
-            data.text.push(response.rows[i].hazardCheckName)
-            data.num.push(response.rows[i].sumTotal)
-            data.percent.push(response.rows[i].percent)
+          response.data.sort(this.compare('sumTotal', true))
+          for(let i=0;i<response.data.length;i++){
+            data.name.push(response.data[i].subjectName.length>8?response.data[i].subjectName.substring(0,8)+'..':response.data[i].subjectName)
+            data.nameText.push(response.data[i].subjectName)
+            data.text.push(response.data[i].hazardCheckName)
+            data.num.push(response.data[i].sumTotal)
+            data.percent.push(response.data[i].percent)
           }
           let option = {
             grid: {
@@ -197,18 +197,18 @@
         hiddenCountByType({hdLevel:this.hdLevel}).then(response => {
           let myChart = this.$echarts.init(document.getElementById('hiddenDangerStatisticsEcharts-box'));
           let data = [];
-          if(!response.rows[0]){
+          if(!response.data[0]){
             this.$set(this,'nullType',true);
             return
           }else{
             this.$set(this,'nullType',false);
           }
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             // substring
             let obj = {
-              name:response.rows[i].collegeName.length>8?response.rows[i].collegeName.substring(0,8)+'..':response.rows[i].collegeName,
-              nameText:response.rows[i].collegeName,
-              value:response.rows[i].sumTotal,
+              name:response.data[i].collegeName.length>8?response.data[i].collegeName.substring(0,8)+'..':response.data[i].collegeName,
+              nameText:response.data[i].collegeName,
+              value:response.data[i].sumTotal,
             }
             data.push(obj);
           }

src/views/safetyCheck/worktable/index.vue

@@ -158,7 +158,7 @@
 </template>
 
 <script>
-  import { schoolWorkCheck, schoolWorkSubCheck, hiddenCount, hiddenDangerRectify } from '@/apiDemo/safetyCheck/index'
+  import { schoolWorkCheck, schoolWorkSubCheck, hiddenCount, hiddenDangerRectify } from '@/api/safetyCheck/index'
   import toDoListBox from './toDoListBox.vue'
   import worktableButtonBox from './worktableButtonBox.vue'
   import coverageRateEcharts from './coverageRateEcharts.vue'

src/views/safetyCheck/worktable/inspectionStatisticsEcharts.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-  import { checkStatistics } from '@/apiDemo/safetyCheck/index'
+  import { checkStatistics } from '@/api/safetyCheck/index'
   export default {
     name: 'inspectionStatisticsEcharts',
     data(){
@@ -26,19 +26,19 @@
             standards : [],
             notStandards : [],
           }
-          for(let i=0;i<response.rows.length;i++){
-            data.name.push(response.rows[i].yearMonth)
-            if(response.rows[i].notStandards.indexOf('%') != -1){
-              response.rows[i].notStandards = response.rows[i].notStandards.split('%')[0]
-              data.notStandards.push(response.rows[i].notStandards)
+          for(let i=0;i<response.data.length;i++){
+            data.name.push(response.data[i].yearMonth)
+            if(response.data[i].notStandards.indexOf('%') != -1){
+              response.data[i].notStandards = response.data[i].notStandards.split('%')[0]
+              data.notStandards.push(response.data[i].notStandards)
             }else{
-              data.notStandards.push(response.rows[i].notStandards)
+              data.notStandards.push(response.data[i].notStandards)
             }
-            if(response.rows[i].standards.indexOf('%') != -1){
-              response.rows[i].standards = response.rows[i].standards.split('%')[0]
-              data.standards.push(response.rows[i].standards)
+            if(response.data[i].standards.indexOf('%') != -1){
+              response.data[i].standards = response.data[i].standards.split('%')[0]
+              data.standards.push(response.data[i].standards)
             }else{
-              data.standards.push(response.rows[i].standards)
+              data.standards.push(response.data[i].standards)
             }
           }
           let myChart = this.$echarts.init(document.getElementById('inspectionStatisticsEcharts-box'));

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -58,7 +58,7 @@
 </template>
 
 <script>
-  import { todoList, tobeReviewed,getFindByCheckPlanId } from '@/apiDemo/safetyCheck/index'
+  import { todoList, tobeReviewed,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {