From a9bcb83a7942e3da175ab6da9ed16eda38f49180 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 五月 2024 14:38:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/User/userlist.vue |   83 ++++++++++++++++++++---------------------
 1 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index aa8c386..bca1fae 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -107,6 +107,29 @@
       // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
       ElMessage.success(response.message);
       add.value = false;
+    //  tableData.value = response.data;
+    } else {
+      // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+      ElMessage.error(response.msg);
+    }
+  } catch (error) {
+    // 澶勭悊閿欒
+    console.error(error);
+  }
+};
+// 缂栬緫
+const getTableRowa = async () => {
+  try {
+    const response = await request.post('/loadGlass/sys/user/updateUser', {
+      userName: userName.value,
+      password: password.value,
+      name: selectedProjectNoa.value,
+    }); 
+ 
+    if (response.code == 200) {
+      // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+      ElMessage.success(response.message);
+      add.value = false;
      tableData.value = response.data;
     } else {
       // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -131,9 +154,8 @@
     );  
     if (confirmResult === 'confirm') {  
       // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
-        glassId: row.GlassId,
-        controlsId: 301
+      const response = await request.post("/loadGlass/sys/user/deleteUser", {
+        ids: [row.id],
     })
     if (response.code === 200) {
       ElMessage.success(response.message);
@@ -284,8 +306,8 @@
           <el-col :span="6">
               <div id="dt" style="font-size: 15px;">
         <div>
-              <el-form-item label="鐢ㄦ埛鍚嶏細" :required="true" style="width: 25vw">
-                <el-input  autocomplete="off" />
+          <el-form-item label="鐢ㄦ埛鍚嶏細" :required="true" style="width: 25vw">
+                <el-input v-model="userName" autocomplete="off" />
               </el-form-item></div></div>
           </el-col>
         </el-row>
@@ -295,46 +317,17 @@
         <div>
               <el-form-item label="瑙掕壊锛�" :required="true" style="width: 25vw;">
                 <el-select
-               v-model="value"
+               v-model="selectedProjectNoa"
+               filterable
                clearable
                placeholder="璇烽�夋嫨瑙掕壊"
                style="width: 330px"
              >
                <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-              </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="閭锛�" :required="true" style="width: 25vw;">
-                <el-input autocomplete="off" />
-              </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="鏄惁绂佺敤" :required="true" style="width: 25vw;">
-                <el-select
-               v-model="value"
-               clearable
-               placeholder="璇烽�夋嫨鏄惁绂佺敤"
-               style="width: 330px"
-             >
-               <el-option
-            v-for="item in optionsa"
-            :key="item.valuea"
-            :label="item.labela"
-            :value="item.valuea"
+         v-for="item in titleSelectJsona['processTypea']"  
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
           />
         </el-select>
               </el-form-item></div></div>
@@ -345,7 +338,11 @@
               <div id="dt" style="font-size: 15px;">
         <div>
               <el-form-item label="瀵嗙爜锛�" :required="true" style="width: 25vw;">
-                <el-input autocomplete="off" />
+                <el-input style="width: 340px;"
+                        v-model="password"
+                        autocomplete="off"
+                        :prefix-icon="Lock"
+                        show-password/>
               </el-form-item></div></div>
           </el-col>
         </el-row>
@@ -354,13 +351,13 @@
           </div>
     <template #footer>
       <div id="dialog-footer">
-        <el-button type="primary" @click="getTableRow('edit')">
+        <el-button type="primary" @click="getTableRowa">
           纭
         </el-button>
         <el-button @click="adda = false">鍙栨秷</el-button>
       </div>
     </template>
-  </el-dialog>
+  </el-dialog> 
 </template>
 
 <style scoped>

--
Gitblit v1.8.0