Explorar o código

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao %!s(int64=3) %!d(string=hai) anos
pai
achega
e8cab1b4e0
Modificáronse 29 ficheiros con 21 adicións e 8 borrados
  1. 2 1
      src/permission.js
  2. 7 6
      src/router/modules/aqpt.js
  3. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/1.png
  4. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/10.png
  5. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/11.png
  6. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/12.png
  7. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/13.png
  8. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/2.png
  9. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/3.png
  10. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/4.png
  11. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/5.png
  12. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/6.png
  13. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/7.png
  14. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/8.png
  15. BIN=BIN
      src/views/aqpt/visualEditor/images/layers/9.png
  16. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/1.png
  17. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/10.png
  18. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/11.png
  19. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/12.png
  20. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/13.png
  21. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/2.png
  22. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/3.png
  23. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/4.png
  24. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/5.png
  25. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/6.png
  26. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/7.png
  27. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/8.png
  28. BIN=BIN
      src/views/aqpt/visualEditor/images/layers1/9.png
  29. 12 1
      src/views/aqpt/visualEditor/index.vue

+ 2 - 1
src/permission.js

@@ -84,7 +84,8 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      // next(`/login?redirect=${to.path}`)
+      next(`/login`)
       NProgress.done()
     }
   }

+ 7 - 6
src/router/modules/aqpt.js

@@ -18,6 +18,13 @@ const aqptRouter = [
       }
     ]
   },
+  /** 不能跟路由1重复出现 */
+  {
+    path: '/',
+    component: () => import('@/views/aqpt/visualEditor/index'),
+    name: 'VisualEditor',
+    meta: { title: '作业活动可视化配置', noCache: true, permit: 'jyprj_setting' }
+  },
   {
     path: '/alert',
     component: Layout,
@@ -131,12 +138,6 @@ const aqptRouter = [
     ]
   },
   {
-    path: '/VisualEditor',
-    component: () => import('@/views/aqpt/visualEditor/index'),
-    name: 'VisualEditor',
-    meta: { title: '作业活动可视化配置', noCache: true, permit: 'jyprj_setting' }
-  },
-  {
     path: '/aqpt/check',
     component: Layout,
     name: 'AqptCheck',

BIN=BIN
src/views/aqpt/visualEditor/images/layers/1.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/10.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/11.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/12.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/13.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/2.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/3.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/4.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/5.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/6.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/7.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/8.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers/9.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/1.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/10.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/11.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/12.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/13.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/2.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/3.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/4.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/5.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/6.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/7.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/8.png


BIN=BIN
src/views/aqpt/visualEditor/images/layers1/9.png


+ 12 - 1
src/views/aqpt/visualEditor/index.vue

@@ -94,8 +94,19 @@ export default {
   created() {
     this.init()
   },
+  // beforeRouteEnter(to, from, next) {
+  //   const params = window.location.href.split('?')[1].split('&')
+  //   function getParams(name = 'name') {
+  //     let param
+  //     params.map(item => item.includes('name') ? (param = item.split('=')[1]) : '')
+  //     return param
+  //   }
+  //   next()
+  //   console.log(getParams())
+  // },
   methods: {
     init() {
+      // console.log(this.$route.query)
       this.initProject()
       this.$nextTick(() => {
         this.initMap()
@@ -500,7 +511,7 @@ export default {
 /* 标记点 */
 .leaflet-marker-icon{
   background-size: 100%;
-
+  background-repeat: no-repeat;
 }
 .leaflet-marker-icon.leaflet-marker-draggable{
   box-shadow: 0 2px 4px #154c74;