From 663da7fa440b2760cdc31cb3b2d064838a0e722b Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 14 九月 2022 17:57:47 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workPlan/workReservation/index.vue | 19 +++---
src/views/riskWarningSys/warningBigScreen/index.vue | 132 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+), 11 deletions(-)
diff --git a/src/views/riskWarningSys/warningBigScreen/index.vue b/src/views/riskWarningSys/warningBigScreen/index.vue
index d8744f2..e0bf691 100644
--- a/src/views/riskWarningSys/warningBigScreen/index.vue
+++ b/src/views/riskWarningSys/warningBigScreen/index.vue
@@ -1,5 +1,24 @@
<template>
<div id="container" class="dark">
+ <div class="warn-dialog" :class="dialogShow">
+ <div>预警消息：<p style="margin-top: 20px;font-size: 18px;line-height: 28px;text-align: left">企业8月份总体安全生产预警指数SPI风险值高于预警阈值，可能存在未处理隐患，请注意查阅相关风险因素，采取风险防控措施。</p></div>
+ <span @click="dialogShow = 'hide'">关闭</span>
+ </div>
+ <div class="info-panel" :class="dialogHide" @click="openDialog">
+ <div class="info-tit">
+ <div>
+ <el-icon><Bell /></el-icon>
+ <div style="margin-left: 10px">消息预警</div>
+ </div>
+ <div @click.stop="dialogHide = 'hide'">X</div>
+ </div>
+ <div class="info-desc">
+ 企业8月份总体安全生产预警指数SPI风险值高于预警阈值。
+ </div>
+ <div class="info-num">
+ 1
+ </div>
+ </div>
<div class="header-content">
<div class="logo">
<img v-if="screenTheme.isDark" src="../../../assets/warningScreen/logo_dark.png" alt="" />
@@ -170,7 +189,9 @@
isScreenfull: boolean;
currentTime: string;
spiValue: number;
- spiOptions: Array<any>
+ spiOptions: Array<any>;
+ dialogShow: string;
+ dialogHide: string
}
export default defineComponent({
name: 'warningScreen',
@@ -201,6 +222,8 @@
isScreenfull: false,
currentTime: '',
spiValue: 0,
+ dialogShow: 'hide',
+ dialogHide: 'showup',
spiOptions: [
{
value: 0,
@@ -303,6 +326,18 @@
});
};
+ const openDialog = () => {
+ if(state.dialogShow == 'hide'){
+ state.dialogShow = 'showup'
+ }else{
+ state.dialogShow = 'hide'
+ }
+ };
+
+ const closeInfo = ()=>{
+ state.dialogHide = 'hide'
+ };
+
const jumpPage = (num) =>{
router.push({
path: 'screenPage',
@@ -335,6 +370,8 @@
router,
props,
screenTheme,
+ openDialog,
+ closeInfo,
changeTheme,
onScreenfullClick,
jumpPage,
@@ -347,6 +384,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
+
.dark {
width: 100%;
height: 100%;
@@ -357,6 +395,96 @@
background-size: 100% 100%;
color: #11FEEE;
+ .warn-dialog{
+ position: absolute;
+ z-index: 999999;
+ top: 25%;
+ left: 50%;
+ width: 50%;
+ height: 50%;
+ transform: translateX(-50%);
+ border-radius: 8px;
+ transition: .3s;
+ box-shadow: 0 15px 30px rgba(0,0,0,.2);
+ border: 1px solid rgba(17,254,238,.4);
+ padding: 40px;
+ background: rgba(0,16,32,.8);
+
+ span{
+ position: inherit;
+ right: 20px;
+ top: 20px;
+ font-size: 15px;
+ cursor: pointer;
+ }
+
+ div{
+ font-size: 24px;
+ text-align: center;
+ }
+ }
+
+ .info-panel{
+ position: absolute;
+ width: 20%;
+ right: 50px;
+ bottom: 50px;
+ z-index: 9999999;
+ font-size: 16px;
+ padding: 0 10px;
+ border-radius: 4px;
+ cursor: pointer;
+ box-shadow: 0 15px 30px rgba(0,0,0,.2);
+ border: 1px solid rgba(17,254,238,.4);
+ background: rgba(0,16,32,.8);
+
+ .info-tit{
+ display: flex;
+ align-items: center;
+ padding: 10px;
+ border-bottom: 1px solid rgba(17,254,238,.4);
+ justify-content: space-between;
+
+ &>div{
+ display: flex;
+ align-items: center;
+
+ img{
+ width: 18px;
+ height: 18px;
+ margin-right: 10px;
+ }
+ }
+ }
+
+ .info-desc{
+ padding: 15px 10px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ .info-num{
+ position: inherit;
+ width: 24px;
+ height: 24px;
+ line-height: 24px;
+ text-align: center;
+ left: -12px;
+ top: -12px;
+ color: #fff;
+ z-index: 999999999;
+ border-radius: 50%;
+ border: 1px solid #ff0000;
+ background: #ff0000;
+ }
+ }
+ .hide{
+ display: none;
+ }
+
+ .showup{
+ display: block;
+ }
.header-content {
width: 100%;
height: 7.8%;
@@ -576,6 +704,8 @@
background-size: 100% 100%;
color: #000;
+
+
.header-content {
width: 100%;
height: 7.8%;
diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
index 8e696b2..0a792f0 100644
--- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
@@ -2,12 +2,12 @@
<div class="home-container">
<div style="height: 100%">
<el-row class="homeCard">
- <el-col :span="6" style="display:flex;align-items: center">
- <span style="white-space: nowrap">申请部门：</span>
- <div class="grid-content topInfo">
- <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>
- </div>
- </el-col>
+<!-- <el-col :span="6" style="display:flex;align-items: center">-->
+<!-- <span style="white-space: nowrap">申请部门：</span>-->
+<!-- <div class="grid-content topInfo">-->
+<!-- <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>-->
+<!-- </div>-->
+<!-- </el-col>-->
<el-col :span="6" style="display:flex;align-items: center;">
<span style="white-space: nowrap;margin-left: 20px">预约日期：</span>
<div class="grid-content topInfo">
@@ -142,9 +142,9 @@
</el-dialog>
<el-dialog v-model="dialogAddRecord" title="作业预约编辑" @close="closeAdd">
<el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
- <el-form-item label="申请部门" prop="applyDepId">
- <el-cascader placeholder="若选择部门非本人所在部门，则记录不会出现在该页面" :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />
- </el-form-item>
+<!-- <el-form-item label="申请部门" prop="applyDepId">-->
+<!-- <el-cascader placeholder="若选择部门非本人所在部门，则记录不会出现在该页面" :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />-->
+<!-- </el-form-item>-->
<el-form-item label="预约时间" prop="appointmentTime">
<el-date-picker
v-model="addRecord.appointmentTime"
@@ -299,7 +299,6 @@
const addRef = ref<FormInstance>();
const addRules = reactive<FormRules>({
- applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
appointmentTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
hotWork: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
groundBreakingOper: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
--
Gitblit v1.9.2