dedsudiyu 2 týždňov pred
rodič
commit
ae7c8633a8

+ 258 - 235
src/utils/request.js

@@ -1,271 +1,294 @@
-import axios from "axios";
+import axios from 'axios'
 import { MessageBox, Message, Loading } from 'element-ui'
-import { getToken,removeToken } from '@/utils/auth'
-import {tansParams,judgmentNetworkReturnAddress} from "@/utils/public";
-
+import { getToken, removeToken } from '@/utils/auth'
+import { tansParams, judgmentNetworkReturnAddress } from '@/utils/public'
 
 //判定http或者https
-let urlText = window.location.href.split('://')[0]+'://';
+let urlText = window.location.href.split('://')[0] + '://'
 //弹窗状态开关
-let messageData = null;
+let messageData = null
 
 // 弹层数据
-let loadingInstance = {};
+let loadingInstance = {}
 let options = {
-    spinner:"",
-    background: 'rgba(255, 255, 255, 0.1)'
-};
-let loadingCount = 0;
+  spinner: '',
+  background: 'rgba(255, 255, 255, 0.1)'
+}
+let loadingCount = 0
 
 // 允许跨域
-axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
+axios.defaults.headers.post['Access-Control-Allow-Origin-Type'] = '*'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 
 // 创建 axios 请求实例
 const serviceAxios = axios.create({
-    baseURL: urlText+judgmentNetworkReturnAddress(), // 基础请求地址
-    timeout: 10000, // 请求超时设置
-    withCredentials: false, // 跨域请求是否需要携带 cookie
-});
-
+  baseURL: urlText + judgmentNetworkReturnAddress(), // 基础请求地址
+  timeout: 10000, // 请求超时设置
+  withCredentials: false // 跨域请求是否需要携带 cookie
+})
 
 // 创建请求拦截
 serviceAxios.interceptors.request.use(config => {
-        // 弹层相关
-        loadingInstance = Loading.service(options)
-        const isToken = (config.headers || {}).isToken === false
-        if (getToken() && !isToken) {
-            config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-        }
-        // get请求映射params参数
-        if (config.method === 'get' && config.params) {
-            let url = config.url + '?' + tansParams(config.params);
-            url = url.slice(0, -1);
-            config.params = {};
-            config.url = url;
-        }
-        // 弹层相关
-        loadingCount ++;
-        return config;
-    },
-    (error) => {
-        // 弹层相关
-        loadingCount --;
-        if(loadingCount===0){
-            loadingInstance.close();
-        }
-        Promise.reject(error);
+    // 弹层相关
+    loadingInstance = Loading.service(options)
+    const isToken = (config.headers || {}).isToken === false
+    if (getToken() && !isToken) {
+      config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-);
-
+    // get请求映射params参数
+    if (config.method === 'get' && config.params) {
+      let url = config.url + '?' + tansParams(config.params)
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
+    }
+    // 弹层相关
+    loadingCount++
+    return config
+  },
+  (error) => {
+    // 弹层相关
+    loadingCount--
+    if (loadingCount === 0) {
+      loadingInstance.close()
+    }
+    Promise.reject(error)
+  }
+)
 
 // 创建响应拦截
 serviceAxios.interceptors.response.use(res => {
-        // 弹层相关
-        loadingCount --;
-        if(loadingCount===0) {
-            loadingInstance.close();
+    // 弹层相关
+    loadingCount--
+    if (loadingCount === 0) {
+      loadingInstance.close()
+    }
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200
+    // 获取错误信息
+    if (code == 5002) {
+      if (getToken()) {
+        removeToken()
+        MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
+            confirmButtonText: '确定',
+            showCancelButton: false,
+            closeOnClickModal: false,
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          if (localStorage.getItem('entranceJumpType') == 'PC') {
+            window.location.href = process.env.VUE_APP_OUT_URL
+          } else {
+            window.location.href = '#/'
+          }
+        }).catch(() => {
+        })
+      }
+    } else if (code == 5005) {
+      if (getToken()) {
+        removeToken()
+        MessageBox.confirm('没有相关权限,请重新登录', '系统提示', {
+            confirmButtonText: '确定',
+            showCancelButton: false,
+            closeOnClickModal: false,
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          if (localStorage.getItem('entranceJumpType') == 'PC') {
+            window.location.href = process.env.VUE_APP_OUT_URL
+          } else {
+            window.location.href = '#/'
+          }
+        }).catch(() => {
+        })
+      }
+    } else if (code == 5007) {
+      return res.data
+    } else if (code != 200) {
+      if (!messageData) {
+        messageData = Message({
+          message: res.data.message,
+          type: 'error',
+          offset: 100
+        })
+        setTimeout(function() {
+          messageData = null
+        }, 1000)
+      }
+      return res.data
+      // return Promise.reject(new Error('系统未知错误,请联系管理员'))
+    } else {
+      return res.data
+    }
+  },
+  (error) => {
+    if (error.response.data.code == 5002) {
+      removeToken()
+      MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
+          confirmButtonText: '确定',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          cancelButtonText: '取消',
+          type: 'warning'
         }
-        // 未设置状态码则默认成功状态
-        const code = res.data.code || 200;
-        // 获取错误信息
-        if(code == 5002){
-            if(getToken()){
-                removeToken();
-                MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-                        confirmButtonText: '确定',
-                        showCancelButton:false,
-                        closeOnClickModal:false,
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }
-                ).then(() => {
-                    if(localStorage.getItem('entranceJumpType') == 'PC'){
-                        window.location.href = process.env.VUE_APP_OUT_URL;
-                    }else{
-                        window.location.href='#/';
-                    }
-                }).catch(() => {});
-            }
-        }else if (code == 5005) {
-            if(getToken()){
-                removeToken();
-                MessageBox.confirm('没有相关权限,请重新登录', '系统提示', {
-                        confirmButtonText: '确定',
-                        showCancelButton:false,
-                        closeOnClickModal:false,
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }
-                ).then(() => {
-                    if(localStorage.getItem('entranceJumpType') == 'PC'){
-                        window.location.href = process.env.VUE_APP_OUT_URL;
-                    }else{
-                        window.location.href='#/';
-                    }
-                }).catch(() => {});
-            }
-        }else if(code == 5007){
-            return res.data
-        }else if (code != 200) {
-            if(!messageData){
-                messageData = Message({
-                    message: res.data.message,
-                    type: 'error',
-                    offset:100
-                })
-                setTimeout(function(){
-                    messageData = null
-                },1000);
-            }
-            return res.data
-            // return Promise.reject(new Error('系统未知错误,请联系管理员'))
+      ).then(() => {
+        if (localStorage.getItem('entranceJumpType') == 'PC') {
+          window.location.href = process.env.VUE_APP_OUT_URL
         } else {
-            return res.data
+          window.location.href = '#/'
         }
-    },
-    (error) => {
-        // 弹层相关
-        loadingCount --;
-        if(loadingCount===0){
-            loadingInstance.close();
-        }
-        let { message } = error;
-        if (message == "Network Error") {
-            message = "服务连接异常";
-        }
-        else if (message.includes("timeout")) {
-            message = "系统接口请求超时";
-        }
-        else if (message.includes("Request failed with status code")) {
-            if(message.substr(message.length - 3) == 401){
-                if(getToken()){
-                    removeToken();
-                    MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-                            confirmButtonText: '确定',
-                            showCancelButton:false,
-                            closeOnClickModal:false,
-                            cancelButtonText: '取消',
-                            type: 'warning'
-                        }
-                    ).then(() => {
-                        if(localStorage.getItem('entranceJumpType') == 'PC'){
-                            window.location.href = process.env.VUE_APP_OUT_URL;
-                        }else{
-                            window.location.href='#/';
-                        }
-                    }).catch(() => {});
-                }
-            }else{
-                messageData = Message({
-                    message: message,
-                    type: 'error',
-                    offset:100
-                })
-                setTimeout(function(){
-                    messageData = null
-                },1000);
+      }).catch(() => {
+      })
+    }
+    // 弹层相关
+    loadingCount--
+    if (loadingCount === 0) {
+      loadingInstance.close()
+    }
+    let { message } = error
+    if (message == 'Network Error') {
+      message = '服务连接异常'
+    }
+    else if (message.includes('timeout')) {
+      message = '系统接口请求超时'
+    }
+    else if (message.includes('Request failed with status code')) {
+      if (message.substr(message.length - 3) == 401) {
+        if (getToken()) {
+          removeToken()
+          MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
+              confirmButtonText: '确定',
+              showCancelButton: false,
+              closeOnClickModal: false,
+              cancelButtonText: '取消',
+              type: 'warning'
             }
-            return Promise.reject(error)
-        }
-        if(!messageData){
-            messageData = Message({
-                message: message,
-                type: 'error',
-                duration: 5 * 1000,
-                offset:100
-            })
-            setTimeout(function(){
-                messageData = null
-            },1000);
+          ).then(() => {
+            if (localStorage.getItem('entranceJumpType') == 'PC') {
+              window.location.href = process.env.VUE_APP_OUT_URL
+            } else {
+              window.location.href = '#/'
+            }
+          }).catch(() => {
+          })
         }
