From 9e13a7301cbd00d42c40950feb1fa1cf7adad11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 13 Sep 2023 17:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF+J?=
 =?UTF-8?q?ob+Store=E3=80=91=E6=96=B0=E6=9D=83=E9=99=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/currenButton/innerButton.vue   |    3 +-
 .../src/components/tableTree/index.vue        |    6 +-
 .../src/components/umyTable/index.vue         |    2 +-
 .../src/layout/components/Sidebar/Logo.vue    |   12 +-
 PC/InterFace.Dash/src/permission.js           |    2 +-
 PC/InterFace.Dash/src/router/index.js         |    2 +-
 PC/InterFace.Dash/src/store/modules/app.js    |   14 +-
 PC/InterFace.Dash/src/utils/auth.js           |    7 +-
 PC/InterFace.Dash/src/utils/request.js        |    3 +-
 .../views/menuList/AbpIdentityMarkRoles.vue   |    2 +-
 .../views/menuList/AbpIdentityMarkUsers.vue   |    5 +-
 .../components/currenButton/innerButton.vue   |    3 +-
 .../src/components/tableTree/index.vue        |    6 +-
 .../src/components/umyTable/index.vue         |    2 +-
 .../src/layout/components/Sidebar/Logo.vue    |    3 +-
 PC/UI.WinIn.FasterZ.Job/src/permission.js     |    2 +-
 PC/UI.WinIn.FasterZ.Job/src/settings.js       |    2 +-
 .../src/store/modules/app.js                  |   14 +-
 PC/UI.WinIn.FasterZ.Job/src/utils/auth.js     |    7 +-
 PC/UI.WinIn.FasterZ.Job/src/utils/request.js  |    3 +-
 .../views/menuList/AbpIdentityMarkRoles.vue   |    2 +-
 .../views/menuList/AbpIdentityMarkUsers.vue   |    5 +-
 .../components/currenButton/innerButton.vue   |    3 +-
 .../src/components/tableTree/index.vue        |    6 +-
 .../src/components/umyTable/index.vue         |    2 +-
 .../src/layout/components/Sidebar/Logo.vue    |   12 +-
 PC/UI.WinIn.FasterZ.Store/src/permission.js   |    2 +-
 PC/UI.WinIn.FasterZ.Store/src/router/index.js |    2 +-
 PC/UI.WinIn.FasterZ.Store/src/settings.js     |    2 +-
 .../src/store/modules/app.js                  |   14 +-
 PC/UI.WinIn.FasterZ.Store/src/utils/auth.js   |    7 +-
 .../src/utils/request.js                      |    3 +-
 .../views/menuList/AbpIdentityMarkRoles.vue   | 1021 ++++++++---------
 .../views/menuList/AbpIdentityMarkUsers.vue   |    5 +-
 34 files changed, 592 insertions(+), 594 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/currenButton/innerButton.vue b/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
index 198fd11..fe0e745 100644
--- a/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
+++ b/PC/InterFace.Dash/src/components/currenButton/innerButton.vue
@@ -16,9 +16,8 @@
         }"
         :class="item.class"
         @click="tableButtonClick(item.name,item)"
-        v-permission="item.permission"
+        v-permission="item.permission || []"
     >{{ item.label }}</el-button>
-    <!-- v-permission="item.permission" -->
   </div>
 </template>
 <script>
diff --git a/PC/InterFace.Dash/src/components/tableTree/index.vue b/PC/InterFace.Dash/src/components/tableTree/index.vue
index bbcfc4f..4b723da 100644
--- a/PC/InterFace.Dash/src/components/tableTree/index.vue
+++ b/PC/InterFace.Dash/src/components/tableTree/index.vue
@@ -11,7 +11,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
       <div class="query-box">
@@ -31,7 +31,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
     </div>
@@ -75,7 +75,7 @@
             :style="item.style"
             v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
             :icon="item.icon"
-            v-permission="item.permission"
+            v-permission="item.permission || []"
           >{{item.label}}</el-button>
         </template>
       </el-table-column>
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index ab57c35..397654c 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -167,7 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
-          v-permission="itemButton.permission"
+          v-permission="itemButton.permission || []"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
diff --git a/PC/InterFace.Dash/src/layout/components/Sidebar/Logo.vue b/PC/InterFace.Dash/src/layout/components/Sidebar/Logo.vue
index b45e7f5..d039e75 100644
--- a/PC/InterFace.Dash/src/layout/components/Sidebar/Logo.vue
+++ b/PC/InterFace.Dash/src/layout/components/Sidebar/Logo.vue
@@ -15,6 +15,7 @@
 
 <script>
 import logo from "@/assets/img/menuLogo.png"
+import getPageTitle from '@/utils/get-page-title'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,8 +26,9 @@ export default {
   },
   data() {
     return {
-      title: '',
-      logo: logo
+      title: getPageTitle(),
+      // logo: logo
+      logo: null
     }
   }
 }
@@ -56,8 +58,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 140px;
-      // height: 15px;
+      width: 61px;
+      height: 15px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -77,7 +79,7 @@ export default {
   &.collapse {
     .sidebar-logo {
       width: 42px;
-      // height: 10px;
+      height: 10px;
       margin-right: 0px;
     }
   }
diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js
index 188ca74..77fb358 100644
--- a/PC/InterFace.Dash/src/permission.js
+++ b/PC/InterFace.Dash/src/permission.js
@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken,removeToken } from '@/utils/auth' // get token from cookie
+import { getToken } from '@/utils/auth'
 import getPageTitle from '@/utils/get-page-title'
 import { mgr } from "@/oidc/oidc-client";
 
