SunTao/xjsaas-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改大屏今日巡查，修改工单生成通知单，修改病害对比加标题，

Browse Source
This commit is contained in:
SunTao 2025-01-07 16:26:35 +08:00
parent 1747147428
commit e453a88a56
6 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/big-screen/disease-components/traffic-safety.vue
View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-21 09:59:32 * @Date: 2024-10-21 09:59:32
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-12-19 10:43:45 * @LastEditTime: 2025-01-07 14:26:49
* @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-safety.vue * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-safety.vue
* @Description: 病害巡检大屏-今日巡查 * @Description: 病害巡检大屏-今日巡查
--> -->
@ -21,9 +21,9 @@
<div class="right-rate-top"> <div class="right-rate-top">
<span>{{ count }}</span <span>{{ count }}</span
>个 >个
<i v-if="state === '增加'" class="el-icon-top"></i> <i v-if="state === '增加'" class="el-icon-caret-top"></i>
<i v-if="state === '无变化'" class="el-icon-minus"></i> <i v-else-if="state === '无变化'" class="el-icon-minus"></i>
<i v-else class="el-icon-bottom"></i> <i v-else class="el-icon-caret-bottom"></i>
</div> </div>
<div class="right-rate-bottom"> <div class="right-rate-bottom">
<span v-if="state === '增加'" class="up">{{ state }}</span> <span v-if="state === '增加'" class="up">{{ state }}</span>
@ -691,7 +691,9 @@ export default {
background-size: 100%; background-size: 100%;
background-position: 100% 50%; background-position: 100% 50%;
color: #aac6c7; color: #aac6c7;
font-size: 1rem; // font-size: 1rem;
font-family: "DouYu";
font-size: 0.8rem;
span { span {
margin-right: 0.5rem; margin-right: 0.5rem;
@ -725,6 +727,8 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-end; align-items: flex-end;
font-family: "DouYu";
font-size: 0.8rem;
span { span {
font-size: 1rem; font-size: 1rem;
@ -739,14 +743,18 @@ export default {
/*给文字设置成透明*/ /*给文字设置成透明*/
} }
.el-icon-top { .el-icon-caret-top {
font-size: 1.5rem; font-size: 1.2rem;
line-height: 1.5rem;
font-weight: 800;
color: red; color: red;
} }
.el-icon-bottom, .el-icon-caret-bottom,
.el-icon-minus { .el-icon-minus {
font-size: 1.5rem; font-size: 1.2rem;
line-height: 1.5rem;
font-weight: 800;
color: #19eb27; color: #19eb27;
} }
} }

25
src/views/big-screen/overview-components/today-inspection.vue
View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-18 09:42:49 * @Date: 2024-10-18 09:42:49
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-12-23 09:53:28 * @LastEditTime: 2025-01-07 14:26:03
* @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\today-inspection.vue * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\today-inspection.vue
* @Description: 总览大屏-今日巡查 * @Description: 总览大屏-今日巡查
--> -->
@ -21,9 +21,9 @@
<div class="right-rate-top"> <div class="right-rate-top">
<span>{{ count }}</span <span>{{ count }}</span
>个 >个
<i v-if="state === '增加'" class="el-icon-top"></i> <i v-if="state === '增加'" class="el-icon-caret-top"></i>
<i v-if="state === '无变化'" class="el-icon-minus"></i> <i v-else-if="state === '无变化'" class="el-icon-minus"></i>
<i v-else class="el-icon-bottom"></i> <i v-else class="el-icon-caret-bottom"></i>
</div> </div>
<div class="right-rate-bottom"> <div class="right-rate-bottom">
<span v-if="state === '增加'" class="up">{{ state }}</span> <span v-if="state === '增加'" class="up">{{ state }}</span>
@ -683,7 +683,8 @@ export default {
background-size: 100%; background-size: 100%;
background-position: 100% 50%; background-position: 100% 50%;
color: #aac6c7; color: #aac6c7;
font-size: 1rem; font-family: "DouYu";
font-size: 0.8rem;
span { span {
font-size: 1rem; font-size: 1rem;
@ -718,6 +719,8 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-end; align-items: flex-end;
font-family: "DouYu";
font-size: 0.8rem;
span { span {
font-size: 1rem; font-size: 1rem;
@ -732,14 +735,18 @@ export default {
/*给文字设置成透明*/ /*给文字设置成透明*/
} }
.el-icon-top { .el-icon-caret-top {
font-size: 1.5rem; font-size: 1.2rem;
line-height: 1.5rem;
font-weight: 800;
color: red; color: red;
} }
.el-icon-bottom, .el-icon-caret-bottom,
.el-icon-minus { .el-icon-minus {
font-size: 1.5rem; font-size: 1.2rem;
line-height: 1.5rem;
font-weight: 800;
color: #19eb27; color: #19eb27;
} }
} }

15
src/views/xj/document/maintenance-notice/index.vue
View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-11-20 11:58:33 * @Date: 2024-11-20 11:58:33
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-03 14:25:11 * @LastEditTime: 2025-01-07 15:03:36
* @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
* @Description: 养护通知单 * @Description: 养护通知单
--> -->
@ -174,12 +174,11 @@
> >
<el-table-column type="index" label="序号"> </el-table-column> <el-table-column type="index" label="序号"> </el-table-column>
<el-table-column label="路段名称" align="center" prop="segmentName" /> <el-table-column label="路段名称" align="center" prop="segmentName" />
<el-table-column label="采集时间" align="center" prop="createdTime"> <el-table-column
<template slot-scope="scope"> label="采集时间"
<span>{{ align="center"
new Date(scope.row.createdTime).toLocaleString() prop="createdTimeLocal"
}}</span> >
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="病害类型" label="病害类型"
@ -227,7 +226,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>生成工单 >生成通知单
</el-button> </el-button>
<el-button <el-button
v-if="activeName === '已生成'" v-if="activeName === '已生成'"

12
src/views/xj/inspection/surface-management/components/surface-map.vue
View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-14 14:49:21 * @Date: 2024-10-14 14:49:21
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2025-01-03 09:38:10 * @LastEditTime: 2025-01-07 15:56:50
* @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\components\surface-map.vue * @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\components\surface-map.vue
* @Description: 路面病害管理-地图组件 * @Description: 路面病害管理-地图组件
--> -->
@ -10,6 +10,9 @@
<template> <template>
<div class="div-all"> <div class="div-all">
<div class="div-map"> <div class="div-map">
<span>
{{ mapObject.title }}
</span>
<fssm-map <fssm-map
ref="contentMap" ref="contentMap"
:mapId="id" :mapId="id"
@ -353,6 +356,13 @@ export default {
height: 65%; height: 65%;
position: relative; position: relative;
span {
position: absolute;
color: #ffffff;
background-color: rgba(0, 0, 0, 0.5);
z-index: 1;
}
.map-clean { .map-clean {
position: absolute; position: absolute;
top: 0.5rem; top: 0.5rem;

20
src/views/xj/inspection/surface-management/index.vue
View File

@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com * @Author: SunTao 328867980@qq.com
* @Date: 2024-10-14 13:59:51 * @Date: 2024-10-14 13:59:51
* @LastEditors: SunTao 328867980@qq.com * @LastEditors: SunTao 328867980@qq.com
* @LastEditTime: 2024-11-20 15:01:48 * @LastEditTime: 2025-01-07 15:53:44
* @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\index.vue * @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\index.vue
* @Description: 巡检管理-路面病害对比 * @Description: 巡检管理-路面病害对比
--> -->
@ -20,6 +20,7 @@
> >
<el-form-item label="路段名称" prop="segmentId"> <el-form-item label="路段名称" prop="segmentId">
<el-select <el-select
ref="segmentIdSelect"
v-model="surfaceForm.segmentId" v-model="surfaceForm.segmentId"
placeholder="请选择道路名称" placeholder="请选择道路名称"
clearable clearable
@ -44,6 +45,7 @@
</el-form-item> </el-form-item>
<el-form-item label="病害类型"> <el-form-item label="病害类型">
<el-cascader <el-cascader
ref="segmentIdCascader"
v-model="surfaceForm.defectType" v-model="surfaceForm.defectType"
:options="defectTypeList" :options="defectTypeList"
:props="{ :props="{
@ -234,12 +236,24 @@ export default {
Object.keys(this.surfaceListLeft).length < 1 && Object.keys(this.surfaceListLeft).length < 1 &&
data.data.length > 0 data.data.length > 0
) { ) {
this.surfaceListLeft = data; const [node] = this.$refs.segmentIdCascader.getCheckedNodes();
this.surfaceListLeft = {
...data,
title: `${this.$refs.segmentIdSelect.selected.label}——${
this.surfaceForm.time
}——${node?.label || "全部病害"}`,
};
} else if ( } else if (
Object.keys(this.surfaceListRight).length < 1 && Object.keys(this.surfaceListRight).length < 1 &&
data.data.length > 0 data.data.length > 0
) { ) {
this.surfaceListRight = data; const [node] = this.$refs.segmentIdCascader.getCheckedNodes();
this.surfaceListRight = {
...data,
title: `${this.$refs.segmentIdSelect.selected.label}——${
this.surfaceForm.time
}——${node?.label || "全部病害"}`,
};
} }
} }
}); });

2
src/views/xj/inspection/task-management/components/task-map.vue
View File

@ -36,7 +36,7 @@
destroy-on-close destroy-on-close
@close="screenImgCancel" @close="screenImgCancel"
> >
<div class="image-container" ref="imageContainer"> <div class="image-container" ref="imageContainer" v-if="showImageDialog">
<img <img
:src="screenImage.imageUrl" :src="screenImage.imageUrl"
alt="Main Image" alt="Main Image"