From eda704f48beacb5c68372482f73b50af3c4623fb Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 26 六月 2024 14:23:50 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- UI-Project/src/views/User/rolelist.vue | 88 +++++++++++++------------------------------- 1 files changed, 26 insertions(+), 62 deletions(-) diff --git a/UI-Project/src/views/User/rolelist.vue b/UI-Project/src/views/User/rolelist.vue index abbe82c..8a92066 100644 --- a/UI-Project/src/views/User/rolelist.vue +++ b/UI-Project/src/views/User/rolelist.vue @@ -2,6 +2,9 @@ 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') const router = useRouter() const add = ref(false) const adda = ref(false) @@ -103,16 +106,16 @@ }; // 鍒犻櫎 const opena = async(row) => { - try { + try { const confirmResult = await ElMessageBox.confirm( - '鏄惁鍒犻櫎璇ヨ鑹�?', - '鎻愮ず', + t('delivery.derole'), + t('delivery.prompt'), { - confirmButtonText: '鏄�', - cancelButtonText: '鍙栨秷', + confirmButtonText: t('delivery.yes'), + cancelButtonText: t('delivery.cancel'), type: 'warning', - } - ); + } + ); if (confirmResult === 'confirm') { // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛 const response = await request.post("/loadGlass/sys/role/delete", { @@ -130,68 +133,29 @@ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑 console.error('鍙戠敓閿欒:', error); } -}; - -const gridOptions = reactive({ - border: "full",//琛ㄦ牸鍔犺竟妗� - keepSource: true,//淇濇寔婧愭暟鎹� - align: 'center',//鏂囧瓧灞呬腑 - stripe:true,//鏂戦┈绾� - rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒 - id: 'OrderList', - showFooter: true,//鏄剧ず鑴� - printConfig: {}, - importConfig: {}, - exportConfig: {}, - scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔� - showOverflow:true, - columnConfig: { - resizable: true, - useKey: true - }, - filterConfig: { //绛涢�夐厤缃」 - remote: true - }, - customConfig: { - storage: true - }, - editConfig: { - trigger: 'click', - mode: 'row', - showStatus: true - }, - data: [ - { - 'id': '1', - 'long': '5', - 'wide': '1005', - 'thick': '183.6', - } - ] - -}) +}; </script> <template> <div> - <el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">娣诲姞瑙掕壊</el-button> + <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" @selection-change="handleSelectionChange" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> - <el-table-column prop="name" align="center" label="瑙掕壊" min-width="180" /> - <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200"> + <el-table-column prop="name" align="center" :label="$t('delivery.role')" min-width="180" /> + <el-table-column fixed="right" :label="$t('delivery.operate')" align="center" width="200"> <template #default="scope"> - <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">缂栬緫</el-button> - <el-button size="mini" type="text" plain @click="opena(scope.row)">鍒犻櫎</el-button> + <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('delivery.edit') }}</el-button> + <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('delivery.delete') }}</el-button> </template> </el-table-column> </el-table> </div> </el-card> </div> - <el-dialog v-model="add" top="23vh" width="37%" title="娣诲姞瑙掕壊" > + <el-dialog v-model="add" top="23vh" width="37%" :title="$t('delivery.addrole')" > <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;"> <el-form size="mini" label-width="150px"> <el-form label-width="100px" label-position="right"> @@ -199,8 +163,8 @@ <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> - <el-form-item label="瑙掕壊锛�" :required="true" style="width: 25vw"> - <el-input placeholder="璇疯緭鍏ヨ鑹�" v-model="name" autocomplete="off" /> + <el-form-item :label="$t('delivery.rolea')" :required="true" style="width: 25vw"> + <el-input :placeholder="$t('delivery.inrole')" v-model="name" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> @@ -210,13 +174,13 @@ <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="getTableRow"> - 纭 + {{ $t('delivery.sure') }} </el-button> - <el-button @click="add = false">鍙栨秷</el-button> + <el-button @click="add = false"> {{ $t('delivery.cancel') }}</el-button> </div> </template> </el-dialog> - <el-dialog v-model="adda" top="23vh" width="37%" title="淇敼瑙掕壊" > + <el-dialog v-model="adda" top="23vh" width="37%" :title="$t('delivery.editrole')"> <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;"> <el-form :model="editingUser" ref="formRef" size="mini" label-width="150px"> <el-form label-width="100px" label-position="right"> @@ -224,8 +188,8 @@ <el-col :span="6"> <div id="dt" style="font-size: 15px;"> <div> - <el-form-item label="瑙掕壊锛�" :required="true" style="width: 25vw"> - <el-input placeholder="璇疯緭鍏ヨ鑹�" v-model="editingUser.name" autocomplete="off" /> + <el-form-item :label="$t('delivery.rolea')" :required="true" style="width: 25vw"> + <el-input :placeholder="$t('delivery.inrole')" v-model="editingUser.name" autocomplete="off" /> </el-form-item></div></div> </el-col> </el-row> @@ -235,9 +199,9 @@ <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="getTableRowa"> - 纭 + {{ $t('delivery.sure') }} </el-button> - <el-button @click="adda = false">鍙栨秷</el-button> + <el-button @click="adda = false">{{ $t('delivery.cancel') }}</el-button> </div> </template> </el-dialog> -- Gitblit v1.8.0