From 4c3af55b5ba49da7d330b4c2b4367d38b9bb3aad Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 8 Nov 2024 15:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=86=E9=9B=86=E6=9F=9C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/bookcase/index.vue | 41 ++++++++++++-------
 dangan-ui/src/views/dangan/cabinet/index.vue  |  8 +++-
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/dangan-ui/src/views/dangan/bookcase/index.vue b/dangan-ui/src/views/dangan/bookcase/index.vue
index 1bcdebe..24d16db 100644
--- a/dangan-ui/src/views/dangan/bookcase/index.vue
+++ b/dangan-ui/src/views/dangan/bookcase/index.vue
@@ -8,11 +8,11 @@
         <span v-show="editID!==item.id">{{ item.label }}</span>
         <el-input v-show="editID===item.id" v-model="item.label" placeholder="请输入内容" style="width: 500px;"></el-input>
 
-        <div class="title_btn" v-show="editID!==item.id" >
+        <div class="title_btn" v-show="editID!==item.id" v-hasPermi="['dangan:cabinet:edit']">
           <i class="el-icon-edit-outline" @click="clickEdit(item)"></i>
         </div>
 
-        <div class="title_btn1" v-show="editID===item.id">
+        <div class="title_btn1" v-show="editID===item.id" v-hasPermi="['dangan:cabinet:edit']">
           <i class="el-icon-position" v-show="editID===item.id" @click="clickSubmit(item)"></i>
         </div>
 
@@ -27,25 +27,24 @@
                 <span>{{ item1.label }}</span>
               </el-tooltip>
             </div>
-            <div class="info">{{ item1.content }}</div>
+<!--            <div class="info">{{ item1.content }}</div>-->
+            <div class="info">
+              <image-preview :src="item1.remark" :width="80" :height="80"/>
+            </div>
 
           </div>
 
           <div v-show="editID===item1.id" class="grid_input">
             <el-input v-model="item1.label" placeholder="请输入内容"></el-input>
-            <el-input style="width:100%;margin-top:2px;"
-                      resize="none"
-                      type="textarea"
-                      placeholder="请输入内容"
-                      v-model="item1.content"
-            >
-            </el-input>
+            <div class="info">
+              <image-upload v-model="item1.remark" :limit="4" :isShowTip="false"/>
+            </div>
           </div>
 
-          <div class="grid_btn" v-show="editID!==item1.id">
+          <div class="grid_btn" v-show="editID!==item1.id" v-hasPermi="['dangan:cabinet:edit']">
             <i class="el-icon-edit-outline" @click="clickEdit(item1)"></i>
           </div>
-          <div class="grid_btn1" v-show="editID===item1.id">
+          <div class="grid_btn1" v-show="editID===item1.id" v-hasPermi="['dangan:cabinet:edit']">
             <i class="el-icon-position" @click="clickSubmit(item1)"></i>
           </div>
 
@@ -153,7 +152,7 @@ export default {
       .grid{
         position: relative;
         width: 25%;
-        height: 130px;
+        height: 140px;
         padding: 5px;
         box-sizing: border-box;
 
@@ -177,7 +176,7 @@ export default {
           .info{
             margin-top: 5px;
             font-size: 14px;
-            height: 75px;
+            height: 85px;
             overflow-y: auto;
           }
         }
@@ -236,6 +235,20 @@ export default {
     background-color: rgb(31 45 61 / 50%);
   }
 
+  ::v-deep.el-upload--picture-card, ::v-deep.el-upload-list--picture-card .el-upload-list__item{
+    width: 80px;
+    height: 80px;
+    line-height: 85px;
+  }
+
+  ::v-deep.el-upload--picture-card i{
+    font-size: 20px;
+  }
+
+  ::v-deep.el-upload-list__item-status-label{
+    display: none;
+  }
+
 }
 
 </style>
diff --git a/dangan-ui/src/views/dangan/cabinet/index.vue b/dangan-ui/src/views/dangan/cabinet/index.vue
index 1bf60ef..23ed3b7 100644
--- a/dangan-ui/src/views/dangan/cabinet/index.vue
+++ b/dangan-ui/src/views/dangan/cabinet/index.vue
@@ -22,8 +22,12 @@
       <el-table-column label="ID" align="center" prop="id"/>
 <!--      <el-table-column label="父目录ID" align="center" prop="pid" />-->
 <!--      <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="内容" align="center" prop="content" />-->
+      <el-table-column label="图片" align="center" prop="remark" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.remark" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
     </el-table>
 
   </div>