Sfoglia il codice sorgente

'路由拦截修改'

zhangyu 4 anni fa
parent
commit
7857dcc765

+ 0 - 3
src/App.vue

@@ -8,8 +8,5 @@
 
 export default {
     name: 'App',
-    components: {
-        
-    },
 }
 </script>

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -59,7 +59,7 @@
 import { mapGetters } from "vuex";
 export default {
   components: {
-    versionDialog
+    
   },
   props: {
     tableData: Array,

+ 0 - 1
src/main.js

@@ -9,7 +9,6 @@ import CollapseTransition from 'element-ui/lib/transitions/collapse-transition';
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './framework/style/awesome.less'
-Vue.use(uploader)
 Vue.use(ElementUI, { size: "small", zIndex: 1000 })
 
 Vue.component(CollapseTransition.name, CollapseTransition)

+ 1 - 1
src/router/index.js

@@ -5,7 +5,7 @@ import systemRoute from './system'
 Vue.use(Router)
 
 let routes = []
-// routes = routes.concat(demoRoute)
+
 routes = routes.concat(systemRoute)
 
 const router = new Router({

+ 1 - 10
src/store/modules/layout-store.js

@@ -24,7 +24,6 @@ export default {
       uploaderList: [], //当前上传文件列表
       secret: "", //项目密码
       userId: "", //用户id
-      rowEdit: false,//表格数据变化
     },
     getters: {
       sidebarClosed: state => state.sidebarClosed,
@@ -64,7 +63,6 @@ export default {
       }
     },
     mutations: {
-      setRowEdit: (state, val) => (state.rowEdit = val),
       setSidebarClosed: (state, val) => (state.sidebarClosed = val),
       setSidebarSelected: (state, val) => {
         state.sidebarSelected = val
@@ -98,9 +96,6 @@ export default {
 
     },
   actions: {
-    setRowEdit(contentx, value) {
-      contentx.commit('setRowEdit', value)
-    },
     loadUserInfo({state}) {
       console.log(state)
       return new Promise((resolve, reject) => {
@@ -139,11 +134,7 @@ export default {
     },
     setBreadcrumb: {
       root: true,
-      handler({state, commit}, val) {
-        let label = val[0].label;
-        if (label === "消息中心") {
-          commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏
-        }
+      handler({ state }, val) {
         state.breadcrumb = []
         state.breadcrumb = val
         storage.set(KEY_PAGE_BRANDCRUMB, val)

+ 17 - 42
src/utils/authutils.js

@@ -1,7 +1,5 @@
 import store from '@/store'
 import menus from '@/data/menus'
-import session from "@/utils/storage"
-import { MessageBox } from 'element-ui'
 
 function toLogin() {
     let ssoServer = process.env.SSO_SERVER
@@ -39,47 +37,24 @@ export default {
      */
     routerBeforeEach: async function(to, from, next) {
         console.log('router before ', to)
-        if (to.path == '/auth' || to.path == '/nouser') {
+        // if (to.path == '/auth' || to.path == '/nouser') {
             next()
-        } else {
-            let userInfo = store.getters['layout/userInfo']
-            console.log("user info ", userInfo)
-            if (!userInfo) {
-                // 本地是未登录状态, 保存目标页面地址, 去登录
-                let lastRoute = { path: to.path, params: to.params, query: to.query }
-                store.commit('setLastRoute', lastRoute)
-                toLogin()
-            } else {
-                if (to.meta.breadcrumbs) {
-                    store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
-                }
-                if(
-                    (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
-                    (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
-                    (from.path == "/ledger/deviceadd" && session.get("deviceAddData") && session.get("deviceAddData").length) ||
-                    (from.path == "/ledger/spaceadd" && session.get("spaceAddData") && session.get("spaceAddData").length) ||
-                    (from.path == "/ledger/propertyadd" && session.get("propertyAddData") && session.get("propertyAddData").length) ||
-                    (from.path == "/ledger/partsadd" && session.get("partsAddData") && session.get("partsAddData").length) ||
-                    (from.path == "/ledger/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
-                ) { //判断新增信息是否保存
-                    MessageBox.confirm("新增信息未保存,离开将丢失新增信息,是否继续?", "提示", {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        type: 'warning'
-                    }).then(() => {
-                        let arr = from.path.split("/")
-                        let srt = arr[arr.length - 1].slice(0,-3)
-                        session.remove(`${srt}AddData`)
-                        next()
-                    }).catch(() => {
-                        next(false)
-                    })
-                } else {
-                    next()
-                }
-            }
-            return true
-        }
+        // } else {
+        //     let userInfo = store.getters['layout/userInfo']
+        //     console.log("user info ", userInfo)
+        //     if (!userInfo) {
+        //         // 本地是未登录状态, 保存目标页面地址, 去登录
+        //         let lastRoute = { path: to.path, params: to.params, query: to.query }
+        //         store.commit('setLastRoute', lastRoute)
+        //         toLogin()
+        //     } else {
+        //         if (to.meta.breadcrumbs) {
+        //             store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+        //         }
+        //         next()
+        //     }
+        //     return true
+        // }
     },
     toNoUser(){
         console.log(this)