-        return Promise.reject(error)
+      } else {
+        messageData = Message({
+          message: message,
+          type: 'error',
+          offset: 100
+        })
+        setTimeout(function() {
+          messageData = null
+        }, 1000)
+      }
+      return Promise.reject(error)
     }
-);
+    if (!messageData) {
+      messageData = Message({
+        message: message,
+        type: 'error',
+        duration: 5 * 1000,
+        offset: 100
+      })
+      setTimeout(function() {
+        messageData = null
+      }, 1000)
+    }
+    return Promise.reject(error)
+  }
+)
+
 // 通用下载方法
 export function download(url, params, filename) {
-    return serviceAxios.post(url, params, {
-        transformRequest: [(params) => {
-            return this.tansParams(params)
-        }],
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            "Access-Control-Allow-Origin": "*",
-            token:getToken(),
+  return serviceAxios.post(url, params, {
+    transformRequest: [(params) => {
+      return this.tansParams(params)
+    }],
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      'Access-Control-Allow-Origin': '*',
+      token: getToken()
 
-        },
-        responseType: 'blob'
-    }).then((data) => {
-        const content = data
-        const blob = new Blob([content])
-        if ('download' in document.createElement('a')) {
-            const elink = document.createElement('a');
-            elink.download = filename
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(blob)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href)
-            document.body.removeChild(elink)
-        } else {
-            navigator.msSaveBlob(blob, filename)
-        }
-        this.msgSuccess('正在下载,请稍候')
-    }).catch((r) => {
-        //console.error(r)
-    })
+    },
+    responseType: 'blob'
+  }).then((data) => {
+    const content = data
+    const blob = new Blob([content])
+    if ('download' in document.createElement('a')) {
+      const elink = document.createElement('a')
+      elink.download = filename
+      elink.style.display = 'none'
+      elink.href = URL.createObjectURL(blob)
+      document.body.appendChild(elink)
+      elink.click()
+      URL.revokeObjectURL(elink.href)
+      document.body.removeChild(elink)
+    } else {
+      navigator.msSaveBlob(blob, filename)
+    }
+    this.msgSuccess('正在下载,请稍候')
+  }).catch((r) => {
+    //console.error(r)
+  })
 }
