提交文件

.env

@@ -7,6 +7,6 @@ VUE_APP_USER_KEY=admin.user
 VUE_APP_SETTING_KEY=admin.setting
 VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_API_BASE_URL=https://sxzgkj.baoxianzhanggui.com/web-api
-VUE_APP_BASE_URL=https://sxzgkj.baoxianzhanggui.com
+VUE_APP_API_BASE_URL=https://test.baoxianzhanggui.com/web-api
+VUE_APP_BASE_URL=https://test.baoxianzhanggui.com
 

.env.development

@@ -1,5 +1,5 @@
-VUE_APP_API_BASE_URL='http://192.168.1.103:8080'
-# VUE_APP_API_BASE_URL='"https://sxzgkj.baoxianzhanggui.com/web-api"'  #//正式服务器
+VUE_APP_API_BASE_URL='https://test.baoxianzhanggui.com/web-api'
+# VUE_APP_API_BASE_URL='"https://test.baoxianzhanggui.com/web-api"'  #//测试服务器
 # VUE_APP_API_BASE_URL='"https://sxzgkj.baoxianzhanggui.com/web-api"'  #//正式服务器
 # VUE_APP_API_BASE_URL= '"http://192.168.0.115:8080/"'                 #//凯森
 # VUE_APP_API_BASE_URL= '"http://192.168.0.106:8080/"'                #//屈晨

package.json

@@ -30,7 +30,7 @@
     "viser-vue": "^2.4.8",
     "vue": "~2.6.11",
     "vue-i18n": "^8.18.2",
-    "vue-router": "^3.3.4",
+    "vue-router": "^3.6.5",
     "vue-template-compiler": "^2.6.11",
     "vuedraggable": "^2.23.2",
     "vuex": "^3.4.0"

src/layouts/AdminLayout.vue

@@ -3,7 +3,7 @@
     <drawer v-if="isMobile" v-model="drawerOpen">
       <side-menu
         :theme="theme.mode"
-        :menuData="menuData"
+        :menuData="sideMenuData"
         :collapsed="false"
         :collapsible="false"
         @menuSelect="onMenuSelect"
@@ -131,7 +131,7 @@ export default {
     },
     sideMenuData() {
       const { layout, menuData, subMenu } = this;
-      console.log(menuData, 666, this);
+      console.log(subMenu);
 
       return layout === "mix" ? subMenu : menuData;
     },

src/layouts/header/AdminHeader.vue

@@ -112,7 +112,7 @@ export default {
     breadcrumb() {
       let page = this.page;
       let breadcrumb = page && page.matched;
-      console.log(page);
+
       if (breadcrumb) {
         let i18nBreadcrumb = [];
         breadcrumb.forEach((item) => {

src/pages/personnelManage/channel.vue

@@ -31,18 +31,24 @@
       ></fromRow>
       <a-form layout="inline" :model="formState">
         <a-form-item label="姓名" :labelCol="{ span: 5 }" :colon="false">
-          <a-input placeholder="请输入姓名" v-model="formState.name"></a-input>
+          <a-input
+            placeholder="请输入姓名"
+            v-model="formState.name"
+            allowClear
+          ></a-input>
         </a-form-item>
         <a-form-item label="工号" :labelCol="{ span: 5 }" :colon="false">
           <a-input
             placeholder="请输入工号"
             v-model="formState.userCode"
+            allowClear
           ></a-input>
         </a-form-item>
         <a-form-item label="手机号" :labelCol="{ span: 5 }" :colon="false">
           <a-input
             placeholder="请输入手机号"
             v-model="formState.phoneNumber"
+            allowClear
           ></a-input>
         </a-form-item>
         <a-form-item label="" :labelCol="{ span: 5 }" :colon="false">

src/pages/sys/roleConfig.vue

@@ -182,6 +182,7 @@ export default {
     configRole(item) {
       this.visible = true;
       this.dataForm = { ...item.record };
+      this.dataForm.roleId = item.record.roleId * 1;
     },
     treeChoose(id) {
       this.pagination.current = 1;

src/router/config.js

@@ -224,7 +224,7 @@ const router = new Router({
     },
     {
       path: '/index',
-      name: '首页',
+      name: '首',
       component: () => import('@/pages/index/index')
     },
     {
@@ -256,8 +256,13 @@ router.beforeEach(async (to, from, next) => {
   // 存在时间为会话生命周期，页面关闭即失效。
   // let token = getToken()
   // let userName = sessionStorage.getItem('user')
-  let userName = Cookies.get('user')
+  // let userName = Cookies.get('user')
+  await store.dispatch('setting/getUserLogin')
+
+
+  let userInfo = store.state.setting.userInfo
   // let token = Cookies.get('Authorization')
+
   if (to.matched.some(record => record.meta.requiresAuth)) {
 
     next()
@@ -265,9 +270,10 @@ router.beforeEach(async (to, from, next) => {
 
   }
 
-  if (!userName) {
+  if (!userInfo.id) {
     // 如果访问非登录界面，且户会话信息不存在，代表未登录，则跳转到登录界面
     // next({ path: '/login' })
+    alert("当前用户无权访问")
     window.location.href = process.env.VUE_APP_BASE_URL + "/#/login"
 
   } else {
@@ -279,10 +285,7 @@ router.beforeEach(async (to, from, next) => {
     // for (let key in store.state.setting) {
     //   // console.log(key, store.state.setting[key])
     // }
-    await store.dispatch('setting/getUserLogin')
-
 
-    let userInfo = store.state.setting.userInfo
     await store.dispatch('setting/getMenuList', userInfo.id)
     await store.dispatch('setting/getPermissionsAuth', userInfo.id)
     let menuData = store.state.setting.menuData
@@ -344,7 +347,7 @@ async function addDynamicMenuAndRoutes(menuData, to, next) {
   router.options.routes[0].children = [].concat(dynamicRoutes);
   handleStaticComponent(router, dynamicRoutes)
 
-  // router.addRoute(...dynamicRoutes)
+  router.addRoute(...dynamicRoutes)
 
 
 

src/services/api.js

@@ -5,7 +5,7 @@
 
 
 // const BASE_URL = '"https://test.baoxianzhanggui.com/web-api"'//测试服务器
-const BASE_URL = '"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+const BASE_URL = '"https://test.baoxianzhanggui.com/web-api"'//正式服务器
 // const BASE_URL='"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
 // const BASE_URL= '"http://192.168.0.115:8080/"' //凯森
 // const BASE_URL= '"http://192.168.0.106:8080/"'//屈晨

vue.config.js

@@ -24,7 +24,7 @@ const assetsCDN = {
   ],
   js: [
     '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
+    '//cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js',
     '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
     '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
     '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
@@ -121,9 +121,9 @@ module.exports = {
     }
   },
 
-  // publicPath: 'https://sxzgkj.baoxianzhanggui.com/console-api',
+  publicPath: 'https://test.baoxianzhanggui.com/console-api',
 
-  publicPath: '/',
+  // publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
   productionSourceMap: false