From 73949e79fdf76615209f72164f601a64a146729b Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 29 八月 2023 20:45:27 +0800
Subject: [PATCH] 更新了首页,以及完善家根网的头像显示

---
 ruoyi-ui/src/views/note/index.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index fc616ec..1e5879e 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -246,8 +246,7 @@
           :http-request="requestUpload"
           :file-list="fileList"
         >
-          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+          <i  slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
             <img
               class="el-upload-list__item-thumbnail"
@@ -289,6 +288,7 @@
           :show-file-list="true"
         >
           <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
           <template #tip>
             <div class="el-upload__tip">
             </div>
@@ -649,11 +649,21 @@
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       }).catch(() => {});
     },
+
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      this.download('family/property/export', {
-        ...this.queryParams
-      }, `property_${new Date().getTime()}.xlsx`)
+      const Ids = this.ids;
+
+      if(Ids.length==0)
+      {
+        this.download('family/property/export', {
+          ...this.queryParams
+        }, `property_${new Date().getTime()}.xlsx`)
+      }
+      else{
+        this.download('family/property/export1/'+Ids, {
+        }, `property_${new Date().getTime()}.xlsx`)
+      }
     },
     /** 瀵煎叆鎿嶄綔*/
     handleEnport(params){

--
Gitblit v1.9.1