+
 // 通用文件下载方法POST请求
-export function downloadPost(fileUrl,fleName) {
-    const newUrl = urlText + judgmentNetworkReturnAddress() + fileUrl;
-    const x = new XMLHttpRequest();
-    x.open("post", newUrl, true);
-    x.setRequestHeader("Authorization",getToken());
-    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();
-    this.msgSuccess('正在下载,请稍候')
+export function downloadPost(fileUrl, fleName) {
+  const newUrl = urlText + judgmentNetworkReturnAddress() + fileUrl
+  const x = new XMLHttpRequest()
+  x.open('post', newUrl, true)
+  x.setRequestHeader('Authorization', getToken())
+  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()
+  this.msgSuccess('正在下载,请稍候')
 }
+
 // 通用文件下载方法GET请求
-export function downloadGet(fileUrl,fleName) {
-    const newUrl = urlText + judgmentNetworkReturnAddress() + fileUrl;
-    const x = new XMLHttpRequest();
-    x.open('get', newUrl, true)
-    x.setRequestHeader("Authorization",getToken());
-    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();
-    this.msgSuccess('正在下载,请稍候')
+export function downloadGet(fileUrl, fleName) {
+  const newUrl = urlText + judgmentNetworkReturnAddress() + fileUrl
+  const x = new XMLHttpRequest()
+  x.open('get', newUrl, true)
+  x.setRequestHeader('Authorization', getToken())
+  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()
+  this.msgSuccess('正在下载,请稍候')
 }
+
 // 通用URL地址文件下载方法
-export function downloadUrl(fileUrl,fleName) {
-    const x = new XMLHttpRequest();
-    x.open('get', fileUrl, true)
-    x.setRequestHeader("Authorization",getToken());
-    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();
-    this.msgSuccess('正在下载,请稍候')
+export function downloadUrl(fileUrl, fleName) {
+  const x = new XMLHttpRequest()
+  x.open('get', fileUrl, true)
+  x.setRequestHeader('Authorization', getToken())
+  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()
+  this.msgSuccess('正在下载,请稍候')
 }
-export default serviceAxios;
+
+export default serviceAxios

+ 20 - 66
src/views/courtyardManage/courtyardHome.vue

@@ -3,7 +3,6 @@
     <img class="bg_img" src="@/assets/image/bg.png"/>
     <div class="header">
       <p class="header_l"></p>
-      <!--<img class="header_l-position" src="@/assets/image/logo@1x.png" />-->
       <img class="header_l-position" :src="rectangleLogo"/>
       <div class="header_c">实验室安全智慧化管控系统</div>
       <div class="header_r1">
@@ -11,14 +10,6 @@
         <i class="schoolName">{{deptName?deptName:'****'}}</i>
         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
       </div>
-      <!--<div class="position-img-button-left-box" @click="topButtonGoPage('video')">-->
-        <!--<img src="@/assets/image/icon_yjgl_spjk.png">-->
-        <!--<p>视频监控</p>-->
-      <!--</div>-->
-      <!--<div class="position-img-button-right-box" @click="topButtonGoPage('alarm')">-->
-        <!--<img src="@/assets/image/icon_yjgl_yjpt.png">-->
-        <!--<p>应急指挥平台</p>-->
-      <!--</div>-->
       <p class="position-button-right-bottom-1" @click="topButtonGoPage('video')">视频监控</p>
       <p class="position-button-right-bottom-2" @click="topButtonGoPage('alarm')">智能预警</p>
     </div>
@@ -93,11 +84,11 @@
                     <i>执行日期</i>
                   </div>
                   <div class="left_t_r2_b" v-for='(item,index2) in workList' :key="index2">
-                    <li v-if="index2<7"  @click="openInfoUrl(item)">
+                    <li v-if="index2<7"  @click="openInfoUrl(item,3)">
                       <i class="over">{{item.title}}</i>
                       <i>{{item.company}}</i>
-                      <i>{{item.executionTime}}</i>
-                      <img src="@/assets/image/index_icon8.png" @click="openInfoUrl()"/>
+                      <i>{{parseTime(item.createTime,'{y}-{m}-{d}')}}</i>
+                      <img src="@/assets/image/index_icon8.png"/>
                     </li>
                   </div>
                   <div v-if="workList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
@@ -148,9 +139,7 @@
 </template>
 
 <script>
-  import router from '@/router'
   import {
-    listCollegeJh,
     getLogoInfo,
     indexListRelease,
     mySub,
@@ -160,13 +149,10 @@
   } from '../../api/http'
   import {
     systemNotifyList,
-    laboratoryGradeManageList,
     laboratoryBigViewSelectTriggerInfo,
     laboratoryBigViewCollegeEventStatistics,
     laboratoryBigViewListCollegeApplyColumn,
     examBigViewNewStatistics,
-    securityBigViewList,
-    securityBigViewPlanStatistics,
     systemWarningNoticeNoMenuList
   } from '@/api/index'
   import {
@@ -205,13 +191,11 @@
         planTitle: '',//预警事件
         workList: [],//工作计划
         workTitle: '',//工作计划
-        inspectList: [],//安全检查
         inspecremark: '',//安全检查时间
         inspeccheckZs: '',//安全检查隐患排查数
         inspeccheckWzg: '',//安全检查历史遗留
         inspeccheckYzg: '',//安全检查已整改
         labInfoList: [],//实验室信息
-        controlList: [],//分级管控
         controlTitle: '',//分级管控标题
         inspectBatchList: [],//安全检查批次列表
         //风险预案
@@ -247,8 +231,6 @@
       self.infoFun()
       self.warningPlanFun()
       self.workPlanFun()
-      self.securityBigViewList()
-      self.laboratoryGradeManageList()
       self.laboratoryBigViewSelectTriggerInfo()
       self.laboratoryBigViewCollegeEventStatistics()
       this.offPlanMQTT('on')
@@ -271,8 +253,6 @@
           self.infoFun()
           self.warningPlanFun()
           self.workPlanFun()
-          self.securityBigViewList()
-          self.laboratoryGradeManageList()
           self.laboratoryBigViewSelectTriggerInfo()
           self.laboratoryBigViewCollegeEventStatistics()
         }, 50000 * 6)
@@ -318,7 +298,7 @@
           }
         })
       },
