diff --git a/package-lock.json b/package-lock.json
index e926ed3..6e1392c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1744,6 +1744,16 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
"cacache": {
"version": "13.0.1",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594428108619&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -1770,6 +1780,34 @@
"unique-filename": "^1.1.1"
}
},
+ "chalk": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+ "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
"find-cache-dir": {
"version": "3.3.1",
"resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.3.1.tgz",
@@ -1791,6 +1829,25 @@
"path-exists": "^4.0.0"
}
},
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
"locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz",
@@ -1855,6 +1912,16 @@
"minipass": "^3.1.1"
}
},
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
"terser-webpack-plugin": {
"version": "2.3.8",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881839307&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1871,6 +1938,18 @@
"terser": "^4.6.12",
"webpack-sources": "^1.4.3"
}
+ },
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.2.0",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+ "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ }
}
}
},
@@ -3872,6 +3951,11 @@
"timsort": "^0.3.0"
}
},
+ "css-element-queries": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/css-element-queries/-/css-element-queries-1.2.3.tgz",
+ "integrity": "sha512-QK9uovYmKTsV2GXWQiMOByVNrLn2qz6m3P7vWpOR4IdD6I3iXoDw5qtgJEN3Xq7gIbdHVKvzHjdAtcl+4Arc4Q=="
+ },
"css-loader": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1602609194593&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@@ -6327,6 +6411,11 @@
}
}
},
+ "intersection-observer": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.5.1.tgz",
+ "integrity": "sha512-Zd7Plneq82kiXFixs7bX62YnuZ0BMRci9br7io88LwDyF3V43cQMI+G5IiTlTNTt+LsDUppl19J/M2Fp9UkH6g=="
+ },
"ip": {
"version": "1.1.5",
"resolved": "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz",
@@ -6963,6 +7052,11 @@
"integrity": "sha1-tEqbYpe8tpjxxRo1RaKzs2jVnFI=",
"dev": true
},
+ "lodash.debounce": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+ },
"lodash.defaultsdeep": {
"version": "4.6.1",
"resolved": "https://registry.npm.taobao.org/lodash.defaultsdeep/download/lodash.defaultsdeep-4.6.1.tgz",
@@ -10964,85 +11058,14 @@
}
}
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.0.0-beta.9",
- "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-beta.9.tgz?cache=0&sync_timestamp=1603783081012&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.0.0-beta.9.tgz",
- "integrity": "sha1-UlEsthwpaCfJnA1UOYvvhL5ESPw=",
- "dev": true,
- "optional": true,
+ "vue-resize-directive": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/vue-resize-directive/-/vue-resize-directive-1.2.0.tgz",
+ "integrity": "sha512-LmpFexQcl1XYyz3DQrTrq3Efgj50MKEON60nR9MMAq1D2ZtXFg1WDcy1wy1T0SeduNtIu9hos2aLTsJUplvjlQ==",
"requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839122515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
- "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
- "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
- "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
- "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
- "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
- "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1598611787836&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
- "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
+ "css-element-queries": "^1.0.2",
+ "intersection-observer": "^0.5.0",
+ "lodash.debounce": "^4.0.8"
}
},
"vue-style-loader": {
diff --git a/package.json b/package.json
index 76a8367..b15a497 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
"ol": "^6.4.3",
"v-charts": "^1.19.0",
"vue": "^2.6.11",
+ "vue-resize-directive": "^1.2.0",
"vue-router": "^3.4.8",
"vuex": "^3.5.1"
},
diff --git a/public/index.html b/public/index.html
index 9d43d2b..bfde8ac 100644
--- a/public/index.html
+++ b/public/index.html
@@ -28,7 +28,9 @@
-
+
+
+
diff --git a/src/components/Main.vue b/src/components/Main.vue
index ae8dc00..b61bd35 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -56,9 +56,9 @@
水质质量类别统计
-
+
水质超标处理记录
diff --git a/src/components/analysis/A1.vue b/src/components/analysis/A1.vue
new file mode 100644
index 0000000..40dee26
--- /dev/null
+++ b/src/components/analysis/A1.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/analysis/A2.vue b/src/components/analysis/A2.vue
new file mode 100644
index 0000000..35d2e23
--- /dev/null
+++ b/src/components/analysis/A2.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/analysis/A3.vue b/src/components/analysis/A3.vue
new file mode 100644
index 0000000..ee28cf9
--- /dev/null
+++ b/src/components/analysis/A3.vue
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/analysis/Index.vue b/src/components/analysis/Index.vue
index 2d70a16..b98b4a6 100644
--- a/src/components/analysis/Index.vue
+++ b/src/components/analysis/Index.vue
@@ -18,12 +18,12 @@
-
- 小时值分析
- 日均值分析
- 水质指标统计
- 质量等级统计
- 质量对比分析
+
+ 小时值分析
+ 日均值分析
+ 水质指标统计
+ 质量等级统计
+ 质量对比分析
检测项：
@@ -43,13 +43,16 @@
-
+
+
+
+
@@ -57,7 +60,11 @@
diff --git a/src/components/search/Means.vue b/src/components/search/Means.vue
index 310990f..9018cce 100644
--- a/src/components/search/Means.vue
+++ b/src/components/search/Means.vue
@@ -23,7 +23,7 @@
-
diff --git a/src/components/search/QaDay.vue b/src/components/search/QaDay.vue
index d7f444b..86786e4 100644
--- a/src/components/search/QaDay.vue
+++ b/src/components/search/QaDay.vue
@@ -48,6 +48,7 @@
diff --git a/src/components/search/QaSTS.vue b/src/components/search/QaSTS.vue
index 72a06e3..89b5ba1 100644
--- a/src/components/search/QaSTS.vue
+++ b/src/components/search/QaSTS.vue
@@ -48,6 +48,7 @@
diff --git a/src/components/search/YLSTS.vue b/src/components/search/YLSTS.vue
index 15e7e3c..654df07 100644
--- a/src/components/search/YLSTS.vue
+++ b/src/components/search/YLSTS.vue
@@ -48,6 +48,7 @@
diff --git a/src/main.js b/src/main.js
index 0189cb0..7c2535f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,8 @@ import router from './utils/router'
// Vue.use(Antd)
// Vue.use(VCharts)
+import resize from 'vue-resize-directive'
+Vue.directive('resize', resize)
Vue.config.productionTip = false
Vue.prototype.$store = store
diff --git a/src/utils/water.js b/src/utils/water.js
index ff86e2e..606e9fc 100644
--- a/src/utils/water.js
+++ b/src/utils/water.js
@@ -31,14 +31,16 @@ export function processTimeData(dataArr=[], start=new Date(), end=new Date(), st
export function generateWaterData(label, count) {
let data = []
+ let start = Moment().subtract(count, "minute")
for(let _ = 0; _< count; _ ++) {
let d = {}
- label.forEach(key => {
- d[key] = Math.random()
+ label.forEach((key, i) => {
+ d[key] = Math.sin( _ * _ * _ * 34654 - _ * _ * 54324 + _ * 2345 + 343) + 1 + Math.random() / 10
+ d[key] = parseFloat( d[key].toFixed(3) )
})
d.key = Math.round( Math.random() * 10000000 ).toString()
- d['time_str'] = Moment().format('lll')
- d['time'] = Moment().toDate()
+ d['time_str'] = start.add(_, "minute").format('lll')
+ d['time'] = start.add(_, "minute").toDate()
data.push(d)
}
diff --git a/vue.config.js b/vue.config.js
index 26a7322..8a9dfcb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,7 +12,7 @@ module.exports = {
'/backend': {
// target: 'http://223.75.53.208:8081',
// target: 'http://121.36.155.145:10025/',
- target: 'http://127.0.0.1:7788/'
+ target: 'http://8.136.226.16:10025/'
}
}
},
@@ -33,7 +33,7 @@ module.exports = {
'com': path.resolve(__dirname, 'src', 'components')
}
},
- externals: true ? {
+ externals: {
'vue': 'Vue',
'vuex':'Vuex',
'antd': 'antd',
@@ -42,14 +42,8 @@ module.exports = {
"md5": "js-md5",
'axios': 'axios',
'v-charts':'VCharts',
- 'ol':'ol'
- }: {
- 'antd': 'antd',
'ol':'ol',
- 'v-charts':'VCharts',
- "moment": "moment",
- "md5": "js-md5",
- 'axios': 'axios',
+ 'echarts': 'echarts'
},
module: {