From 20b0ce2db27b64a60de60aee05dedd448099e330 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期一, 08 七月 2024 10:12:16 +0800 Subject: [PATCH] xiugai --- src/views/riskWarningSys/warningBigScreen/index.vue | 52 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/views/riskWarningSys/warningBigScreen/index.vue b/src/views/riskWarningSys/warningBigScreen/index.vue index 15c75bc..ffcb8aa 100644 --- a/src/views/riskWarningSys/warningBigScreen/index.vue +++ b/src/views/riskWarningSys/warningBigScreen/index.vue @@ -30,10 +30,10 @@ <!-- <img src="themeStyle.skinIcon" class="qiehuan" @click="changeTheme" />--> <span class="datetime">{{currentTime}}</span> <div class="btns"> - <div class="themeBtn" @click="changeTheme()"> - <img v-if="screenTheme.isDark" src="../../../assets/warningScreen/skin.png"/> - <img v-else src="../../../assets/warningScreen/skin-light.png"/> - </div> +<!-- <div class="themeBtn" @click="changeTheme()">--> +<!-- <img v-if="screenTheme.isDark" src="../../../assets/warningScreen/skin.png"/>--> +<!-- <img v-else src="../../../assets/warningScreen/skin-light.png"/>--> +<!-- </div>--> <div class="fullBtn" @click="onScreenfullClick"> <div class="toFull"> <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i> @@ -64,7 +64,7 @@ <div class="left-mid"> <dv-border-box-13 :backgroundColor="boxBg" :color="boxColor" class="box-bg"></dv-border-box-13> <div class="part-tit"> - <span>| 应急演练次数</span> + <span>| 智能巡检超期未巡检任务</span> <!-- <img @click="jumpPage(2)" src="../../../assets/warningScreen/small-full.png">--> <Switch style="width: 1.2rem;height: 1.2rem;cursor: pointer" @click="jumpPage(2)"/> </div> @@ -75,7 +75,7 @@ <div class="left-bottom"> <dv-border-box-13 :backgroundColor="boxBg" :color="boxColor" class="box-bg"></dv-border-box-13> <div class="part-tit"> - <span>| 隐患等级数量分布</span> + <span>| 隐患趋势</span> <Switch style="width: 1.2rem;height: 1.2rem;cursor: pointer" @click="jumpPage(3)"/> </div> <div class="chart-box"> @@ -88,15 +88,15 @@ <dv-border-box-11 title="SPI数据分析" :backgroundColor="boxBg" :color="boxBigColor" class="box-bg"></dv-border-box-11> <div class="part-tit" style="position: absolute;top: 10%;padding: 0 4%;align-items: flex-start;z-index: 10001"> <div class="spiChart"> - <el-cascader - class="spiSe" - :teleported="false" - v-model="depValue" - :options="departList" - :props="depProps" - :show-all-levels="false" - @change="depChange" - /> +<!-- <el-cascader--> +<!-- class="spiSe"--> +<!-- :teleported="false"--> +<!-- v-model="depValue"--> +<!-- :options="departList"--> +<!-- :props="depProps"--> +<!-- :show-all-levels="false"--> +<!-- @change="depChange"--> +<!-- />--> </div> <Switch style="width: 1.2rem;height: 1.2rem;cursor: pointer" @click="jumpPage(4)"/> </div> @@ -160,7 +160,7 @@ <Switch style="width: 1.2rem;height: 1.2rem;cursor: pointer" @click="jumpPage(9)"/> </div> <div class="chart-box"> - <monitor></monitor> + <monitor :size="1" ref="monRef" :theme="screenTheme.isDark"></monitor> </div> </div> <div class="right-bottom"> @@ -201,6 +201,8 @@ import {useScreenTheme} from "/@/stores/screenTheme" import {storeToRefs} from "pinia"; import {teamManageApi} from "/@/api/systemManage/basicDateManage/personShiftManage/teamManage"; + import {NextLoading} from "/@/utils/loading"; + import {videoApi} from "/@/api/systemManage/video"; // 定义接口来定义对象的类型 interface stateType { @@ -248,7 +250,7 @@ isScreenfull: false, currentTime: '', dialogShow: 'hide', - dialogHide: 'showup', + dialogHide: 'hide', depProps: { expandTrigger: 'hover', checkStrictly: true, @@ -259,8 +261,10 @@ departList: [], timer: null }); + const monRef = ref() // 页面载入时执行方法 onMounted(() => { + NextLoading.done(); state.depValue = screenTheme.value.depId getTime(); getAllDepartment(); @@ -344,7 +348,7 @@ }else{ state.dialogShow = 'hide' } - }; + } const closeInfo = ()=>{ state.dialogHide = 'hide' @@ -361,7 +365,10 @@ // 返回上一页 const goBack = () => { - window.history.go(-1); + // window.history.go(-1); + router.push({ + path: 'newMenu' + }); }; onBeforeUnmount(() =>{ @@ -385,6 +392,7 @@ router, props, screenTheme, + monRef, openDialog, closeInfo, changeTheme, @@ -403,10 +411,14 @@ .hide{ display: none; } - + #container{ + width: 100%; + height: 100%; + } .showup{ display: block; } + .dark { width: 100%; height: 100%; -- Gitblit v1.9.2