-      //工作通知
+      //通知详情
       openInfoUrl(item, type) {
         this.$router.push(
           {
@@ -331,12 +311,10 @@
       },
       //安全检查
       openinspectUrl() {
-        // this.$router.push({path: './inspectDetail', query: {key: this.planId}})
         this.$router.push({ path: './inspectDetail' })
       },
       //预警通知
       eventUrl() {
-        // this.$router.push({path: './inspectDetail', query: {key: this.planId}})
         this.$router.push({ path: './eventList' })
       },
       //进入实验室人员
@@ -350,7 +328,6 @@
       //获取报警信息
       openRiskPlanUrl(item) {
         this.$refs['planAlarm'].initialize(item)
-        // this.$router.push({path: './warningDetail', query: {key: d.id, subjectId: d.subjectId}})
       },
       //跳转后台管理
       openBackManageUrl() {
@@ -510,7 +487,7 @@ self.controlTitle=data.title*/
         })
       },
 
-      //工作通知
+      //校院通知
       infoFun: function() {
         let self = this
         systemNotifyList({ pageNum: 1, pageSize: 4, notifyType: 2 }).then((res) => {
@@ -522,18 +499,6 @@ self.controlTitle=data.title*/
           }
         })
       },
-      //分级管控
-      laboratoryGradeManageList() {
-        laboratoryGradeManageList({
-          page: 1,
-          pageSize: 9,
-          type: localStorage.getItem('deptLevel')
-        }).then((res) => {
-          if (res.code == 200) {
-            this.$set(this, 'controlList', res.data.records)
-          }
-        })
-      },
       //预警事件
       warningPlanFun: function() {
         let self = this
@@ -545,26 +510,13 @@ self.controlTitle=data.title*/
       },
       //工作计划
       workPlanFun: function() {
-        let self=this;
-        listCollegeJh({pageNum:1,pageSize:10,notifyType:1}).then((res) =>{
-          if(res.code==200){
-            this.$set(self, 'planList', res.rows)
-          }
-        })
-      },
-      //安全检查
-      securityBigViewList: function() {
         let self = this
-        securityBigViewList({ deptId: this.deptId, page: 1, pageSize: 7 }).then((res) => {
+        systemNotifyList({ pageNum: 1, pageSize: 4, notifyType: 3 }).then((res) => {
           if (res.code == 200) {
-            this.$set(this, 'inspectList', res.data.records)
-          }
-        })
-        securityBigViewPlanStatistics({ deptId: this.deptId, page: 1, pageSize: 7 }).then((res) => {
-          if (res.code == 200) {
-            this.$set(this, 'inspeccheckZs', res.data.notStart)
-            this.$set(this, 'inspeccheckWzg', res.data.running)
-            this.$set(this, 'inspeccheckYzg', res.data.finished)
+            res.data.forEach((item) => {
+              item.contentText = item.content.replace(/<\/?.+?\/?>/g, '')
+            })
+            this.$set(self, 'workList', res.data)
           }
         })
       },
@@ -1156,7 +1108,7 @@ self.controlTitle=data.title*/
                 width: 234px;
               }
               > i:nth-of-type(3) {
-                width: 200px;
+                width: 179px;
               }
 
             }
