diff --git a/package.json b/package.json index 36f8420..96026d8 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "npm run lint && vue-tsc --noEmit && vite build", "build:ci": "vite build", "prelint": "npm run format", - "lint": "eslint --fix './src/**/*.{ts,js,vue}'", + "lint": "eslint --fix \"./src/**/*.{ts,js,vue}\"", "format": "prettier --write .", "preview": "vite preview" }, diff --git a/src/components/data-analysis/ControlPanel.vue b/src/components/data-analysis/ControlPanel.vue index c454cbc..3f98374 100644 --- a/src/components/data-analysis/ControlPanel.vue +++ b/src/components/data-analysis/ControlPanel.vue @@ -4,13 +4,28 @@ + +
+ +
+
+ +
+
+
+

{{ channel.xAxis }}

+

{{ channel.yAxis }}

+

{{ fileView.filesSelected }}

+
+
+ Start - @@ -19,20 +34,26 @@ 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 })