From a4db210c069cd45448067fffb39f070e9d119bb9 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 17:00:32 +0800
Subject: [PATCH] 修改家大事记 的图片文件上传 直调接口

---
 ruoyi-ui/src/views/clean/index.vue |   56 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index a329503..01aca6c 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -6,7 +6,10 @@
             v-model="queryParams.kind"
             placeholder="鎵�鏈夌被鍨�"
             clearable
-            style="width: 240px"
+            style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           >
             <el-option
               v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
               v-model="queryParams.suitable"
               placeholder="璇疯緭鍏ラ�傜敤浜�"
               clearable
-              style="width: 240px"
+              style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
@@ -29,7 +35,10 @@
               v-model="queryParams.type"
               placeholder="璇疯緭鍏ョ被鍒�"
               clearable
-              style="width: 240px"
+              style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
@@ -38,7 +47,10 @@
               v-model="queryParams.method"
               placeholder="璇疯緭鍏ヤ繚娲佹柟娉�"
               clearable
-              style="width: 240px"
+              style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
@@ -125,13 +137,16 @@
           </el-table-column>
        <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
         <el-table-column label="绫诲埆" prop="type" sortable width="100" />
-        <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="100" />
-        <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="120" />
-        <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="100" />
-        <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
+        <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="120" />
+        <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="150" />
+        <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="120" />
+        <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
           <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
         <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+        <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+          <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+        </el-table-column>
         <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
 
           <template slot-scope="scope" >
@@ -142,15 +157,16 @@
                 alt=""
                 style="width: 35px; height: 35px;"
                 fit="cover"
-                v-if="scope.row.url !== ',' "
+                v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
               >
               <img
+                v-else
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/images/deviceA.png"
                 alt=""
                 style="width: 35px; height: 35px;"
                 fit="cover"
-                v-if="scope.row.url === ','"
+
               ></div>
           </template>
         </el-table-column>
@@ -235,7 +251,7 @@
             :http-request="requestUpload"
             :file-list="fileList"
           >
-            <i 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"
@@ -277,6 +293,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>
@@ -351,6 +368,7 @@
         ],
         dsb:true,
         btn:false,
+        uploading: false,
         formDat: {
           type: undefined,
           kind: undefined,
@@ -609,8 +627,13 @@
         Object.keys(this.formDat).forEach(key => {
           this.formDat[key] = '';
         });
-        this.handleRemove(this.fileList[0]);
-        this.handleRemoveFile(this.fileListOther[0]);
+        for(let i = 0; i <= this.fileList.length; i++)
+        {
+          this.handleRemove(this.fileList[0]);
+        }
+        for(let i = 0; i < this.fileListOther.length; i++){
+          this.handleRemoveFile(this.fileListOther[0]);
+        }
       },
       requestUpload(params)
       {
@@ -618,10 +641,11 @@
         var formData = new FormData();
         formData.append('uploadFile', file);
         let _this = this
-
+        this.uploading = true;
         uploadPic(formData).then(response => {
           let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+          this.uploading = false;
+          this.$modal.msgSuccess("涓婁紶鎴愬姛");
           if(_this.fot.includes(pth) === true)
           {
             _this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -638,7 +662,7 @@
       /** 鍒犻櫎鎸夐挳鎿嶄綔 */
       handleDelete(row) {
         const Ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
           return delClean(Ids);
         }).then(() => {
           this.getList();

--
Gitblit v1.9.1