From 79e99379a0f83d8276fb9f231a1a998023ebdc3e Mon Sep 17 00:00:00 2001
From: ym1026 <1539963735@qq.com>
Date: Tue, 9 Sep 2025 10:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9+=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=AD=98=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/config/columnList.js   |  8 ++++----
 web/src/components/Home/Map.vue   |  2 +-
 web/src/components/Home/Modal.vue |  2 +-
 web/src/utils/btnList.js          | 20 ++++++++------------
 web/src/views/LoginView.vue       |  2 +-
 web/src/views/MainView.vue        | 12 ++++++------
 web/src/views/system/station.vue  |  2 +-
 7 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/web/public/config/columnList.js b/web/public/config/columnList.js
index d2a4ec6..9d7ed6f 100644
--- a/web/public/config/columnList.js
+++ b/web/public/config/columnList.js
@@ -212,9 +212,9 @@ export const columnList = [
       },
       {
         title: '场站运行模式',
-        dataIndex: 'work_mode_id',
-        key: 'work_mode_id',
-        scopedSlots: { customRender: 'work_mode_id' }
+        dataIndex: 'work_mode',
+        key: 'work_mode',
+        scopedSlots: { customRender: 'work_mode' }
       },
       {
         title: '场站运行策略',
@@ -499,7 +499,7 @@ export const stationOptions = [
 
         label: '场站运行模式',
         value: undefined,
-        key: 'work_mode_id',
+        key: 'work_mode',
         type: 'select',
         list: [
           {
diff --git a/web/src/components/Home/Map.vue b/web/src/components/Home/Map.vue
index 2651a88..3ee42fb 100644
--- a/web/src/components/Home/Map.vue
+++ b/web/src/components/Home/Map.vue
@@ -93,7 +93,7 @@ export default {
     async getMarkList() {
       try {
         let query = {
-          role_id: localStorage.getItem('user')[0].role_id
+          role_id: localStorage.getItem('permission')[0].role_id
         }
         const res = await getReq('/queryStationList', query)
         if (res.errcode === 0) {
diff --git a/web/src/components/Home/Modal.vue b/web/src/components/Home/Modal.vue
index a9afced..5afc646 100644
--- a/web/src/components/Home/Modal.vue
+++ b/web/src/components/Home/Modal.vue
@@ -106,7 +106,7 @@ export default {
         }
       ],
       sysName: '',
-      user: JSON.parse(localStorage.getItem('user')) || {}
+      user: JSON.parse(localStorage.getItem('permission')) || {}
     }
   },
   computed: {
diff --git a/web/src/utils/btnList.js b/web/src/utils/btnList.js
index 0e79e0e..a328b89 100644
--- a/web/src/utils/btnList.js
+++ b/web/src/utils/btnList.js
@@ -1,21 +1,17 @@
+import route from 'vue-router'
 const btnList = [
   { label: '', type: '', disFlag: '' },
-  { label: '新增', type: 'add', disFlag: 'isEdit', icon: 'icon-add' },
-  { label: '查看', type: 'read', disFlag: 'isQuery' },
-  { label: '修改', type: 'edit', disFlag: 'isEdit' },
-  { label: '删除', type: 'del', disFlag: 'isEdit', icon: 'icon-del' }
-  // { label: '批量删除', type: 'del', disFlag: 'isEdit', icon: 'icon-del' }
+  { label: '新增', type: 'add', disFlag: 'is_add', icon: 'icon-add' },
+  { label: '查看', type: 'read', disFlag: 'is_view' },
+  { label: '修改', type: 'edit', disFlag: 'is_edit' },
+  { label: '删除', type: 'del', disFlag: 'is_del', icon: 'icon-del' }
 ]
 
-// arr:按钮数组
-// permissions:{
-//  isControl: true;
-//  isEdit: true;
-//  isQuery: true;
-// }
 function getBtns(arr) {
+  console.log(route, 'route')
+  // JSON.parse(localStorage.getItem('permission')).find((item)=>item.route==)
   // const permissions =
-  //   JSON.parse(localStorage.getItem('user')) || {}
+  //   JSON.parse(localStorage.getItem('permission')) || {}
   const btns = []
   btnList.forEach((item) => {
     if (arr.includes(item.label)) {
diff --git a/web/src/views/LoginView.vue b/web/src/views/LoginView.vue
index a65bfbc..508d64b 100644
--- a/web/src/views/LoginView.vue
+++ b/web/src/views/LoginView.vue
@@ -81,7 +81,7 @@ export default {
         if (res.errcode === 0) {
           this.$message.success('登录成功')
           localStorage.setItem('token', res.token)
-          localStorage.setItem('user',JSON.stringify( res.permission) )
+          localStorage.setItem('permission',JSON.stringify( res.permission) )
           this.$router.push('/')
 
         } 
diff --git a/web/src/views/MainView.vue b/web/src/views/MainView.vue
index 6660e1d..d148652 100644
--- a/web/src/views/MainView.vue
+++ b/web/src/views/MainView.vue
@@ -149,15 +149,15 @@ export default {
       })
     },
     initRoute() {
-      console.log(localStorage.getItem('user'), "localStorage.getItem('user')")
+      console.log(localStorage.getItem('permission'), "localStorage.getItem('permission')")
       // 执行过滤
-      const filteredRoutes = this.filterRoutes(
-        this.menuList,
-        JSON.parse(localStorage.getItem('user'))
-      )
+      // const filteredRoutes = this.filterRoutes(
+      //   this.menuList,
+      //   JSON.parse(localStorage.getItem('permission'))
+      // )
       console.log( this.$route.matched, 'filteredRoutes')
       this.subMenu = this.$route.matched[1].children || []
-      // this.menuList= JSON.parse(localStorage.getItem('user'))
+      // this.menuList= JSON.parse(localStorage.getItem('permission'))
       // this.subMenu =filteredRoutes[0].children||[]
 
       this.currentKey = '/' + this.$route.fullPath.split('/')[1]
diff --git a/web/src/views/system/station.vue b/web/src/views/system/station.vue
index a3241da..127a798 100644
--- a/web/src/views/system/station.vue
+++ b/web/src/views/system/station.vue
@@ -20,7 +20,7 @@
         <template #status="record">
           <span>{{ ['未启用', '启用'][record.status] }}</span>
         </template>
-        <template #work_mode_id="record">
+        <template #work_mode="record">
           <span>{{workModeList.find(item=>record.value==item.value)?.label|| '' }}</span>
         </template>
         <template #policy_id="record">