From 89d98c8e071e937e161f62bd24ac81853a225fcd Mon Sep 17 00:00:00 2001 From: copper Date: Wed, 2 Jun 2021 18:13:44 +0800 Subject: [PATCH] false data --- public/index.html | 4 +- src/components/Main.vue | 4 +- src/components/analysis/A1.vue | 88 ++++++++++++++ src/components/analysis/A2.vue | 139 +++++++++++++++++++++++ src/components/analysis/A3.vue | 101 ++++++++++++++++ src/components/analysis/Index.vue | 24 ++-- src/components/charts/BaseIndexChart.vue | 49 +------- src/components/icon/index.js | 2 +- src/components/search/Index.vue | 39 ++----- src/components/search/LurMean.vue | 8 +- src/components/search/Means.vue | 12 +- src/components/search/QaDay.vue | 8 +- src/components/search/QaSTS.vue | 32 ++++++ src/components/search/YLSTS.vue | 31 +++-- src/main.js | 2 + src/utils/water.js | 18 +++ vue.config.js | 11 +- 17 files changed, 467 insertions(+), 105 deletions(-) create mode 100644 src/components/analysis/A1.vue create mode 100644 src/components/analysis/A2.vue create mode 100644 src/components/analysis/A3.vue 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 b7a1b70..1eee3f1 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 1477934..3093f09 100644 --- a/src/utils/water.js +++ b/src/utils/water.js @@ -28,4 +28,22 @@ 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, 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'] = start.add(_, "minute").format('lll') + d['time'] = start.add(_, "minute").toDate() + data.push(d) + } + + return data; } \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 40adef2..446c592 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,7 +12,6 @@ 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/' } } @@ -34,7 +33,7 @@ module.exports = { 'com': path.resolve(__dirname, 'src', 'components') } }, - externals: true ? { + externals: { 'vue': 'Vue', 'vuex':'Vuex', 'antd': 'antd', @@ -43,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: {