From dd43c95c5a020c1a828263cc5944ed6fb644b65d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:53:18 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/~mayuhao/HazardInvestigationSystem
---
src/views/doubleIndex/saftyScreen/components/screen.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/doubleIndex/saftyScreen/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue
index 0eda9fd..e8a47c6 100644
--- a/src/views/doubleIndex/saftyScreen/components/screen.vue
+++ b/src/views/doubleIndex/saftyScreen/components/screen.vue
@@ -4,7 +4,7 @@
<div class="logo">
众泰煤焦化智能化安全管理技术平台
</div>
- <div class="title">安全信息大屏</div>
+ <div class="title">安全信息公示</div>
<div class="title-right">
<!-- <img src="themeStyle.skinIcon" class="qiehuan" @click="changeTheme" />-->
<span class="datetime">{{currentTime}}</span>
@@ -311,9 +311,11 @@
this.$router.push({
path:"/fullScreen"
})
+ this.$parent.clickFullscreen()
},
back(){
window.history.go(-1);
+ this.$parent.clickFullscreen()
},
// 获取部门列表
@@ -725,8 +727,7 @@
if (option && typeof option === 'object') {
myChart.setOption(option);
- t.myVar = setInterval(function(){
- console.log('tik')
+ t.myVar = window.setInterval(function(){
if (option.dataZoom[0].endValue == t.depList.length ) {
option.dataZoom[0].endValue = 6;
option.dataZoom[0].startValue = 0;
--
Gitblit v1.9.2