From 93badd5ecf2da6120973bbf4cf23b159ee02aff2 Mon Sep 17 00:00:00 2001 From: lai8928 Date: Fri, 9 Dec 2022 11:09:13 +0800 Subject: [PATCH 1/4] add mode input form --- src/components/data-analysis/ControlPanel.vue | 16 +++++++++++++--- src/pages/admin/data-analysis/DataAnalysis.vue | 15 ++++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/components/data-analysis/ControlPanel.vue b/src/components/data-analysis/ControlPanel.vue index c454cbc..b63896e 100644 --- a/src/components/data-analysis/ControlPanel.vue +++ b/src/components/data-analysis/ControlPanel.vue @@ -2,13 +2,22 @@
+ + +
+ +
+
b
+
+ + Start +
-
b
+
+ +
Start - @@ -33,16 +35,18 @@ export default { emits: ['filter-data'], setup(props, { emit }) { - const VTModeModel = 5 + const dataNameValue = ref('') + const VTModeModel = ref(10) + const slopModeModel = ref(20) const simpleSelectModel = ref({}) const simpleOptions = ref([ { id: 1, - description: 'V-T mode', + description: 'V-T Mode', }, { id: 2, - description: 'Second option', + description: '1st Order Differential', }, { id: 3, @@ -50,10 +54,24 @@ }, ]) const filterData = function () { - emit('filter-data') + console.log(VTModeModel.value) + // switch(simpleSelectModel.value.id) { + // case 1: + // const return_data = { mode: 1, data_id: 166, data: { persentage: 0 } }; + // case 2: + // const return_data = { mode: 2, data_id: 166, data: { persentage: 0 } }; + // default: + // } + // console.log(return_data) + emit('filter-data', { + mode: simpleSelectModel.value.id, + data_id: [], + data_name: dataNameValue.value, + data: { persentage: VTModeModel.value, window: slopModeModel.value }, + }) } - return { props, simpleSelectModel, simpleOptions, VTModeModel, filterData } + return { props, dataNameValue, simpleSelectModel, simpleOptions, VTModeModel, slopModeModel, filterData } }, } diff --git a/src/pages/admin/data-analysis/DataAnalysis.vue b/src/pages/admin/data-analysis/DataAnalysis.vue index 2e6deda..5089060 100644 --- a/src/pages/admin/data-analysis/DataAnalysis.vue +++ b/src/pages/admin/data-analysis/DataAnalysis.vue @@ -25,6 +25,7 @@ startMqtt(`${controllerID}/data_analysis/#`, (topic: string, message: ArrayBuffer) => { // [data, data, ceiling, ground] const msg = JSON.parse(message.toString()) + console.log('startMqtt', msg) // try draw line // msg.push(1500000, -1500000) @@ -40,13 +41,14 @@ // stop loading linechart_ref.value?.stopLoading() + + // draw line + if (msg.length < 3) return true let yAxis_list = msg[2].map((x) => ({ yAxis: x })) let coord_list = [{ coord: [msg[3][0][0], msg[3][0][1]] }, { coord: [msg[3][1][0], msg[3][1][1]] }] // yAxis_list.append([{ coord:[ msg[3][0][0],msg[3][0][1]]},{ coord:[ msg[3][1][0], msg[3][1][1]]}]) yAxis_list.push(coord_list) console.log('yAxis_list', yAxis_list) - // draw line - if (msg.length < 3) return true linechart_ref.value.setOption({ series: [ { @@ -66,10 +68,11 @@ const linechart_ref = ref() // methods - const filterData = function () { + const filterData = function (e: any) { linechart_ref.value?.startLoading() console.log(linechart_ref) - publish(`${controllerID}_data_analysis/get_analysis_data`, JSON.stringify({})) + console.log(e) + publish(`${controllerID}_data_analysis/get_analysis_data`, JSON.stringify({ e })) } return { linechart_ref, filterData } From dfb3a96f84380acb326a9ec0c6fffd4d5493e9c1 Mon Sep 17 00:00:00 2001 From: lai8928 Date: Tue, 3 Jan 2023 16:50:40 +0800 Subject: [PATCH 4/4] [update] merge file modal --- src/components/data-analysis/ControlPanel.vue | 17 ++++++++++++----- src/pages/admin/data-analysis/DataAnalysis.vue | 14 +++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/components/data-analysis/ControlPanel.vue b/src/components/data-analysis/ControlPanel.vue index 4bc2a2b..3f98374 100644 --- a/src/components/data-analysis/ControlPanel.vue +++ b/src/components/data-analysis/ControlPanel.vue @@ -2,7 +2,6 @@
-
+
+

{{ channel.xAxis }}

+

{{ channel.yAxis }}

+

{{ fileView.filesSelected }}

+
Start @@ -30,12 +34,15 @@ diff --git a/src/pages/admin/data-analysis/DataAnalysis.vue b/src/pages/admin/data-analysis/DataAnalysis.vue index 23c878c..3f28bd4 100644 --- a/src/pages/admin/data-analysis/DataAnalysis.vue +++ b/src/pages/admin/data-analysis/DataAnalysis.vue @@ -43,13 +43,19 @@ // stop loading linechart_ref.value?.stopLoading() + // draw line // draw line if (msg.length < 3) return true + let yAxis_list = msg[2].map((x) => ({ yAxis: x })) + let coord_list = [{ coord: [msg[3][0][0], msg[3][0][1]] }, { coord: [msg[3][1][0], msg[3][1][1]] }] + // yAxis_list.append([{ coord:[ msg[3][0][0],msg[3][0][1]]},{ coord:[ msg[3][1][0], msg[3][1][1]]}]) + yAxis_list.push(coord_list) + console.log('yAxis_list', yAxis_list) linechart_ref.value.setOption({ series: [ { markLine: { - data: [{ yAxis: msg[2] }, { yAxis: msg[3] }], + data: yAxis_list, }, }, ], @@ -60,9 +66,11 @@ const linechart_ref = ref() // ControlPanel handling - const filterData = function () { + const filterData = function (e: any) { linechart_ref.value?.startLoading() - publish(`${controllerID}_data_analysis/get_analysis_data`, JSON.stringify({})) + console.log(linechart_ref) + console.log(e) + publish(`${controllerID}_data_analysis/get_analysis_data`, JSON.stringify({ e })) } defineExpose({ linechart_ref, filterData })