zc

src/api/index.js

@@ -214,11 +214,11 @@ export function laboratoryRiskDeviceTypeGetList(query) {
     })
 }
 //首页-安全检查-统计数量
-export function securityBigViewCheckStatusCount(query) {
+export function securityBigViewPlanStatistics(data) {
     return request({
-        url: '/security/bigView/checkStatusCount',
-        method: 'get',
-        params: query
+        url: '/security/bigView/planStatistics',
+        method: 'post',
+        data: data
     })
 }
 //首页-人员违规统计-违规原因

src/views/courtyardManage/courtyardHome.vue

@@ -75,7 +75,7 @@
                                 <!--安全检查-->
                                 <div class="left_t_r3">
                                     <div class="left_t_r2_t">
-                                        <i>安全检查</i>
+                                        <i></i>
                                         <img src="@/assets/image/index_icon8.png" @click="openinspectUrl()"/>
                                     </div>
                                     <div class="left_t_r2_t2">
@@ -85,18 +85,19 @@
                                     </div>
                                     <div class="left_t_r2_m">
                                         <i>计划标题</i>
-                                        <i>检查范围</i>
+                                        <i></i>
                                         <i>检查类型</i>
                                         <i>任务周期</i>
                                         <i>状态</i>
                                     </div>
                                     <div class="left_t_r2_b" v-if="inspectList">
                                         <li v-for='(item,index3) in inspectList' :key="index3">
-                                            <i class="over">{{item.title}}</i>
-                                            <i>{{item.checkRange==1?'全校':(item.checkRange==2?'学院':(item.checkRange==3?'实验室':''))}}</i>
+                                            <i class="over">{{item.planTitle}}</i>
+                                            <!--<i>{{item.checkRange==1?'全校':(item.checkRange==2?'学院':(item.checkRange==3?'实验室':''))}}</i>-->
+                                            <i></i>
                                             <i>{{item.checkCategory==1?'综合检查':(item.checkCategory==2?'专项检查':'')}}</i>
                                             <i>{{item.cycleStartTime}}至{{item.cycleEndTime}}</i>
-                                            <i>{{item.checkStatus==1?'未开始':(item.checkStatus==2?'进行中':(item.checkStatus==3?'已结束':''))}}</i>
+                                            <i>{{item.planStatus==0?'未开始':(item.planStatus==1?'进行中':(item.planStatus==2?'已结束':''))}}</i>
                                         </li>
                                     </div>
                                     <div v-if="inspectList.length<=0"
@@ -389,7 +390,7 @@
         laboratoryBigViewListCollegeApplyColumn,
         examBigViewNewStatistics,
         securityBigViewList,
-        securityBigViewCheckStatusCount
+        securityBigViewPlanStatistics
     } from "@/api/index"
     import {
         laboratoryBigViewsSubTypeLevelCount,
@@ -417,6 +418,7 @@
             return {
                 rectangleLogo: localStorage.getItem('rectangleLogo'),
                 deptName: null,
+                deptId: null,
                 mtopicTwo: "manage/work" + localStorage.getItem('userId'),
                 timer: null,//定时器
                 chartReload3: null,//定时器
@@ -465,6 +467,7 @@
         },
         created() {
             this.$set(this, 'deptName', localStorage.getItem('deptName'));
+            this.$set(this, 'deptId', localStorage.getItem('deptId'));
         },
         mounted() {
             let self = this;
@@ -593,7 +596,8 @@
             },
             //安全检查
             openinspectUrl() {
-                this.$router.push({path: './inspectDetail', query: {key: this.planId}})
+                // this.$router.push({path: './inspectDetail', query: {key: this.planId}})
+                this.$router.push({path: './inspectDetail',})
 
             },
             //进入实验室人员
@@ -829,15 +833,15 @@
             //安全检查
             securityBigViewList: function () {
                 let self = this;
-                securityBigViewList({page: 1, pageSize: 7}).then((res) => {
+                securityBigViewList({deptId:this.deptId,page: 1, pageSize: 7}).then((res) => {
                     if (res.code == 200) {
                         this.$set(this, 'inspectList', res.data.records);
                     }
                 });
-                securityBigViewCheckStatusCount({page: 1, pageSize: 7}).then((res) => {
+                securityBigViewPlanStatistics({deptId:this.deptId,page: 1, pageSize: 7}).then((res) => {
                     if (res.code == 200) {
-                        this.$set(this, 'inspeccheckZs', res.data.notStarted);
-                        this.$set(this, 'inspeccheckWzg', res.data.underway);
+                        this.$set(this, 'inspeccheckZs', res.data.notStart);
+                        this.$set(this, 'inspeccheckWzg', res.data.running);
                         this.$set(this, 'inspeccheckYzg', res.data.finished);
                     }
                 });

src/views/courtyardManage/inspectDetail.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="main_b">
-      <div class="main_b_title">校院巡查</div>
+      <div class="main_b_title">校级检查</div>
       <!--查询条件-->
       <el-form :model="editForm" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
         <el-form-item label="" prop="searchValue" label-width="80px">
@@ -18,11 +18,11 @@
                   placeholder="计划标题"
           />
         </el-form-item>
-        <el-form-item label="" prop="checkStatus" label-width="80px">
-          <el-select v-model="editForm.checkStatus" popper-class="select-big-data" placeholder="状态">
-            <el-option key="1" label="未开始" value="1"></el-option>
-            <el-option key="2" label="进行中" value="2"></el-option>
-            <el-option key="3" label="已结束" value="3"></el-option>
+        <el-form-item label="" prop="planStatus" label-width="80px">
+          <el-select v-model="editForm.planStatus" popper-class="select-big-data" placeholder="状态">
+            <el-option key="0" label="未开始" value="0"></el-option>
+            <el-option key="1" label="进行中" value="1"></el-option>
+            <el-option key="2" label="已结束" value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label-width="0">
@@ -33,7 +33,7 @@
       <!--列表-->
       <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 align="center" header-align='center' prop="title" label="计划标题"/>
+        <el-table-column align="center" header-align='center' prop="planTitle" label="计划标题"/>
         <el-table-column align="center" header-align='center' prop="typeName" label="检查范围">
           <template slot-scope="scope">
             <span>{{scope.row.checkRange ==1?'全校':(scope.row.checkRange ==2?'学院':(scope.row.checkRange ==3?'实验室':''))}}</span>
@@ -49,9 +49,9 @@
             <span>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" header-align='center' prop="title" label="状态">
+        <el-table-column align="center" header-align='center' prop="planStatus" label="状态">
           <template slot-scope="scope">
-            <span>{{scope.row.checkStatus==1?'未开始':(scope.row.checkStatus==2?'进行中':(scope.row.checkStatus==3?'已结束':''))}}</span>
+            <span>{{scope.row.planStatus==0?'未开始':(scope.row.planStatus==1?'进行中':(scope.row.planStatus==2?'已结束':''))}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -67,7 +67,7 @@
       </el-pagination>
     </div>
     <div class="main_b2">
-      <div class="main_b_title">实验室自查</div>
+      <div class="main_b_title">学院自查</div>
       <!--查询条件-->
       <el-form :model="editForm2" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
         <el-form-item label="" prop="searchValue" label-width="80px">
@@ -77,11 +77,11 @@
                   placeholder="计划标题"
           />
         </el-form-item>
-        <el-form-item label="" prop="checkStatus" label-width="80px">
-          <el-select v-model="editForm2.checkStatus" popper-class="select-big-data" placeholder="状态">
-            <el-option key="1" label="未开始" value="1"></el-option>
-            <el-option key="2" label="进行中" value="2"></el-option>
-            <el-option key="3" label="已结束" value="3"></el-option>
+        <el-form-item label="" prop="planStatus" label-width="80px">
+          <el-select v-model="editForm2.planStatus" popper-class="select-big-data" placeholder="状态">
+            <el-option key="0" label="未开始" value="0"></el-option>
+            <el-option key="1" label="进行中" value="1"></el-option>
+            <el-option key="2" label="已结束" value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label-width="0">
@@ -92,7 +92,7 @@
       <!--列表-->
       <el-table :data="tableData2"  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 align="center" header-align='center' prop="title" label="计划标题"/>
+        <el-table-column align="center" header-align='center' prop="planTitle" label="计划标题"/>
         <el-table-column align="center" header-align='center' prop="typeName" label="检查范围">
           <template slot-scope="scope">
             <span>{{scope.row.checkRange ==1?'全校':(scope.row.checkRange ==2?'学院':(scope.row.checkRange ==3?'实验室':''))}}</span>
@@ -108,9 +108,9 @@
             <span>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" header-align='center' prop="title" label="状态">
+        <el-table-column align="center" header-align='center' prop="planStatus" label="状态">
           <template slot-scope="scope">
-            <span>{{scope.row.checkStatus==1?'未开始':(scope.row.checkStatus==2?'进行中':(scope.row.checkStatus==3?'已结束':''))}}</span>
+            <span>{{scope.row.planStatus==0?'未开始':(scope.row.planStatus==1?'进行中':(scope.row.planStatus==2?'已结束':''))}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -138,16 +138,16 @@ export default {
   data() {
     return {
       editForm:{
-        checkType:1,
+        checkCategory:1,
         searchValue:'',
-        checkStatus:'',
+        planStatus:'',
         page:1,
         pageSize:10
       },
       editForm2:{
-        checkType:2,
+        checkCategory:2,
         searchValue:'',
-        checkStatus:'',
+        planStatus:'',
         page:1,
         pageSize:10
       },
@@ -202,7 +202,9 @@ export default {
     },
     //请求列表
     getAjaxList:function (){
-        securityBigViewList(this.editForm).then((res) =>{
+        let obj = JSON.parse(JSON.stringify(this.editForm));
+        obj.deptId = localStorage.getItem('deptId');
+        securityBigViewList(obj).then((res) =>{
             if(res.code==200){
                 this.$set(this,'tableData',res.data.records);
                 this.$set(this,'totalNum',res.data.total);
@@ -211,7 +213,9 @@ export default {
     },
     //请求列表
     getAjaxList2:function (){
-        securityBigViewList(this.editForm2).then((res) =>{
+        let obj = JSON.parse(JSON.stringify(this.editForm2));
+        obj.deptId = localStorage.getItem('deptId');
+        securityBigViewList(obj).then((res) =>{
             if(res.code==200){
                 this.$set(this,'tableData2',res.data.records);
                 this.$set(this,'totalNum2',res.data.total);
@@ -227,7 +231,7 @@ export default {
     /*重置*/
     resetForm() {
       this.editForm.searchValue = "";
-      this.editForm.checkStatus = "";
+      this.editForm.planStatus = "";
       this.onSearch();
     },
     /*查询*/
@@ -239,7 +243,7 @@ export default {
     /*重置*/
     resetForm2() {
       this.editForm2.searchValue = "";
-      this.editForm2.checkStatus = "";
+      this.editForm2.planStatus = "";
       this.onSearch2();
     },
     handleCurrentChange(val) {

src/views/login.vue

@@ -172,6 +172,7 @@
             getInfo() {
                 getInfo().then(res => {
                     localStorage.setItem('deptName',res.data.userInfo.deptName)
+                    localStorage.setItem('deptId',res.data.userInfo.deptId)
                 });
             },
             handleLogin() {