diff --git a/package.json b/package.json index 9d86044e8..ed4517d83 100644 --- a/package.json +++ b/package.json @@ -1,87 +1,92 @@ { - "name": "vue-admin-template", - "version": "4.1.0", - "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", - "author": "Pan ", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve --open", - "build": "vue-cli-service build", - "test": "vue-cli-service build --mode staging", - "local": "vue-cli-service build --mode native", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", - "test:unit": "jest --clearCache && vue-cli-service test:unit", - "test:ci": "npm run lint && npm run test:unit", - "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" - }, - "dependencies": { - "axios": "0.18.0", - "echarts": "^4.7.0", - "element-ui": "^2.12.0", - "file-saver": "^1.3.3", - "js-cookie": "2.2.0", - "js-md5": "^0.7.3", - "lodash": "^4.17.11", - "normalize.css": "7.0.0", - "nprogress": "^0.2.0", - "path-to-regexp": "2.4.0", - "qrcode.vue": "^1.6.2", - "script-loader": "^0.7.2", - "sessionstorage": "^0.1.0", - "sockjs-client": "^1.4.0", - "stompjs": "^2.3.3", - "storejs": "^1.0.25", - "three": "^0.107.0", - "vue": "^2.6.10", - "vue-i18n": "^8.12.0", - "vue-router": "^3.1.6", - "vuedraggable": "^2.23.2", - "vuex": "^3.1.0", - "xlsx": "^0.14.2", - "zrender": "^4.0.4" - }, - "devDependencies": { - "@babel/core": "7.0.0", - "@babel/register": "7.0.0", - "@vue/cli-plugin-babel": "3.6.0", - "@vue/cli-plugin-eslint": "3.6.0", - "@vue/cli-plugin-unit-jest": "3.6.3", - "@vue/cli-service": "3.6.0", - "@vue/test-utils": "1.0.0-beta.29", - "autoprefixer": "^9.5.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "23.6.0", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-preset-env": "1.6.1", - "babel-preset-stage-2": "6.24.1", - "chalk": "2.4.2", - "compression-webpack-plugin": "^3.1.0", - "connect": "3.6.6", - "copy-webpack-plugin": "^4.5.2", - "eslint": "5.15.3", - "eslint-plugin-vue": "5.2.2", - "file-loader": "^3.0.1", - "html-webpack-plugin": "3.2.0", - "mockjs": "1.0.1-beta3", - "node-sass": "^4.9.0", - "runjs": "^4.3.2", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "^0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.2", - "vue-template-compiler": "2.6.11" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] + "name": "vue-admin-template", + "version": "4.1.0", + "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint", + "author": "Pan ", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve --open", + "build": "vue-cli-service build", + "test": "vue-cli-service build --mode staging", + "local": "vue-cli-service build --mode native", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit", + "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" + }, + "dependencies": { + "axios": "0.18.0", + "echarts": "^4.7.0", + "element-ui": "^2.12.0", + "file-saver": "^1.3.3", + "js-cookie": "2.2.0", + "js-md5": "^0.7.3", + "lodash": "^4.17.11", + "normalize.css": "7.0.0", + "nprogress": "^0.2.0", + "path-to-regexp": "2.4.0", + "qrcode.vue": "^1.6.2", + "script-loader": "^0.7.2", + "sessionstorage": "^0.1.0", + "sockjs-client": "^1.4.0", + "stompjs": "^2.3.3", + "storejs": "^1.0.25", + "three": "^0.107.0", + "vue": "^2.6.10", + "vue-i18n": "^8.12.0", + "vue-router": "^3.1.6", + "vuedraggable": "^2.23.2", + "vuex": "^3.1.0", + "xlsx": "^0.14.2", + "zrender": "^4.0.4" + }, + "devDependencies": { + "@babel/core": "7.0.0", + "@babel/register": "7.0.0", + "@vue/cli-plugin-babel": "3.6.0", + "@vue/cli-plugin-eslint": "3.6.0", + "@vue/cli-plugin-unit-jest": "3.6.3", + "@vue/cli-service": "3.6.0", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "^9.5.1", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "23.6.0", + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-preset-env": "1.6.1", + "babel-preset-stage-2": "6.24.1", + "chalk": "2.4.2", + "compression-webpack-plugin": "^3.1.0", + "connect": "3.6.6", + "copy-webpack-plugin": "^4.5.2", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", + "file-loader": "^3.0.1", + "html-webpack-plugin": "3.2.0", + "mockjs": "1.0.1-beta3", + "node-sass": "^4.9.0", + "runjs": "^4.3.2", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "^0.7.2", + "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.2", + "vue-template-compiler": "2.6.11" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] } + + + + + diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index c77da6b5b..27aa67831 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -3,7 +3,7 @@ export default { designhomePage: '公共地图', designUserPage: '个人地图', - newDesignUserPage: '新版地图', + newDesignUserPage: '地图绘制', mapManage: '地图管理', skinManage: '皮肤管理', diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 98e1b36a9..713f12977 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -369,7 +369,7 @@ export const asyncRouter = [ redirect: '/design/userlist/home', component: Layout, meta: { - roles: [admin, user] + roles: [admin] }, children: [ { @@ -855,7 +855,7 @@ export const asyncRouter = [ redirect: '/design/usermap/home', component: Layout, meta: { - roles: [admin] + roles: [admin, user] }, children: [ { diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue index 44a89f03e..62a92c492 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -1,74 +1,74 @@