From ef9e8df8f911d53d1ec23bf920f1cd5ba8f18e13 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 13 九月 2024 08:04:26 +0800
Subject: [PATCH] 线路配置,打标机前端页面

---
 UI-Project/src/views/User/permissions.vue |   53 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/UI-Project/src/views/User/permissions.vue b/UI-Project/src/views/User/permissions.vue
index 0d5a7e4..8bb45c7 100644
--- a/UI-Project/src/views/User/permissions.vue
+++ b/UI-Project/src/views/User/permissions.vue
@@ -24,14 +24,6 @@
 
 const tableData = ref([])
 const slot = ref('')
-request.post("/deviceInteraction/roleMenu/findRoleMenusAll").then((res) => {
-          if (res.code == 200) {
-          console.log(res.data);
-          tableData.value = res.data
-          } else {
-          ElMessage.warning(res.msg)
-          }
-          });
 const titleSelectJsona = ref({
   processType: [],
 })
@@ -42,10 +34,23 @@
   processType2: [],
 })
 onMounted(() => {  
+  list('');
   fetchOptionsa('');
   fetchOptionsa1('');
   fetchOptionsa2('');
 }); 
+const list = async () => {
+  try {  
+    const response = await request.post('/deviceInteraction/roleMenu/findRoleMenusAll');  
+    if (response.code === 200) {  
+      tableData.value = response.data
+    } else {  
+      ElMessage.warning(response.data);  
+    }  
+  } catch (error) {  
+    console.error('Error fetching options:', error);  
+  }  
+}; 
   // 瑙掕壊涓嬫媺閫�  
   const fetchOptionsa = async () => {  
   try {  
@@ -90,6 +95,9 @@
 }; 
 // 澶勭悊缂栬緫鎸夐挳鐐瑰嚮  
 function handleEdit(row) {  
+  selectedProjectNoa.value = row.role_name;
+  selectedProjectNoa1.value = row.menu_name;
+  selectedProjectNoa2.value = row.page_name;
   userName.value = row.userName;
   if (row.roleList && row.roleList.length > 0) {  
     const firstRole = row.roleList[0];  
@@ -126,7 +134,8 @@
     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);
@@ -147,8 +156,9 @@
     });
     if (response.code === 200) {
       ElMessage.success(response.message);
-      add.value = false;
-     tableData.value = response.data;
+      add1.value = false;
+        list()
+        //  tableData.value = response.data;
     } else {
       // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
       ElMessage.error(response.message);
@@ -162,21 +172,19 @@
 const getTableRowa = async () => {
   let id = window.localStorage.getItem('id')
   try {
-    const response = await request.post('/loadGlass/sys/user/updateUser', {
+    const response = await request.post('/deviceInteraction/role/updateRole', {
       id: id,
-      userName: userName.value,
-      roleList: [
-    {
-      id: selectedProjectNoa.value,
-      // roleKey: selectedProjectNoa.value.id,
-    }]
+      remark: selectedProjectNoa.value,
+      roleName: selectedProjectNoa1.value,
+      roleNumber: selectedProjectNoa2.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);
@@ -205,6 +213,7 @@
       })
     if (response.code === 200) {
       ElMessage.success(response.message);
+        list()
       } else {  
         // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.msg);
@@ -230,6 +239,8 @@
         :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
           <el-table-column prop="id" align="center" :label="$t('delivery.id')" min-width="180" />
           <el-table-column prop="role_name" align="center" :label="$t('delivery.role')" min-width="180" />
+          <el-table-column prop="menu_name" align="center" :label="$t('delivery.titleMenu')" min-width="180" />
+          <el-table-column prop="page_name" align="center" :label="$t('delivery.titlePage')" min-width="180" />
           <el-table-column fixed="right" :label="$t('delivery.operate')" align="center" width="270">
             <template #default="scope">
               <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('delivery.edit') }}</el-button>
@@ -379,7 +390,7 @@
         <div>
               <el-form-item :label="$t('delivery.menu')" :required="true" style="width: 25vw;">
                 <el-select
-               v-model="selectedProjectNoa"
+               v-model="selectedProjectNoa1"
                filterable
                clearable
                :placeholder="$t('delivery.menuchoice')"
@@ -401,7 +412,7 @@
         <div>
               <el-form-item :label="$t('delivery.page')" :required="true" style="width: 25vw;">
                 <el-select
-               v-model="selectedProjectNoa"
+               v-model="selectedProjectNoa2"
                filterable
                clearable
                :placeholder="$t('delivery.pagechoice')"

--
Gitblit v1.8.0