Merge branch 'merge-master'

README.md

@@ -1,8 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-19 15:07:25
- * @LastEditTime: 2023-10-19 14:25:30
+ * @LastEditTime: 2023-10-27 14:23:29
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -741,3 +740,11 @@ feature
 update
 - c1后台设备功耗查看页面
     - 修改 数据解析方法
+
+
+
+## v1.0.93
+`2023.10.27`
+fix
+- c1后台设备功耗查看页面
+    - 修复 上报周期无数据时显示不全的问题

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.92F'; //版本号
+export const VERSION_MODEL = '1.0.93F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/gps-card-frontend/device-setting/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-10-11 15:34:12
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-13 15:01:00
+ * @LastEditTime: 2023-10-27 14:19:16
  * @FilePath: \TelpoH5FrontendWeb\src\views\gps-card-frontend\device-setting\index.vue
  * @description:
 -->
@@ -361,7 +361,7 @@ export default {
             if(data) {
                 this.settingItems[9].text = `上报周期(${data.uploadinteval}分钟)`;
             } else {
-                this.settingItems[9].text = '关闭';
+                this.settingItems[9].text = '上报周期(关闭)';
             }
         })
     },