From 9ac4f1edc86c9af627fcff2b3263e029ec4c95ff Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 21:50:56 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/note/index.vue |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index d0d1132..2a38206 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -66,7 +66,7 @@
       <el-form-item label="鍙戠敓鏃堕棿"  prop="happenTime">
         <el-date-picker
           v-model="dateRange"
-          style="width: 200px;
+          style="width: 240px;
                    height: 35px;
                    border-radius: 16px 16px 16px 16px;
                    opacity: 0.5;"
@@ -129,7 +129,7 @@
           v-hasPermi="['family:note:export']"
         >瀵煎叆妯℃澘涓嬭浇</el-button>
       </el-col>
-      <el-col :span="1.2">
+      <el-col :span="1.5">
         <el-upload
           action=""
           class="upload-demo"
@@ -138,7 +138,7 @@
         >
           <el-button size="mini"   type="primary"
                      plain
-                     icon="el-icon-plus" >瀵煎叆</el-button>
+                    icon="el-icon-top" >瀵煎叆</el-button>
 
         </el-upload>
       </el-col>
@@ -188,8 +188,9 @@
             ></div>
         </template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <div class="button-container">
           <el-button
             size="mini"
             type="text"
@@ -208,6 +209,7 @@
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
 
           </el-dropdown>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -375,7 +377,10 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
-      fot:[".jpg",".jif"],
+     // 鏁版嵁鑼冨洿閫夐」
+     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+     
       fileList:[
       ],
       fileListOther:[
@@ -485,14 +490,21 @@
       this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
 
       // console.log(this.queryParams)
+      let _this = this
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
       listProperty(this.queryParams).then(response => {
           //  alert(123)
           //   console.log(response.data)
-          this.propertyList = response.data.data;
+		  if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+		  {
+		      _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+		      _this.loading = false;
+		  }else{
+          _this.propertyList = response.data.data;
 
-          this.total = response.data.total;
-          this.loading = false;
+          _this.total = response.data.total;
+          _this.loading = false;
+		  }
         }
       );
     },
@@ -661,6 +673,7 @@
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
+		alert(23)
       const Ids = row.id || this.ids;
       this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
         return delProperty(Ids);
@@ -709,7 +722,7 @@
 
 };
 </script>
-<style>
+<style scoped="">
 .el-table__row.statistics-warning-row {
   background: #E0EEFE;
 
@@ -718,4 +731,10 @@
   background: #FFEFF2;
 
 }
+.el-table__cell {
+  font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+  display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
 </style>

--
Gitblit v1.9.1