From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/User/rolelist.vue | 44 +++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/User/rolelist.vue b/UI-Project/src/views/User/rolelist.vue
index 78dfa0f..e53ba36 100644
--- a/UI-Project/src/views/User/rolelist.vue
+++ b/UI-Project/src/views/User/rolelist.vue
@@ -2,34 +2,28 @@
import {Search} from "@element-plus/icons-vue";
import {reactive} from "vue";
import {useRouter} from "vue-router"
- import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
const router = useRouter()
const add = ref(false)
const adda = ref(false)
import request from "@/utils/request"
import { ref, onMounted } from "vue";
-// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-// import LanguageMixin from './lang/LanguageMixin'
const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
-// const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
- const name = ref('');
+const name = ref('');
const tableData = ref([])
const options = ref([])
const selectedOptions = ref([])
-// 瀹氫箟绾ц仈閫夋嫨鍣ㄧ殑灞炴��
const cascaderProps = {
value: 'id',
label: 'menuName',
multiple: true
};
const slot = ref('')
-
const titleSelectJsona = ref({
processType: [],
-
})
onMounted(() => {
fetchOptionsa('');
@@ -45,7 +39,6 @@
// titleSelectJsona.value.processTypea = response.data.menuList;
// options.value = response.data.menuList
console.log(response.data);
-
} else {
ElMessage.warning(response.data);
}
@@ -66,7 +59,7 @@
if (!parentIdMap[id]) {
menuList.push({
id: id,
- parentId: 0, // 閫氬父锛岄《绾ч」鐨刾arentId鍙兘鏄痭ull鎴栫壒瀹氱殑鏍笽D锛岃繖閲岃涓�0鍙兘鏄釜鐗规畩鐢ㄩ��
+ parentId: 0,
children: []
});
parentIdMap[id] = menuList[menuList.length - 1]; // 鏇存柊鏄犲皠
@@ -164,7 +157,7 @@
let ids = window.localStorage.getItem('ids')
try {
let menuList = [];
- let parentIdMap = {}; // 鐢ㄤ簬瀛樺偍宸茬粡娣诲姞鐨勭埗椤�
+ let parentIdMap = {}; // 鐢ㄤ簬瀛樺偍宸茬粡娣诲姞鐨勭埗椤�
selectedOptions.value.forEach(array => {
if (array.length >= 2) {
let id = array[0];
@@ -173,7 +166,7 @@
if (!parentIdMap[id]) {
menuList.push({
id: id,
- parentId: 0, // 閫氬父锛岄《绾ч」鐨刾arentId鍙兘鏄痭ull鎴栫壒瀹氱殑鏍笽D锛岃繖閲岃涓�0鍙兘鏄釜鐗规畩鐢ㄩ��
+ parentId: 0,
children: []
});
parentIdMap[id] = menuList[menuList.length - 1]; // 鏇存柊鏄犲皠
@@ -229,20 +222,16 @@
type: 'warning',
}
);
- if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ if (confirmResult === 'confirm') {
const response = await request.post("/loadGlass/sys/role/delete",[row.id])
if (response.code === 200) {
ElMessage.success(response.message);
fetchOptionsa()
- } else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ } else {
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ } catch (error) {
console.error('鍙戠敓閿欒:', error);
}
};
@@ -256,13 +245,12 @@
}
});
</script>
-
<template>
<div>
<el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('delivery.addrole') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="240" ref="table"
+ <el-table height="750" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="name" align="center" :label="$t('delivery.role')" min-width="180" />
@@ -285,7 +273,7 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item :label="$t('delivery.rolea')" :required="true" style="width: 25vw">
- <el-input :placeholder="$t('delivery.inrole')" v-model="name" autocomplete="off" />
+ <el-input :placeholder="$t('delivery.inrole')" v-model="name" autocomplete="off" style="width: 350px"/>
</el-form-item></div></div>
</el-col>
</el-row>
@@ -299,7 +287,7 @@
:placeholder="$t('delivery.inchoice')"
:props="cascaderProps"
:options="options"
- style="width: 330px"
+ style="width: 350px"
clearable />
</el-form-item></div></div>
</el-col>
@@ -325,7 +313,7 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item :label="$t('delivery.rolea')" :required="true" style="width: 25vw">
- <el-input :placeholder="$t('delivery.inrole')" v-model="name" autocomplete="off" />
+ <el-input :placeholder="$t('delivery.inrole')" v-model="name" autocomplete="off" style="width: 350px"/>
</el-form-item></div></div>
</el-col>
</el-row>
@@ -339,7 +327,7 @@
:placeholder="$t('delivery.inchoice')"
:props="cascaderProps"
:options="options"
- style="width: 330px"
+ style="width: 350px"
clearable />
</el-form-item></div></div>
</el-col>
@@ -357,9 +345,7 @@
</template>
</el-dialog>
</template>
-
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
--
Gitblit v1.8.0