From c4d4c5d25cd78fa302fe07a824c8d7b3412bd9f1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 16:42:15 +0800
Subject: [PATCH] 修改内容
---
ruoyi-ui/src/views/honor/index.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 7751898..800a31b 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -186,7 +186,7 @@
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- </el-table-column>-->
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -613,7 +613,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
@@ -858,7 +858,7 @@
this.loading1 = true;
let userId = this.$store.state.user.userId
// alert(userId)
-
+ // alert(124)
showShareUser(userId, 2030).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -872,6 +872,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -889,6 +890,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
@@ -899,8 +901,9 @@
this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
return share(shareList);
}).then(() => {
-
+ this.userOptions = []
this.getList();
+ this.getList1();
this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
this.id1 = undefined
this.open1 = false;
@@ -1108,6 +1111,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
+ this.open2 = false;
this.$router.push("/self/Honor/honorInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1