From 6a5d4d498832f3f4ad7dcbcb202199643017920f Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 30 八月 2022 10:47:43 +0800
Subject: [PATCH] Default Changelist
---
src/assets/warningScreen/pagebg-r.png | 0
src/assets/warningScreen/pagebg-t.png | 0
src/views/specialWorkSystem/workTicket/workApply/components/broken.vue | 11 +-
src/theme/bigScreen.css | 18 ++++
src/assets/warningScreen/small-full.png | 0
src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue | 29 +++---
src/views/specialWorkSystem/workTicket/workApply/components/plate.vue | 35 ++++----
src/views/specialWorkSystem/workTicket/workApply/components/space.vue | 5
src/router/route.ts | 8 ++
src/views/specialWorkSystem/workTicket/workApply/components/power.vue | 5 -
src/views/specialWorkSystem/workTicket/workApply/components/height.vue | 47 ++++++-----
src/views/specialWorkSystem/workTicket/workApply/components/fire.vue | 29 +++---
src/views/specialWorkSystem/workTicket/workApply/components/ground.vue | 9 +-
src/assets/warningScreen/body-bg.jpg | 0
src/assets/warningScreen/pagebg-l.png | 0
15 files changed, 108 insertions(+), 88 deletions(-)
diff --git a/src/assets/warningScreen/body-bg.jpg b/src/assets/warningScreen/body-bg.jpg
new file mode 100644
index 0000000..92def2a
--- /dev/null
+++ b/src/assets/warningScreen/body-bg.jpg
Binary files differ
diff --git a/src/assets/warningScreen/pagebg-l.png b/src/assets/warningScreen/pagebg-l.png
new file mode 100644
index 0000000..c630e6f
--- /dev/null
+++ b/src/assets/warningScreen/pagebg-l.png
Binary files differ
diff --git a/src/assets/warningScreen/pagebg-r.png b/src/assets/warningScreen/pagebg-r.png
new file mode 100644
index 0000000..26976dc
--- /dev/null
+++ b/src/assets/warningScreen/pagebg-r.png
Binary files differ
diff --git a/src/assets/warningScreen/pagebg-t.png b/src/assets/warningScreen/pagebg-t.png
new file mode 100644
index 0000000..dd132ec
--- /dev/null
+++ b/src/assets/warningScreen/pagebg-t.png
Binary files differ
diff --git a/src/assets/warningScreen/small-full.png b/src/assets/warningScreen/small-full.png
new file mode 100644
index 0000000..ea70b32
--- /dev/null
+++ b/src/assets/warningScreen/small-full.png
Binary files differ
diff --git a/src/router/route.ts b/src/router/route.ts
index 5ee3c9e..96ace6c 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -111,5 +111,13 @@
meta: {
title: '预警预报'
}
+ },
+ {
+ path: '/screenPage',
+ name: 'screenPage',
+ component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/index.vue'),
+ meta: {
+ title: '预警预报'
+ }
}
];
diff --git a/src/theme/bigScreen.css b/src/theme/bigScreen.css
new file mode 100644
index 0000000..9bda57f
--- /dev/null
+++ b/src/theme/bigScreen.css
@@ -0,0 +1,18 @@
+@media screen and (max-width: 1920px) {
+ body { font-size: 16px;}
+}
+@media screen and (max-width: 1200px) {
+ body { font-size: 14px;}
+}
+@media screen and (max-width: 1000px) {
+ body { font-size: 12px;}
+}
+@media screen and (max-width: 800px) {
+ body { font-size: 8px;}
+}
+@media screen and (max-width: 700px) {
+ body { font-size: 7px;}
+}
+@media screen and (max-width: 600px) {
+ body { font-size: 6px;}
+}
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
index dad3610..0187f0a 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
@@ -16,8 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -54,8 +52,7 @@
</el-form-item>
</el-col>
</el-row>
-
-
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
@@ -104,7 +101,7 @@
<el-upload accept="image/*" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' v-model:file-list="fileList" :http-request="upload" :action="uploadUrl" list-type="picture-card" :on-remove="handleRemove" :before-remove="beforeRemove" :before-upload="getUploadUrl">
<el-icon><Plus /></el-icon>
<template #tip>
- <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传5张</div>
+ <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传3张</div>
</template>
</el-upload>
</el-form-item>
@@ -174,7 +171,7 @@
expEndTime: ''
},
fileList: [],
- imgLimit: 5,
+ imgLimit: 3,
uploadUrl: '',
dialogVisible: false,
dialogImageUrl: null,
@@ -410,7 +407,7 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
index 9732afb..6418d6e 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
@@ -16,20 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="作业等级" prop="workLevel">
- <el-select v-model="form.workLevel">
- <el-option
- v-for="item in workLevelList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -46,6 +32,18 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="作业等级" prop="workLevel">
+ <el-select v-model="form.workLevel">
+ <el-option
+ v-for="item in workLevelList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容" prop="workContent">
<el-input
v-model="form.workContent"
@@ -55,6 +53,8 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="作业地址" prop="workLocation">
<el-input
@@ -66,6 +66,7 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="动火方式" prop="workDetail.hotMethod">
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
index 9e14e96..64481d4 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
@@ -16,8 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -54,6 +52,7 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
@@ -104,7 +103,7 @@
<el-upload accept="image/*" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' v-model:file-list="fileList" :http-request="upload" :action="uploadUrl" list-type="picture-card" :on-remove="handleRemove" :before-remove="beforeRemove" :before-upload="getUploadUrl">
<el-icon><Plus /></el-icon>
<template #tip>
- <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传5张</div>
+ <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传3张</div>
</template>
</el-upload>
</el-form-item>
@@ -175,7 +174,7 @@
expEndTime: ''
},
fileList: [],
- imgLimit: 5,
+ imgLimit: 3,
uploadUrl: '',
dialogVisible: false,
dialogImageUrl: null,
@@ -448,7 +447,7 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
index ecd1aeb..dc73325 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue
@@ -16,20 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="作业等级" prop="workLevel">
- <el-select v-model="form.workLevel">
- <el-option
- v-for="item in workLevelList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -46,6 +32,18 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="作业等级" prop="workLevel">
+ <el-select v-model="form.workLevel">
+ <el-option
+ v-for="item in workLevelList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容" prop="workContent">
<el-input
v-model="form.workContent"
@@ -55,6 +53,8 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="作业地址" prop="workLocation">
<el-input
@@ -66,17 +66,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="作业单位" prop="workDetail.operationDepId">
-<!-- <el-select v-model="form.workDetail.operationDepId">-->
-<!-- <el-option-->
-<!-- v-for="item in heDepList"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value"-->
-<!-- />-->
-<!-- </el-select>-->
+ <!-- <el-select v-model="form.workDetail.operationDepId">-->
+ <!-- <el-option-->
+ <!-- v-for="item in heDepList"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- />-->
+ <!-- </el-select>-->
<el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" />
</el-form-item>
</el-col>
@@ -349,7 +350,7 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
index ca95264..96038ec 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
@@ -16,20 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="作业等级" prop="workLevel">
- <el-select v-model="form.workLevel">
- <el-option
- v-for="item in workLevelList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -46,6 +32,18 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="作业等级" prop="workLevel">
+ <el-select v-model="form.workLevel">
+ <el-option
+ v-for="item in workLevelList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容" prop="workContent">
<el-input
v-model="form.workContent"
@@ -55,6 +53,8 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="作业地址" prop="workLocation">
<el-input
@@ -66,6 +66,7 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="吊装工具名称" prop="workDetail.hoistingToolName">
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
index 16b94cc..8e31dfc 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
@@ -16,20 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="作业等级" prop="workLevel">
- <el-select v-model="form.workLevel">
- <el-option
- v-for="item in workLevelList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -46,6 +32,18 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="作业等级" prop="workLevel">
+ <el-select v-model="form.workLevel">
+ <el-option
+ v-for="item in workLevelList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="作业内容" prop="workContent">
<el-input
v-model="form.workContent"
@@ -55,6 +53,8 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="作业地址" prop="workLocation">
<el-input
@@ -66,8 +66,7 @@
</el-form-item>
</el-col>
</el-row>
-
-
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="盲板编号" prop="workDetail.bpCode">
@@ -181,7 +180,7 @@
<el-upload accept="image/*" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' v-model:file-list="fileList" :http-request="upload" :action="uploadUrl" list-type="picture-card" :on-remove="handleRemove" :before-remove="beforeRemove" :before-upload="getUploadUrl">
<el-icon><Plus /></el-icon>
<template #tip>
- <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传5张</div>
+ <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传3张</div>
</template>
</el-upload>
</el-form-item>
@@ -258,7 +257,7 @@
expEndTime: ''
},
fileList: [],
- imgLimit: 5,
+ imgLimit: 3,
uploadUrl: '',
dialogVisible: false,
dialogImageUrl: null,
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
index 0d52888..f81cac7 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/power.vue
@@ -16,8 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -54,8 +52,7 @@
</el-form-item>
</el-col>
</el-row>
-
-
+ <el-divider border-style="dashed"/>
<el-row>
<el-col :span="12">
<el-form-item label="电源接入点" prop="workDetail.powerAccessPoint">
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
index 0f7515c..6036dd3 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
+++ b/src/views/specialWorkSystem/workTicket/workApply/components/space.vue
@@ -16,8 +16,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="作业时间" prop="workTimeLine">
<el-date-picker
@@ -54,6 +52,7 @@
</el-form-item>
</el-col>
</el-row>
+ <el-divider border-style="dashed" />
<el-row>
<el-col :span="12">
<el-form-item label="受限空间所属单位" prop="workDetail.csDepId">
@@ -312,7 +311,7 @@
.el-select{
width: 100%;
}
- .el-cascader{
+ :deep(.el-cascader){
width: 100% !important;
}
}
--
Gitblit v1.9.2