diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/src/views/cityManage/components/cityGovern/components/specialBar.vue b/src/views/cityManage/components/cityGovern/components/specialBar.vue index 792d811..d07e434 100644 --- a/src/views/cityManage/components/cityGovern/components/specialBar.vue +++ b/src/views/cityManage/components/cityGovern/components/specialBar.vue @@ -19,7 +19,8 @@ import SimplePieChart from '@/components/pieChart/simplePieChart' import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' -import {fetchSpecial} from '@/api/cityManage' +import mockData from '../../../../../../static/city.json' +import { fetchSpecial } from '@/api/cityManage' export default { name: 'specialBar', components: {ChartLayout, Corner1, SimplePieChart}, @@ -36,19 +37,23 @@ } } }, - created(){ + created () { this.getData() }, - methods:{ - getData(){ - fetchSpecial().then(response=>{ - if(response.code==200){ - this.config = { - rowNum: 4, - data: response.data - } - } - }) + methods: { + getData () { + this.config = { + rowNum: 4, + data: mockData.specialPopulations + } + // fetchSpecial().then(response=>{ + // if(response.code==200){ + // this.config = { + // rowNum: 4, + // data: response.data + // } + // } + // }) } } } diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/src/views/cityManage/components/cityGovern/components/specialBar.vue b/src/views/cityManage/components/cityGovern/components/specialBar.vue index 792d811..d07e434 100644 --- a/src/views/cityManage/components/cityGovern/components/specialBar.vue +++ b/src/views/cityManage/components/cityGovern/components/specialBar.vue @@ -19,7 +19,8 @@ import SimplePieChart from '@/components/pieChart/simplePieChart' import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' -import {fetchSpecial} from '@/api/cityManage' +import mockData from '../../../../../../static/city.json' +import { fetchSpecial } from '@/api/cityManage' export default { name: 'specialBar', components: {ChartLayout, Corner1, SimplePieChart}, @@ -36,19 +37,23 @@ } } }, - created(){ + created () { this.getData() }, - methods:{ - getData(){ - fetchSpecial().then(response=>{ - if(response.code==200){ - this.config = { - rowNum: 4, - data: response.data - } - } - }) + methods: { + getData () { + this.config = { + rowNum: 4, + data: mockData.specialPopulations + } + // fetchSpecial().then(response=>{ + // if(response.code==200){ + // this.config = { + // rowNum: 4, + // data: response.data + // } + // } + // }) } } } diff --git a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue index 5887ce9..f531b9e 100644 --- a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue +++ b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue @@ -14,6 +14,7 @@ import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' import EarthViews from '@/components/EarthViews/EarthViews' +import mockData from '../../../../../../static/city.json' import {fetchParkOccupation, fetchAverageParkTime} from '@/api/cityManage' export default { name: 'contradictionEarth', @@ -34,6 +35,7 @@ getData () { // this.getOccupation() // this.getOccupationByPark() + this.data = mockData.diversifiedSolutions.count }, getOccupation () { fetchParkOccupation().then(response => { diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/src/views/cityManage/components/cityGovern/components/specialBar.vue b/src/views/cityManage/components/cityGovern/components/specialBar.vue index 792d811..d07e434 100644 --- a/src/views/cityManage/components/cityGovern/components/specialBar.vue +++ b/src/views/cityManage/components/cityGovern/components/specialBar.vue @@ -19,7 +19,8 @@ import SimplePieChart from '@/components/pieChart/simplePieChart' import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' -import {fetchSpecial} from '@/api/cityManage' +import mockData from '../../../../../../static/city.json' +import { fetchSpecial } from '@/api/cityManage' export default { name: 'specialBar', components: {ChartLayout, Corner1, SimplePieChart}, @@ -36,19 +37,23 @@ } } }, - created(){ + created () { this.getData() }, - methods:{ - getData(){ - fetchSpecial().then(response=>{ - if(response.code==200){ - this.config = { - rowNum: 4, - data: response.data - } - } - }) + methods: { + getData () { + this.config = { + rowNum: 4, + data: mockData.specialPopulations + } + // fetchSpecial().then(response=>{ + // if(response.code==200){ + // this.config = { + // rowNum: 4, + // data: response.data + // } + // } + // }) } } } diff --git a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue index 5887ce9..f531b9e 100644 --- a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue +++ b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue @@ -14,6 +14,7 @@ import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' import EarthViews from '@/components/EarthViews/EarthViews' +import mockData from '../../../../../../static/city.json' import {fetchParkOccupation, fetchAverageParkTime} from '@/api/cityManage' export default { name: 'contradictionEarth', @@ -34,6 +35,7 @@ getData () { // this.getOccupation() // this.getOccupationByPark() + this.data = mockData.diversifiedSolutions.count }, getOccupation () { fetchParkOccupation().then(response => { diff --git a/src/views/cityManage/components/introduce/introduce.vue b/src/views/cityManage/components/introduce/introduce.vue index d8b406f..978daff 100644 --- a/src/views/cityManage/components/introduce/introduce.vue +++ b/src/views/cityManage/components/introduce/introduce.vue @@ -21,6 +21,7 @@ import ChartLayout from '@/components/layout/chartLayout' import Corner1 from '@/components/corner/Corner1' import {fetchBaseInfo} from '@/api/cityManage' +import mockData from '../../../../../static/city.json' import {fetchSocialLive} from '@/api/community' export default { name: 'introduce', @@ -54,15 +55,23 @@ }, methods: { getData () { - this.getArea() - this.getQuhua() - this.getStreet() - this.getPopulation() - this.getStreet() - this.getGrid() - this.getBuilding() - this.getRoom() - this.getCommunity() + // this.getArea() + // this.getQuhua() + // this.getStreet() + // this.getPopulation() + // this.getStreet() + // this.getGrid() + // this.getBuilding() + // this.getRoom() + // this.getCommunity() + this.data.area.value = mockData.overallOverview.totalArea + this.data.quhua.value = mockData.overallOverview.regionCount + this.data.population.value = mockData.overallOverview.person + this.data.street.value = mockData.overallOverview.streetCount + this.data.community.value = mockData.overallOverview.communityCount + this.data.building.value = mockData.overallOverview.buildingCount + this.data.room.value = mockData.overallOverview.houseCount + this.data.grid.value = mockData.overallOverview.gridCount }, getArea () { fetchBaseInfo('area').then(response => { diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/src/views/cityManage/components/cityGovern/components/specialBar.vue b/src/views/cityManage/components/cityGovern/components/specialBar.vue index 792d811..d07e434 100644 --- a/src/views/cityManage/components/cityGovern/components/specialBar.vue +++ b/src/views/cityManage/components/cityGovern/components/specialBar.vue @@ -19,7 +19,8 @@ import SimplePieChart from '@/components/pieChart/simplePieChart' import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' -import {fetchSpecial} from '@/api/cityManage' +import mockData from '../../../../../../static/city.json' +import { fetchSpecial } from '@/api/cityManage' export default { name: 'specialBar', components: {ChartLayout, Corner1, SimplePieChart}, @@ -36,19 +37,23 @@ } } }, - created(){ + created () { this.getData() }, - methods:{ - getData(){ - fetchSpecial().then(response=>{ - if(response.code==200){ - this.config = { - rowNum: 4, - data: response.data - } - } - }) + methods: { + getData () { + this.config = { + rowNum: 4, + data: mockData.specialPopulations + } + // fetchSpecial().then(response=>{ + // if(response.code==200){ + // this.config = { + // rowNum: 4, + // data: response.data + // } + // } + // }) } } } diff --git a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue index 5887ce9..f531b9e 100644 --- a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue +++ b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue @@ -14,6 +14,7 @@ import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' import EarthViews from '@/components/EarthViews/EarthViews' +import mockData from '../../../../../../static/city.json' import {fetchParkOccupation, fetchAverageParkTime} from '@/api/cityManage' export default { name: 'contradictionEarth', @@ -34,6 +35,7 @@ getData () { // this.getOccupation() // this.getOccupationByPark() + this.data = mockData.diversifiedSolutions.count }, getOccupation () { fetchParkOccupation().then(response => { diff --git a/src/views/cityManage/components/introduce/introduce.vue b/src/views/cityManage/components/introduce/introduce.vue index d8b406f..978daff 100644 --- a/src/views/cityManage/components/introduce/introduce.vue +++ b/src/views/cityManage/components/introduce/introduce.vue @@ -21,6 +21,7 @@ import ChartLayout from '@/components/layout/chartLayout' import Corner1 from '@/components/corner/Corner1' import {fetchBaseInfo} from '@/api/cityManage' +import mockData from '../../../../../static/city.json' import {fetchSocialLive} from '@/api/community' export default { name: 'introduce', @@ -54,15 +55,23 @@ }, methods: { getData () { - this.getArea() - this.getQuhua() - this.getStreet() - this.getPopulation() - this.getStreet() - this.getGrid() - this.getBuilding() - this.getRoom() - this.getCommunity() + // this.getArea() + // this.getQuhua() + // this.getStreet() + // this.getPopulation() + // this.getStreet() + // this.getGrid() + // this.getBuilding() + // this.getRoom() + // this.getCommunity() + this.data.area.value = mockData.overallOverview.totalArea + this.data.quhua.value = mockData.overallOverview.regionCount + this.data.population.value = mockData.overallOverview.person + this.data.street.value = mockData.overallOverview.streetCount + this.data.community.value = mockData.overallOverview.communityCount + this.data.building.value = mockData.overallOverview.buildingCount + this.data.room.value = mockData.overallOverview.houseCount + this.data.grid.value = mockData.overallOverview.gridCount }, getArea () { fetchBaseInfo('area').then(response => { diff --git a/src/views/cityManage/components/introduce/introduce4.vue b/src/views/cityManage/components/introduce/introduce4.vue index f42acf9..523da04 100644 --- a/src/views/cityManage/components/introduce/introduce4.vue +++ b/src/views/cityManage/components/introduce/introduce4.vue @@ -20,6 +20,7 @@ import SimpleBlock from './components/simpleBlock' import ChartLayout from '@/components/layout/chartLayout' import Corner1 from '@/components/corner/Corner1' +import mockData from '../../../../../static/city.json' import {fetchPopulationByType} from '@/api/cityManage' export default { name: 'introduce4', @@ -46,10 +47,14 @@ }, methods: { getData () { - this.getChangzhu() - this.getLiudong() - this.getHuji() - this.getZanzhu() + // this.getChangzhu() + // this.getLiudong() + // this.getHuji() + // this.getZanzhu() + this.data.changzhu.value = mockData.totalPopulation.changzhu + this.data.liudong.value = mockData.totalPopulation.liudong + this.data.huji.value = mockData.totalPopulation.huji + this.data.zanzhu.value = mockData.totalPopulation.zanzhu }, getChangzhu () { fetchPopulationByType('changzhu').then(response => { diff --git a/node_modules.zip b/node_modules.zip new file mode 100644 index 0000000..ab075bd --- /dev/null +++ b/node_modules.zip Binary files differ diff --git a/package copy.json b/package copy.json new file mode 100644 index 0000000..557b8c9 --- /dev/null +++ b/package copy.json @@ -0,0 +1,117 @@ +{ + "name": "big-data", + "version": "1.0.0", + "description": "A Vue.js project", + "author": "chenyanqing", + "private": true, + "scripts": { + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", + "start": "npm run dev", + "unit": "jest --config test/unit/jest.conf.js --coverage", + "e2e": "node test/e2e/runner.js", + "test": "npm run unit && npm run e2e", + "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs", + "build": "node build/build.js" + }, + "dependencies": { + "@jiaminghi/data-view": "^2.9.6", + "@supermap/iclient-leaflet": "^10.0.0", + "animate.css": "^4.1.1", + "axios": "^0.19.0", + "bignumber.js": "^9.0.0", + "cesium": "^1.80.0", + "echarts": "^4.3.0", + "echarts-bmap": "^1.0.3", + "echarts-gl": "^1.1.1", + "echarts-liquidfill": "^2.0.6", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.14.1", + "heatmap.js": "^2.0.5", + "jquery": "1.11.3", + "mapvgl": "^1.0.0-beta.70", + "mars3d": "^3.0.24", + "mars3d-esri": "^3.0.4", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.4", + "mars3d-space": "^3.0.3", + "mockjs": "^1.1.0", + "moment": "^2.24.0", + "postcss-pxtorem": "^4.0.1", + "vue": "^2.5.2", + "vue-amap": "^0.5.10", + "vue-router": "^3.0.1", + "vuescroll": "^4.14.4", + "vuex": "^3.1.1" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "babel-core": "^6.22.1", + "babel-eslint": "^8.2.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^21.0.2", + "babel-loader": "^7.1.1", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-transform-vue-jsx": "^3.5.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.3.2", + "babel-preset-stage-2": "^6.22.0", + "babel-register": "^6.22.0", + "chalk": "^2.0.1", + "chromedriver": "^2.27.2", + "copy-webpack-plugin": "^4.0.1", + "cross-spawn": "^5.0.1", + "css-loader": "^0.28.0", + "eslint": "^4.15.0", + "eslint-config-standard": "^10.2.1", + "eslint-friendly-formatter": "^3.0.0", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.7.0", + "eslint-plugin-node": "^5.2.0", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "^3.0.1", + "eslint-plugin-vue": "^4.0.0", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^1.1.4", + "friendly-errors-webpack-plugin": "^1.6.1", + "html-webpack-plugin": "^2.30.1", + "jest": "^22.0.4", + "jest-serializer-vue": "^0.3.0", + "mockjs": "^1.1.0", + "nightwatch": "^0.9.12", + "node-notifier": "^5.1.2", + "node-sass": "^4.14.1", + "optimize-css-assets-webpack-plugin": "^3.2.0", + "ora": "^1.2.0", + "portfinder": "^1.0.13", + "postcss-import": "^11.0.0", + "postcss-loader": "^2.0.8", + "postcss-url": "^7.2.1", + "rimraf": "^2.6.0", + "sass-loader": "7.0.3", + "selenium-server": "^3.0.1", + "semver": "^5.3.0", + "shelljs": "^0.7.6", + "uglifyjs-webpack-plugin": "^1.1.1", + "url-loader": "^0.5.8", + "vue-jest": "^1.0.2", + "vue-loader": "^13.3.0", + "vue-style-loader": "^3.0.1", + "vue-template-compiler": "^2.5.2", + "webpack": "^3.6.0", + "webpack-bundle-analyzer": "^2.9.0", + "webpack-dev-server": "^2.9.1", + "webpack-merge": "^4.1.0" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] +} diff --git a/package-lock.json b/package-lock.json index a289f5e..49c409f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10803,7 +10803,7 @@ }, "mars3d": { "version": "3.0.24", - "resolved": "https://registry.npmjs.org/mars3d/-/mars3d-3.0.24.tgz", + "resolved": "https://registry.npmmirror.com/mars3d/-/mars3d-3.0.24.tgz", "integrity": "sha512-eQ8Dum7kO9ZbfpB7G1q2yZKKyxNf2JU8X6ntvmfxncElteuTZKkaxtzMtmBtaN3L8dcWpeQZkPOn8sPl4gdQUA==", "requires": { "@turf/turf": "^5.1.6", @@ -10815,28 +10815,19 @@ "resolved": "https://registry.npmjs.org/mars3d-cesium/-/mars3d-cesium-1.80.1.tgz", "integrity": "sha512-UqfsaLPg5Xdfb7toauJu9JDPIbmYevz6TIQ3G+RvzHYGX/Cs1jZfljFmktGtN+Tmu91jZoF7p+3tQP07KvB2Hw==" }, - "mars3d-esri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-esri/-/mars3d-esri-3.0.5.tgz", - "integrity": "sha512-A0JewcYb/Aj94mlxinpCFz9ILV+57SLiXPMI+y+J/NvzpuYH0YLqPl7iqILxQLM2wwIqYbD//EHd/izf3XhMCA==", - "requires": { - "mars3d": "^3.0.24", - "mars3d-cesium": "^1.80.1" - } - }, "mars3d-heatmap": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/mars3d-heatmap/-/mars3d-heatmap-3.0.6.tgz", - "integrity": "sha512-pFL8qUF7RVEw5SMPPj98nPq4QLyx2s3Cd8ch7jBP6kHVQGNEuyKy2bEq1iOfEAH7cCfxlg3tM0cmcmyXCF9MBA==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/mars3d-heatmap/-/mars3d-heatmap-3.0.5.tgz", + "integrity": "sha512-g5FO3TS7q7RXkKNQjBdenq3XF9O5JVtnrEmaF1yCx92WVC4Sgyaz7cezqkrl+rsRXRbuaGpMsGc6qn5hf0PwEA==", "requires": { "heatmap.js": "^2.0.5", - "mars3d": "^3.0.23", + "mars3d": "^3.0.20", "mars3d-cesium": "^1.80.1" } }, "mars3d-mapv": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/mars3d-mapv/-/mars3d-mapv-3.0.4.tgz", "integrity": "sha512-ZKGZTjlk/fyKn+wgve7eIBApD8IeHgPUinLWfqgt1n3R0IsPUwdkQEs+WOMByZE85YZhFuh3bTrolcEnPtPczg==", "requires": { "mapv": "^2.0.34", @@ -10845,12 +10836,12 @@ } }, "mars3d-space": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mars3d-space/-/mars3d-space-3.0.5.tgz", - "integrity": "sha512-lv3auK0UF90iusI6v4+Y+yYA4NbTEXi3vkqo7iLZu+lwjWTzwX8N/TN65qP/TiL90f3lm1txM8lrxT1yWS+pEA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/mars3d-space/-/mars3d-space-3.0.3.tgz", + "integrity": "sha512-+xoRvZZeS5QFTF0F0TGX3ll1vUZOcF/dD74gp7TbcTJ64RNJ0BBi0SlmLG8aO8un65DfVf8GXgzpY0sxGrHO1g==", "requires": { - "mars3d": "^3.0.23", - "mars3d-cesium": "^1.80.1" + "mars3d": "^3.0.16", + "mars3d-cesium": "^1.79.2" } }, "math-expression-evaluator": { diff --git a/package.json b/package.json index 557b8c9..f4eff6e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "jquery": "1.11.3", "mapvgl": "^1.0.0-beta.70", "mars3d": "^3.0.24", - "mars3d-esri": "^3.0.4", "mars3d-heatmap": "^3.0.5", "mars3d-mapv": "^3.0.4", "mars3d-space": "^3.0.3", diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index 7a1d425..752686f 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,8 @@ export default { jingyiService: 'http://11.100.6.5:8084/', // 精一的后台地址 + // jingyiService: 'http://11.100.6.9:8088/', // 精一的后台地址 // baseUrl: 'http://192.168.1.108:11307/api' // 运行监测的后台地址 - baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + // baseUrl: 'http://11.100.6.149:8080/monitor/api' // 运行监测的后台地址 + baseUrl: 'http://11.100.6.149:8080/monitor2/monitor/api' // 运行监测的后台地址 // baseUrl: 'http://192.168.14.104:8085' // 运行监测的后台地址 } diff --git a/src/views/cityManage/components/cityGovern/components/specialBar.vue b/src/views/cityManage/components/cityGovern/components/specialBar.vue index 792d811..d07e434 100644 --- a/src/views/cityManage/components/cityGovern/components/specialBar.vue +++ b/src/views/cityManage/components/cityGovern/components/specialBar.vue @@ -19,7 +19,8 @@ import SimplePieChart from '@/components/pieChart/simplePieChart' import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' -import {fetchSpecial} from '@/api/cityManage' +import mockData from '../../../../../../static/city.json' +import { fetchSpecial } from '@/api/cityManage' export default { name: 'specialBar', components: {ChartLayout, Corner1, SimplePieChart}, @@ -36,19 +37,23 @@ } } }, - created(){ + created () { this.getData() }, - methods:{ - getData(){ - fetchSpecial().then(response=>{ - if(response.code==200){ - this.config = { - rowNum: 4, - data: response.data - } - } - }) + methods: { + getData () { + this.config = { + rowNum: 4, + data: mockData.specialPopulations + } + // fetchSpecial().then(response=>{ + // if(response.code==200){ + // this.config = { + // rowNum: 4, + // data: response.data + // } + // } + // }) } } } diff --git a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue index 5887ce9..f531b9e 100644 --- a/src/views/cityManage/components/contradiction/components/contradictionEarth.vue +++ b/src/views/cityManage/components/contradiction/components/contradictionEarth.vue @@ -14,6 +14,7 @@ import Corner1 from '@/components/corner/Corner1' import ChartLayout from '@/components/layout/chartLayout' import EarthViews from '@/components/EarthViews/EarthViews' +import mockData from '../../../../../../static/city.json' import {fetchParkOccupation, fetchAverageParkTime} from '@/api/cityManage' export default { name: 'contradictionEarth', @@ -34,6 +35,7 @@ getData () { // this.getOccupation() // this.getOccupationByPark() + this.data = mockData.diversifiedSolutions.count }, getOccupation () { fetchParkOccupation().then(response => { diff --git a/src/views/cityManage/components/introduce/introduce.vue b/src/views/cityManage/components/introduce/introduce.vue index d8b406f..978daff 100644 --- a/src/views/cityManage/components/introduce/introduce.vue +++ b/src/views/cityManage/components/introduce/introduce.vue @@ -21,6 +21,7 @@ import ChartLayout from '@/components/layout/chartLayout' import Corner1 from '@/components/corner/Corner1' import {fetchBaseInfo} from '@/api/cityManage' +import mockData from '../../../../../static/city.json' import {fetchSocialLive} from '@/api/community' export default { name: 'introduce', @@ -54,15 +55,23 @@ }, methods: { getData () { - this.getArea() - this.getQuhua() - this.getStreet() - this.getPopulation() - this.getStreet() - this.getGrid() - this.getBuilding() - this.getRoom() - this.getCommunity() + // this.getArea() + // this.getQuhua() + // this.getStreet() + // this.getPopulation() + // this.getStreet() + // this.getGrid() + // this.getBuilding() + // this.getRoom() + // this.getCommunity() + this.data.area.value = mockData.overallOverview.totalArea + this.data.quhua.value = mockData.overallOverview.regionCount + this.data.population.value = mockData.overallOverview.person + this.data.street.value = mockData.overallOverview.streetCount + this.data.community.value = mockData.overallOverview.communityCount + this.data.building.value = mockData.overallOverview.buildingCount + this.data.room.value = mockData.overallOverview.houseCount + this.data.grid.value = mockData.overallOverview.gridCount }, getArea () { fetchBaseInfo('area').then(response => { diff --git a/src/views/cityManage/components/introduce/introduce4.vue b/src/views/cityManage/components/introduce/introduce4.vue index f42acf9..523da04 100644 --- a/src/views/cityManage/components/introduce/introduce4.vue +++ b/src/views/cityManage/components/introduce/introduce4.vue @@ -20,6 +20,7 @@ import SimpleBlock from './components/simpleBlock' import ChartLayout from '@/components/layout/chartLayout' import Corner1 from '@/components/corner/Corner1' +import mockData from '../../../../../static/city.json' import {fetchPopulationByType} from '@/api/cityManage' export default { name: 'introduce4', @@ -46,10 +47,14 @@ }, methods: { getData () { - this.getChangzhu() - this.getLiudong() - this.getHuji() - this.getZanzhu() + // this.getChangzhu() + // this.getLiudong() + // this.getHuji() + // this.getZanzhu() + this.data.changzhu.value = mockData.totalPopulation.changzhu + this.data.liudong.value = mockData.totalPopulation.liudong + this.data.huji.value = mockData.totalPopulation.huji + this.data.zanzhu.value = mockData.totalPopulation.zanzhu }, getChangzhu () { fetchPopulationByType('changzhu').then(response => { diff --git a/src/views/cityManage/components/service/components/serviceCount.vue b/src/views/cityManage/components/service/components/serviceCount.vue index 9191a42..638ca17 100644 --- a/src/views/cityManage/components/service/components/serviceCount.vue +++ b/src/views/cityManage/components/service/components/serviceCount.vue @@ -13,6 +13,8 @@