diff --git a/.env.development b/.env.development index e6ba13a97..d1c8a3e7c 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ NODE_ENV=development -# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api diff --git a/package.json b/package.json index 799ec0ed1..76454b2f6 100644 --- a/package.json +++ b/package.json @@ -19,60 +19,60 @@ "@antv/l7": "2.9.14", "@antv/l7-draw": "3.0.5", "@antv/l7-maps": "2.9.14", - "@riophae/vue-treeselect": "^0.4.0", - "@tinymce/tinymce-vue": "^3.2.8", - "async-validator": "^4.2.5", - "axios": "^0.19.0", - "babel-eslint": "^8.0.1", - "babel-plugin-component": "^1.1.1", - "echarts": "^5.2.2", - "echarts-gl": "^2.0.9", + "@riophae/vue-treeselect": "0.4.0", + "@tinymce/tinymce-vue": "3.2.8", + "async-validator": "4.2.5", + "axios": "0.19.0", + "babel-eslint": "8.0.1", + "babel-plugin-component": "1.1.1", + "echarts": "5.2.2", + "echarts-gl": "2.0.9", "element-theme": "2.0.1", "element-ui": "2.13.2", - "file-saver": "^2.0.5", - "gulp-autoprefixer": "^6.1.0", - "gulp-clean-css": "^4.2.0", - "gulp-load-plugins": "^2.0.0", - "gulp-rename": "^1.4.0", - "gulp-sass": "^4.0.2", - "js-cookie": "^2.2.0", - "jsencrypt": "^3.0.3", - "lodash": "^4.17.15", - "mint-ui": "^2.2.13", - "node-sass": "^4.12.0", - "ol": "^6.9.0", - "portfinder": "^1.0.21", - "proj4": "^2.8.0", - "qs": "^6.7.0", - "quill": "^1.3.6", - "screenfull": "^4.2.1", - "sortablejs": "^1.12.0", - "svg-sprite-loader": "^4.1.6", - "throttle-debounce": "^3.0.1", - "v-distpicker": "^1.2.2", - "vue": "^2.6.11", - "vue-baidu-map": "^0.21.22", - "vue-i18n": "^8.12.0", - "vue-quill-editor": "^3.0.6", - "vue-router": "^3.0.7", - "vuex": "^3.1.1", - "xlsx": "^0.17.1" + "file-saver": "2.0.5", + "gulp-autoprefixer": "6.1.0", + "gulp-clean-css": "4.2.0", + "gulp-load-plugins": "2.0.0", + "gulp-rename": "1.4.0", + "gulp-sass": "4.0.2", + "js-cookie": "2.2.0", + "jsencrypt": "3.0.3", + "lodash": "4.17.15", + "mint-ui": "2.2.13", + "node-sass": "4.12.0", + "ol": "6.9.0", + "portfinder": "1.0.21", + "proj4": "2.8.0", + "qs": "6.7.0", + "quill": "1.3.6", + "screenfull": "4.2.1", + "sortablejs": "1.12.0", + "svg-sprite-loader": "4.1.6", + "throttle-debounce": "3.0.1", + "v-distpicker": "1.2.2", + "vue": "2.6.11", + "vue-baidu-map": "0.21.22", + "vue-i18n": "8.12.0", + "vue-quill-editor": "3.0.6", + "vue-router": "3.0.7", + "vuex": "3.1.1", + "xlsx": "0.17.1" }, "devDependencies": { - "@antv/f2": "^3.8.10-beta.1", + "@antv/f2": "3.8.10-beta.1", "@tinymce/tinymce-vue": "3.2.8", - "@vue/cli-plugin-babel": "^3.10.0", - "@vue/cli-plugin-eslint": "^3.10.0", - "@vue/cli-service": "^3.10.0", - "@vue/eslint-config-standard": "^4.0.0", - "dai-js": "^0.0.12", - "element-theme-chalk": "^2.13.0", - "natives": "^1.1.6", - "ol": "^6.9.0", - "sass-loader": "^7.3.1", - "script-loader": "^0.7.2", + "@vue/cli-plugin-babel": "3.10.0", + "@vue/cli-plugin-eslint": "3.10.0", + "@vue/cli-service": "3.10.0", + "@vue/eslint-config-standard": "4.0.0", + "dai-js": "0.0.12", + "element-theme-chalk": "2.13.0", + "natives": "1.1.6", + "ol": "6.9.0", + "sass-loader": "7.3.1", + "script-loader": "0.7.2", "tinymce": "5.8.2", - "vue-template-compiler": "^2.6.11" + "vue-template-compiler": "2.6.11" }, "eslintConfig": { "root": true, diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 1e9825252..03c824e91 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -823,7 +823,8 @@ export default { }); } }); - return selectedFuncIdList.map((id) => obj[id]); + console.log('88888888888888888', selectedFuncIdList) + return selectedFuncIdList.filter((id) => obj[id]).map((id) => obj[id]); }, maxTableHeight() { // return this.clientHeight - 450;