fix:修改病害确认弹窗,修改大屏病害日志字段展示,
This commit is contained in:
parent
b9d643ac5c
commit
1035ee864a
@ -2,7 +2,7 @@
|
|||||||
* @Author: SunTao 328867980@qq.com
|
* @Author: SunTao 328867980@qq.com
|
||||||
* @Date: 2024-11-08 11:56:02
|
* @Date: 2024-11-08 11:56:02
|
||||||
* @LastEditors: SunTao 328867980@qq.com
|
* @LastEditors: SunTao 328867980@qq.com
|
||||||
* @LastEditTime: 2024-12-24 09:07:12
|
* @LastEditTime: 2024-12-27 16:40:12
|
||||||
* @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-log.vue
|
* @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-log.vue
|
||||||
* @Description: 病害巡检-病害日志
|
* @Description: 病害巡检-病害日志
|
||||||
-->
|
-->
|
||||||
@ -131,7 +131,10 @@
|
|||||||
style="width: 100%; background: none"
|
style="width: 100%; background: none"
|
||||||
height="85%"
|
height="85%"
|
||||||
>
|
>
|
||||||
<el-table-column prop="defectType" width="100" label="病害类型">
|
<el-table-column
|
||||||
|
prop="defectType"
|
||||||
|
label="病害类型"
|
||||||
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="segmentName"
|
prop="segmentName"
|
||||||
@ -139,7 +142,7 @@
|
|||||||
label="路段名称"
|
label="路段名称"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column show-overflow-tooltip prop="companyName" label="所属">
|
<el-table-column show-overflow-tooltip prop="stakeStart" label="桩号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column width="70" prop="pci" label="操作">
|
<el-table-column width="70" prop="pci" label="操作">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@ -172,7 +175,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { emergencyData, DefectType } from "@/api/xj/screen/traffic-screen";
|
import { emergencyData } from "@/api/xj/screen/traffic-screen";
|
||||||
import { getSegment, getDefectDropDown } from "@/api/xj/screen/index";
|
import { getSegment, getDefectDropDown } from "@/api/xj/screen/index";
|
||||||
import fssmScroll from "@/components/scroll/fssm-scroll.vue";
|
import fssmScroll from "@/components/scroll/fssm-scroll.vue";
|
||||||
export default {
|
export default {
|
||||||
@ -541,8 +544,9 @@ export default {
|
|||||||
|
|
||||||
// 表头行
|
// 表头行
|
||||||
.headerRow {
|
.headerRow {
|
||||||
background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
|
// background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
|
||||||
background-size: 100% 100%;
|
// background-size: 100% 100%;
|
||||||
|
background: #154167;
|
||||||
|
|
||||||
th {
|
th {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
@ -560,6 +564,10 @@ export default {
|
|||||||
background: #113463;
|
background: #113463;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:nth-child(2n + 1) {
|
||||||
|
background: #051637;
|
||||||
|
}
|
||||||
|
|
||||||
// 表格内下划线
|
// 表格内下划线
|
||||||
td {
|
td {
|
||||||
// border-color: transparent;
|
// border-color: transparent;
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: SunTao 328867980@qq.com
|
* @Author: SunTao 328867980@qq.com
|
||||||
* @Date: 2024-11-08 09:40:18
|
* @Date: 2024-11-08 09:40:18
|
||||||
* @LastEditors: SunTao 328867980@qq.com
|
* @LastEditors: SunTao 328867980@qq.com
|
||||||
* @LastEditTime: 2024-12-20 11:15:31
|
* @LastEditTime: 2024-12-27 16:01:37
|
||||||
* @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
|
* @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
|
||||||
* @Description: 总览大屏-巡检车辆
|
* @Description: 总览大屏-巡检车辆
|
||||||
-->
|
-->
|
||||||
@ -405,8 +405,9 @@ export default {
|
|||||||
|
|
||||||
// 表头行
|
// 表头行
|
||||||
.headerRow {
|
.headerRow {
|
||||||
background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
|
// background: url("~@/assets/screen/traffic/emergency-top.png") no-repeat;
|
||||||
background-size: 100% 100%;
|
// background-size: 100% 100%;
|
||||||
|
background: #154167;
|
||||||
|
|
||||||
th {
|
th {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|||||||
@ -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: 2024-11-26 15:49:28
|
* @LastEditTime: 2024-12-27 14:59:31
|
||||||
* @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
|
* @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
|
||||||
* @Description: 养护通知单
|
* @Description: 养护通知单
|
||||||
-->
|
-->
|
||||||
@ -21,6 +21,7 @@
|
|||||||
v-model="noticeForm.segmentName"
|
v-model="noticeForm.segmentName"
|
||||||
placeholder="请选择路段"
|
placeholder="请选择路段"
|
||||||
clearable
|
clearable
|
||||||
|
filterable
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in segmentList"
|
v-for="item in segmentList"
|
||||||
@ -289,7 +290,7 @@
|
|||||||
<el-dialog
|
<el-dialog
|
||||||
title="查看图片"
|
title="查看图片"
|
||||||
:visible.sync="showImageDialog"
|
:visible.sync="showImageDialog"
|
||||||
width="75rem"
|
width="85rem"
|
||||||
append-to-body
|
append-to-body
|
||||||
destroy-on-close
|
destroy-on-close
|
||||||
@close="imgCancel"
|
@close="imgCancel"
|
||||||
@ -307,6 +308,19 @@
|
|||||||
class="rect-overlay"
|
class="rect-overlay"
|
||||||
:style="getRectStyle(rect)"
|
:style="getRectStyle(rect)"
|
||||||
></div>
|
></div>
|
||||||
|
<div class="rect-image">
|
||||||
|
采集时间:
|
||||||
|
{{ new Date(currentImageItem.createdTime).toLocaleString()}} 起始桩号:
|
||||||
|
{{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号:
|
||||||
|
{{ currentImageItem.stakeEnd || "暂无数据" }}
|
||||||
|
病害类型:
|
||||||
|
{{ currentImageItem.defectTypeName || "暂无数据" }}
|
||||||
|
病害面积:{{ currentImageItem.targetArea }}平方米 病害长度:{{
|
||||||
|
currentImageItem.targetLen * 1 <= 0
|
||||||
|
? "暂无数据"
|
||||||
|
: `${currentImageItem.targetLen}米`
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
@ -318,7 +332,6 @@ import ViewDialog from "./components/view-dialog.vue";
|
|||||||
import {
|
import {
|
||||||
getSegment,
|
getSegment,
|
||||||
getDefectList,
|
getDefectList,
|
||||||
getDefectStatus,
|
|
||||||
getMaintenanceNoticeList,
|
getMaintenanceNoticeList,
|
||||||
} from "@/api/xj/document";
|
} from "@/api/xj/document";
|
||||||
export default {
|
export default {
|
||||||
@ -734,4 +747,14 @@ export default {
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
border: 2px solid red;
|
border: 2px solid red;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 图片信息
|
||||||
|
.rect-image {
|
||||||
|
width: 90%;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
color: #ffffff;
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
* @Author: SunTao 328867980@qq.com
|
* @Author: SunTao 328867980@qq.com
|
||||||
* @Date: 2024-10-22 15:30:25
|
* @Date: 2024-10-22 15:30:25
|
||||||
* @LastEditors: SunTao 328867980@qq.com
|
* @LastEditors: SunTao 328867980@qq.com
|
||||||
* @LastEditTime: 2024-12-26 15:41:56
|
* @LastEditTime: 2024-12-27 17:11:58
|
||||||
* @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue
|
* @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue
|
||||||
* @Description: 大屏查看图片弹窗
|
* @Description: 大屏查看图片弹窗
|
||||||
-->
|
-->
|
||||||
@ -155,11 +155,9 @@
|
|||||||
{{ item.stakeEnd || "暂无数据" }}
|
{{ item.stakeEnd || "暂无数据" }}
|
||||||
病害类型:
|
病害类型:
|
||||||
{{ item.defectTypeName || "暂无数据" }}
|
{{ item.defectTypeName || "暂无数据" }}
|
||||||
<span v-if="bottomTipClick === '1'">
|
病害面积:{{ item.targetArea }}平方米 病害长度:{{
|
||||||
病害面积:{{ item.targetArea }}平方米 病害长度:{{
|
item.targetLen * 1 <= 0 ? "暂无数据" : `${item.targetLen}米`
|
||||||
item.targetLen * 1 <= 0 ? "暂无数据" : `${item.targetLen}米`
|
}}
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
@ -223,10 +221,6 @@ import debounce from "lodash/debounce";
|
|||||||
export default {
|
export default {
|
||||||
name: "ImgDialog",
|
name: "ImgDialog",
|
||||||
props: {
|
props: {
|
||||||
bottomTipClick: {
|
|
||||||
type: String,
|
|
||||||
default: "1",
|
|
||||||
},
|
|
||||||
imageItem: {
|
imageItem: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
@ -333,14 +327,9 @@ export default {
|
|||||||
deep: true,
|
deep: true,
|
||||||
immediate: true,
|
immediate: true,
|
||||||
},
|
},
|
||||||
bottomTipClick: {
|
|
||||||
handler() {
|
|
||||||
this.getDefectType();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getDefectType();
|
// this.getDefectType();
|
||||||
},
|
},
|
||||||
mounted() {},
|
mounted() {},
|
||||||
mounted() {
|
mounted() {
|
||||||
@ -438,7 +427,7 @@ export default {
|
|||||||
* @return {*}
|
* @return {*}
|
||||||
*/
|
*/
|
||||||
getDefectType() {
|
getDefectType() {
|
||||||
getItemTypes({ classType: this.bottomTipClick }).then(
|
getItemTypes({ classType: this.imgForm.classType }).then(
|
||||||
({ code, data }) => {
|
({ code, data }) => {
|
||||||
if (code === 200) {
|
if (code === 200) {
|
||||||
this.defectTypeList = data;
|
this.defectTypeList = data;
|
||||||
@ -460,7 +449,7 @@ export default {
|
|||||||
...this.searchForm,
|
...this.searchForm,
|
||||||
segmentId: this.searchForm.segmentName,
|
segmentId: this.searchForm.segmentName,
|
||||||
};
|
};
|
||||||
|
this.getDefectType();
|
||||||
this.getList();
|
this.getList();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.pageTip > 1) {
|
if (this.pageTip > 1) {
|
||||||
@ -477,7 +466,6 @@ export default {
|
|||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
const data = {
|
const data = {
|
||||||
classType: this.bottomTipClick,
|
|
||||||
lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",
|
lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",
|
||||||
...this.imgForm,
|
...this.imgForm,
|
||||||
...this.params,
|
...this.params,
|
||||||
@ -503,7 +491,6 @@ export default {
|
|||||||
getListTop() {
|
getListTop() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
const data = {
|
const data = {
|
||||||
classType: this.bottomTipClick,
|
|
||||||
...this.imgForm,
|
...this.imgForm,
|
||||||
...this.params,
|
...this.params,
|
||||||
lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",
|
lastId: this.defectData[this.defectData.length - 1]?.snapshotId || "",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user