1.修复big界面饼图label显示不全

2.修复预热时间不更新bug 3.v1.1.4发布
date13 · Jan 6, 2025 · c280593 · c280593
1 parent 5dec466
commit c280593
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/web_page/package.json b/web_page/package.json
@@ -1,7 +1,7 @@
 {
   "name": "carelink_follower",
   "private": true,
-  "version": "1.1.3",
+  "version": "1.1.4",
   "scripts": {
     "dev": "vite --mode development",
     "local": "vite --mode dev_local",
@@ -21,7 +21,7 @@
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.1",
+    "element-plus": "^2.9.2",
     "lodash-es": "^4.17.21",
     "mathjs": "^14.0.1",
     "nprogress": "^0.2.0",
@@ -45,7 +45,7 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@iconify-json/ep": "^1.2.2",
     "@types/crypto-js": "^4.2.2",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "@types/node": "^22.10.5",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
@@ -57,7 +57,7 @@
     "@vue/runtime-core": "^3.5.13",
     "eslint": "^9.17.0",
     "rollup-plugin-visualizer": "^5.13.1",
-    "sass": "1.83.0",
+    "sass": "1.83.1",
     "typescript": "^5.7.2",
     "unocss": "^0.65.3",
     "unplugin-auto-import": "^0.19.0",

diff --git a/web_page/src/model/classes/Carelink.ts b/web_page/src/model/classes/Carelink.ts
@@ -81,10 +81,19 @@ export class InTimeBarChartData extends Base {
   tooltip = {
     trigger: 'item'
   }
+  minAngle = 10          　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互
+
   label = {
     show: true, // 显示标签
-    position: 'inside',
-    formatter: '{d}%' // 设置标签格式
+    formatter: '{b|{d}%}', // 设置标签格式
+    rich: {
+      b: {
+        fontSize: 12,
+        height: 60,
+        lineHeight: 20,
+        align: 'center' // 设置文字居中
+      },
+    }
   }
   series = [
     {

diff --git a/web_page/src/views/index.vue b/web_page/src/views/index.vue
@@ -97,7 +97,7 @@
                >
                 <template #reference>
                   预计启动:&nbsp;{{
-                    Tools.toNow(nextStartTime)
+                    nextStartTimeToNow
                   }}
                 </template>
                </el-popover>
@@ -346,7 +346,9 @@ const chartTimeOption: any = computed(() => {
     interval
   }
 })
-
+const nextStartTimeToNow = computed(() => {
+  return Tools.toNow(sugarCommon.state.nextStartTime)
+})
 //画图的参数
 const charOption = computed(() => {
   return {

diff --git a/web_page/src/views/index_big.vue b/web_page/src/views/index_big.vue
@@ -40,7 +40,7 @@
                  >
                   <template #reference>
                     预计启动:&nbsp;{{
-                      Tools.toNow(nextStartTime)
+                      nextStartTimeToNow
                     }}
                   </template>
                 </el-popover>
@@ -243,7 +243,6 @@ const state: any = reactive({
 const {
   statistics,
   showLogsDialog,
-  playAlarmObj
 } = toRefs(state)
 
 const {
@@ -402,6 +401,9 @@ function refreshChart() {
   chartObj.myChart.setOption(charOption.value.myChart, true);
 }
 
+const nextStartTimeToNow = computed(() => {
+  return Tools.toNow(sugarCommon.state.nextStartTime)
+})
 //画图的参数
 const charOption = computed(() => {
   return {