diff --git a/src/assets/images/point/c1.png b/src/assets/images/point/c1.png new file mode 100644 index 0000000..67b623f Binary files /dev/null and b/src/assets/images/point/c1.png differ diff --git a/src/assets/images/point/c2.png b/src/assets/images/point/c2.png new file mode 100644 index 0000000..519da03 Binary files /dev/null and b/src/assets/images/point/c2.png differ diff --git a/src/assets/images/point/c3.png b/src/assets/images/point/c3.png new file mode 100644 index 0000000..cc87fa7 Binary files /dev/null and b/src/assets/images/point/c3.png differ diff --git a/src/assets/images/point/c4.png b/src/assets/images/point/c4.png new file mode 100644 index 0000000..80b7380 Binary files /dev/null and b/src/assets/images/point/c4.png differ diff --git a/src/assets/images/point/c5.png b/src/assets/images/point/c5.png new file mode 100644 index 0000000..bccf70b Binary files /dev/null and b/src/assets/images/point/c5.png differ diff --git a/src/assets/images/point/p1.png b/src/assets/images/point/p1.png new file mode 100644 index 0000000..1771c93 Binary files /dev/null and b/src/assets/images/point/p1.png differ diff --git a/src/assets/images/point/p2.png b/src/assets/images/point/p2.png new file mode 100644 index 0000000..6c085d8 Binary files /dev/null and b/src/assets/images/point/p2.png differ diff --git a/src/assets/images/point/p3.png b/src/assets/images/point/p3.png new file mode 100644 index 0000000..4198a27 Binary files /dev/null and b/src/assets/images/point/p3.png differ diff --git a/src/assets/images/point/p4.png b/src/assets/images/point/p4.png new file mode 100644 index 0000000..34e09da Binary files /dev/null and b/src/assets/images/point/p4.png differ diff --git a/src/assets/images/point/p5.png b/src/assets/images/point/p5.png new file mode 100644 index 0000000..dd24cb3 Binary files /dev/null and b/src/assets/images/point/p5.png differ diff --git a/src/assets/images/dataScreen/plotPremises/mark.png b/src/assets/images/point/p6.png similarity index 100% rename from src/assets/images/dataScreen/plotPremises/mark.png rename to src/assets/images/point/p6.png diff --git a/src/assets/images/point/position.png b/src/assets/images/point/position.png new file mode 100644 index 0000000..782d405 Binary files /dev/null and b/src/assets/images/point/position.png differ diff --git a/src/permission.js b/src/permission.js index 8934d9c..60e7bba 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/app/login', '/app/list'] +const whiteList = ['/login', '/register', '/app/login', '/app/list', '/app/edit'] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) diff --git a/src/router/index.js b/src/router/index.js index 8b91c61..0c33514 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,43 +87,7 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] - }, - { //登录页 - path: '/app/login', - name: 'appLogin', - meta: { - title: '登录', - hidden: true, - }, - component: (resolve) => require(['@/views/app/login'], resolve) - }, - { //首页 - path: '/app/index', - name: 'appIndex', - meta: { - title: '首页', - hidden: true, - }, - component: (resolve) => require(['@/views/app/index'], resolve) - }, - { //用户页 - path: '/app/user', - name: 'appUser', - meta: { - title: '首页', - hidden: true, - }, - component: (resolve) => require(['@/views/app/user'], resolve) - }, - { //用户页 - path: '/app/list', - name: 'appList', - meta: { - title: '列表', - hidden: true, - }, - component: (resolve) => require(['@/views/app/list'], resolve) - }, + } ] // 动态路由，基于用户权限动态去加载 @@ -211,7 +175,61 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] - } + }, + { //登录页 + path: '/app/login', + name: 'appLogin', + meta: { + title: '登录', + hidden: true, + }, + component: (resolve) => require(['@/views/app/login'], resolve) + }, + { //首页 + path: '/app/index', + name: 'appIndex', + meta: { + title: '首页', + hidden: true, + }, + component: (resolve) => require(['@/views/app/index'], resolve) + }, + { //用户页 + path: '/app/user', + name: 'appUser', + meta: { + title: '首页', + hidden: true, + }, + component: (resolve) => require(['@/views/app/user'], resolve) + }, + { //用户页 + path: '/app/list', + name: 'appList', + meta: { + title: '列表', + hidden: true, + }, + component: (resolve) => require(['@/views/app/list'], resolve) + }, + { //用户页 + path: '/app/edit', + name: 'appEdit', + meta: { + title: '修改', + hidden: true, + }, + component: (resolve) => require(['@/views/app/edit'], resolve) + }, + { //用户页 + path: '/app/map', + name: 'appMap', + meta: { + title: '地图', + hidden: true, + }, + component: (resolve) => require(['@/views/app/map'], resolve) + }, ] // 防止连续点击多次路由报错 diff --git a/src/utils/ol_map.js b/src/utils/ol_map.js index b93efd4..f924950 100644 --- a/src/utils/ol_map.js +++ b/src/utils/ol_map.js @@ -641,7 +641,7 @@ export const olMap = function(selector) { //透明度 opacity: 0.9, //图片路径 - src: require("@/assets/images/dataScreen/plotPremises/mark.png"), + src: require("@/assets/images/point/p6.png"), }), /* text: new ol.style.Text({ textAlign: "center", //位置 diff --git a/src/views/app/edit.vue b/src/views/app/edit.vue new file mode 100644 index 0000000..fcdb38a --- /dev/null +++ b/src/views/app/edit.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/views/app/list.vue b/src/views/app/list.vue index c044bea..5b0b545 100644 --- a/src/views/app/list.vue +++ b/src/views/app/list.vue @@ -11,7 +11,7 @@

已清查

- +
搜索
@@ -57,12 +57,16 @@ return { loading: false, finished: false, + value:'' }; }, created() { }, methods: { + onClickLeft(){ + history.back(-1); + }, getList(){ } diff --git a/src/views/app/map.vue b/src/views/app/map.vue new file mode 100644 index 0000000..e4ec4be --- /dev/null +++ b/src/views/app/map.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index 588c1d4..46985a1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,8 +9,8 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE -//const baseUrl = 'http://localhost:8080' // 后端接口 -const baseUrl = 'http://192.168.0.108:8080' // 后端接口 zzl +const baseUrl = 'http://localhost:8080' // 后端接口 +//const baseUrl = 'http://192.168.0.108:8080' // 后端接口 zzl const port = process.env.port || process.env.npm_config_port || 80 // 端口