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/page.vue |   74 ++++++++++--------------------------
 1 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/UI-Project/src/views/User/page.vue b/UI-Project/src/views/User/page.vue
index 170104e..af83a1f 100644
--- a/UI-Project/src/views/User/page.vue
+++ b/UI-Project/src/views/User/page.vue
@@ -12,47 +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 selectedProjectNoa = ref(null);
   const pageName = ref('');
   const pageUrl = ref('');
-
+  const pageNumber = ref('');
 const tableData = ref([])
 const slot = ref('')
-request.post("/deviceInteraction/page/findPagesAll").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('');  
+  list('');
 }); 
-  // 瑙掕壊涓嬫媺閫�  
-  const fetchOptionsa = async () => {  
+const list = async () => {
   try {  
-    // 鍙戦�佽姹傚埌鍚庣鎺ュ彛  
-    const response = await request.post('/deviceInteraction/role/findRolesAll');  
+    const response = await request.post('/deviceInteraction/page/findPagesAll');  
     if (response.code === 200) {  
-    titleSelectJsona.value.processTypea = response.data;
-    console.log(response.data);
- 
+      tableData.value = response.data
     } else {  
       ElMessage.warning(response.data);  
     }  
@@ -62,7 +35,9 @@
 }; 
 // 澶勭悊缂栬緫鎸夐挳鐐瑰嚮  
 function handleEdit(row) {
-  userName.value = row.userName;
+  pageName.value = row.pageName;
+  pageUrl.value = row.pageUrl;
+  pageNumber.value = row.pageNumber;
   window.localStorage.setItem('ids', row.id);
   window.localStorage.setItem('pageNumber', row.pageNumber);
   if (row.roleList && row.roleList.length > 0) {
@@ -71,19 +46,17 @@
   }  
   adda.value = true; // 鏄剧ず瀵硅瘽妗�  
 }
-
 function closeDialog(row) {
      add.value = false;
-     userName.value = '';
-     nickName.value = '';
-     password.value = '';
-     selectedProjectNoa.value = '';
+     pageNumber.value = '';
+     pageUrl.value = '';
+     pageName.value = '';
 }
 function closeDialoga(row) {
      adda.value = false;
-     userName.value = '';
-     nickName.value = '';
-     password.value = '';
+     pageNumber.value = '';
+     pageUrl.value = '';
+     pageName.value = '';
 }
 // 娣诲姞 
 const getTableRow = async () => {
@@ -95,38 +68,32 @@
       pageUrl: pageUrl.value,
     }); 
     if (response.code === 200) {
-      // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
       ElMessage.success(response.message);
       add.value = false;
-     tableData.value = response.data;
-    } else {
-      // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+        list()
+      } else {
       ElMessage.error(response.message);
     }
   } catch (error) {
-    // 澶勭悊閿欒
     console.error(error);
   }
 };
 // 缂栬緫
 const getTable = async () => {
   let ids = window.localStorage.getItem('ids')
-  let pageNumber = window.localStorage.getItem('pageNumber')
   try {
     const response = await request.post('/deviceInteraction/page/updatePage', {
       id: ids,
       pageName: pageName.value,
-      pageNumber: pageNumber,
+      pageNumber: pageNumber.value,
       pageUrl: pageUrl.value,
   }
   ); 
     if (response.code === 200) {
-      // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
       ElMessage.success(response.message);
       adda.value = false;
-     tableData.value = response.data;
+        list()
     } else {
-      // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
       ElMessage.error(response.message);
     }
   } catch (error) {
@@ -153,6 +120,7 @@
       })
     if (response.code === 200) {
       ElMessage.success(response.message);
+        list()
       } else {  
         // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.msg);
@@ -256,7 +224,7 @@
         <el-button type="primary" @click="getTable">
           {{ $t('pagemenu.sure') }}
         </el-button>
-        <el-button @click="closeDialog">{{ $t('pagemenu.cancel') }}</el-button>
+        <el-button @click="closeDialoga">{{ $t('pagemenu.cancel') }}</el-button>
       </div>
     </template>
   </el-dialog> 

--
Gitblit v1.8.0