From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化

---
 src/views/article/discussionManage.vue |   58 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index c3c1f89..f8616eb 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -20,13 +20,18 @@
         </el-button>
 
         <el-button icon="el-icon-user" :size="size" v-if="row.articleType != 4" :type="type"
-          @click.stop="openUserPopup(row, 1)">
+          @click.stop="openUserPopup(row, 0)">
           参与用户
         </el-button>
 
         <el-button icon="el-icon-user" v-if="row.articleType == 4" :size="size" :type="type"
           @click.stop="handleExport(row)">
-          导出用户
+          导出投票
+        </el-button>
+
+        <el-button icon="el-icon-user" v-if="row.articleType == 4 && row.publish == '1'" :size="size" :type="type"
+          @click.stop="lookVotingStatistics(row,'业主大会统计')">
+          查看投票
         </el-button>
 
         <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
@@ -54,6 +59,8 @@
     </deitDiscussion>
 
     <discussionManageChild ref="discussionManageChild" />
+
+    <votingStatistics ref="votingStatistics" />
 
   </basic-container>
 </template>
@@ -85,6 +92,7 @@
   } from "vuex"
   import deitDiscussion from "./components/deitDiscussion"
   import discussionManageChild from "./components/discussionManageChild"
+  import votingStatistics from "./components/votingStatistics"
   import NProgress from 'nprogress'
   import 'nprogress/nprogress.css'
   import Qs from "qs"
@@ -105,6 +113,7 @@
     components: {
       deitDiscussion,
       discussionManageChild,
+      votingStatistics
     },
 
     data() {
@@ -178,6 +187,7 @@
               minRows: 2,
               tags: true,
               type: "tree",
+              dataType: "string",
               multiple: true,
               dicData: [],
               rules: [{
@@ -195,7 +205,6 @@
               width: 110,
               label: "封面",
               prop: "url",
-              // align:'center',
               type: "upload",
               listType: "picture-img",
               action: "/api/blade-resource/oss/endpoint/put-file",
@@ -203,7 +212,6 @@
                 res: "data",
                 url: "link",
               },
-              // hide: true,
               span: 24,
             },
             {
@@ -228,25 +236,6 @@
                 trigger: "blur",
               }, ],
             },
-            // {
-            //   label: "发布时间",
-            //   prop: "dateTime",
-            //   type: "daterange",
-            //   format: "yyyy-MM-dd",
-            //   valueFormat: "yyyy-MM-dd",
-            //   searchSpan: 6,
-            //   searchRange: true,
-            //   hide: true,
-            //   addDisplay: false,
-            //   editDisplay: false,
-            //   viewDisplay: false,
-            //   search: true,
-            //   rules: [{
-            //     required: true,
-            //     message: "请选择发布时间",
-            //     trigger: "blur",
-            //   }, ],
-            // },
             {
               width: 100,
               label: "发布时间",
@@ -509,8 +498,15 @@
       }
     },
     methods: {
+
+      lookVotingStatistics(row, name) {
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/view/965861526961414144?articleId=${row.id}`
+        })
+      },
+
       handleExport(row) {
-        this.$confirm("是否导出投票人员数据?", "提示", {
+        this.$confirm("是否导出投票结果数据?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -527,7 +523,7 @@
               `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data)
             .then(
               res => {
-                downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
+                downloadXls(res.data, `投票结果${dateNow()}.xlsx`)
                 NProgress.done()
               })
         })
@@ -557,8 +553,8 @@
         })
       },
 
-      openUserPopup(row) {
-        this.$refs.DeitDiscussion.openUser(row)
+      openUserPopup(row, type) {
+        this.$refs.DeitDiscussion.openUser(row, type)
       },
 
       openDilog(row, type) {
@@ -573,7 +569,7 @@
           row.videoUrl = ""
         }
         row.userid = this.userInfo.user_id
-        row.articleRange = JSON.stringify(row.articleList)
+        row.articleRange = row.articleList
         if (row.url.length > 0) {
           var urls = []
           var split = row.url.split(",")
@@ -603,7 +599,7 @@
         )
       },
       rowUpdate(row, index, done, loading) {
-        row.articleRange = JSON.stringify(row.articleList)
+        row.articleRange = row.articleList
         if (row.url.length > 0) {
           var urls = []
           var split = row.url.split(",")
@@ -701,7 +697,7 @@
             // })
             this.form = {
               ...data,
-              articleList: JSON.parse(data.articleRange)
+              articleList: data.articleRange
             }
           })
         }
@@ -741,7 +737,7 @@
           this.page.total = data.total
           this.data = data.records
           this.data.forEach(item => {
-            item.articleList = JSON.parse(item.articleRange)
+            item.articleList = item.articleRange
             if (item.url.length > 0) {
               var urls = []
               var names = item.url.split(",")

--
Gitblit v1.9.3