@@ -1190,7 +1142,7 @@ self.controlTitle=data.title*/
                 }
                 > i:nth-of-type(3) {
                   // width: 146px;
-                  width: 200px;
+                  width: 179px;
                 }
                 > img {
                   width: 12px;
@@ -1272,14 +1224,14 @@ self.controlTitle=data.title*/
                 text-overflow: ellipsis;
               }
               > i:nth-of-type(1) {
-                width: 184px;
+                width: 260px;
                 margin-left: 22px;
               }
               > i:nth-of-type(2) {
-                width: 100px;
+                width: 140px;
               }
               > i:nth-of-type(3) {
-                width: 100px;
+                width: 180px;
               }
               > i:nth-of-type(4) {
                 width: 182px;
@@ -1307,14 +1259,14 @@ self.controlTitle=data.title*/
                   text-overflow: ellipsis;
                 }
                 > i:nth-of-type(1) {
-                  width: 184px;
+                  width: 260px;
                   margin-left: 22px;
                 }
                 > i:nth-of-type(2) {
-                  width: 100px;
+                  width: 140px;
                 }
                 > i:nth-of-type(3) {
-                  width: 100px;
+                  width: 180px;
                 }
                 > i:nth-of-type(4) {
                   width: 182px;
@@ -1325,6 +1277,8 @@ self.controlTitle=data.title*/
                 > img {
                   width: 12px;
                   height: 12px;
+                  margin-top:13px;
+                  cursor: pointer;
                 }
               }
               > li:nth-of-type(even) {

+ 3 - 11
src/views/courtyardManage/workInfoDetail.vue

@@ -4,23 +4,15 @@
         <div class="main_t">
             <div class="main_t_t">
                 <i class="main_t_t_l">当前位置:首页 &gt;</i>
-                <i>{{type==1?'校院通知':(type==2?'预警事件':(type==3?'分级管控':''))}}</i>
+                <i>{{type==1?'校院通知':(type==2?'预警事件':(type==3?'工作通知':''))}}</i>
             </div>
             <div style="background: rgba(9, 55, 81, 0.6);margin-top:30px;height:900px;padding-top:20px;">
-                <div class="title" v-if="type == 1">{{codeData.title}}</div>
-                <div class="main_t_b" v-if="type == 1">
+                <div class="title" v-if="type == 1||type == 3">{{codeData.title}}</div>
+                <div class="main_t_b" v-if="type == 1||type == 3">
                     <p v-html="codeData.content"></p>
                     <div class="unit">{{codeData.company}}</div>
                     <div class="time">{{parseTime(codeData.createTime,"{y}-{m}-{d}")}}</div>
                 </div>
-                <div class="title" v-if="type == 3">{{codeData.name}}</div>
-                <div class="main_t_b" v-if="type == 3">
-                    <p style="margin-bottom:20px;">{{codeData.deptName}} - {{codeData.typeName}} -
-                        {{codeData.levelName}}</p>
-                    <p>{{codeData.manageDes}}</p>
-                    <div class="unit">{{codeData.status?'已执行':'未执行'}}</div>
-                    <div class="time">{{parseTime(codeData.createTime,"{y}-{m}-{d}")}}</div>
-                </div>
                 <div class="content-box" style="margin-top:-20px;" v-if="type == 2 || type == 4">
                     <div class="top-max-big-box">
                         <p class="title-p">预警信息</p>