diff --git a/src/api/rain/maintain.js b/src/api/rain/maintain.js index a384322..ecfa824 100644 --- a/src/api/rain/maintain.js +++ b/src/api/rain/maintain.js @@ -80,3 +80,19 @@ export function savemire(data) { data }) } + +export function storewater(data) { + return request({ + url: '/api/admin/rain-maintains/out-water-store', + method: 'post', + data + }) +} + +export function savewater(data) { + return request({ + url: '/api/admin/rain-maintains/out-water-save', + method: 'post', + data + }) +} diff --git a/src/views/assess/clue.vue b/src/views/assess/clue.vue index 1addba4..dc7cecf 100644 --- a/src/views/assess/clue.vue +++ b/src/views/assess/clue.vue @@ -122,7 +122,7 @@ - 点击上传 @@ -162,7 +162,7 @@ - diff --git a/src/views/assess/daily.vue b/src/views/assess/daily.vue index 2d8b158..3f58402 100644 --- a/src/views/assess/daily.vue +++ b/src/views/assess/daily.vue @@ -61,7 +61,7 @@ - @@ -103,7 +103,7 @@ - diff --git a/src/views/assess/wade.vue b/src/views/assess/wade.vue index 578cc7c..2e92fad 100644 --- a/src/views/assess/wade.vue +++ b/src/views/assess/wade.vue @@ -98,7 +98,7 @@ - 点击上传 diff --git a/src/views/common/index.vue b/src/views/common/index.vue index 562954a..6eba7bd 100644 --- a/src/views/common/index.vue +++ b/src/views/common/index.vue @@ -106,7 +106,7 @@ - @@ -202,7 +202,7 @@ -
@@ -235,7 +235,7 @@ - 点击上传 diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 02edf29..5f5e62f 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -179,7 +179,7 @@ export default { width: 120 }, { - field: "admin_id", + field: "username", title: "提交人", type: "string", align: "center", @@ -216,7 +216,7 @@ export default { width:120 }, { - field: "admin_id", + field: "username", title: "提交人", type: "string", align: "center", @@ -342,6 +342,7 @@ export default { for(var m of response.data){ m.typeName = m.type==1?"日常雨水设施":"在建工地巡查" + m.username = m.admin?m.admin.name:"" } this.tableData = response.data; @@ -356,7 +357,7 @@ export default { }).then(response => { for(var m of response.data){ m.typeName = (m.type==1?"雨水管道疏挖":(m.type==2?"雨水管道疏通":(m.type==3?"汛期助排":"污泥外运"))) - + m.username = m.admin?m.admin.name:"" } this.mainData = response.data; }).catch(error => { diff --git a/src/views/rain/basic/site.vue b/src/views/rain/basic/site.vue index df2fa8a..36521ae 100644 --- a/src/views/rain/basic/site.vue +++ b/src/views/rain/basic/site.vue @@ -58,7 +58,7 @@ - + @@ -298,6 +298,7 @@ var topHeight = 50; //页面 头部 let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; that.tableHeight = tableHeight; + getparameteritem('siteType').then(res => { that.siteType = res.detail }) @@ -352,6 +353,8 @@ that.info(obj) }else{ that.mapform = ['','','']; + let timeNumber = new Date().getTime() + that.form.number = timeNumber } this.dialogFormVisible = true; }, diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue index 79577da..8aba06e 100644 --- a/src/views/rain/inspection/inspection.vue +++ b/src/views/rain/inspection/inspection.vue @@ -107,7 +107,7 @@
- + @@ -119,6 +119,16 @@
+ + + + {{form.scope}}米 + + + + + {{form.point_name}} + @@ -142,7 +152,7 @@ -
@@ -181,7 +191,7 @@ -
@@ -333,7 +343,7 @@ -
@@ -446,15 +456,28 @@ + :label-width="formLabelWidth"> + + + + + + + + + + - - - - - - - + + + + + + + + + + @@ -478,8 +501,9 @@ -
@@ -526,8 +550,9 @@ -
@@ -582,7 +607,7 @@ - + @@ -617,8 +642,9 @@ -
@@ -787,7 +813,9 @@ content: "", ask_content_id: "", is_unusual: 0, - is_scene: 0, + is_scene: 0, + point_name:"", + scope:"", result: "", tip: "", longitude: "", @@ -795,7 +823,6 @@ address: "", files_list: [], files_end_list: [], - building_site_id: "", name: "", number: "", @@ -893,7 +920,13 @@ } }, methods: { - buildchange(val) { + buildchange(val) { + if(Object.prototype.toString.call(val) != '[object Object]'){ + this.mapform = ['', '', '']; + this.$refs['form'].resetFields(); + let timeNumber = new Date().getTime() + this.form.number = timeNumber + } if (Object.prototype.toString.call(val) === '[object Object]') { this.mapform = [val.longitude, val.latitude, val.address] this.form.longitude = val.longitude @@ -1206,7 +1239,15 @@ file.photoType = "after" this.dealFilesList = fileList - } + } + this.$message({ + message: '上传成功', + type: 'success' + }); + }, + + handleError(err,file,fileList){ + this.$message.error('上传失败，重新上传'); }, resetrainType() { diff --git a/src/views/rain/maintain/maintain.vue b/src/views/rain/maintain/maintain.vue index 3e330a5..42bd4fa 100644 --- a/src/views/rain/maintain/maintain.vue +++ b/src/views/rain/maintain/maintain.vue @@ -5,17 +5,13 @@
-
- - - - +
+ + + + - +
@@ -26,42 +22,44 @@ - + -
- -
- 雨水管道疏挖 - 雨水管道疏通 - 汛期助排 - 污泥外运 -
- -
- 取 消 - 确认 -
- - - - -
- - - - - - - {{form.address}} - - - - - {{form.longitude}} - - - - - {{form.latitude}} - - - - - {{form.content}} - - - - - -
- - - - - - -
- - - - - - 否 - 是 - - - - - 否 - 是 - - - - - {{form.deal_content}} - - - - - {{form.deal_result}} - - - - - -
- - - - - - -
- - - - - - - - - - - - - 无 - 有 - - - - - - 无 - 有 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{form.address}} - - - - - {{form.longitude}} - - - - - {{form.latitude}} - - - - - {{form.content}} - - - - - -
- - - - - - -
- - - - - - 否 - 是 - - - - - {{form.deal_content}} - - - - - {{form.deal_result}} - - - - - -
- - - - - - -
- - - - - - - - - - - - - 无 - 有 - - - - - - 无 - 有 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{form.date}} - - - - - {{form.address}} - - - - - {{form.content}} - - - - - -
- - - - - - -
- - - - - - - - - - - - 无 - 有 - - - - - - 无 - 有 - - - - - - - - - - - - - - - - - - - - - - - -
- -
- 取 消 - 审核 - 缺陷办结 - 办结 - 退回 - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - 否 - 是 - - - - - - - 否 - 是 - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - 否 - 是 - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - -
- -
- 取 消 - 保存 -
- - - - - - +
+ +
+ 雨水管道疏挖 + 雨水管道疏通 + 汛期助排 + 污泥外运 + 出水口排查 +
+ +
+ 取 消 + 确认 +
+ + + + +
+ + + + + + +
+
+ {{item.value}} +
+
+ + + + + {{form.number}} + + + + + {{form.scope}}米 + + + + + {{form.point_name}} + + + + + {{form.address}} + + + + + {{form.longitude}} + + + + + {{form.latitude}} + + + + + {{form.content}} + + + + + +
+ + + + + + +
+ + + + + + 否 + 是 + + + + + 否 + 是 + + + + + {{form.deal_content}} + + + + + {{form.deal_result}} + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + 无 + 有 + + + + + + 无 + 有 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{form.address}} + + + + + {{form.longitude}} + + + + + {{form.latitude}} + + + + + {{form.content}} + + + + + +
+ + + + + + +
+ + + + + + 否 + 是 + + + + + {{form.deal_content}} + + + + + {{form.deal_result}} + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + 无 + 有 + + + + + + 无 + 有 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{form.date}} + + + + + {{form.address}} + + + + + {{form.content}} + + + + + +
+ + + + + + +
+ + + + + + + + + + + + 无 + 有 + + + + + + 无 + 有 + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ 取 消 + 审核 + + + 缺陷办结 + 办结 + + 退回 + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + 否 + 是 + + + + + + + 否 + 是 + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + 否 + 是 + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + +
+ +
+ 取 消 + 保存 +
+ + + + + + @@ -724,156 +734,167 @@
-