diff --git a/package.json b/package.json index 1c9903c..6e84916 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "sortablejs": "1.10.2", "vkbeautify": "^0.99.3", "vue": "2.6.12", - "vue-count-to": "1.0.13", + "vue-count-to": "^1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", diff --git a/src/views/big-screen/disease-components/traffic-trend.vue b/src/views/big-screen/disease-components/traffic-trend.vue index b8afe21..154fa02 100644 --- a/src/views/big-screen/disease-components/traffic-trend.vue +++ b/src/views/big-screen/disease-components/traffic-trend.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-21 10:03:08 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-13 13:54:26 + * @LastEditTime: 2024-12-13 15:21:00 * @FilePath: \znxjxt-ui\src\views\big-screen\traffic-components\traffic-trend.vue * @Description: 病害巡检大屏-病害趋势 --> @@ -213,10 +213,11 @@ export default { ], yAxis: [ { - name: "数量", + name: "数量:个", nameTextStyle: { color: "#C7DAF2", }, + minInterval: 1, splitLine: { show: false, }, diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index 32fbc2b..1d5e50f 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -1420,6 +1420,7 @@ export default { background-color: transparent; padding: 0 0.3rem; border: none; + color: #ffffff; } .el-radio-button__orig-radio:checked + .el-radio-button__inner { @@ -1463,8 +1464,8 @@ export default { height: 7rem; width: 2rem; position: absolute; - top: 17%; - left: 26%; + bottom: 16%; + right: 27%; z-index: 1; background-image: url("../../assets/screen/index/map-legend.png"); background-repeat: no-repeat; @@ -1519,9 +1520,10 @@ export default { .map-image-select { left: 28%; top: 10%; - font-size: 1rem; + font-size: 0.9rem; position: absolute; color: #ffffff; + font-family: "DouYu"; } // 打点部分 diff --git a/src/views/big-screen/overview-components/disease-current.vue b/src/views/big-screen/overview-components/disease-current.vue index 12e4395..ef9b395 100644 --- a/src/views/big-screen/overview-components/disease-current.vue +++ b/src/views/big-screen/overview-components/disease-current.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-18 10:19:56 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-10 11:42:43 + * @LastEditTime: 2024-12-13 16:44:58 * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\disease-current.vue * @Description: 总览大屏-病害三维饼图 --> @@ -34,6 +34,26 @@