+
-
+
@@ -196,7 +203,8 @@
- {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
+ {{
+ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
@@ -264,7 +272,7 @@ import {
} from "@/api/xj/document";
import FssmScroll from "@/components/scroll/fssm-scroll.vue";
import DiseaseDialog from "./disease-dialog.vue";
-import FssmMap from '@/components/map/fssm-map.vue';
+import FssmMap from "@/components/map/fssm-map.vue";
import { Feature } from "ol";
import { Point } from "ol/geom";
import { Style, Icon, Fill, Text } from "ol/style";
@@ -275,10 +283,17 @@ export default {
name: "EditDialog",
components: { FssmScroll, DiseaseDialog, FssmMap },
props: {
- dialogItemObj:{
- type: Object,
- default: () => {},
+ // 传过来的弹窗提示
+ dialogMsg: {
+ type: String,
+ default: "",
},
+ // 传过来的表单信息
+ dialogItemObj: {
+ type: Object,
+ default: () => { },
+ },
+ // 传过来的列表信息
dialogItem: {
type: Array,
default: () => [],
@@ -295,7 +310,7 @@ export default {
// 病害类型下拉数据
diseFirstType: {
type: Array,
- default: () => []
+ default: () => [],
},
// 路段类型下拉数据
segmentTypeList: {
@@ -315,7 +330,7 @@ export default {
// 收费站位置下拉数据
stationLocationList: {
type: Array,
- default: () => []
+ default: () => [],
},
segmentList: {
type: Array,
@@ -369,7 +384,7 @@ export default {
// 所在路段
diseRoadPart: "",
// 详细描述
- diseElaDecs: ""
+ diseElaDecs: "",
},
// 病害类型二级下拉数据
diseTypeDetailedList: [],
@@ -426,23 +441,33 @@ export default {
diseRoadPosiType: [
{ required: true, message: "请选择路段类型", trigger: "change" },
],
- diseTypeDetailed: [{ required: true, message: "请选择病害二级类型", trigger: "change" }],
- matTaskAreaId: [{ required: true, message: "请选择工区", trigger: "change" }],
+ diseTypeDetailed: [
+ { required: true, message: "请选择病害二级类型", trigger: "change" },
+ ],
+ matTaskAreaId: [
+ { required: true, message: "请选择工区", trigger: "change" },
+ ],
diseFirstType: [
{ required: true, message: "请选择病害类型", trigger: "change" },
],
matTWorkStationId: [
{ required: true, message: "请选择工作站", trigger: "change" },
],
- diseRoadDirec: [{ required: true, message: "请选择方向", trigger: "change" }],
- diseRoadLine: [{ required: true, message: "请选择车道", trigger: "blur" }],
+ diseRoadDirec: [
+ { required: true, message: "请选择方向", trigger: "change" },
+ ],
+ diseRoadLine: [
+ { required: true, message: "请选择车道", trigger: "blur" },
+ ],
stationCode: [
{ required: true, message: "请选择收费站", trigger: "change" },
],
stationLocation: [
{ required: true, message: "请选择收费站位置", trigger: "change" },
],
- rampType: [{ required: true, message: "请选择匝道", trigger: "change" }],
+ rampType: [
+ { required: true, message: "请选择匝道", trigger: "change" },
+ ],
rampInterchangeCode: [
{ required: true, message: "请选择匝道立交", trigger: "change" },
],
@@ -479,110 +504,122 @@ export default {
diseRoadPart: [
{ required: true, message: "请选择所在路段", trigger: "change" },
],
- }
+ };
},
isStakeStartRequired() {
- return this.editForm.diseRoadPosiType !== '2'
- }
+ return this.editForm.diseRoadPosiType !== "2";
+ },
},
watch: {
dialogItem: {
handler(val) {
- this.checkedDiseaseList = val
+ this.checkedDiseaseList = val;
},
deep: true,
immediate: true,
},
- dialogItemObj:{
+ dialogItemObj: {
handler(val) {
- this.changeDetailed(val.diseFirstType);
- this.changeRampIntOrientation(val.rampInterchangeCode);
- this.editForm = Object.assign(this.editForm, val);
+ if (val) {
+ this.handleDiseRoadPart(val.diseRoadPartName);
+ this.handleMatTaskArea(val.matTaskAreaIdName);
+ this.handleMatWorkStation(val.matTWorkStationIdName);
+ this.handleConnBridge(val.connBridgeName)
+ this.handleConnTunnel(val.connTunnelName)
+ this.handleStationCode(val.stationCodename)
+ this.handleRampIntOrientation(val.rampInterchangeName)
+
+ this.changeDetailed(val.diseFirstType);
+ this.changeRampIntOrientation(val.rampInterchangeCode);
+ this.editForm = Object.assign(this.editForm, val);
+ if (this.dialogMsg !== "请注意:") {
+ this.$modal.msgWarning(this.dialogMsg);
+ }
+ } else {
+ this.handleDiseRoadPart();
+ this.handleMatTaskArea();
+ this.handleMatWorkStation();
+ this.handleConnBridge();
+ this.handleConnTunnel();
+ this.handleStationCode();
+ this.handleRampIntOrientation();
+ }
},
deep: true,
immediate: true,
- }
- },
- mounted() {
- this.handleDiseRoadPart()
- this.handleMatTaskArea()
- this.handleMatWorkStation()
- this.handleConnBridge()
- this.handleConnTunnel()
- this.handleStationCode()
- this.handleRampIntOrientation()
+ },
},
+ mounted() { },
methods: {
/**
- * @description: 获取所在路段下拉数据
- * @param {*}
- * @return {*}
- */
+ * @description: 获取所在路段下拉数据
+ * @param {*}
+ * @return {*}
+ */
handleDiseRoadPart(str) {
getDiseRoadPartDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.roadPartList = data
+ this.roadPartList = data;
}
- })
+ });
},
/**
- * @description: 修改所在路段事件
- * @param {*}
- * @return {*}
- */
+ * @description: 修改所在路段事件
+ * @param {*}
+ * @return {*}
+ */
changeDiseRoadPart(value) {
if (!value) {
- this.handleDiseRoadPart()
+ this.handleDiseRoadPart();
}
},
/**
- * @description: 获取工区下拉数据
- * @param {*}
- * @return {*}
- */
+ * @description: 获取工区下拉数据
+ * @param {*}
+ * @return {*}
+ */
handleMatTaskArea(str) {
getTaskareaDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.taskAreaList = data
+ this.taskAreaList = data;
}
- })
+ });
},
-
/**
- * @description: 修改工区事件
- * @param {*}
- * @return {*}
- */
+ * @description: 修改工区事件
+ * @param {*}
+ * @return {*}
+ */
changeMatTaskArea(value) {
if (!value) {
- this.handleMatTaskArea()
+ this.handleMatTaskArea();
}
},
/**
- * @description: 获取工作站下拉数据
- * @param {*}
- * @return {*}
- */
+ * @description: 获取工作站下拉数据
+ * @param {*}
+ * @return {*}
+ */
handleMatWorkStation(str) {
getWorkstationDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.matWorkStationList = data
+ this.matWorkStationList = data;
}
- })
+ });
},
/**
- * @description: 工作站修改事件
- * @param {*}
- * @return {*}
- */
+ * @description: 工作站修改事件
+ * @param {*}
+ * @return {*}
+ */
changeMatWorkStation(value) {
if (!value) {
- this.handleMatWorkStation()
+ this.handleMatWorkStation();
}
},
@@ -594,19 +631,19 @@ export default {
handleConnBridge(str) {
getBridgeDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.connBridgeList = data
+ this.connBridgeList = data;
}
- })
+ });
},
/**
- * @description: 桥梁修改事件
- * @param {*}
- * @return {*}
- */
+ * @description: 桥梁修改事件
+ * @param {*}
+ * @return {*}
+ */
changeConnBridge(value) {
if (!value) {
- this.handleConnBridge()
+ this.handleConnBridge();
}
},
@@ -618,19 +655,19 @@ export default {
handleConnTunnel(str) {
getTunnelDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.connTunnelList = data
+ this.connTunnelList = data;
}
- })
+ });
},
/**
- * @description: 隧道修改事件
- * @param {*}
- * @return {*}
- */
+ * @description: 隧道修改事件
+ * @param {*}
+ * @return {*}
+ */
changeConnTunnel(value) {
if (!value) {
- this.handleConnTunnel()
+ this.handleConnTunnel();
}
},
@@ -642,19 +679,19 @@ export default {
handleStationCode(str) {
getStationDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.stationCodeList = data
+ this.stationCodeList = data;
}
- })
+ });
},
/**
- * @description: 收费站修改事件
- * @param {*}
- * @return {*}
- */
+ * @description: 收费站修改事件
+ * @param {*}
+ * @return {*}
+ */
changeStationCode(value) {
if (!value) {
- this.handleStationCode()
+ this.handleStationCode();
}
},
@@ -666,22 +703,22 @@ export default {
handleRampIntOrientation(str) {
getCrossDropDown({ name: str }).then(({ code, data }) => {
if (code === 200) {
- this.rampIntOrientationList = data
+ this.rampIntOrientationList = data;
}
- })
+ });
},
/**
- * @description: 互通立交修改事件
- * @param {*}
- * @return {*}
- */
+ * @description: 互通立交修改事件
+ * @param {*}
+ * @return {*}
+ */
changeRampIntOrientation(value) {
if (!value) {
- this.handleRampIntOrientation()
+ this.handleRampIntOrientation();
}
- this.editForm.rampIntOrientation = ""
- this.handleRampInterchangeCode()
+ this.editForm.rampIntOrientation = "";
+ this.handleRampInterchangeCode();
},
/**
@@ -690,42 +727,44 @@ export default {
* @return {*}
*/
handleRampInterchangeCode() {
- getRampDropDown({ crossid: this.editForm.rampInterchangeCode }).then(({ code, data }) => {
- if (code === 200) {
- this.rampInterchangeCodeList = data
+ getRampDropDown({ crossid: this.editForm.rampInterchangeCode }).then(
+ ({ code, data }) => {
+ if (code === 200) {
+ this.rampInterchangeCodeList = data;
+ }
}
- })
+ );
},
/**
- * @description: 病害类型一级修改事件
- * @param {*} row
- * @return {*}
- */
+ * @description: 病害类型一级修改事件
+ * @param {*} row
+ * @return {*}
+ */
changeDetailed(value) {
this.editForm.diseTypeDetailed = "";
- const [child] = this.diseFirstType.filter(item => item.value === value)
+ const [child] = this.diseFirstType.filter((item) => item.value === value);
getDiseTypeDetailed({ parentId: child.key }).then(({ code, data }) => {
if (code === 200) {
this.diseTypeDetailedList = data;
}
- })
+ });
},
/**
- * @description: 列表行绑定id
- * @param {*} row
- * @return {*}
- */
+ * @description: 列表行绑定id
+ * @param {*} row
+ * @return {*}
+ */
getRowKey(row) {
- return row.snapshotId;
+ return row.id;
},
/**
- * @description: 列表行删除事件
- * @param {*} row
- * @return {*}
- */
+ * @description: 列表行删除事件
+ * @param {*} row
+ * @return {*}
+ */
handleDelete(index) {
this.checkedDiseaseList.splice(index, 1);
},
@@ -741,18 +780,19 @@ export default {
* @description: 提交表单
*/
submitForm() {
-
this.$refs.editForm.validate((valid) => {
if (valid) {
- const defectId = this.checkedDiseaseList?.map(item => item.id)
- addMaintenanceNotice({ ...this.editForm, defectId }).then(({ code, data }) => {
- if (code === 200) {
- this.$message.success("生成成功");
- this.$emit("cancel");
- } else {
- this.$message.error(data);
+ const defectId = this.checkedDiseaseList?.map((item) => item.id);
+ addMaintenanceNotice({ ...this.editForm, defectId }).then(
+ ({ code, data }) => {
+ if (code === 200) {
+ this.$message.success("生成成功");
+ this.$emit("cancel");
+ } else {
+ this.$message.error(data);
+ }
}
- });
+ );
}
});
},
@@ -763,7 +803,7 @@ export default {
* @return {*}
*/
viewMapSelected(tip) {
- this.mapTip = tip
+ this.mapTip = tip;
// 地图打点
if (!tip && this.checkedDiseaseList.length > 0) {
// 修改地图中心点位
@@ -776,7 +816,7 @@ export default {
this.$nextTick(() => {
this.fitMapToPoints(pointArray);
this.drawPoint();
- })
+ });
}
},
@@ -880,8 +920,8 @@ export default {
return new Style({
image: new Icon({
crossOrigin: "anonymous",
- src: require(`@/assets/screen/index/${feature.getProperties().features[0].get("data").defectTypeName
- || "龟裂"
+ src: require(`@/assets/screen/index/${feature.getProperties().features[0].get("data")
+ .defectTypeName || "龟裂"
}.png`),
// 图标缩放比例
scale: 0.5,
@@ -937,7 +977,6 @@ export default {
center: feature.getGeometry().getCoordinates(),
zoom: map.getView().getZoom() + 1,
});
-
}
}
},
@@ -948,7 +987,7 @@ export default {
* @return {*}
*/
viewSelected() {
- this.diseaseVisible = true
+ this.diseaseVisible = true;
},
/**
@@ -967,7 +1006,7 @@ export default {
* @return {*}
*/
diseaseCancel() {
- this.diseaseVisible = false
+ this.diseaseVisible = false;
},
/**
@@ -1090,7 +1129,6 @@ export default {
justify-content: flex-end;
}
-
/* 查看大图弹窗 */
.image-container {
position: relative;
diff --git a/src/views/xj/document/maintenance-notice/index.vue b/src/views/xj/document/maintenance-notice/index.vue
index e80b51c..79d845d 100644
--- a/src/views/xj/document/maintenance-notice/index.vue
+++ b/src/views/xj/document/maintenance-notice/index.vue
@@ -2,186 +2,88 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-11-20 11:58:33
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-02-26 14:47:59
+ * @LastEditTime: 2025-02-27 09:59:19
* @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue
* @Description: 养护通知单
-->
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
-
+
-
-
+
-
+
-
-
+
- 搜索
- 重置
+ 搜索
+ 重置
- 新增
+ 新增
- 删除
+ 删除
- 病害长度:{{ lengthSum }}米;病害总面积:{{ areaSum }}平方米
+ 病害长度:{{ lengthSum }}米;病害总面积:{{ areaSum }}平方米
-
+
@@ -193,122 +95,56 @@
-
+
- {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
-
+ {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
{{
scope.row.inspectDirection === "0" ? "上行" : "下行"
- }}
+ }}
- 紧急
- 不紧急
+ 紧急
+ 不紧急
-
+
- 生成工单
+ 生成工单
-
-
+
+
-
+
-
![Main Image]()
-
+
![Main Image]()
+
采集时间:
{{ new Date(currentImageItem.createdTime).toLocaleString() }}
@@ -317,12 +153,8 @@
病害类型:
{{ currentImageItem.defectTypeName || "暂无数据" }}
病害面积:{{ currentImageItem.targetArea }}平方米 病害长度:{{
- currentImageItem.targetLen * 1 <= 0
- ? "暂无数据"
- : `${currentImageItem.targetLen}米`
- }}
+ currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }}
-
@@ -432,6 +264,8 @@ export default {
dialogItem: [],
// 编辑弹窗数据绑定
dialogItemObj: {},
+ // 弹窗弹出信息绑定
+ dialogMsg: "",
// 编辑弹窗显隐控制
addVisible: false,
// 查看弹窗显隐控制
@@ -667,7 +501,7 @@ export default {
* @return {*}
*/
getRowKey(row) {
- return row.snapshotId;
+ return row.id;
},
/**
@@ -676,16 +510,13 @@ export default {
* @return {*}
*/
handleAdd() {
- getMaintenanceDetail(this.checkIds)
- .then(({ code, data, msg }) => {
- if (code === 200) {
- this.dialogItemObj = data;
- $modal.msgWarning(msg);
- }
- })
- .finally(() => {
+ getMaintenanceDetail(this.checkIds).then(({ code, data, msg }) => {
+ if (code === 200) {
+ this.dialogItemObj = data;
+ this.dialogMsg = msg;
this.addVisible = true;
- });
+ }
+ });
},
/**
@@ -695,7 +526,8 @@ export default {
*/
handleUpdate(row) {
this.dialogItem = [row];
- this.addVisible = true;
+ this.checkIds = [row.id];
+ this.handleAdd();
},
/**
@@ -713,7 +545,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => {});
+ .catch(() => { });
},
/**
@@ -745,6 +577,7 @@ export default {
this.addVisible = false;
this.dialogItem = [];
this.dialogItemObj = {};
+ this.dialogMsg = "";
this.getList();
},
diff --git a/src/views/xj/document/view-notification/components/disease-dialog.vue b/src/views/xj/document/view-notification/components/disease-dialog.vue
new file mode 100644
index 0000000..2c81e10
--- /dev/null
+++ b/src/views/xj/document/view-notification/components/disease-dialog.vue
@@ -0,0 +1,533 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.targetLen * 1 <= 0 ? "" : `${scope.row.targetLen}米` }}
+
+
+
+
+ {{
+ scope.row.inspectDirection === "0" ? "上行" : "下行"
+ }}
+
+
+
+
+
+
+
+
+
+
+
![Main Image]()
+
+
+ 采集时间:
+ {{ new Date(currentImageItem.createdTime).toLocaleString() }}
+ 起始桩号: {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号:
+ {{ currentImageItem.stakeEnd || "暂无数据" }}
+ 病害类型:
+ {{ currentImageItem.defectTypeName || "暂无数据" }}
+ 病害面积:{{ currentImageItem.targetArea }}平方米 病害长度:{{
+ currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }}
+
+
+
+
+
+
+
+
diff --git a/src/views/xj/document/view-notification/components/view-dialog.vue b/src/views/xj/document/view-notification/components/view-dialog.vue
index 9bf0f5b..b8faa40 100644
--- a/src/views/xj/document/view-notification/components/view-dialog.vue
+++ b/src/views/xj/document/view-notification/components/view-dialog.vue
@@ -2,51 +2,27 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2025-02-24 14:18:41
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2025-02-25 16:31:38
+ * @LastEditTime: 2025-02-27 13:18:55
* @FilePath: \znxjxt-ui\src\views\xj\document\view-notification\components\view-dialog.vue
* @Description: 查看通知单-查看详情
-->
-
+
-
-
+
+
-
-
+
+
@@ -59,41 +35,18 @@
-->
-
-
+
+
-
-
+
+
@@ -101,283 +54,130 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -386,50 +186,22 @@
病害列表
-
- 地图查看
- 列表查看
+ 选择病害
+ 地图查看
+ 列表查看
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
![Main Image]()
-
+
![Main Image]()
+
采集时间:
{{ new Date(currentImageItem.createdTime).toLocaleString() }}
@@ -511,12 +258,15 @@
病害类型:
{{ currentImageItem.defectTypeName || "暂无数据" }}
病害面积:{{ currentImageItem.targetArea }}平方米 病害长度:{{
- currentImageItem.targetLen * 1 <= 0
- ? "暂无数据"
- : `${currentImageItem.targetLen}米`
- }}
+ currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }}
-
+
+
+
+