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/userlist.vue |  107 +++++++++++++++++++++++++----------------------------
 1 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index 4e7d745..6897c36 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -1,50 +1,41 @@
 <script setup>
 import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
 import {useRouter} from "vue-router"
 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 { ref, onMounted,reactive } from "vue";
 import { ElMessage, ElMessageBox } from 'element-plus'
-  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('');
-
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+const selectedProjectNoa = ref(null);
+const userName = ref('');
+const account = ref('');
+const password = ref('');
 const tableData = ref([])
 const slot = ref('')
-request.post("/deviceInteraction/account/findAccounts").then((res) => {
-          if (res.code == 200) {
-          console.log(res.data);
-          tableData.value = res.data
-          } else {
-          ElMessage.warning(res.msg)
-        
-          }
-          });
+onMounted(() => {
+  list('');
+  fetchOptionsa('');  
+}); 
+const list = async () => {
+  try {  
+    const response = await request.post('/deviceInteraction/account/findAccounts');  
+    if (response.code === 200) {  
+      tableData.value = response.data
+    } else {  
+      ElMessage.warning(response.data);  
+    }  
+  } catch (error) {  
+    console.error('Error fetching options:', error);  
+  }  
+}; 
 const titleSelectJsona = ref({
   processType: [],
  
 })
-// const handleInputChangea = async (value: string) => {  
-//   if (value) {  
-//     await fetchOptionsa(value);  
-//   } else {  
-//     options.value = []; // 娓呯┖閫夐」鍒楄〃  
-//   }  
-// };  
-onMounted(() => {  
-  // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級  
-  fetchOptionsa('');  
-}); 
   // 瑙掕壊涓嬫媺閫�  
   const fetchOptionsa = async () => {  
   try {  
@@ -63,31 +54,30 @@
 }; 
 // 澶勭悊缂栬緫鎸夐挳鐐瑰嚮  
 function handleEdit(row) {
+  account.value = row.account;
+  selectedProjectNoa.value = row.role_name;
+  userName.value = row.user_name;
+  password.value = row.password;
   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 = '';
+      account.value = '';
+      selectedProjectNoa.value = '';
+      userName.value = '';
+      password.value = '';
 }
 function closeDialoga(row) {
      adda.value = false;
-     userName.value = '';
-     nickName.value = '';
-     password.value = '';
+      account.value = '';
+      selectedProjectNoa.value = '';
+      userName.value = '';
+      password.value = '';
 }
 // 娣诲姞 
 const getTableRow = async () => {
-  try {
+    try {
     const response = await request.post('/deviceInteraction/account/addAccount', {
       account: account.value,
       roleId: selectedProjectNoa.value,
@@ -95,19 +85,21 @@
       password: password.value,
     }); 
     if (response.code === 200) {
-      // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
       ElMessage.success(response.message);
       add.value = false;
-     tableData.value = response.data;
+      account.value = '';
+      selectedProjectNoa.value = '';
+      userName.value = '';
+      password.value = '';
+        list()
     } else {
       // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
       ElMessage.error(response.message);
     }
-  } catch (error) {
-    // 澶勭悊閿欒
-    console.error(error);
-  }
-};
+  } catch (error) {  
+      // 澶勭悊璇锋眰閿欒  
+    }
+}; 
 // 缂栬緫
 const getTableRowa = async () => {
   let ids = window.localStorage.getItem('ids')
@@ -124,8 +116,9 @@
       // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
       ElMessage.success(response.message);
       adda.value = false;
-     tableData.value = response.data;
-    } else {
+    //  tableData.value = response.data;
+        list()
+      } else {
       // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
       ElMessage.error(response.message);
     }
@@ -153,6 +146,7 @@
       })
     if (response.code === 200) {
       ElMessage.success(response.message);
+        list()
       } else {  
         // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛  
       ElMessage.error(response.msg);
@@ -164,7 +158,6 @@
     console.error('鍙戠敓閿欒:', error);  
   }  
 };   
-
 </script>
 
 <template>

--
Gitblit v1.8.0