From f18923ebf1d491090931d8461f48a0bb61a7ff0b Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 14 Mar 2024 14:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/userManagement.vue | 5 +++++
 vue.config.js                            | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/system/user/userManagement.vue b/src/views/system/user/userManagement.vue
index 8a7aa92..782c990 100644
--- a/src/views/system/user/userManagement.vue
+++ b/src/views/system/user/userManagement.vue
@@ -39,6 +39,11 @@
               <span v-else>{{ scope.row.role }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            label="备注"
+            show-overflow-tooltip
+            prop="notes"
+          ></el-table-column>
           <el-table-column
             label="创建时间"
             show-overflow-tooltip
diff --git a/vue.config.js b/vue.config.js
index 4b19a45..214b452 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,13 +22,12 @@ module.exports = defineConfig({
       "/api": {
         //表示拦截以/api开头的请求路径
         //target: "http://47.96.238.157:8093", //阿里云服务器环境
-        //target: "http://180.166.218.222:40080", //dell
-        // target: "http://192.168.1.190:90", //dell
-        target: "http://192.168.50.7:8094", //liu 本机ip
+        target: "http://180.166.218.222:40080", //dell
+        //target: "http://192.168.50.7:8094", //liu 本机ip
         // target: "http://192.168.50.42:81", //东视
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },