From b6674e0667716e5d3231ba5d2d0a566e496a2f7b Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Thu, 19 Dec 2024 15:14:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  1 -
 src/api/system/sysAttachment.ts          |  2 +-
 src/components/uploadImg/index.vue       |  2 +-
 src/components/uploadSelector/index.vue  | 12 +++++++++++-
 src/layout/navBars/breadcrumb/search.vue |  2 +-
 src/views/system/role/index.vue          |  2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 5465a7f..c684982 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "vue-next-admin",
   "version": "2.4.33",
-  "GFastVersion": "2.3.0",
   "description": "vue3 vite next admin template",
   "author": "lyt_20201208",
   "license": "MIT",
diff --git a/src/api/system/sysAttachment.ts b/src/api/system/sysAttachment.ts
index 48c14ca..db4a5b4 100644
--- a/src/api/system/sysAttachment.ts
+++ b/src/api/system/sysAttachment.ts
@@ -76,7 +76,7 @@ export function uploadPart(data:Object,progress:Callback,cancelToken:CancelToken
     }
   })*/
   return axios({
-    url: baseURL+'/api/v1/system/upload/uploadPart',
+    url: baseURL+'api/v1/system/upload/uploadPart',
     method: 'post',
     data:data,
     headers: {
diff --git a/src/components/uploadImg/index.vue b/src/components/uploadImg/index.vue
index 14e6ca3..0e432f6 100644
--- a/src/components/uploadImg/index.vue
+++ b/src/components/uploadImg/index.vue
@@ -18,7 +18,7 @@
     </el-upload>
 
     <el-dialog v-model="dialogVisible">
-      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+      <el-image :src="dialogImageUrl" fit="contain" />
     </el-dialog>
   </div>
   <div class="up-img" v-else>
diff --git a/src/components/uploadSelector/index.vue b/src/components/uploadSelector/index.vue
index 84ba92f..99d0964 100644
--- a/src/components/uploadSelector/index.vue
+++ b/src/components/uploadSelector/index.vue
@@ -8,7 +8,11 @@
           v-model:file-list="dataFileList"
           ref="upImageRef"
           :list-type="fileType=='image'?'picture-card':'text'"
+          :on-preview="handlePictureCardPreview"
       ></el-upload>
+      <el-dialog v-model="dialogVisible">
+        <el-image :src="dialogImageUrl" fit="contain" />
+      </el-dialog>
     </div>
     <el-dialog title="选择文件" v-model="isShowDialog" width="1000px" :close-on-click-modal="false" :destroy-on-close="true">
       <el-card shadow="hover">
@@ -159,7 +163,7 @@
 </template>
 <script setup lang="ts">
 import {toRefs, reactive, ref, computed,getCurrentInstance} from 'vue';
-import {FormInstance, UploadUserFile} from 'element-plus';
+import {FormInstance, type UploadProps, UploadUserFile} from 'element-plus';
 import {
     listSysAttachment,
 } from "/@/api/system/sysAttachment";
@@ -213,6 +217,8 @@ const isShowDialog = ref(false)
 const loading = ref(false)
 const queryRef = ref()
 const editRef = ref();
+const dialogImageUrl = ref('')
+const dialogVisible = ref(false)
 // 是否显示所有搜索选项
 const showAll =  ref(false)
 // 非单个禁用
@@ -335,6 +341,10 @@ const reset = ()=>{
   resetQuery(queryRef.value)
   state.ids = []
 }
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  dialogImageUrl.value = uploadFile.url!
+  dialogVisible.value = true
+};
 </script>
 <style lang="scss" scoped>
     .system-sysAttachment-container{
diff --git a/src/layout/navBars/breadcrumb/search.vue b/src/layout/navBars/breadcrumb/search.vue
index 756e920..8af30ec 100644
--- a/src/layout/navBars/breadcrumb/search.vue
+++ b/src/layout/navBars/breadcrumb/search.vue
@@ -105,7 +105,7 @@ const onHandleSelect = (item: any) => {
 const onSearchBlur = () => {
   closeSearch();
 };
-
+defineExpose({openSearch})
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 79f80a1..021ea62 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -205,7 +205,7 @@ const handleUserScope = ((row:any)=>{
   setRole.value = row.id
   getUsersById(row.id).then((res:any)=>{
     ld.close()
-    roleUsers.value=res.data.userList??[]
+    roleUsers.value=res.data.userList?res.data.userList.map((user:any)=>user.id):[]
     selectUserRef.value.openDialog()
   })
 })