diff --git a/PC/InterFace.Dash/src/router/index.js b/PC/InterFace.Dash/src/router/index.js
index d566d78..a1459f1 100644
--- a/PC/InterFace.Dash/src/router/index.js
+++ b/PC/InterFace.Dash/src/router/index.js
@@ -153,7 +153,7 @@ export let asyncRoutes = [
 ]
 
 const createRouter = () => new Router({
-  mode: 'history', // 单点登录需要使用history,require service support
+  mode: 'hash', // 单点登录需要使用history,但是history会使线上nginx刷新404（需要确认及处理）
   scrollBehavior: () => ({
     y: 0
   }),
diff --git a/PC/InterFace.Dash/src/store/modules/app.js b/PC/InterFace.Dash/src/store/modules/app.js
index 18ea082..75762cc 100644
--- a/PC/InterFace.Dash/src/store/modules/app.js
+++ b/PC/InterFace.Dash/src/store/modules/app.js
@@ -1,12 +1,10 @@
-import Cookies from 'js-cookie'
-
 const state = {
   sidebar: {
-    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+    opened: localStorage.getItem('sidebarStatus') ? !!+localStorage.getItem('sidebarStatus') : true,
     withoutAnimation: false
   },
   device: 'desktop',
-  size: Cookies.get('size') || 'medium',
+  size: localStorage.getItem('size') || 'medium',
   loading: false
 }
 
@@ -15,13 +13,13 @@ const mutations = {
     state.sidebar.opened = !state.sidebar.opened
     state.sidebar.withoutAnimation = false
     if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
+      localStorage.setItem('sidebarStatus', 1)
     } else {
-      Cookies.set('sidebarStatus', 0)
+      localStorage.setItem('sidebarStatus', 0)
     }
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 0)
+    localStorage.setItem('sidebarStatus', 0)
     state.sidebar.opened = false
     state.sidebar.withoutAnimation = withoutAnimation
   },
@@ -30,7 +28,7 @@ const mutations = {
   },
   SET_SIZE: (state, size) => {
     state.size = size
-    Cookies.set('size', size)
+    localStorage.setItem('size', size)
   },
   APP_MAIN_LOADING: (state, loading) => {
     state.loading = loading
diff --git a/PC/InterFace.Dash/src/utils/auth.js b/PC/InterFace.Dash/src/utils/auth.js
index 94ccbff..86a3830 100644
--- a/PC/InterFace.Dash/src/utils/auth.js
+++ b/PC/InterFace.Dash/src/utils/auth.js
@@ -1,18 +1,17 @@
-import Cookies from 'js-cookie'
 import store from '@/store'
 
 const TokenKey = 'Admin-Token'
 
 export function getToken() {
-  return Cookies.get(TokenKey)
+  return localStorage.getItem(TokenKey)
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+  return localStorage.setItem(TokenKey,token)
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+  return localStorage.removeItem(TokenKey)
 }
 
 // fast-new
diff --git a/PC/InterFace.Dash/src/utils/request.js b/PC/InterFace.Dash/src/utils/request.js
index 1e1a39e..b1773c5 100644
--- a/PC/InterFace.Dash/src/utils/request.js
+++ b/PC/InterFace.Dash/src/utils/request.js
@@ -3,7 +3,6 @@ import {
   MessageBox,
   Message
 } from 'element-ui'
-import store from '@/store'
 import {
   getToken
 } from '@/utils/auth'
@@ -11,7 +10,7 @@ import {
 // create an axios instance
 const service = axios.create({
   baseURL: '', // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  // withCredentials: true, // send when cross-domain requests
   timeout: 300000 // request timeout
 })
 
diff --git a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
index 1cabd61..26fac16 100644
--- a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkRoles.vue
@@ -539,7 +539,7 @@ export default {
   }
   .permission-tree{
     padding: 20px;
-    height: 690px;
+    height: calc(100vh - 260px);
     overflow-y: auto;
   }
 }
diff --git a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
index 72bd049..9ff7024 100644
--- a/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
+++ b/PC/InterFace.Dash/src/views/menuList/AbpIdentityMarkUsers.vue
@@ -113,7 +113,7 @@
       <el-form
         ref="form"
         :model="form"
-        label-width="70px"
+        label-width="100px"
         :rules="rules"
       >
         <el-form-item label="用户名" prop="userName">
@@ -352,6 +352,9 @@ export default {
         roleNames: [
           { required: true, message: "请选择角色", trigger: "change" },
         ],
+        isActive: [
+          { required: true, message: "请选择是否禁用", trigger: "change" },
+        ],
       },
     };
   },
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
index 6d7d293..0bff8ec 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/currenButton/innerButton.vue
@@ -16,9 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
       >{{ item.label }}</el-button>
-      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/tableTree/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/tableTree/index.vue
index bbcfc4f..4b723da 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/tableTree/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/tableTree/index.vue
@@ -11,7 +11,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
       <div class="query-box">
@@ -31,7 +31,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
     </div>
@@ -75,7 +75,7 @@
             :style="item.style"
             v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
             :icon="item.icon"
-            v-permission="item.permission"
+            v-permission="item.permission || []"
           >{{item.label}}</el-button>
         </template>
       </el-table-column>
diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
index ab57c35..397654c 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/umyTable/index.vue
@@ -167,7 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
-          v-permission="itemButton.permission"
+          v-permission="itemButton.permission || []"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
diff --git a/PC/UI.WinIn.FasterZ.Job/src/layout/components/Sidebar/Logo.vue b/PC/UI.WinIn.FasterZ.Job/src/layout/components/Sidebar/Logo.vue
index b79cbbf..d039e75 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/layout/components/Sidebar/Logo.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/layout/components/Sidebar/Logo.vue
@@ -15,6 +15,7 @@
 
 <script>
 import logo from "@/assets/img/menuLogo.png"
+import getPageTitle from '@/utils/get-page-title'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: 'QAD&WMS',
+      title: getPageTitle(),
       // logo: logo
       logo: null
     }
diff --git a/PC/UI.WinIn.FasterZ.Job/src/permission.js b/PC/UI.WinIn.FasterZ.Job/src/permission.js
index 188ca74..77fb358 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/permission.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/permission.js
@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken,removeToken } from '@/utils/auth' // get token from cookie
+import { getToken } from '@/utils/auth'
 import getPageTitle from '@/utils/get-page-title'
 import { mgr } from "@/oidc/oidc-client";
 
