소스 검색

style待解决

Shannon_mu 3 년 전
부모
커밋
5861d7f934

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 461 - 541
operationSupport/package-lock.json


+ 4 - 4
operationSupport/src/assets/common.styl

@@ -1,10 +1,10 @@
 @import './sc-variables.styl'
 @import './fun.styl'
 
-*
-	box-sizing: border-box
-	&:focus
-		outline: none
+// *
+// 	box-sizing: border-box
+// 	&:focus
+// 		outline: none
 body
 	margin: 0
 	padding: 0

+ 0 - 2
operationSupport/src/components/common/MenuTree.vue

@@ -23,8 +23,6 @@ export default {
     data() {
         return {
             envConfig: envConfig,
-            //去掉菜单
-            discard: ['概览']
         };
     },
     components: {

+ 2 - 31
operationSupport/src/main.js

@@ -16,9 +16,8 @@ import 'element-ui/lib/theme-chalk/index.css'; // 默认主题
 import moment from 'moment';
 moment.locale('zh-cn');
 import './assets/css/icon.css';
-import "./assets/element-variables.scss";
-import './assets/css/main.scss';
 import './assets/css/element-variables.scss';
+import './assets/css/main.scss';
 import '@utils/rem.js';
 import directiveInit from '@utils/directives';
 import http from '@utils/http.js';
@@ -60,35 +59,6 @@ Vue.prototype.$api = apiService(http);
 
 let defaultPath = '';
 Vue.prototype.routerLoad = {
-    findOne(arr) {
-        return arr.map(v => {
-            if (v.children) {
-                return this.findOne(v.children)
-            } else {
-                return {
-                    path: "/" + v.linkPath,
-                    name: v.name
-                }
-            }
-        })
-    },
-    // 获取菜单
-    loadMenus() {
-        http.get('/user/findUserMenu', { appId: '1002' }).then(({ status, data, msg }) => {
-            if (0 === status) {
-                let routerArr = this.findOne(data[0].children);
-                if (routerArr[0].length) {
-                    defaultPath = routerArr[0][0].path;
-                } else {
-                    defaultPath = routerArr[0].path;
-                }
-                if (localStorage.getItem('path') == '/') {
-                    localStorage.setItem('path', defaultPath)
-                }
-                router.push({ path: localStorage.getItem('path') })
-            }
-        });
-    }
 };
 //使用钩子函数对路由进行权限跳转
 router.beforeEach((to, from, next) => {
@@ -99,6 +69,7 @@ router.beforeEach((to, from, next) => {
     // next();
 
     if (localStorage.getItem("SC_token")) {
+
         let menuList = window.sessionStorage.getItem("operationMuen")
         let newAr = [];
         if (menuList === null || menuList === undefined) {

+ 53 - 0
operationSupport/src/router/dynamicMuen.js

@@ -16,6 +16,57 @@ const staticMuen = [
     component: () => import(/* webpackChunkName: "404" */ '@views/404'),
     meta: { title: '404' }
   },
+  {
+    path: '/communityManagement',
+    component: () => import(/* webpackChunkName: "404" */ '@views/communityManagement'),
+    meta: { title: '社区管理' },
+
+  }, 
+  {
+    path: '/communityManagement/pageJump/AddOrEdit',
+    meta: { title: '添加社区' },
+    component: () => import(/* webpackChunkName: "404" */ '@views/communityManagement/pageJump/AddOrEdit.vue'),
+  },
+  // {
+  //   path: '/buildingManagement',
+  //   component: () => import(/* webpackChunkName: "404" */ '@views/buildingManagement'),
+  //   meta: { title: '楼栋管理' }
+  // },
+  {
+    path: '/buildingManagement/pageJump/addoredit',
+    component: () => import(/* webpackChunkName: "404" */ '@views/buildingManagement/pageJump/addoredit.vue'),
+    meta: { title: '添加编辑楼栋管理' }
+  },
+  // {
+  //   path: '/housingManagement',
+  //   component: () => import(/* webpackChunkName: "404" */ '@views/housingManagement'),
+  //   meta: { title: '房屋管理' }
+  // }, 
+  {
+    path: '/housingManagement/pageJump/saveEdits',
+    component: () => import(/* webpackChunkName: "404" */ '@views/housingManagement/pageJump/saveEdits.vue'),
+    meta: { title: '房屋编辑' }
+  },
+  //  {
+  //   path: '/shopManagement',
+  //   component: () => import(/* webpackChunkName: "404" */ '@views/shopManagement'),
+  //   meta: { title: '商铺管理' }
+  // },
+  {
+    path: '/shopManagement/pageJump/saveEdits',
+    component: () => import(/* webpackChunkName: "404" */ '@views/shopManagement/pageJump/saveEdits.vue'),
+    meta: { title: '商铺编辑' }
+  },
+  // {
+  //   path: '/parkingLotAdministration',
+  //   component: () => import(/* webpackChunkName: "404" */ '@views/parkingLotAdministration'),
+  //   meta: { title: '车位管理' }
+  // }
+  , {
+    path: '/parkingLotAdministration/pageJump/partitionManagement',
+    component: () => import(/* webpackChunkName: "404" */ '@views/parkingLotAdministration/pageJump/partitionManagement.vue'),
+    meta: { title: '车库分区管理' }
+  }
 ]
 //路由格式
 // 自定义路由文件
@@ -38,10 +89,12 @@ const dimension = (arrList, arr) => {
 //添加路由
 const AddRt = (router, dynamicMuenList) => {
   let NEWdynamicMuenList = [...dynamicMuenList, ...staticMuen]
+  debugger;
   if (NEWdynamicMuenList.length !== 0) {
     NEWdynamicMuenList.forEach(item => {
       router.options.routes[0].children.push(item)
     })
+
     router.options.routes[0].redirect = router.options.routes[0].children[0].path
     router.addRoutes(router.options.routes)
   }

+ 7 - 56
operationSupport/src/router/index.js

@@ -19,68 +19,19 @@ export default new Router({
                 //     name: 'msg',
                 //     component: () => import(/* webpackChunkName: "messages" */ '@views/messages'),
                 //     meta: { title: '消息中心' }
-                //   },
-                //   {
+                // },
+                // {
                 //     path: '/403',
                 //     component: () => import(/* webpackChunkName: "404" */ '@views/403'),
                 //     meta: { title: '403' }
-                //   },
-                //   {
+                // },
+                // {
                 //     path: '/404',
                 //     component: () => import(/* webpackChunkName: "404" */ '@views/404'),
                 //     meta: { title: '404' }
-                //   },
-                {
-                    path: '/communityManagement',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/communityManagement'),
-                    meta: { title: '社区管理' },
-                    // children:[
-                    //     {
-                    //         path:'/communityManagement/popups/AddOrEdit',
-                    //         meta: { title: '添加社区' },
-                    //         component:() => import(/* webpackChunkName: "404" */ '@views/communityManagement/popups/AddOrEdit.vue'),
-                    //     },
-                    // ]
-                },{
-                    path:'/communityManagement/pageJump/AddOrEdit',
-                    meta: { title: '添加社区' },
-                    component:() => import(/* webpackChunkName: "404" */ '@views/communityManagement/pageJump/AddOrEdit.vue'),
-                },{
-                    path: '/buildingManagement',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/buildingManagement'),
-                    meta: { title: '楼栋管理' }
-                },
-                {
-                    path: '/buildingManagement/pageJump/addoredit',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/buildingManagement/pageJump/addoredit.vue'),
-                    meta: { title: '添加编辑楼栋管理' }
-                },{
-                    path: '/housingManagement',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/housingManagement'),
-                    meta: { title: '房屋管理' }
-                },{
-                    path: '/housingManagement/pageJump/saveEdits',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/housingManagement/pageJump/saveEdits.vue'),
-                    meta: { title: '房屋编辑' }
-                },{
-                    path: '/shopManagement',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/shopManagement'),
-                    meta: { title: '商铺管理' }
-                },{
-                    path: '/shopManagement/pageJump/saveEdits',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/shopManagement/pageJump/saveEdits.vue'),
-                    meta: { title: '商铺编辑' }
-                },{
-                    path: '/parkingLotAdministration',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/parkingLotAdministration'),
-                    meta: { title: '车位管理' }
-                }
-                ,{
-                    path: '/parkingLotAdministration/pageJump/partitionManagement',
-                    component: () => import(/* webpackChunkName: "404" */ '@views/parkingLotAdministration/pageJump/partitionManagement.vue'),
-                    meta: { title: '车库分区管理' }
-                }
-            ]
+                // },
+            ],
+            // redirect: '/workbench/index'
         },
         {
             path: '*',

+ 1 - 1
operationSupport/src/views/communityManagement/pageJump/AddOrEdit.vue

@@ -101,7 +101,7 @@
     </div>
 </template>
 <script>
-    import MapPopup from '../../../components/mapPopup'
+    import MapPopup from '@/components/mapPopup/index.vue'
 export default {
     data() {
         return {

+ 1 - 1
operationSupport/vue.config.js

@@ -83,7 +83,7 @@ module.exports = {
                     /* "^/api": "" */
                 }
             },
-            'sc-user-center': {
+            '/sc-user-center': {
                 target: envConfig.baseCeAPI,
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.