diff --git a/1.1/instance/monitor_data.db b/1.1/instance/monitor_data.db index 9ed592c..6d387f3 100644 Binary files a/1.1/instance/monitor_data.db and b/1.1/instance/monitor_data.db differ diff --git a/zhandianxinxi/my-vue-app/package-lock.json b/zhandianxinxi/my-vue-app/package-lock.json index 4ab6e2d..93f5d59 100644 --- a/zhandianxinxi/my-vue-app/package-lock.json +++ b/zhandianxinxi/my-vue-app/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@element-plus/icons-vue": "^2.1.0", "axios": "^1.5.1", + "echarts": "^6.0.0", "element-plus": "^2.3.14", "vue": "^3.3.4", "vue-json-viewer": "^3.0.4" @@ -760,6 +761,15 @@ "node": ">= 0.4" } }, + "node_modules/echarts": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.0.0.tgz", + "integrity": "sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "6.0.0" + } + }, "node_modules/element-plus": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.0.tgz", @@ -1177,6 +1187,11 @@ "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, + "node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "node_modules/vite": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", @@ -1262,6 +1277,14 @@ "peerDependencies": { "vue": "^3.2.2" } + }, + "node_modules/zrender": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.0.0.tgz", + "integrity": "sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==", + "dependencies": { + "tslib": "2.3.0" + } } }, "dependencies": { @@ -1719,6 +1742,15 @@ "gopd": "^1.2.0" } }, + "echarts": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.0.0.tgz", + "integrity": "sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==", + "requires": { + "tslib": "2.3.0", + "zrender": "6.0.0" + } + }, "element-plus": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.0.tgz", @@ -1999,6 +2031,11 @@ "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "vite": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", @@ -2030,6 +2067,14 @@ "requires": { "clipboard": "^2.0.4" } + }, + "zrender": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.0.0.tgz", + "integrity": "sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==", + "requires": { + "tslib": "2.3.0" + } } } } diff --git a/zhandianxinxi/my-vue-app/package.json b/zhandianxinxi/my-vue-app/package.json index e1a5d2d..49fdf85 100644 --- a/zhandianxinxi/my-vue-app/package.json +++ b/zhandianxinxi/my-vue-app/package.json @@ -8,14 +8,15 @@ "build": "vite build" }, "dependencies": { - "vue": "^3.3.4", - "element-plus": "^2.3.14", - "axios": "^1.5.1", "@element-plus/icons-vue": "^2.1.0", + "axios": "^1.5.1", + "echarts": "^6.0.0", + "element-plus": "^2.3.14", + "vue": "^3.3.4", "vue-json-viewer": "^3.0.4" }, "devDependencies": { - "vite": "4.5.0", - "@vitejs/plugin-vue": "4.5.0" + "@vitejs/plugin-vue": "4.5.0", + "vite": "4.5.0" } } diff --git a/zhandianxinxi/my-vue-app/src/App.vue b/zhandianxinxi/my-vue-app/src/App.vue index 65e23c5..b13a22a 100644 --- a/zhandianxinxi/my-vue-app/src/App.vue +++ b/zhandianxinxi/my-vue-app/src/App.vue @@ -25,7 +25,7 @@ 106 代理 82 气象站 - +
@@ -38,8 +38,10 @@ @@ -47,7 +49,7 @@ {{ getStatusLabel(row) }} - + @@ -62,16 +64,33 @@ - -
- - {{ activeDevice.name }} - {{ activeDevice.latest_time }} - -

📦 原始数据

-
- - + +
+
+ + {{ activeDevice.name }} + {{ activeDevice.source }} + {{ activeDevice.latest_time }} + +
+ +
+

光谱能量分布分析

+
未检测到可解析的光谱数据模块
+
+
+ {{ module.title }} + 序列号: {{ module.sn }} +
+
+
+
+ +
+

原始数据报文

+
+ +
@@ -79,9 +98,11 @@