diff --git a/PC/UI.WinIn.FasterZ.Job/src/settings.js b/PC/UI.WinIn.FasterZ.Job/src/settings.js
index d86f18e..e484d10 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/settings.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '接口看板-QAD&WMS',
+  title: 'JOB-QAD&WMS',
 
   /**
    * @type {boolean} true | false
diff --git a/PC/UI.WinIn.FasterZ.Job/src/store/modules/app.js b/PC/UI.WinIn.FasterZ.Job/src/store/modules/app.js
index 18ea082..75762cc 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/store/modules/app.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/store/modules/app.js
@@ -1,12 +1,10 @@
-import Cookies from 'js-cookie'
-
 const state = {
   sidebar: {
-    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+    opened: localStorage.getItem('sidebarStatus') ? !!+localStorage.getItem('sidebarStatus') : true,
     withoutAnimation: false
   },
   device: 'desktop',
-  size: Cookies.get('size') || 'medium',
+  size: localStorage.getItem('size') || 'medium',
   loading: false
 }
 
@@ -15,13 +13,13 @@ const mutations = {
     state.sidebar.opened = !state.sidebar.opened
     state.sidebar.withoutAnimation = false
     if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
+      localStorage.setItem('sidebarStatus', 1)
     } else {
-      Cookies.set('sidebarStatus', 0)
+      localStorage.setItem('sidebarStatus', 0)
     }
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 0)
+    localStorage.setItem('sidebarStatus', 0)
     state.sidebar.opened = false
     state.sidebar.withoutAnimation = withoutAnimation
   },
@@ -30,7 +28,7 @@ const mutations = {
   },
   SET_SIZE: (state, size) => {
     state.size = size
-    Cookies.set('size', size)
+    localStorage.setItem('size', size)
   },
   APP_MAIN_LOADING: (state, loading) => {
     state.loading = loading
diff --git a/PC/UI.WinIn.FasterZ.Job/src/utils/auth.js b/PC/UI.WinIn.FasterZ.Job/src/utils/auth.js
index 94ccbff..86a3830 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/utils/auth.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/utils/auth.js
@@ -1,18 +1,17 @@
-import Cookies from 'js-cookie'
 import store from '@/store'
 
 const TokenKey = 'Admin-Token'
 
 export function getToken() {
-  return Cookies.get(TokenKey)
+  return localStorage.getItem(TokenKey)
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+  return localStorage.setItem(TokenKey,token)
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+  return localStorage.removeItem(TokenKey)
 }
 
 // fast-new
diff --git a/PC/UI.WinIn.FasterZ.Job/src/utils/request.js b/PC/UI.WinIn.FasterZ.Job/src/utils/request.js
index 1e1a39e..b1773c5 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/utils/request.js
+++ b/PC/UI.WinIn.FasterZ.Job/src/utils/request.js
@@ -3,7 +3,6 @@ import {
   MessageBox,
   Message
 } from 'element-ui'
-import store from '@/store'
 import {
   getToken
 } from '@/utils/auth'
@@ -11,7 +10,7 @@ import {
 // create an axios instance
 const service = axios.create({
   baseURL: '', // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  // withCredentials: true, // send when cross-domain requests
   timeout: 300000 // request timeout
 })
 
diff --git a/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkRoles.vue b/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkRoles.vue
index deef6b7..40a96d0 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkRoles.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkRoles.vue
@@ -539,7 +539,7 @@
     }
     .permission-tree{
       padding: 20px;
-      height: 690px;
+      height: calc(100vh - 260px);
       overflow-y: auto;
     }
   }
diff --git a/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkUsers.vue b/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkUsers.vue
index d6b2ef2..b922d41 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkUsers.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/views/menuList/AbpIdentityMarkUsers.vue
@@ -113,7 +113,7 @@
         <el-form
           ref="form"
           :model="form"
-          label-width="70px"
+          label-width="100px"
           :rules="rules"
         >
           <el-form-item label="用户名" prop="userName">
@@ -352,6 +352,9 @@
           roleNames: [
             { required: true, message: "请选择角色", trigger: "change" },
           ],
+          isActive: [
+            { required: true, message: "请选择是否禁用", trigger: "change" },
+          ],
         },
       };
     },
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
index 6d7d293..0bff8ec 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/currenButton/innerButton.vue
@@ -16,9 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
       >{{ item.label }}</el-button>
-      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/tableTree/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/tableTree/index.vue
index bbcfc4f..4b723da 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/tableTree/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/tableTree/index.vue
@@ -11,7 +11,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
       <div class="query-box">
@@ -31,7 +31,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
     </div>
@@ -75,7 +75,7 @@
             :style="item.style"
             v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
             :icon="item.icon"
-            v-permission="item.permission"
+            v-permission="item.permission || []"
           >{{item.label}}</el-button>
         </template>
       </el-table-column>
diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
index ab57c35..397654c 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/umyTable/index.vue
@@ -167,7 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
-          v-permission="itemButton.permission"
+          v-permission="itemButton.permission || []"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
diff --git a/PC/UI.WinIn.FasterZ.Store/src/layout/components/Sidebar/Logo.vue b/PC/UI.WinIn.FasterZ.Store/src/layout/components/Sidebar/Logo.vue
index b45e7f5..d039e75 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/layout/components/Sidebar/Logo.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/layout/components/Sidebar/Logo.vue
@@ -15,6 +15,7 @@
 
 <script>
 import logo from "@/assets/img/menuLogo.png"
+import getPageTitle from '@/utils/get-page-title'
 export default {
   name: 'SidebarLogo',
   props: {
@@ -25,8 +26,9 @@ export default {
   },
   data() {
     return {
-      title: '',
-      logo: logo
+      title: getPageTitle(),
+      // logo: logo
+      logo: null
     }
   }
 }
@@ -56,8 +58,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 140px;
-      // height: 15px;
+      width: 61px;
+      height: 15px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -77,7 +79,7 @@ export default {
   &.collapse {
     .sidebar-logo {
       width: 42px;
-      // height: 10px;
+      height: 10px;
       margin-right: 0px;
     }
   }
diff --git a/PC/UI.WinIn.FasterZ.Store/src/permission.js b/PC/UI.WinIn.FasterZ.Store/src/permission.js
index 188ca74..77fb358 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/permission.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/permission.js
@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken,removeToken } from '@/utils/auth' // get token from cookie
+import { getToken } from '@/utils/auth'
 import getPageTitle from '@/utils/get-page-title'
 import { mgr } from "@/oidc/oidc-client";
 
diff --git a/PC/UI.WinIn.FasterZ.Store/src/router/index.js b/PC/UI.WinIn.FasterZ.Store/src/router/index.js
index d566d78..a1459f1 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/router/index.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/router/index.js
@@ -153,7 +153,7 @@ export let asyncRoutes = [
 ]
 
 const createRouter = () => new Router({
-  mode: 'history', // 单点登录需要使用history,require service support
+  mode: 'hash', // 单点登录需要使用history,但是history会使线上nginx刷新404（需要确认及处理）
   scrollBehavior: () => ({
     y: 0
   }),
diff --git a/PC/UI.WinIn.FasterZ.Store/src/settings.js b/PC/UI.WinIn.FasterZ.Store/src/settings.js
index d86f18e..94de510 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/settings.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '接口看板-QAD&WMS',
+  title: 'STORE-QAD&WMS',
 
   /**
    * @type {boolean} true | false
diff --git a/PC/UI.WinIn.FasterZ.Store/src/store/modules/app.js b/PC/UI.WinIn.FasterZ.Store/src/store/modules/app.js
index 18ea082..75762cc 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/store/modules/app.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/store/modules/app.js
@@ -1,12 +1,10 @@
-import Cookies from 'js-cookie'
-
 const state = {
   sidebar: {
-    opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+    opened: localStorage.getItem('sidebarStatus') ? !!+localStorage.getItem('sidebarStatus') : true,
     withoutAnimation: false
   },
   device: 'desktop',
-  size: Cookies.get('size') || 'medium',
+  size: localStorage.getItem('size') || 'medium',
   loading: false
 }
 
@@ -15,13 +13,13 @@ const mutations = {
     state.sidebar.opened = !state.sidebar.opened
     state.sidebar.withoutAnimation = false
     if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
+      localStorage.setItem('sidebarStatus', 1)
     } else {
-      Cookies.set('sidebarStatus', 0)
+      localStorage.setItem('sidebarStatus', 0)
     }
   },
   CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 0)
+    localStorage.setItem('sidebarStatus', 0)
     state.sidebar.opened = false
     state.sidebar.withoutAnimation = withoutAnimation
   },
@@ -30,7 +28,7 @@ const mutations = {
   },
   SET_SIZE: (state, size) => {
     state.size = size
-    Cookies.set('size', size)
+    localStorage.setItem('size', size)
   },
   APP_MAIN_LOADING: (state, loading) => {
     state.loading = loading
diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/auth.js b/PC/UI.WinIn.FasterZ.Store/src/utils/auth.js
index 94ccbff..86a3830 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/utils/auth.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/utils/auth.js
@@ -1,18 +1,17 @@
-import Cookies from 'js-cookie'
 import store from '@/store'
 
 const TokenKey = 'Admin-Token'
 
 export function getToken() {
-  return Cookies.get(TokenKey)
+  return localStorage.getItem(TokenKey)
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token)
+  return localStorage.setItem(TokenKey,token)
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+  return localStorage.removeItem(TokenKey)
 }
 
 // fast-new
diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/request.js b/PC/UI.WinIn.FasterZ.Store/src/utils/request.js
index 1e1a39e..b1773c5 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/utils/request.js
+++ b/PC/UI.WinIn.FasterZ.Store/src/utils/request.js
@@ -3,7 +3,6 @@ import {
   MessageBox,
   Message
 } from 'element-ui'
-import store from '@/store'
 import {
   getToken
 } from '@/utils/auth'
@@ -11,7 +10,7 @@ import {
 // create an axios instance
 const service = axios.create({
   baseURL: '', // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  // withCredentials: true, // send when cross-domain requests
   timeout: 300000 // request timeout
 })
 
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkRoles.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkRoles.vue
index deef6b7..26fac16 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkRoles.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkRoles.vue
@@ -1,548 +1,547 @@
 <template>
-    <div class="appMainPage">
-      <el-row :gutter="24">
-        <el-col :md="16" style="margin-bottom: 10px">
-          <div class="main">
-            <div class="table-active">
-              <div class="bttton-box">
+  <div class="appMainPage">
+    <el-row :gutter="24">
+      <el-col :md="16" style="margin-bottom: 10px">
+        <div class="main">
+          <div class="table-active">
+            <div class="bttton-box">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleCreate"
+                size="mini"
+                v-permission="['AbpIdentity.Roles.Create']"
+                >创建角色</el-button
+              >
+              <el-button
+                type="success"
+                icon="el-icon-refresh"
+                @click.native.prevent="Createview"
+                size="mini"
+                >刷新</el-button
+              >
+            </div>
+            <div class="query-box">
+              <!-- 搜索 -->
+              <searchNormal 
+                ref="normalSearch_roleManage"
+                @searchNormalClick="filtrate"
+                @searchNormalClear="filtrate"
+              ></searchNormal>
+            </div>
+          </div>
+          <el-table
+            v-loading="tableLoading"
+            :border="true"
+            ref="multipleTable"
+            :data="tableData"
+            height="calc(100vh - 265px)"
+            style="width: 100%"
+            @sort-change="sortChange"
+            @row-click="handleRowClick"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              prop="name"
+              label="角色名"
+              sortable="custom"
+              :align="'left'"
+            />
+            <el-table-column label="操作" :align="'center'" width="150">
+              <template slot-scope="scope">
                 <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  @click="handleCreate"
-                  size="mini"
-                  v-permission="['AbpIdentity.Roles.Create']"
-                  >创建角色</el-button
+                  type="text"
+                  @click="Update(scope.row)"
+                  v-permission="['AbpIdentity.Roles.Update']"
+                  v-if="scope.row.name == 'admin' ? false : true"
+                  >编辑</el-button
                 >
                 <el-button
-                  type="success"
-                  icon="el-icon-refresh"
-                  @click.native.prevent="Createview"
-                  size="mini"
-                  >刷新</el-button
+                  type="text"
+                  @click="Delete(scope.row)"
+                  v-permission="['AbpIdentity.Roles.Delete']"
+                  v-if="scope.row.name == 'admin' ? false : true"
+                  style="color:red"
+                  >删除</el-button
                 >
-              </div>
-              <div class="query-box">
-                <!-- 搜索 -->
-                <searchNormal 
-                  ref="normalSearch_roleManage"
-                  @searchNormalClick="filtrate"
-                  @searchNormalClear="filtrate"
-                ></searchNormal>
-              </div>
-            </div>
-            <el-table
-              v-loading="tableLoading"
-              :border="true"
-              ref="multipleTable"
-              :data="tableData"
-              height="calc(100vh - 265px)"
-              style="width: 100%"
-              @sort-change="sortChange"
-              @row-click="handleRowClick"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column
-                prop="name"
-                label="角色名"
-                sortable="custom"
-                :align="'left'"
-              />
-              <el-table-column label="操作" :align="'center'" width="150">
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    @click="Update(scope.row)"
-                    v-permission="['AbpIdentity.Roles.Update']"
-                    v-if="scope.row.name == 'admin' ? false : true"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    type="text"
-                    @click="Delete(scope.row)"
-                    v-permission="['AbpIdentity.Roles.Delete']"
-                    v-if="scope.row.name == 'admin' ? false : true"
-                    style="color:red"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div class="Footer">
-            <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryInfo.currentPage"
-              :page-sizes="[10, 15, 20]"
-              :page-size="queryInfo.pagesize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total"
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="Footer">
+          <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="queryInfo.currentPage"
+            :page-sizes="[10, 15, 20]"
+            :page-size="queryInfo.pagesize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+          <el-button
+            type="primary"
+            size="mini"
+            style="margin-left: 10px; background-color: #409eff"
+            >确定</el-button
+          >
+        </div>
+      </el-col>
+      <el-col  
+        v-loading="treeLoading"
+        :md="8" 
+        v-permission="['AbpIdentity.Roles.Update']"
+      >
+        <el-card class="box-card" shadow="never">
+          <div slot="header" class="clearfix" style="height: 20px">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="选择指定角色的模块权限"
+              placement="top"
             >
-            </el-pagination>
+              <span class="role-span">【{{name}}角色】模块权限</span>
+            </el-tooltip>
             <el-button
-              type="primary"
+              :loading="treeLoading"
+              :disabled="multipleSelection.length != 1"
+              icon="el-icon-check"
               size="mini"
-              style="margin-left: 10px; background-color: #409eff"
-              >确定</el-button
-            >
+              style="float: right; padding: 6px 9px"
+              type="primary"
+              @click="savePer"
+              v-permission="['AbpIdentity.Roles.ManagePermissions']"
+              v-if="name != 'admin'"
+            >保存</el-button>
           </div>
-        </el-col>
-        <el-col  
-          v-loading="treeLoading"
-          :md="8" 
-          v-permission="['AbpIdentity.Roles.Update']"
-        >
-          <el-card class="box-card" shadow="never">
-            <div slot="header" class="clearfix" style="height: 20px">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="选择指定角色的模块权限"
-                placement="top"
-              >
-                <span class="role-span">【{{name}}角色】模块权限</span>
-              </el-tooltip>
-              <el-button
-                :loading="treeLoading"
-                :disabled="multipleSelection.length != 1"
-                icon="el-icon-check"
-                size="mini"
-                style="float: right; padding: 6px 9px"
-                type="primary"
-                @click="savePer"
-                v-permission="['AbpIdentity.Roles.ManagePermissions']"
-                v-if="name != 'admin'"
-              >保存</el-button>
-            </div>
-            <el-tree
-              ref="tree"
-              :check-strictly="false"
-              :data="permissionsData"
-              :props="defaultProps"
-              show-checkbox
-              node-key="name"
-              class="permission-tree"
-            />
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-dialog
-        :title="formTitle"
-        :visible.sync="dialogVisible"
-        width="800px"
-        :close-on-click-modal="false"
+          <el-tree
+            ref="tree"
+            :check-strictly="false"
+            :data="permissionsData"
+            :props="defaultProps"
+            show-checkbox
+            node-key="name"
+            class="permission-tree"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        label-width="70px"
+        :rules="rules"
       >
-        <el-form
-          ref="form"
-          :model="form"
-          label-width="70px"
-          :rules="rules"
-        >
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="form.name" style="width: 380px" maxlength="23" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="resetform">取 消</el-button>
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  <script>
-  import {
-    getPageListRoles,
-    getPermissionsRoles,
-    savePermissionsRoles,
-    updatePermissionsGranted,
-    postCreateRoles,
-    postUpdateRoles,
-    postDeleteRoles,
-  } from "@/api/wms-auth";
-  import permission from "@/utils/permission/index";
-  import searchNormal from "@/components/searchNormal/index.vue"
-  export default {
-    directives: { permission },
-    components:{
-      searchNormal
-    },
-    name:"AbpIdentityMarkRoles",
-    data() {
-      // 自定义验证
-      return {
-        URL: 'identity/roles',
-        // 角色名称
-        name: '',
-        //编辑弹出
-        dialogVisible: false,
-        //创建与编辑判断
-        isEdit: false,
-        //弹出title
-        formTitle: "",
-        //总条数
-        total: 0,
-        //分页器
-        queryInfo: {
-          //当前页数
-          currentPage: 1,
-          //每页条数
-          pagesize: 20,
-          Sorting: "",
-        },
-        //当前用户ID
-        usersId: "",
-        //编辑参数
-        concurrencyStamp: "",
-        //新增参数
-        form: {
-          name: "",
-          isDefault: true,
-          isPublic: true,
-        },
-        // 左侧table加载
-        tableLoading:false,
-        //权限模板树形控件加载
-        treeLoading: false,
-        //权限模板树形控件默认勾选的数组
-        checkedPermission: [],
-        //权限模板树形结构渲染数据
-        permissionsData: [],
-        defaultProps: {
-          children: "children",
-          label: "displayName",
-        },
-        //渲染权限模板参数
-        params: {
-          providerName: "R",
-          providerKey: "",
-        },
-        //选择行数据
-        multipleSelection: [],
-        //table渲染
-        tableData: [],
-        rules: {
-          name: [
-            { required: true, trigger: "blur", message: "请输入姓名" },
-            {
-              min: 1,
-              max: 23,
-              message: "长度在 1 到 23 个字符",
-              trigger: "blur",
-            },
-          ],
-        },
-      };
-    },
-    mounted() {
-      this.pageList();
-    },
-    methods: {
-      //请求数据渲染table
-      pageList(val) {
-        const data = {
-          Filter: val || '',
-          Sorting: this.queryInfo.Sorting,
-          SkipCount: (this.queryInfo.currentPage - 1) * this.queryInfo.pagesize,
-          MaxResultCount: this.queryInfo.pagesize,
-        };
-        this.tableLoading = true
-        getPageListRoles(data).then((res) => {
-          this.total = res.totalCount;
-          this.tableData = res.items;
-          this.tableLoading = false
-        }).catch(err=>{
-          console.log(err)
-          this.tableLoading = false
-        })
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" style="width: 380px" maxlength="23" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetform">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getPageListRoles,
+  getPermissionsRoles,
+  savePermissionsRoles,
+  updatePermissionsGranted,
+  postCreateRoles,
+  postUpdateRoles,
+  postDeleteRoles,
+} from "@/api/wms-auth";
+import permission from "@/utils/permission/index";
+import searchNormal from "@/components/searchNormal/index.vue"
+export default {
+  directives: { permission },
+  components:{
+    searchNormal
+  },
+  name:"AbpIdentityMarkRoles",
+  data() {
+    // 自定义验证
+    return {
+      URL: 'identity/roles',
+      // 角色名称
+      name: '',
+      //编辑弹出
+      dialogVisible: false,
+      //创建与编辑判断
+      isEdit: false,
+      //弹出title
+      formTitle: "",
+      //总条数
+      total: 0,
+      //分页器
+      queryInfo: {
+        //当前页数
+        currentPage: 1,
+        //每页条数
+        pagesize: 20,
+        Sorting: "",
       },
-      //排序
-      sortChange(data) {
-        const { prop, order } = data;
-        if (!prop || !order) {
-          this.queryInfo.Sorting = "";
-          this.handleFilter();
-          return;
-        }
-        this.queryInfo.Sorting = prop + " " + order;
-        this.handleFilter();
+      //当前用户ID
+      usersId: "",
+      //编辑参数
+      concurrencyStamp: "",
+      //新增参数
+      form: {
+        name: "",
+        isDefault: true,
+        isPublic: true,
       },
-      //排序触发页面更新
-      handleFilter() {
-        this.queryInfo.currentPage = 1;
-        this.pageList();
+      // 左侧table加载
+      tableLoading:false,
+      //权限模板树形控件加载
+      treeLoading: false,
+      //权限模板树形控件默认勾选的数组
+      checkedPermission: [],
+      //权限模板树形结构渲染数据
+      permissionsData: [],
+      defaultProps: {
+        children: "children",
+        label: "displayName",
       },
-      //筛选
-      filtrate(val) {
-        this.queryInfo.currentPage = 1;
-        this.pageList(val);
+      //渲染权限模板参数
+      params: {
+        providerName: "R",
+        providerKey: "",
       },
-      //选择每页条数分页
-      handleSizeChange(val) {
-        this.queryInfo.pagesize = val;
-        this.pageList();
+      //选择行数据
+      multipleSelection: [],
+      //table渲染
+      tableData: [],
+      rules: {
+        name: [
+          { required: true, trigger: "blur", message: "请输入姓名" },
+          {
+            min: 1,
+            max: 23,
+            message: "长度在 1 到 23 个字符",
+            trigger: "blur",
+          },
+        ],
       },
-      //选择当前页分页
-      handleCurrentChange(val) {
-        this.queryInfo.currentPage = val;
-        this.pageList();
-      },
-      //重置创建与编辑后的参数
-      resetform() {
-        this.$refs.form.resetFields();
-        this.dialogVisible = false;
-        this.form.name = "";
-        this.$refs.multipleTable.clearSelection();
-      },
-      //创建角色
-      handleCreate() {
-        this.formTitle = "创建角色";
-        this.dialogVisible = true;
-        this.isEdit = false;
-      },
-      //刷新
-      Createview() {
-        this.queryInfo.currentPage = 1;
+    };
+  },
+  mounted() {
+    this.pageList();
+  },
+  methods: {
+    //请求数据渲染table
+    pageList(val) {
+      const data = {
+        Filter: val || '',
+        Sorting: this.queryInfo.Sorting,
+        SkipCount: (this.queryInfo.currentPage - 1) * this.queryInfo.pagesize,
+        MaxResultCount: this.queryInfo.pagesize,
+      };
+      this.tableLoading = true
+      getPageListRoles(data).then((res) => {
+        this.total = res.totalCount;
+        this.tableData = res.items;
+        this.tableLoading = false
+      }).catch(err=>{
+        console.log(err)
+        this.tableLoading = false
+      })
+    },
+    //排序
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
         this.queryInfo.Sorting = "";
-        this.$refs.normalSearch_roleManage.searchNormalClear()//清空搜索
-        this.$refs.multipleTable.clearSort();
-      },
-      //编辑默认参数
-      Update(row) {
-        if (row) {
-          this.formTitle = "编辑角色";
-          this.dialogVisible = true;
-          this.isEdit = true;
-          this.usersId = row.id;
-          this.form.name = row.name;
-          this.concurrencyStamp = row.concurrencyStamp;
-        }
-      },
-      //删除
-      Delete(row) {
-        this.$confirm("此操作将永久删除该角色, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.handleFilter();
+        return;
+      }
+      this.queryInfo.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    //排序触发页面更新
+    handleFilter() {
+      this.queryInfo.currentPage = 1;
+      this.pageList();
+    },
+    //筛选
+    filtrate(val) {
+      this.queryInfo.currentPage = 1;
+      this.pageList(val);
+    },
+    //选择每页条数分页
+    handleSizeChange(val) {
+      this.queryInfo.pagesize = val;
+      this.pageList();
+    },
+    //选择当前页分页
+    handleCurrentChange(val) {
+      this.queryInfo.currentPage = val;
+      this.pageList();
+    },
+    //重置创建与编辑后的参数
+    resetform() {
+      this.$refs.form.resetFields();
+      this.dialogVisible = false;
+      this.form.name = "";
+      this.$refs.multipleTable.clearSelection();
+    },
+    //创建角色
+    handleCreate() {
+      this.formTitle = "创建角色";
+      this.dialogVisible = true;
+      this.isEdit = false;
+    },
+    //刷新
+    Createview() {
+      this.queryInfo.currentPage = 1;
+      this.queryInfo.Sorting = "";
+      this.$refs.normalSearch_roleManage.searchNormalClear()//清空搜索
+      this.$refs.multipleTable.clearSort();
+    },
+    //编辑默认参数
+    Update(row) {
+      if (row) {
+        this.formTitle = "编辑角色";
+        this.dialogVisible = true;
+        this.isEdit = true;
+        this.usersId = row.id;
+        this.form.name = row.name;
+        this.concurrencyStamp = row.concurrencyStamp;
+      }
+    },
+    //删除
+    Delete(row) {
+      this.$confirm("此操作将永久删除该角色, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.tableData.length == 1) {
+            this.queryInfo.currentPage = this.queryInfo.currentPage - 1;
+          }
+          postDeleteRoles(row.id).then((res) => {
+            this.$successMsg("删除成功！");
+            this.pageList();
+            this.permissionsData = []
+          });
         })
-          .then(() => {
-            if (this.tableData.length == 1) {
-              this.queryInfo.currentPage = this.queryInfo.currentPage - 1;
-            }
-            postDeleteRoles(row.id).then((res) => {
-              this.$successMsg("删除成功！");
+        .catch(() => {});
+    },
+    //创建与编辑
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        //创建报表组
+        if (valid && !this.isEdit) {
+          postCreateRoles(this.form)
+            .then((res) => {
+              this.resetform();
+              this.$successMsg("创建成功！");
+              this.queryInfo.currentPage = 1;
               this.pageList();
-              this.permissionsData = []
+            })
+            .catch((err) => {
+              this.resetform();
             });
-          })
-          .catch(() => {});
-      },
-      //创建与编辑
-      submitForm() {
-        this.$refs.form.validate((valid) => {
-          //创建报表组
-          if (valid && !this.isEdit) {
-            postCreateRoles(this.form)
-              .then((res) => {
-                this.resetform();
-                this.$successMsg("创建成功！");
-                this.queryInfo.currentPage = 1;
-                this.pageList();
-              })
-              .catch((err) => {
-                this.resetform();
-              });
-          } else if (valid && this.isEdit) {
-            //编辑报表
-            const data = JSON.parse(JSON.stringify(this.form));
-            data.concurrencyStamp = this.concurrencyStamp;
-            postUpdateRoles(data, this.usersId)
-              .then((res) => {
-                this.$successMsg("编辑成功！");
-                this.pageList();
-                this.resetform();
-              })
-              .catch((err) => {
-                this.resetform();
-              });
-          } else {
-            this.$errorMsg("请按照提示继续输入！");
-            return false;
-          }
-        });
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
-      //模板权限保存
-      savePer(){
-        let _allList = []
-        let checkedKeys = this.$refs.tree.getCheckedKeys();
-        this.permissionsData.forEach(item=>{
-          // 菜单层级
-          item.children.forEach(item_menu=>{
-            let _Granted1 = checkedKeys.indexOf(item_menu.name) >= 0 ? true : false
-            _allList.push({isGranted:_Granted1,name:item_menu.name})
-            // 增删改层级
-            if(item_menu.children){
-              item_menu.children.forEach(item_handle=>{
-                let _Granted2 = checkedKeys.indexOf(item_handle.name) >= 0 ? true : false
-                _allList.push({isGranted:_Granted2,name:item_handle.name})
-                // 如果增删改有已选，更改父级为true
-                if(_Granted2){
-                  _allList.forEach((allItem)=>{
-                    if(allItem.name == item_handle.parentName){
-                      allItem.isGranted = true
-                    }
-                  })
-                }
-              })
-            }
-          })
-        })
-        this.treeLoading = true;
-        savePermissionsRoles(
-          `/permission-management/permissions?providerName=${this.params.providerName}&providerKey=${this.multipleSelection[0].name}`,
-          {permissions:_allList}
-        ).then((response) => {
-          updatePermissionsGranted(this.params.providerName,this.multipleSelection[0].name).then(()=>{
-            this.$notify({
-              title: "成功",
-              message: "更新成功",
-              type: "success",
-              duration: 2000,
+        } else if (valid && this.isEdit) {
+          //编辑报表
+          const data = JSON.parse(JSON.stringify(this.form));
+          data.concurrencyStamp = this.concurrencyStamp;
+          postUpdateRoles(data, this.usersId)
+            .then((res) => {
+              this.$successMsg("编辑成功！");
+              this.pageList();
+              this.resetform();
+            })
+            .catch((err) => {
+              this.resetform();
             });
-            this.treeLoading = false;
-            // 如果更改的是当前用户，则页面刷新
-            if(this.multipleSelection[0].name == this.$store.getters.currentUserInfo.name){
-              location.reload()
-            }
-          }).catch(()=>{
-            this.treeLoading = false;
-          })
-        }).catch(err=>{
-          this.treeLoading = false;
-        });
-      },
-  
-      //点击table行渲染权限模板
-      handleRowClick(row, column, event) {
-        let that = this
-        this.name = row.name
-        this.treeLoading = true;
-        // if (row.name == "admin") {
-        //   this.$notify({
-        //     title: "提示",
-        //     message: "不可更改超级管理员权限",
-        //     type: "warning",
-        //     duration: 2000,
-        //   });
-        //   this.$refs.multipleTable.clearSelection();
-        //   this.permissionsData = [];
-        //   this.checkedPermission = [];
-        // } else {
-          this.$refs.multipleTable.clearSelection();
-          this.$refs.multipleTable.toggleRowSelection(row);
-        // }
-         
-        this.params.providerKey = row.name;
-        getPermissionsRoles(this.params).then((res) => {
-          this.permissionsData = [];
-          this.checkedPermission = [];
-          // 根据前端菜单，进行重置分组
-          res.groups.forEach((itemRes,indexRes) => {
-            itemRes.children = []
-            this.permissionsData.push(itemRes)
-            // todo:使用递归优化
-            itemRes.permissions.forEach(item => {
-              if(!item.parentName){
-                // 当前权限
-                if(item.isGranted)this.checkedPermission.push(item.name)
-                this.permissionsData[indexRes].children.push(item)
-              }else{
-                // 当前权限
-                if(item.isGranted)this.checkedPermission.push(item.name)
-                this.permissionsData[indexRes].children.forEach((pItem,pindex)=>{
-                  if(pItem.name == item.parentName){
-                    if(!this.permissionsData[indexRes].children[pindex].children)this.permissionsData[indexRes].children[pindex].children = []
-                    this.permissionsData[indexRes].children[pindex].children.push(item)
-                    // 如果children中有一个为flase，当前权限，则删除父级，用于回显
-                    if(item.isGranted == false){
-                      if(this.checkedPermission.indexOf(item.parentName) >= 0){
-                        this.checkedPermission.splice(this.checkedPermission.indexOf(item.parentName),1)
-                      }
-                    }
+        } else {
+          this.$errorMsg("请按照提示继续输入！");
+          return false;
+        }
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //模板权限保存
+    savePer(){
+      let _allList = []
+      let checkedKeys = this.$refs.tree.getCheckedKeys();
+      this.permissionsData.forEach(item=>{
+        // 菜单层级
+        item.children.forEach(item_menu=>{
+          let _Granted1 = checkedKeys.indexOf(item_menu.name) >= 0 ? true : false
+          _allList.push({isGranted:_Granted1,name:item_menu.name})
+          // 增删改层级
+          if(item_menu.children){
+            item_menu.children.forEach(item_handle=>{
+              let _Granted2 = checkedKeys.indexOf(item_handle.name) >= 0 ? true : false
+              _allList.push({isGranted:_Granted2,name:item_handle.name})
+              // 如果增删改有已选，更改父级为true
+              if(_Granted2){
+                _allList.forEach((allItem)=>{
+                  if(allItem.name == item_handle.parentName){
+                    allItem.isGranted = true
                   }
                 })
               }
             })
+          }
+        })
+      })
+      this.treeLoading = true;
+      savePermissionsRoles(
+        `/permission-management/permissions?providerName=${this.params.providerName}&providerKey=${this.multipleSelection[0].name}`,
+        {permissions:_allList}
+      ).then((response) => {
+        updatePermissionsGranted(this.params.providerName,this.multipleSelection[0].name).then(()=>{
+          this.$notify({
+            title: "成功",
+            message: "更新成功",
+            type: "success",
+            duration: 2000,
+          });
+          this.treeLoading = false;
+          // 如果更改的是当前用户，则页面刷新
+          if(this.multipleSelection[0].name == this.$store.getters.currentUserInfo.name){
+            location.reload()
+          }
+        }).catch(()=>{
+          this.treeLoading = false;
+        })
+      }).catch(err=>{
+        this.treeLoading = false;
+      });
+    },
+
+    //点击table行渲染权限模板
+    handleRowClick(row, column, event) {
+      let that = this
+      this.name = row.name
+      this.treeLoading = true;
+      // if (row.name == "admin") {
+      //   this.$notify({
+      //     title: "提示",
+      //     message: "不可更改超级管理员权限",
+      //     type: "warning",
+      //     duration: 2000,
+      //   });
+      //   this.$refs.multipleTable.clearSelection();
+      //   this.permissionsData = [];
+      //   this.checkedPermission = [];
+      // } else {
+        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.toggleRowSelection(row);
+      // }
+       
+      this.params.providerKey = row.name;
+      getPermissionsRoles(this.params).then((res) => {
+        this.permissionsData = [];
+        this.checkedPermission = [];
+        // 根据前端菜单，进行重置分组
+        res.groups.forEach((itemRes,indexRes) => {
+          itemRes.children = []
+          this.permissionsData.push(itemRes)
+          // todo:使用递归优化
+          itemRes.permissions.forEach(item => {
+            if(!item.parentName){
+              // 当前权限
+              if(item.isGranted)this.checkedPermission.push(item.name)
+              this.permissionsData[indexRes].children.push(item)
+            }else{
+              // 当前权限
+              if(item.isGranted)this.checkedPermission.push(item.name)
+              this.permissionsData[indexRes].children.forEach((pItem,pindex)=>{
+                if(pItem.name == item.parentName){
+                  if(!this.permissionsData[indexRes].children[pindex].children)this.permissionsData[indexRes].children[pindex].children = []
+                  this.permissionsData[indexRes].children[pindex].children.push(item)
+                  // 如果children中有一个为flase，当前权限，则删除父级，用于回显
+                  if(item.isGranted == false){
+                    if(this.checkedPermission.indexOf(item.parentName) >= 0){
+                      this.checkedPermission.splice(this.checkedPermission.indexOf(item.parentName),1)
+                    }
+                  }
+                }
+              })
+            }
           })
-          that.$nextTick(() => {
-            that.$refs.tree.setCheckedKeys(this.checkedPermission)
-          })
-          console.log('拥有权限',this.checkedPermission)
-          console.log('菜单树',this.permissionsData)
-          that.treeLoading = false;
         })
-        .catch((err)=>{
-          this.$errorMsg('暂无更改权限')
-          that.treeLoading = false;
+        that.$nextTick(() => {
+          that.$refs.tree.setCheckedKeys(this.checkedPermission)
         })
-      },
+        console.log('拥有权限',this.checkedPermission)
+        console.log('菜单树',this.permissionsData)
+        that.treeLoading = false;
+      })
+      .catch((err)=>{
+        this.$errorMsg('暂无更改权限')
+        that.treeLoading = false;
+      })
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  .appMainPage {
-    padding: 20px;
-    .main {
-  
-      .table-active {
+  },
+};
+</script>
+<style lang="scss" scoped>
+.appMainPage {
+  padding: 20px;
+  .main {
+
+    .table-active {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: center;
+      padding: 5px 0 15px 0;
+
+      .bttton-box {
         display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        align-items: center;
-        padding: 5px 0 15px 0;
-  
-        .bttton-box {
-          display: flex;
-        }
-  
       }
+
     }
-  
-    .el-table__body-wrapper {
-      tbody {
-        span {
-          cursor: pointer;
-  
-          &:hover {
-            color: #409eff;
-          }
+  }
+
+  .el-table__body-wrapper {
+    tbody {
+      span {
+        cursor: pointer;
+
+        &:hover {
+          color: #409eff;
         }
       }
     }
-  
-    .Footer {
-      padding: 25px 0;
-      display: flex;
-      justify-content: flex-end;
-    }
-  
-    ::v-deep .el-dialog {
-      .el-dialog__header {
-        button {
-          display: none;
-        }
+  }
+
+  .Footer {
+    padding: 25px 0;
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  ::v-deep .el-dialog {
+    .el-dialog__header {
+      button {
+        display: none;
       }
-  
-    }
-    .permission-tree{
-      padding: 20px;
-      height: 690px;
-      overflow-y: auto;
     }
+
+  }
+  .permission-tree{
+    padding: 20px;
+    height: calc(100vh - 260px);
+    overflow-y: auto;
   }
-  </style>
-  
-  
\ No newline at end of file
+}
+</style>
+
diff --git a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkUsers.vue b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkUsers.vue
index 72bd049..9ff7024 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkUsers.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/views/menuList/AbpIdentityMarkUsers.vue
@@ -113,7 +113,7 @@
       <el-form
         ref="form"
         :model="form"
-        label-width="70px"
+        label-width="100px"
         :rules="rules"
       >
         <el-form-item label="用户名" prop="userName">
@@ -352,6 +352,9 @@ export default {
         roleNames: [
           { required: true, message: "请选择角色", trigger: "change" },
         ],
+        isActive: [
+          { required: true, message: "请选择是否禁用", trigger: "change" },
+        ],
       },
     };
   },