Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

 src/views/article/components/deitDiscussion.vue

@@ -423,23 +423,14 @@
            ...this.query
          }
          data = Qs.stringify(data)
          if (this.type == 0 && this.newData.articleType === 4) {
            exportBlob(
              `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data
            ).then(
          exportBlob(
              `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data)
            .then(
              res => {
                downloadXls(res.data, `投票统计${dateNow()}.xlsx`)
                downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
                NProgress.done()
              })
          } else {
            exportBlob(
                `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data)
              .then(
                res => {
                  downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
                  NProgress.done()
                })
          }

        })
      },

@@ -472,7 +463,7 @@
        done()
      },

      openUser(row, type = 0) {
      openUser(row, type) {
        this.type = type
        this.popupTableUserShow = true
        this.query = {}