zc

src/api/safetyCheck/index.js

@@ -622,7 +622,7 @@ export function getCheckPlanBySubId(query) {
 //通用接口-根据名称查询实验室列表
 export function buildBySubList(query) {
   return request({
-    url: '/laboratory/subject/buildBySub/list',
+    url: '/zd-laboratory/subject/buildBySub/list',
     method: 'get',
     params: query
   })
@@ -652,3 +652,48 @@ export function noticeConfigAdd(data) {
     data: data
   })
 }
+
+//附件列表查询-通过计划ID查询附件列表
+export function getFindByCheckPlanId(query) {
+  return request({
+    url: '/zd-security/upload/findByCheckPlanId',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台跳转后-按指标统计列表
+export function hiddenDataItemsSubList(query) {
+  return request({
+    url: '/zd-security/collegCheck/hiddenDataItemsSubList',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台跳转后-按指标统计顶部数据
+export function hiddenDataItemsSubListTop(query) {
+  return request({
+    url: '/zd-security/collegCheck/hiddenDataItemsSubListTop',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台跳转后-按名称搜索权限下实验室列表
+export function listSubAdmin(query){
+  return request({
+    url: '/zd-laboratory/subject/list/listSubAdmin',
+    method: 'get',
+    params: query
+  })
+}
+
+//工作台跳转后-获取当前角色所属院系ID
+export function getloginUser(query){
+  return request({
+    url: '/zd-security/collegCheck/getloginUser',
+    method: 'get',
+    params: query
+  })
+}

src/components/lookDocumentDialog/lookDocumentListDialog.vue

@@ -95,7 +95,7 @@
       },
       // 下载按钮
       downloadButton(){
-        this.download(this.lookDocumentList[this.lookDocumentListIndex].url, {}, this.lookDocumentList[this.lookDocumentListIndex].name)
+        this.downloadUrl(this.lookDocumentList[this.lookDocumentListIndex].url,this.lookDocumentList[this.lookDocumentListIndex].name)
       },
       //打开新窗口
       goPage(){

src/main.js

@@ -12,7 +12,7 @@ import App from './App'
 import store from './store'
 import router from './router'
 import directive from './directive' //directive
-import { download } from '@/utils/request'
+import { download,downloadUrl } from '@/utils/request'
 import { uploadUrl,judgmentNetworkReturnAddress,versionField } from '@/utils/ruoyi'
 import hasPermiDom from './directive/permission/hasPermiDom'
 
@@ -58,6 +58,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.downloadUrl = downloadUrl
 Vue.prototype.uploadUrl = uploadUrl
 Vue.prototype.versionField = versionField
 Vue.prototype.hasPermiDom = hasPermiDom.hasPermiDom

src/utils/request.js

@@ -187,7 +187,7 @@ export function download(url, params, filename) {
       return tansParams(params)
     }],
     headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
+      'Content-Type': 'application/x-www-form-urlencoded'
     },
     responseType: 'blob'
   }).then((data) => {
@@ -209,6 +209,22 @@ export function download(url, params, filename) {
     console.error(r)
   })
 }
+// 通用地址文件下载方法
+export function downloadUrl(fileUrl,fleName) {
+  const newUrl = urlText + judgmentNetworkReturnAddress() + fileUrl;
+  const x = new XMLHttpRequest();
+  x.open("GET", newUrl, true);
+  x.responseType = "blob";
+  x.onload = () => {
+    const url = URL.createObjectURL(x.response);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = fleName;
+    a.target = "_blank";
+    a.click();
+  };
+  x.send();
+}
 
 
 export default service

src/views/safetyCheck/checkConfiguration/checkUserPage.vue

@@ -36,9 +36,9 @@
       <el-table-column label="序号" align="center"  type="index" width="60" />
       <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
       <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
-      <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="300"/>
+      <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
       <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
-      <el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>
+      <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
     </el-table>
     <pagination :page-sizes="[20, 30, 40, 50]"
                 v-show="total>0"

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -80,7 +80,7 @@
               <el-table-column label="手机号" align="center" prop="phonenumber" show-overflow-tooltip width="100"/>
               <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="80"/>
               <el-table-column label="准入有效期" align="center" prop="deptName" show-overflow-tooltip width="200">
-                <template slot-scope="scope">{{scope.row.validBeginTime}}至{{scope.row.validEndTime}}</template>
+                <template slot-scope="scope">{{scope.row.validBeginTime}} 至 {{scope.row.validEndTime}}</template>
               </el-table-column>
             </el-table>
             <pagination :page-sizes="[20, 30, 40, 50]"
@@ -145,7 +145,7 @@
               <el-table-column label="手机号" align="center" prop="phonenumber" show-overflow-tooltip width="100"/>
               <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="80"/>
               <el-table-column label="准入有效期" align="center" prop="deptName" show-overflow-tooltip width="200">
-                <template slot-scope="scope">{{scope.row.validBeginTime}}至{{scope.row.validEndTime}}</template>
+                <template slot-scope="scope">{{scope.row.validBeginTime}} 至 {{scope.row.validEndTime}}</template>
               </el-table-column>
             </el-table>
             <pagination :page-sizes="[20, 30, 40, 50]"

src/views/safetyCheck/checkConfiguration/rectificationUserPage.vue

@@ -36,9 +36,9 @@
       <el-table-column label="序号" align="center"  type="index" width="60" />
       <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip/>
       <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="300"/>
-      <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="300"/>
+      <el-table-column label="检查者" align="center" prop="nickNames" show-overflow-tooltip width="500"/>
       <el-table-column label="操作人" align="center" prop="createName" show-overflow-tooltip width="200"/>
-      <el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>
+      <!--<el-table-column label="操作时间" align="center" prop="createTime" show-overflow-tooltip width="300"/>-->
     </el-table>
     <pagination :page-sizes="[20, 30, 40, 50]"
                 v-show="total>0"

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -26,7 +26,7 @@
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;min-height:40px;">{{addForm.checkDemand}}<span v-if="!addForm.checkDemand" style="color:#999;">未输入</span></p>
               <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
-            <el-form-item label="检查结果" prop="checkResult">
+            <el-form-item label="检查结果" prop="checkResult" v-if="addForm.checkResult">
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:0 15px;">{{addForm.checkResult==0?'不符合':(addForm.checkResult==1?'符合':'')}}</p>
             </el-form-item>
             <div style="display: flex" v-if="addForm.checkResult==0">
@@ -36,7 +36,7 @@
                   <p class="download-button" @click="downloadButton">下载</p>
                 </div>
               </el-form-item>
-              <el-form-item label="材料附件" style="width: 300px">
+              <el-form-item label="材料附件" style="width: 300px" v-if="addForm.isAttachment == 1">
                 <div class="data-button-box">
                   <p class="look-button" @click="lookDocumentListButton(1)">查看</p>
                 </div>
@@ -56,7 +56,7 @@
             <el-form-item label="整改期限" prop="rectifyDeadline" v-if="addForm.checkResult==0">
               <el-input disabled v-model="addForm.rectifyDeadline" placeholder="未填写" maxLength="10" style="width: 450px"/>
             </el-form-item>
-            <el-form-item label="材料附件" style="width: 450px" v-if="addForm.checkResult==1">
+            <el-form-item label="材料附件" style="width: 450px" v-if="addForm.checkResult==1&&addForm.isAttachment == 1">
               <div class="data-button-box">
                 <p class="look-button" @click="lookDocumentListButton(1)">查看</p>
               </div>
@@ -164,7 +164,7 @@
 </template>
 
 <script>
-  import { findCheckManage } from '@/api/safetyCheck/index'
+  import { findCheckManage,getFindByCheckPlanId } from '@/api/safetyCheck/index'
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
@@ -260,11 +260,21 @@
       //查看多个文档
       lookDocumentListButton(type){
         if(type==1){
-          this.$set(this,'propsLookDocumentListData',{
-            title:"查看附件",
-            list:this.addForm.data7
+          getFindByCheckPlanId({checkPlanId:this.addForm.checkPlanId}).then(response => {
+            let list = [];
+            for(let i=0;i<response.data.length;i++){
+              let obj = {
+                name:response.data[i].fileName,
+                url:response.data[i].fileUrl,
+              }
+              list.push(obj);
+            }
+            this.$set(this,'propsLookDocumentListData',{
+              title:"查看附件",
+              list:list
+            });
+            this.$set(this,'lookDocumentListType',true);
           });
-          this.$set(this,'lookDocumentListType',true);
         }else{
           this.$set(this,'lookDocumentListType',false);
         }

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="checkIndexStatistics">
     <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true">
-      <el-form-item label="" prop="deptId" label-width="50px">
+      <el-form-item label="" prop="deptId" label-width="50px" v-if="!userFlg">
         <el-select v-model="queryParams.deptId" clearable placeholder="全部">
           <el-option
             v-for="item in deptSelectList"
@@ -11,6 +11,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="" prop="subId" label-width="50px" v-if="userFlg">
+        <el-select placeholder="请输入关键词" filterable remote reserve-keyword
+                   v-model="queryParams.subId" :remote-method="getSubList">
+          <el-option
+            v-for="item in subSelectList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="" prop="searchValue" label-width="80px">
         <el-input
           maxLength="30"
@@ -59,7 +70,8 @@
       <el-table-column type="selection" width="50" align="center"/>
       <el-table-column label="序号" align="center"  type="index" width="60" />
       <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="230"/>
+      <el-table-column v-if="!userFlg" label="学院" align="center" prop="collegeName" show-overflow-tooltip width="230"/>
+      <el-table-column v-if="userFlg" label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="230"/>
       <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
       <el-table-column label="一级指标隐患数" align="center" prop="itemsTotal1" show-overflow-tooltip width="130"/>
       <el-table-column label="一级指标占比" align="center" prop="percent" show-overflow-tooltip width="130"/>
@@ -80,7 +92,8 @@
 
 <script>
   import { listDepartments } from "@/api/system/dept";
-  import { dataStatisticsItemsList,dataStatisticsItemsListTop } from "@/api/safetyCheck/index";
+  import { dataStatisticsItemsList,dataStatisticsItemsListTop,isSCollege,getloginUser,
+           hiddenDataItemsSubList,hiddenDataItemsSubListTop,listSubAdmin } from "@/api/safetyCheck/index";
   export default {
     name: 'checkIndexStatistics',
     props:{
@@ -89,59 +102,94 @@
     data(){
       return{
         deptSelectList:[],
+        subSelectList:[],
         classTypeList:[],
         classifiedList:[],
         dateRange:[],
-        queryParams:{
-          pageNum:1,
-          pageSize:20,
-          searchValue:"",
-          deptId:""
-        },
+        queryParams:{},
         setChildren:"",
         numData:{},
         tableList:[{}],
         total:0,
         currentDate:'',
-        jumpType:false,
+        userFlg:false,
+        deptId:"",
       }
     },
     created(){
     },
     mounted(){
-      this.$set(this,'jumpType',this.propsData.jumpType);
       this.initializationInterface();
       this.getList();
     },
     methods:{
       initializationInterface(){
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          pageSize:20,
+          searchValue:"",
+        });
         //获取学院列表
         listDepartments().then(response => {
           this.deptSelectList = response.data;
         });
+        getloginUser().then(response => {
+          this.$set(this,'deptId',response.data.deptId)
+          this.getSubList('');
+        });
+        isSCollege().then(response => {
+          this.$set(this,'userFlg',response.data.userFlg);
+          if(this.userFlg){
+            this.$set(this.queryParams,'subId','')
+          }else{
+            this.$set(this.queryParams,'deptId','')
+          }
+          this.getList();
+        })
+      },
+      //实验室搜索
+      getSubList(val){
+        console.log('val',val)
+        listSubAdmin({deptId:this.deptId,name:val}).then(response => {
+          this.subSelectList = response.data;
+        });
       },
       //获取数据列表
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
+        let objTop = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
           obj.beginTime = this.dateRange[0];
+          objTop.beginTime = this.dateRange[0];
         }else{
           obj.beginTime = "";
+          objTop.beginTime = "";
         }
         if(this.dateRange[1]){
           obj.endTime = this.dateRange[1];
+          objTop.endTime = this.dateRange[1];
         }else{
           obj.endTime = "";
+          objTop.endTime = "";
         }
-        if(this.jumpType){
-          //已跳转
+        delete objTop.pageNum
+        delete objTop.pageSize
+        if(this.userFlg){
+          //院级
+          hiddenDataItemsSubList(obj).then(response => {
+            this.total = response.total;
+            this.tableList = response.rows;
+          });
+          hiddenDataItemsSubListTop(objTop).then(response => {
+            this.$set(this,'numData',response.data);
+          });
         }else{
-          //未跳转
+          //校级
           dataStatisticsItemsList(obj).then(response => {
             this.total = response.total;
             this.tableList = response.rows;
           });
-          dataStatisticsItemsListTop(obj).then(response => {
+          dataStatisticsItemsListTop(objTop).then(response => {
             this.$set(this,'numData',response.data);
           });
         }
@@ -158,8 +206,12 @@
           pageNum:1,
           pageSize:20,
           searchValue:"",
-          deptId:""
         });
+        if(this.userFlg){
+          this.$set(this.queryParams,'subId','')
+        }else{
+          this.$set(this.queryParams,'deptId','')
+        }
         this.handleQuery();
       },
       /** 当前时间 */

src/views/safetyCheck/dataStatistics/index.vue

@@ -41,10 +41,7 @@
     },
     created(){
       if(this.$route.query.type){
-        this.$set(this.propsData,'jumpType',true);
         this.$set(this,'pageType',3);
-      }else{
-        this.$set(this.propsData,'jumpType',false);
       }
     },
     mounted(){

src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -81,7 +81,7 @@
       <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip width="200"/>
       <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200"/>
       <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
-      <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="100"/>
+      <el-table-column label="房间号" align="center" prop="subRoom" show-overflow-tooltip width="100"/>
       <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
       <el-table-column label="隐患等级" align="center" prop="hazardLevel" show-overflow-tooltip width="100">
         <template slot-scope="scope">

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -78,7 +78,9 @@
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
           <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
             <template slot-scope="scope">
-              <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</p>
+              <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">
+                {{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}
+              </p>
             </template>
           </el-table-column>
           <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="100"/>
@@ -91,7 +93,7 @@
           <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
           <el-table-column label="计划周期" align="center" prop="startTime" show-overflow-tooltip width="270">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -363,7 +363,7 @@
         </div>
       </div>
     </div>
-    <div class="inspectionPlan-dialog-look-box" v-show="addDialogBoxType==5">
+    <div class="inspectionPlan-dialog-look-box" v-if="addDialogBoxType==5">
       <iframe
         class="iframe-box"
         :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -962,7 +962,7 @@
       /*===================================弹窗相关结束===================================*/
       // 单个下载按钮
       downloadButton(item){
-        this.download(item.fileUrl, {}, item.fileName+'.docx')
+        this.downloadUrl(item.fileUrl,item.fileName);
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/index.vue

@@ -71,7 +71,7 @@
           </el-table-column>
           <el-table-column label="任务周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="280">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="130">

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -86,7 +86,7 @@
           <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
           <el-table-column label="任务周期" align="center" prop="startTime" show-overflow-tooltip width="270">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -91,7 +91,7 @@
           <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
           <el-table-column label="计划周期" align="center" prop="startTime" show-overflow-tooltip width="270">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -497,7 +497,7 @@
         </div>
       </div>
     </div>
-    <div class="inspectionPlan-dialog-look-box" v-show="addDialogBoxType==5">
+    <div class="inspectionPlan-dialog-look-box" v-if="addDialogBoxType==5">
       <iframe
         class="iframe-box"
         :src="iframeSrc" scrolling="auto" frameborder="0">
@@ -1328,7 +1328,7 @@
       /*===================================弹窗相关结束===================================*/
       // 单个下载按钮
       downloadButton(item){
-        this.download(item.fileUrl, {}, item.fileName+'.docx')
+        this.downloadUrl(item.fileUrl,item.fileName);
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res) {

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -71,7 +71,7 @@
           </el-table-column>
           <el-table-column label="计划周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="280">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="checkStatus" show-overflow-tooltip width="130">

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -86,7 +86,7 @@
           <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
           <el-table-column label="计划周期" align="center" prop="startTime" show-overflow-tooltip width="270">
             <template slot-scope="scope">
-              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+              <p>{{scope.row.cycleStartTime}} 至 {{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -37,7 +37,7 @@
           <p>{{item.collegeName}}</p>
         </div>
         <div class="for-time-box">
-          <p>计划周期：{{item.cycleStartTime}}至{{item.cycleEndTime}}</p>
+          <p>计划周期：{{item.cycleStartTime}} 至 {{item.cycleEndTime}}</p>
           <p v-if="queryParams.manageStatus == 0" :class="item.checkIsStatus?'':'noButton'" @click="goPage(item)">{{item.checkIsStatus?'开始检查':'计划未开始'}}</p>
           <p v-if="queryParams.manageStatus == 1" @click="goPage(item)">编辑</p>
           <p v-if="queryParams.manageStatus == 2" @click="addDialogOpen(true,item)">复核</p>