From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/doubleIndex/saftyScreen/components/screen.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/doubleIndex/saftyScreen/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue
index ff1eaa7..ec4bd8f 100644
--- a/src/views/doubleIndex/saftyScreen/components/screen.vue
+++ b/src/views/doubleIndex/saftyScreen/components/screen.vue
@@ -2,9 +2,9 @@
<div class="screen-container">
<div class="header-content">
<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()
},
// 获取部门列表
@@ -516,14 +518,14 @@
await this.initRiskLevel()
},
changeInspectionTask() {
- this.updateMission(this.personListQuery)
+ this.updateMission(this.taskListQuery)
},
changeTimeTask(){
if(this.value3 !== null){
- this.taskListQuery.startTime = this.value1[0]
- this.taskListQuery.endTime = this.value1[1]
+ this.taskListQuery.startTime = this.value3[0]
+ this.taskListQuery.endTime = this.value3[1]
}
- this.updateMission(this.personListQuery)
+ this.updateMission(this.taskListQuery)
},
// 各部门预约
@@ -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;
@@ -885,7 +886,7 @@
},
series: [
{
- name: '任务数量',
+ name: '当日认领数量',
type: 'bar',
data: this.claimedData,
itemStyle:{
@@ -893,7 +894,7 @@
}
},
{
- name: '已完成',
+ name: '当日完成数量',
type: 'bar',
data: this.completedData,
itemStyle:{
@@ -901,7 +902,7 @@
}
},
{
- name: '未完成',
+ name: '累计领取未完成数量',
type: 'bar',
data: this.uncompletedData,
itemStyle:{
@@ -1211,7 +1212,7 @@
.main-cont {
display: grid;
grid-template-columns: repeat(3, minmax(100px, 1fr));
- grid-template-rows: repeat(2, 1fr);
+ grid-template-rows: repeat(2, calc(50% - 20px));
grid-auto-flow: row;
padding: 10px;
margin-bottom: 20px;
@@ -1253,7 +1254,7 @@
.main-cont {
display: grid;
grid-template-columns: repeat(3, minmax(100px, 1fr));
- grid-template-rows: repeat(2, 1fr);
+ grid-template-rows: repeat(2, calc((100% - 35px)/2));
grid-auto-flow: row;
padding: 10px;
margin-bottom: 20px;
--
Gitblit v1.9.2