From 006906bbe32308e013f4a886dd08cc443e43ced4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 09 九月 2024 14:45:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
UI-Project/src/views/User/menu.vue | 114 ++++++++++++++++++++++++++------------------------------
1 files changed, 53 insertions(+), 61 deletions(-)
diff --git a/UI-Project/src/views/User/menu.vue b/UI-Project/src/views/User/menu.vue
index 70e15f5..2f7ebf2 100644
--- a/UI-Project/src/views/User/menu.vue
+++ b/UI-Project/src/views/User/menu.vue
@@ -12,48 +12,20 @@
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-// import LanguageMixin from './lang/LanguageMixin'
-const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
-// const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
- const userName = ref('');
- const account = ref('');
- const password = ref('');
+ const menuNumber = ref('');
+ const remark = ref('');
+ const menuName = ref('');
const tableData = ref([])
const slot = ref('')
-request.post("/deviceInteraction/menu/findMenusAll").then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- } else {
- ElMessage.warning(res.msg)
-
- }
- });
-const titleSelectJsona = ref({
- processType: [],
-
-})
-// const handleInputChangea = async (value: string) => {
-// if (value) {
-// await fetchOptionsa(value);
-// } else {
-// options.value = []; // 娓呯┖閫夐」鍒楄〃
-// }
-// };
onMounted(() => {
- // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
- fetchOptionsa('');
-});
- // 瑙掕壊涓嬫媺閫�
- const fetchOptionsa = async () => {
+ list('');
+});
+const list = async () => {
try {
- // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
- const response = await request.post('/deviceInteraction/role/findRolesAll');
+ const response = await request.post('/deviceInteraction/menu/findMenusAll');
if (response.code === 200) {
- titleSelectJsona.value.processTypea = response.data;
- console.log(response.data);
-
+ tableData.value = response.data
} else {
ElMessage.warning(response.data);
}
@@ -63,42 +35,40 @@
};
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
function handleEdit(row) {
+ menuName.value = row.menuName;
+ menuNumber.value = row.menuNumber;
+ remark.value = row.remark;
window.localStorage.setItem('ids', row.id);
- userName.value = row.userName;
- if (row.roleList && row.roleList.length > 0) {
- const firstRole = row.roleList[0];
- selectedProjectNoa.value = firstRole.id; // 璁剧疆涓篒D锛岃�屼笉鏄痭ame
- }
adda.value = true; // 鏄剧ず瀵硅瘽妗�
}
function closeDialog(row) {
add.value = false;
- userName.value = '';
- nickName.value = '';
- password.value = '';
- selectedProjectNoa.value = '';
+ menuName.value = '';
+ menuNumber.value = '';
+ remark.value = '';
}
function closeDialoga(row) {
adda.value = false;
- userName.value = '';
- nickName.value = '';
- password.value = '';
+ menuName.value = '';
+ menuNumber.value = '';
+ remark.value = '';
}
// 娣诲姞
const getTableRow = async () => {
try {
- const response = await request.post('/deviceInteraction/account/addAccount', {
+ const response = await request.post('/deviceInteraction/menu/addMenu', {
id: 0,
menuName: menuName.value,
- menuNumber: menuNumber.value,
- remark: passwremarkord.value,
+ menuNumber: '',
+ remark: remark.value
});
if (response.code === 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
add.value = false;
- tableData.value = response.data;
+ list()
+ // tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -113,17 +83,18 @@
let ids = window.localStorage.getItem('ids')
try {
const response = await request.post('/deviceInteraction/menu/updateMenu', {
- account: account.value,
- roleId: selectedProjectNoa.value,
- userName: userName.value,
- password: password.value,
+ id: ids,
+ menuName: menuName.value,
+ menuNumber: menuNumber.value,
+ remark: remark.value,
}
);
if (response.code === 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
adda.value = false;
- tableData.value = response.data;
+ list()
+ // tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -152,6 +123,7 @@
})
if (response.code === 200) {
ElMessage.success(response.message);
+ list()
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.msg);
@@ -195,7 +167,17 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item :label="$t('customer.firstmenua')" :required="true" style="width: 25vw">
- <el-input v-model="userName" autocomplete="off" :placeholder="$t('customer.infirstmenu')" />
+ <el-input v-model="menuName" autocomplete="off" :placeholder="$t('customer.infirstmenu')" />
+ </el-form-item></div></div>
+
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('customer.remark')" style="width: 25vw">
+ <el-input v-model="remark" autocomplete="off" :placeholder="$t('customer.inremark')" />
</el-form-item></div></div>
</el-col>
@@ -221,7 +203,17 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item :label="$t('customer.firstmenua')" :required="true" style="width: 25vw">
- <el-input v-model="userName" autocomplete="off" :placeholder="$t('customer.infirstmenu')" />
+ <el-input v-model="menuName" autocomplete="off" :placeholder="$t('customer.infirstmenu')" />
+ </el-form-item></div></div>
+
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('customer.remark')" style="width: 25vw">
+ <el-input v-model="remark" autocomplete="off" :placeholder="$t('customer.inremark')" />
</el-form-item></div></div>
</el-col>
@@ -231,10 +223,10 @@
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="getTableRow">
+ <el-button type="primary" @click="getTableRowa">
{{ $t('customer.sure') }}
</el-button>
- <el-button @click="closeDialog">{{ $t('customer.cancel') }}</el-button>
+ <el-button @click="closeDialoga">{{ $t('customer.cancel') }}</el-button>
</div>
</template>
</el-dialog>
--
Gitblit v1.8.0