From a50effd6b309e00e78be6c22b3af2e0d10794145 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 17 Dec 2021 17:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue          | 85 ++++++++++++++++++-----
 src/views/dataMember/DataMember.vue       | 10 +--
 src/views/system/UserAnnouncementList.vue | 52 +++++++++++++-
 3 files changed, 125 insertions(+), 22 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index fe56589..795af04 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -29,6 +29,8 @@
         </span>
       </a-table>
     </a-card>
+    <show-announcement ref="ShowAnnouncement"></show-announcement>
+    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
   </div>
   <!--  <div class="index-home">-->
   <!--    <img class="index-bgimg" src="../../assets/indexImgs/index-bg.png"/>-->
@@ -72,24 +74,24 @@
   <!--        </div>-->
   <!--      </div>-->
   <!--    </div>-->
-  <!--    <show-announcement ref="ShowAnnouncement"></show-announcement>-->
-  <!--    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>-->
+
   <!--  </div>-->
 </template>
 
 <script>
 import IndexRouter from '@views/dashboard/indexRouter'
-import { getAction, putAction } from '@api/manage'
-import { Bus } from '@comp/tools/Bus'
-// import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
-import { JeroListMixin } from '@/mixins/JeroListMixin'
+import {getAction, putAction} from '@api/manage'
+import {Bus} from '@comp/tools/Bus'
+import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import DynamicNotice from '@comp/tools/DynamicNotice'
 
 
 export default {
   name: 'Analysis',
   components: {
-    // DynamicNotice,
-    // ShowAnnouncement
+    DynamicNotice,
+    ShowAnnouncement
   },
   mixins: [JeroListMixin],
   data() {
@@ -101,24 +103,24 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'titile_dictText',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '内容',
           align: 'center',
           dataIndex: 'msgContent',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '提醒时间',
           align: 'center',
           width: 180,
           dataIndex: 'createTime',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: {customRender: 'text'}
         }, {
           title: '操作',
           dataIndex: 'action',
           align: 'center',
           width: 160,
-          scopedSlots: { customRender: 'action' }
+          scopedSlots: {customRender: 'action'}
         }
       ],
       url: {
@@ -182,7 +184,7 @@ export default {
       return value
     },
     showAnnouncement(record) {
-      putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
+      putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => {
         if (res.success) {
           this.loadData()
           this.syncHeadNotic(record.anntId)
@@ -204,9 +206,60 @@ export default {
           query: param
         })
       } else if (record.openType === 'href') {
-        let url = `${ record.openPage }=${ param.id }`
+        let url = `${record.openPage}=${param.id}`
         // 返回的是报名页面的链接 打开网址
         window.open(url, '_blank')
+      } else if (record.openType === 'project') {
+        const param = JSON.parse(record.busId)
+        // 1 普通项目 2 工作组项目 4 资料网员 7分标委 8理事会
+        switch (param.type) {
+          case '1':
+            this.openPath = param.path
+            // 将参数传入
+            // delete param.path
+            this.formData = param
+            this.$refs.showDynamNotice.detail()
+            break
+          case '4':
+            this.openPath = param.path
+            // 将参数传入
+            // delete param.path
+            this.formData = param
+            this.$refs.showDynamNotice.detail()
+            break
+          case '2':
+
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                projectId: param.projectId,
+                workingGroupId: param.workingGroupId
+              }
+            })
+            break
+          case '7':
+
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                id: param.id,
+                abbreviation: param.abbreviation
+              }
+            })
+            break
+          case '8':
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                id: param.id
+              }
+            })
+            break
+        }
+
       } else {
         this.$refs.ShowAnnouncement.detail(record)
       }
@@ -217,7 +270,7 @@ export default {
         title: '确认已读',
         content: '是否确认将消息改为已读状态?',
         onOk: function () {
-          putAction(that.url.editCementSend, { anntId: record.anntId }).then((res) => {
+          putAction(that.url.editCementSend, {anntId: record.anntId}).then((res) => {
             if (res.success) {
               that.loadData()
               that.syncHeadNotic(record.anntId)
@@ -228,7 +281,7 @@ export default {
       })
     },
     syncHeadNotic(anntId) {
-      getAction('sys/annountCement/syncNotic', { anntId: anntId })
+      getAction('sys/annountCement/syncNotic', {anntId: anntId})
     }
   }
 }
diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue
index c0de53c..c14c7b6 100644
--- a/src/views/dataMember/DataMember.vue
+++ b/src/views/dataMember/DataMember.vue
@@ -13,7 +13,7 @@
 
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="运行年份">
-                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
               </a-form-item>
             </a-col>
 <!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
@@ -195,10 +195,10 @@ export default {
       // 合同详情
       contractModuleVisible: false,
       queryParam:{
-        year:this.getCurrentYear()
+        particularYear:this.getCurrentYear()
       },
       lastQueryParam:{
-        year:this.getCurrentYear()
+        particularYear:this.getCurrentYear()
       },
       contractId: '',
       url: {
@@ -225,8 +225,8 @@ export default {
       this.contractModuleVisible = true
     },
     searchReset(){
-      this.queryParam.year = this.getCurrentYear()
-      this.lastQueryParam.year = this.getCurrentYear()
+      this.queryParam.particularYear = this.getCurrentYear()
+      this.lastQueryParam.particularYear = this.getCurrentYear()
       this.loadData()
     },
     //获取当前年
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 9d9f55c..619e096 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -240,7 +240,57 @@ export default {
         let url = `${ record.openPage }=${ param.id }`
         // 返回的是报名页面的链接 打开网址
         window.open(url, '_blank')
-      } else {
+      }else if(record.openType === 'project'){
+        const param = JSON.parse(record.busId)
+        // 1 普通项目 2 工作组项目 4 资料网员 7分标委 8理事会
+        switch (param.type){
+          case '1': this.openPath = param.path
+            // 将参数传入
+            // delete param.path
+            this.formData = param
+            this.$refs.showDynamNotice.detail()
+            break
+          case '4':
+            this.openPath = param.path
+            // 将参数传入
+            // delete param.path
+            this.formData = param
+            this.$refs.showDynamNotice.detail()
+            break
+          case '2':
+
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                projectId:param.projectId,
+                workingGroupId:param.workingGroupId
+              }
+            })
+            break
+          case '7':
+
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                id:param.id,
+                abbreviation:param.abbreviation
+              }
+            })
+            break
+          case '8':
+            // 如果是url 跳转页面
+            this.$router.push({
+              path: param.path,
+              query: {
+                id:param.id
+              }
+            })
+            break
+        }
+
+      }else {
         this.$refs.ShowAnnouncement.detail(record)
       }
     },