From 0fefc97808481e7881a03fe5dcc86ac9a8c4b6f9 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 16:29:05 +0800
Subject: [PATCH] 修改了一些bug
---
ruoyi-ui/src/views/system/user/profile/index.vue | 3 ++-
ruoyi-ui/src/views/secret/secretInfo.vue | 2 +-
ruoyi-ui/src/views/clean/index.vue | 17 +++++++++--------
ruoyi-ui/vue.config.js | 4 ++--
ruoyi-ui/src/views/collection/index.vue | 15 +++++++++------
5 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index e42367b..f6d4dfd 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -143,20 +143,20 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
-
+
<el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
-
+
</el-dropdown>
-
+
</el-col>
-
-
+
+
<right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -1223,6 +1223,7 @@
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
+ console.log(params)
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
@@ -1230,10 +1231,10 @@
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
+ }).catch(() => {
+
Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
+ })
}
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 666a3aa..4d7d583 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -191,18 +191,18 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
-
+
<el-dropdown-item icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
<el-dropdown-item icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
-
-
-
+
+
+
<right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
+
</el-row>
</div>
<el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
@@ -1352,7 +1352,10 @@
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
+ })..catch(() => {
+
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ })
}
}
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index eb150cb..8ec22ed 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" allow-create
- filterable clearable :style="{width: '100%'}" >
+ filterable clearable :style="{width: '100%'}" :disabled="dsb">
<el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 524d3db..1c2ab57 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -430,8 +430,9 @@
getList() {
let _this = this
+ let clanId = this.$store.state.user.clanId
- getAllInfo().then(response=>{
+ getAllInfo(clanId).then(response=>{
let fams = response.data
for(let i = 0; i < fams.length; i++)
_this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 14e3b20..493ca4b 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,8 +37,8 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://10.39.18.174:8080/`,
- // target: `https://192.168.1.3:8080/`,
- target: 'https://www.bendudu.com:8080/',
+ target: `https://10.39.18.174:8080/`,
+ // target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1