From 6b8b73bd29b37153cd61971b7f29ca0ade5ea127 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 15 Dec 2023 18:14:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20-=20=E8=AE=BE=E5=A4=87=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9C=AA=E5=93=8D=E5=BA=94=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  8 +++++-
 src/config/models.js                          |  2 +-
 .../device-setting/index.vue                  | 27 ++++++++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index dd1d8fe..edd5582 100644
--- a/README.md
+++ b/README.md
@@ -871,4 +871,10 @@ update
 `2023.12.13`
 update
 - 设备设置列表
-    - 优化 全部接口响应完成才加载完成
\ No newline at end of file
+    - 优化 全部接口响应完成才加载完成
+
+## v1.0.111
+`2023.12.15`
+fix
+- 设备设置列表
+    - 修复 接口未响应完成提示加载完成
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index 503f39e..8259e79 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.110F'; //版本号
+export const VERSION_MODEL = '1.0.111F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/gps-card-frontend/device-setting/index.vue b/src/views/gps-card-frontend/device-setting/index.vue
index ffe908f..7fad3c0 100644
--- a/src/views/gps-card-frontend/device-setting/index.vue
+++ b/src/views/gps-card-frontend/device-setting/index.vue
@@ -112,7 +112,13 @@ export default {
                     message: '数据加载完成',
                     duration: 2000
                 });
-            };
+            } else {
+                this.$toast.clear();
+                this.$dialog.comfirm({
+                    title: '提示',
+                    message: '请重新进入或者刷新页面'
+                })
+            }
         } catch(error){
             console.log('error', error);
             this.$toast.clear();
@@ -223,8 +229,9 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = this.concatTitle('加强省电模式','关闭', '耗电低');
                 }
+                resolve(true)
             });
-            resolve(true)
+            
         })
     },
     // 获取设备定位参数
@@ -257,8 +264,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = this.concatTitle('定位监测','关闭', '耗电低');
                 }
+                resolve(true)
             });
-            resolve(true)
         })
     },
     // 获取免告警水域
@@ -320,8 +327,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('危险区域监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
 
@@ -409,8 +416,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('健康监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 获取血压监测参数设置
@@ -449,8 +456,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('血压监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 格式化等级
@@ -516,8 +523,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('心理监测', '关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
      // 转换时间格式
@@ -605,8 +612,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('佩戴监测', '关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
 
     },
@@ -632,8 +639,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = '上报周期(关闭)';
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 获取设备状态
@@ -659,8 +666,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = `设备状态(无数据)`;
                 }
+                resolve(true)
             });
-            resolve(true);
        })
     },
     // 计算设备状态