From c5876a29fb8dc94562a272df18358bb7b255e64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 19 Sep 2022 16:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E7=A6=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index.vue | 16 +++++++++++-----
 src/views/hrm/ep_form.vue     | 12 ++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index c18a0412..ba288c7d 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -744,6 +744,8 @@ import sysConfig from "@/config";
 export default {
 	data() {
 		return {
+			timerUser: null,
+			timerTime: null,
 			domMarkerLayer: null,
 			userMaskerLayer: null,
 			jobDomMarkerLayer: null,
@@ -878,7 +880,7 @@ export default {
 		that.timeNow = date.getDay();
 		that.todayDate = this.warningData.params.start_create = this.cateAggForm.start_create = this.$TOOL.dateFormat(new Date(), 'yyyy-MM-dd');
 		that.showTime();
-		setInterval(() => {
+		that.timerTime = setInterval(() => {
 			that.showTime();
 		}, 1000);
 		window.map = new jsmap.JSMap({
@@ -1064,9 +1066,10 @@ export default {
 		this.areaTableHeight = areaTableHeight;
 		document.getElementsByClassName('cockpit-info')[0].style.height = domHeight + 'px';
 		// document.getElementsByClassName('area-info-body')[0].style.height = simpleBodyHeight + 'px';
-		setInterval(function () { 
-
-		}, 300000)
+	},
+	beforeUnmount(){
+		clearInterval(this.timerUser)
+		clearInterval(this.timerTime)
 	},
 	methods: {
 		showTime() {
@@ -1628,12 +1631,15 @@ export default {
 				// 	});//动画效果,持续时间一秒
 				// }, 11000)
 			}
-			setInterval(function () {
+			that.timerUser = setInterval(function () {
 				that.refreshUserMarker();
 			}, 30000)
 		},
 		//更新人员标记
 		refreshUserMarker() {
+			if (document.getElementById("mapContainer") == null || document.getElementById("mapContainer") == undefined){
+				return
+			}
 			debugger;
 			let that = this;
 			that.$API.third.blt.all.req().then(res => {
diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue
index 15529245..0e808d5a 100644
--- a/src/views/hrm/ep_form.vue
+++ b/src/views/hrm/ep_form.vue
@@ -119,6 +119,11 @@
 						</el-col>
 						</el-row>
 					</el-row>
+					<el-row>
+						<el-form-item label="门禁时间范围">
+								<span v-if="form.door_range">{{form.door_range[0]}}  至  {{form.door_range[1]}}</span>
+							</el-form-item>
+					</el-row>
 				</el-form>
 			</el-main>
 			<el-footer v-if="mode!=='show'">
@@ -288,9 +293,12 @@
 			//表单注入数据
 			setData(data) {
 				//debugger;
-				console.log(defaultForm);
+				// console.log(defaultForm);
 				// this.form = defaultForm;
-				Object.assign(this.form, data);
+				this.$API.hrm.employee.item.req(data.id).then(res=>{
+					this.form = res
+				})
+				// Object.assign(this.form, data);
 			},
 			//设置过滤项
 			setFilters(filters) {