From 7536b188aef7d7ecde08f043e18a9a3f264db5b9 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Wed, 9 Oct 2024 11:55:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E5=AE=B3=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xj/disease.js | 62 + .../nodePanel/property/executionListener.vue | 2 +- src/router/index.js | 2 +- src/views/bigscreen.vue | 2 +- .../flowable/task/myProcess/send/index.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/xj/defect/index.vue | 4 +- .../inspection/disease-management/index.vue | 1012 +++++++++++++++++ src/views/xj/route/index.vue | 324 ++++-- vue.config.js | 1 + 10 files changed, 1286 insertions(+), 127 deletions(-) create mode 100644 src/api/xj/disease.js create mode 100644 src/views/xj/inspection/disease-management/index.vue diff --git a/src/api/xj/disease.js b/src/api/xj/disease.js new file mode 100644 index 0000000..91ed093 --- /dev/null +++ b/src/api/xj/disease.js @@ -0,0 +1,62 @@ +/* + * @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: 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 + * @LastEditTime: 2024-10-08 18:06:36 + * @FilePath: \znxjxt-ui\src\api\xj\disease.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +import request from '@/utils/request' + +// 查询病害日志列表 +export function listDefect(query) { + return request({ + url: '/xj/defect/list', + method: 'get', + params: query + }) +} + +// 查询病害日志详细 +export function getDefect(id) { + return request({ + url: '/xj/defect/' + id, + method: 'get' + }) +} + +// 新增病害日志 +export function addDefect(data) { + return request({ + url: '/xj/defect', + method: 'post', + data: data + }) +} + +// 修改病害日志 +export function updateDefect(data) { + return request({ + url: '/xj/defect', + method: 'put', + data: data + }) +} + +// 删除病害日志 +export function delDefect(id) { + return request({ + url: '/xj/defect/' + id, + method: 'delete' + }) +} + + +// 病害类型下拉数据 +export function getDefectTypes() { + return request({ + url: '/metadata/defectTypes', + method: 'get' + }) +} + diff --git a/src/components/Process/components/nodePanel/property/executionListener.vue b/src/components/Process/components/nodePanel/property/executionListener.vue index dcdba4a..61354b6 100644 --- a/src/components/Process/components/nodePanel/property/executionListener.vue +++ b/src/components/Process/components/nodePanel/property/executionListener.vue @@ -197,7 +197,7 @@ export default { } }, closeDialog() { - console.log(this.formData) + // console.log(this.formData) this.$refs.xForm.validate().then(() => { this.updateElement() this.dialogVisible = false diff --git a/src/router/index.js b/src/router/index.js index 9ddd49c..7100fa0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -170,7 +170,7 @@ export const constantRoutes = [ meta: { title: '表单配置', icon: '' } } ] - } + }, ] // 动态路由,基于用户权限动态去加载 diff --git a/src/views/bigscreen.vue b/src/views/bigscreen.vue index 0b8b070..a7a921a 100644 --- a/src/views/bigscreen.vue +++ b/src/views/bigscreen.vue @@ -22,7 +22,7 @@ export default { } setTimeout(function () { let a = document.getElementsByName('[data-layerid="128"]'); - console.log(a) + // console.log(a) }, 2000) }, methods: { diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue index b66f1af..166403f 100644 --- a/src/views/flowable/task/myProcess/send/index.vue +++ b/src/views/flowable/task/myProcess/send/index.vue @@ -198,7 +198,7 @@ export default { } else { this.$set(variables, "approval", this.checkValues); } - console.log(variables,"流程发起提交表单数据") + // console.log(variables,"流程发起提交表单数据") // 启动流程并将表单数据加入流程变量 definitionStart(this.procDefId, JSON.stringify(variables)).then(res => { this.$modal.msgSuccess(res.msg); diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 9db0318..034d613 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -215,7 +215,7 @@ export default { listMetadata().then(response => { this.typeList = this.transformToDeepCategorizedListLabelValue(JSON.parse(response.data)) - console.log(this.typeList) + // console.log(this.typeList) this.loading = false; }) diff --git a/src/views/xj/defect/index.vue b/src/views/xj/defect/index.vue index e389252..fbec3b3 100644 --- a/src/views/xj/defect/index.vue +++ b/src/views/xj/defect/index.vue @@ -487,8 +487,8 @@ export default { }, getTypeInfo() { listMetadata().then(response => { - console.log(response) - console.log(this.transformToDeepCategorizedLabelValue(JSON.parse(response.data))); + // console.log(response) + // console.log(this.transformToDeepCategorizedLabelValue(JSON.parse(response.data))); }) }, diff --git a/src/views/xj/inspection/disease-management/index.vue b/src/views/xj/inspection/disease-management/index.vue new file mode 100644 index 0000000..91790e4 --- /dev/null +++ b/src/views/xj/inspection/disease-management/index.vue @@ -0,0 +1,1012 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - + + + + + - + + + + 搜索 + 重置 + + + + + + + 新增 + + + + 删除 + + + + 导出 + + + + 批量确认 + + + + + + + + + + + + + + + + + + + + {{ scope.row.warningFlag === 1 ? "是" : "否" }} + + + + + + 查看 + + 修改 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上报日期:{{ form.createdTime }} + 路段名称:{{ form.segmentName }} + + 病害类型:{{ form.defectType }} + 病害长度:{{ form.targetLen }} 米 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/xj/route/index.vue b/src/views/xj/route/index.vue index f3a26d6..795ba02 100644 --- a/src/views/xj/route/index.vue +++ b/src/views/xj/route/index.vue @@ -1,6 +1,22 @@ + + - + - 搜索 - 重置 + 搜索 + 重置 @@ -40,7 +64,7 @@ size="mini" @click="handleAdd" v-hasPermi="['xj:route:add']" - >新增 + >新增 @@ -52,7 +76,7 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['xj:route:edit']" - >修改 + >修改 @@ -64,7 +88,7 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['xj:route:remove']" - >删除 + >删除 @@ -75,36 +99,57 @@ size="mini" @click="handleExport" v-hasPermi="['xj:route:export']" - >导出 + >导出 - + - - - - - - - - - - - - + + + + + + + + + + + + - {{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }} + {{ parseTime(scope.row.createdAt, "{y}-{m}-{d}") }} - - + + - {{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }} + {{ parseTime(scope.row.updatedAt, "{y}-{m}-{d}") }} - + 修改 + >修改 删除 + >删除 - - + + - + - @@ -156,17 +205,24 @@ - - - - - - - - - - - + + + + + + + + + + @@ -177,7 +233,18 @@ - + + + @@ -214,10 +281,14 @@ - + - @@ -227,15 +298,13 @@ - - - + @@ -248,28 +317,35 @@
上报日期:{{ form.createdTime }}
路段名称:{{ form.segmentName }}
病害类型:{{ form.defectType }}
病害长度:{{ form.targetLen }} 米