From d17dc1fc15cdf3a3d77e2a6120b5183ffd98c765 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Sat, 12 Oct 2024 14:35:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B7=AF=E4=BA=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xj/disease.js | 7 +- src/api/xj/road.js | 78 ++ .../inspection/disease-management/index.vue | 76 +- .../road-management/components/road-add.vue | 438 ++++++++++++ .../road-management/components/road-view.vue | 151 ++++ .../xj/inspection/road-management/index.vue | 668 ++++++++++++++++++ 6 files changed, 1388 insertions(+), 30 deletions(-) create mode 100644 src/api/xj/road.js create mode 100644 src/views/xj/inspection/road-management/components/road-add.vue create mode 100644 src/views/xj/inspection/road-management/components/road-view.vue create mode 100644 src/views/xj/inspection/road-management/index.vue diff --git a/src/api/xj/disease.js b/src/api/xj/disease.js index a5e539b..075c528 100644 --- a/src/api/xj/disease.js +++ b/src/api/xj/disease.js @@ -2,7 +2,7 @@ * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Date: 2024-10-08 09:26:24 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-10-10 17:09:19 + * @LastEditTime: 2024-10-12 14:30:08 * @FilePath: \znxjxt-ui\src\api\xj\disease.js * @Description: 巡检信息-病害管理 */ @@ -44,10 +44,11 @@ export function updateDefect(data) { } // 删除病害日志 -export function delDefect(id) { +export function delDefect(data) { return request({ - url: "/xj/defect/" + id, + url: "/xj/defect/", method: "delete", + data }); } diff --git a/src/api/xj/road.js b/src/api/xj/road.js new file mode 100644 index 0000000..3ad3a3e --- /dev/null +++ b/src/api/xj/road.js @@ -0,0 +1,78 @@ +import request from "@/utils/request"; + +// 获取路产列表数据接口 +export function getRoadTable(params) { + return request({ + url: "/xj/equipment/list", + method: "get", + params, + }); +} + +// 道路名称下拉数据 +export function getSegment() { + return request({ + url: "/api/v2/segment/selectList", + method: "post", + }); +} + +// 路产类型下拉 +export function getRoadType() { + return request({ + url: "/metadata/equipmentEquipmentType", + method: "get", + }); +} + +// 路产状态下拉类型 +export function getDefectStatus() { + return request({ + url: "/metadata/defectState", + method: "get", + }); +} + +// 新增路产接口 +export function addRoad(data) { + return request({ + url: "/xj/equipment", + method: "post", + data, + }); +} + +// 修改路产接口 +export function uploadRoad(data) { + return request({ + url: "/xj/equipment", + method: "put", + data, + }); +} + +// 删除路产接口 +export function deleteRoad(data) { + return request({ + url: "/xj/equipment", + method: "delete", + data, + }); +} + +// 批量修改路产接口 +export function changeRoad(data) { + return request({ + url: "/xj/equipment/batch", + method: "put", + data, + }); + } + +// 路产详情接口 +export function detailRoad(id) { + return request({ + url: "/xj/equipment/" + id, + method: "get", + }); +} diff --git a/src/views/xj/inspection/disease-management/index.vue b/src/views/xj/inspection/disease-management/index.vue index b675d71..6156b4d 100644 --- a/src/views/xj/inspection/disease-management/index.vue +++ b/src/views/xj/inspection/disease-management/index.vue @@ -2,7 +2,7 @@ * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Date: 2024-10-08 10:58:25 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-10-11 15:02:31 + * @LastEditTime: 2024-10-12 11:38:12 * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management .vue * @Description: 巡检信息管理-病害管理 --> @@ -33,7 +33,7 @@ - + 删除 - + 批量确认 - @@ -230,7 +230,7 @@ - {{ scope.row.state === "1" ? "未校验" : "已校验" }} + {{ filterState(scope.row.state) }} @@ -241,7 +241,7 @@ - + @@ -469,7 +469,7 @@ import { listDefect, - getDefect, delDefect, addDefect, updateDefect, @@ -528,8 +527,6 @@ import { } from "@/api/xj/disease"; import { getToken } from "@/utils/auth"; -import { listMetadata } from "@/api/xj/metadata"; - export default { name: "Defect", data() { @@ -560,7 +557,6 @@ export default { page: 1, size: 10, segmentName: "", - dateTime: [], defectType: "", taskId: "", state: "", @@ -575,6 +571,7 @@ export default { minDistance: null, maxDistance: null, }, + dateTime: [], // 新增/编辑表单参数 form: { id: null, @@ -743,6 +740,16 @@ export default { return a.label; } }, + /* 过滤列表病害状态 */ + filterState(value) { + let a = null; + [a] = this.defectStatus.filter((item) => { + return item.value === value; + }); + if (a) { + return a.label; + } + }, /* 获取病害类型下拉数据 */ getdefectTypes() { getDefectTypes().then((response) => { @@ -774,7 +781,11 @@ export default { /** 查询缺陷列表 */ getList() { // 处理日期范围 - const params = { ...this.queryParams }; + const params = { + ...this.queryParams, + startTime: this.dateTime ? this.dateTime[0] : "", + endTime: this.dateTime ? this.dateTime[1] : "", + }; listDefect(params) .then((response) => { this.defectList = response.rows; @@ -791,7 +802,21 @@ export default { this.upload.fileList = []; this.markers = []; this.centerPoint = [123.30297096718999, 41.87942945541742]; - this.resetFormData(); + this.form = { + id: null, + segmentId: "", + defectType: "", + dataStatus: "", + state: "", + stakeStart: "", + stakeEnd: "", + targetLen: undefined, + targetArea: undefined, + inspectDirection: "", + media: [], + }; + this.$refs["addForm"].resetFields(); + // this.resetFormData(); }, /* 重置表单方法 */ resetForm(formName) { @@ -804,7 +829,6 @@ export default { page: 1, size: 10, segmentName: "", - dateTime: [], defectType: [], taskId: "", state: "", @@ -817,7 +841,7 @@ export default { minArea: undefined, maxArea: undefined, }; - this.getList(); + (this.dateTime = []), this.getList(); }, /** 点击搜索按钮操作 */ handleQuery() { @@ -874,11 +898,9 @@ export default { this.onMapClick(e); }); this.form = row; - this.fileList = row.media; this.upload.fileList = row.media.map((item) => { return { ...item, - name: "文件", url: item.img, }; }); @@ -919,16 +941,16 @@ export default { submitForm() { this.$refs["defectForm"].validate((valid) => { if (valid) { - // 验证文件上传列表 - if (this.fileList.length < 1) { - this.$modal.msgWarning("请上传图片"); - return false; - } // 验证点位 if (this.markers.length < 1) { this.$modal.msgWarning("请选择病害位置"); return false; } + // 验证文件上传列表 + if (this.fileList.length < 1) { + this.$modal.msgWarning("请上传图片"); + return false; + } const data = { ...this.form, media: this.fileList, diff --git a/src/views/xj/inspection/road-management/components/road-add.vue b/src/views/xj/inspection/road-management/components/road-add.vue new file mode 100644 index 0000000..72b01d1 --- /dev/null +++ b/src/views/xj/inspection/road-management/components/road-add.vue @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 选取文件 + 上传到服务器 + + 只能上传jpg/png文件,且不超过500kb + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection/road-management/components/road-view.vue b/src/views/xj/inspection/road-management/components/road-view.vue new file mode 100644 index 0000000..0460ab4 --- /dev/null +++ b/src/views/xj/inspection/road-management/components/road-view.vue @@ -0,0 +1,151 @@ + + + + + + + + 上报日期:{{ new Date(viewForm.createdTime).toLocaleString() }} + 路段名称:{{ viewForm.segmentName }} + + 路产类型:{{ filterDefect(viewForm.equipmentType) }} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection/road-management/index.vue b/src/views/xj/inspection/road-management/index.vue new file mode 100644 index 0000000..b35468d --- /dev/null +++ b/src/views/xj/inspection/road-management/index.vue @@ -0,0 +1,668 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + + 删除 + + + + + 批量确认 + + + + + + + + + + {{ new Date(scope.row.createdTime).toLocaleString() }} + + + + + {{ filterDefect(scope.row.equipmentType) }} + + + + + {{ filterState(scope.row.state) }} + + + + + + + + + + + + + + {{ + scope.row.inspectDirection === "0" ? "上行" : "下行" + }} + + + + + + + 查看 + + 修改 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file
上报日期:{{ new Date(viewForm.createdTime).toLocaleString() }}
路段名称:{{ viewForm.segmentName }}
路产类型:{{ filterDefect(viewForm.equipmentType) }}