完成008A功能开发

pages/common/sosSet/LinkManSetting.vue

@@ -53,8 +53,11 @@
 		MsgPrompt
 	} from '@/utils/MsgPops.js'
 	import Common from '@/utils/Common.js';
+	import api from '@/api/670/HBY670.js';
+	
 	var these = null;
 	var eventChannel = null;
+	import {deviceInfo} from '@/api/common/index.js'
 	export default {
 		data() {
 			return {
@@ -86,7 +89,9 @@
 					longitude: null,
 					alarmStatus: null,
 					detailPageUrl: "/pages/650/HBY650",
-					showConfirm: false
+					showConfirm: false,
+					contact1Phone:null,
+					contact2Phone:null
 				}
 			}
 		},
@@ -125,14 +130,41 @@
 				console.log("收到父页面的参数：" + JSON.stringify(data));
 				these.device = data;
 
-				this.list[0] = data.contact1Phone;
-				this.list[1] = data.contact2Phone;
-
+				
+				this.init();
 			});
 
 
 		},
 		methods: {
+			init(){
+				api.getDetail(this.device.id).then(res => {
+				
+					if (res && res.code == 200) {
+						let data = res.data;
+						if(data.length){
+							data=data[0];
+						}
+						let keys = Object.keys(data);
+						let dKeys = Object.keys(this.device);
+						for (let i = 0; i < keys.length; i++) {
+							let key = keys[i];
+				
+							let dk = dKeys.find(k => {
+								return key.toLowerCase() == k.toLowerCase();
+							});
+							if (dk) {
+								this.$set(this.device, dk, data[key]);
+							} else {
+								this.$set(this.device, key, data[key]);
+							}
+						}
+						
+						this.list[0] = data.contact1Phone;
+						this.list[1] = data.contact2Phone;
+					}
+				});
+			},
 			notifyPrevPage(){//通知上一个页面
 				if (eventChannel) {
 					eventChannel.emit('linkManOver', this.list);
@@ -231,9 +263,7 @@
 
 					let requestCall = () => {
 
-						this.$set(this.list, this.cEdit.index, this.cEdit.txt)
-
-						
+						this.$set(this.list, this.cEdit.index, this.cEdit.txt)					
 						this.cEdit.txt = "";
 						this.cEdit.index = -1;
 					}

pages/common/sosSet/TxtMsgSetting.vue

@@ -40,7 +40,7 @@
 		MsgInfo
 	} from '@/utils/MsgPops.js'
 	import Common from '@/utils/Common.js';
-
+	import api from '@/api/670/HBY670.js';
 
 	var these = null;
 	var eventChannel = null;
@@ -67,7 +67,8 @@
 					longitude: null,
 					alarmStatus: null,
 					detailPageUrl: "",
-					showConfirm: false
+					showConfirm: false,
+					sosSmsMsg:null
 				}
 			}
 		},
@@ -101,11 +102,24 @@
 				if(data.sosSmsMsg){
 					this.txt=data.sosSmsMsg;
 				}
+				this.init();
 			});
 
 
 		},
 		methods: {
+			init(){
+				api.getDetail(this.device.id).then(res => {
+				
+					if (res && res.code == 200) {
+						let data = res.data;
+						if(data.length){
+							data=data[0];
+						}
+						this.txt=data.sosSmsMsg;
+					}
+				});
+			},
 			copyTo(item, index) {
 				this.txt = item;
 			},