dedsudiyu 10 kuukautta sitten
vanhempi
commit
31c14df468

+ 9 - 12
src/views/courtyardManage/courtyardHome.vue

@@ -26,14 +26,14 @@
               <div class="swiper-slide">
                 <!--院校通知-->
                 <div class="left_t_r" v-if="infoList">
-                  <li v-for='(item,index) in infoList' :key="index" @click="openInfoUrl(item)">
+                  <li v-for='(item,index) in infoList' :key="index" @click="openInfoUrl(item,1)">
                     <div class="left_t_r_t">
                       <i>{{item.title}}</i>
                       <i>{{item.company}}</i>
                       <i>{{parseTime(item.createTime,"{y}-{m}-{d}")}}</i>
                       <img class="left_t_r_t_r" src="@/assets/image/index_icon8.png" />
                     </div>
-                    <div class="left_t_r_b over2">{{item.content}}</div>
+                    <div class="left_t_r_b over2">{{item.contentText}}</div>
                   </li>
                   <div v-if="infoList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
                 </div>
@@ -50,11 +50,11 @@
                     <i>执行日期</i>
                   </div>
                   <div class="left_t_r2_b" v-for='(item,index2) in planList' :key="index2">
-                    <li v-if="index2<7"  @click="openInfoUrl(item)">
+                    <li v-if="index2<7"  @click="openInfoUrl(item,2)">
                       <i class="over">{{item.title}}</i>
                       <i>{{item.company}}</i>
                       <i>{{parseTime(item.createTime,"{y}-{m}-{d}")}}</i>
-                       <img src="@/assets/image/index_icon8.png" @click="openInfoUrl()"/>
+                       <img src="@/assets/image/index_icon8.png"/>
                     </li>
                   </div>
                   <div v-if="planList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
@@ -96,7 +96,7 @@
                 <div class="left_t_r4" v-if="controlList">
                   <div class="left_t_r2_t">
                     <i>{{controlTitle}}</i>
-                    <img src="@/assets/image/index_icon8.png" @click="openControlUrl()"/>
+                    <img src="@/assets/image/index_icon8.png"/>
                   </div>
                   <div class="left_t_r2_m">
                     <i>管控名称</i>
@@ -105,7 +105,7 @@
                     <i>安全分级</i>
                     <i>执行状态</i>
                   </div>
-                  <div class="left_t_r2_b" v-for='(item,index4) in controlList' :key="index4">
+                  <div class="left_t_r2_b" v-for='(item,index4) in controlList' :key="index4" @click="openInfoUrl(item,3)">
                     <li v-if="index4<7">
                       <i>{{item.name}}</i>
                       <i>{{item.deptName}}</i>
@@ -489,8 +489,8 @@ export default {
       this.$router.push('./illegalDetail')
     },
     //工作通知
-    openInfoUrl(d){
-      this.$router.push({path:'./workInfoDetail',query:{key:d.id}})
+    openInfoUrl(item,type){
+      this.$router.push({path:'./workInfoDetail',query:item,type:type})
     },
     //工作计划
     openPlanUrl(){
@@ -820,7 +820,7 @@ export default {
         systemNotifyList({pageNum:1,pageSize:4,notifyType:2}).then((res) =>{
         if(res.code==200){
             res.data.forEach((item)=>{
-                item.content = item.content.replace(/<\/?.+?\/?>/g,'');
+                item.contentText = item.content.replace(/<\/?.+?\/?>/g,'');
             })
             this.$set(self,'infoList',res.data);
         }
@@ -848,9 +848,6 @@ export default {
       let self=this;
         systemNotifyList({pageNum:1,pageSize:10,notifyType:3}).then((res) =>{
         if(res.code==200){
-            res.data.forEach((item)=>{
-                item.content = item.content.replace(/<\/?.+?\/?>/g,'');
-            })
             this.$set(self,'planList',res.data);
         }
       })

+ 15 - 34
src/views/courtyardManage/workInfoDetail.vue

@@ -4,13 +4,19 @@
         <div class="main_t">
             <div class="main_t_t">
                 <i class="main_t_t_l">当前位置:首页 &gt;</i>
-                <i>工作通知</i>
+                <i>{{type==1?'校院通知':(type==2?'工作通知':(type==3?'分级管控':''))}}</i>
             </div>
-            <div class="title">{{title}}</div>
-            <div class="main_t_b">
-                <p v-html="content"></p>
-                <div class="unit">{{company}}</div>
-                <div class="time">{{createTime.substring(0,10)}}</div>
+            <div class="title" v-if="type == 1 || type == 2">{{codeData.title}}</div>
+            <div class="main_t_b" v-if="type == 1 || type == 2">
+                <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 v-html="codeData.content"></p>
+                <div class="unit">{{codeData.status?'已执行':'未执行'}}</div>
+                <div class="time">{{parseTime(codeData.createTime,"{y}-{m}-{d}")}}</div>
             </div>
         </div>
     </div>
@@ -25,10 +31,7 @@ export default {
   },
   data() {
     return {
-      title:'',
-      company:'',
-      content:'',
-      createTime:'',
+      type:null,
       codeData:'',
 
     }
@@ -37,35 +40,13 @@ export default {
     back(){
       this.$router.push('/')
     },
-    getAjaxData: function () {
-      let _this = this;
-
-      //工作通知
-      notifyplan(_this.codeData).then((res) =>{
-
-
-        if (res.code == 200) {
-          let data=res.data;
-
-          _this.title=data.title
-          _this.company=data.company
-          _this.content=unescape(data.content)
-          console.log(typeof ( _this.content))
-          _this.createTime=data.createTime
-
-
-
-        }
-      })
-    },
 
 
 
   },
   mounted() {
-    this.codeData=this.$route.query.key
-    console.log(this.codeData)
-    this.getAjaxData();
+      this.$set(this,'type',this.$route.type);
+      this.$set(this,'codeData',this.$route.query);
   },