wangyifang
/
patrol-maintain-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 巡查养护字段 工地

Browse Source
master
lion 4 years ago
parent 3a9fb28916
commit ef7d64b495
10 changed files with 1357 additions and 1217 deletions
Show Stats Download Patch File Download Diff File

16
src/api/rain/maintain.js
Unescape View File

@ -80,3 +80,19 @@ export function savemire(data) {
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
})
}

4
src/views/assess/clue.vue
Unescape View File

@ -122,7 +122,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="判断依据" prop="files_list"> <el-form-item label="判断依据" prop="files_list">
<el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther" <el-upload multiple class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove" action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
:on-exceed="handleExceed" :file-list="filesList"> :on-exceed="handleExceed" :file-list="filesList">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
@ -162,7 +162,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="完工照片" prop="files_list"> <el-form-item label="完工照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
:auto-upload="true" :data="uploadOther" :auto-upload="true" :data="uploadOther"
:on-success="handlesuccess"> :on-success="handlesuccess">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>

4
src/views/assess/daily.vue
Unescape View File

@ -61,7 +61,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list"> <el-form-item label="现场照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
:auto-upload="true" :data="uploadOther" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
@ -103,7 +103,7 @@
</el-col> </el-col>
<el-col :span="24" v-if="otherstatus==2&&normalstatus==2"> <el-col :span="24" v-if="otherstatus==2&&normalstatus==2">
<el-form-item label="处理后照片" prop="deal_files_list"> <el-form-item label="处理后照片" prop="deal_files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>

2
src/views/assess/wade.vue
Unescape View File

@ -98,7 +98,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="许可文件" prop="files_list"> <el-form-item label="许可文件" prop="files_list">
<el-upload class="upload-demo" :on-success="handlesuccess" :data="uploadOther" <el-upload multiple class="upload-demo" :on-success="handlesuccess" :data="uploadOther"
action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove" action="/api/admin/upload-file" :on-remove="handleRemove" :before-remove="beforeRemove"
:on-exceed="handleExceed" :file-list="filesList"> :on-exceed="handleExceed" :file-list="filesList">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>

6
src/views/common/index.vue
Unescape View File

@ -106,7 +106,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="common_inspection_files"> <el-form-item label="附件" prop="common_inspection_files">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="commonInspectionFiles" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="commonInspectionFiles"
ref="pictureUploads" :auto-upload="true" :data="uploadOther" ref="pictureUploads" :auto-upload="true" :data="uploadOther"
:on-success="handlesuccess"> :on-success="handlesuccess">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
@ -202,7 +202,7 @@
<!-- <img v-if="commonInspectionFilesCheck.length>0" v-for="item in commonInspectionFilesCheck" :src="item.files.url" alt=""> --> <!-- <img v-if="commonInspectionFilesCheck.length>0" v-for="item in commonInspectionFilesCheck" :src="item.files.url" alt=""> -->
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="commonInspectionFilesCheck" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="commonInspectionFilesCheck"
ref="pictureUploads" ref="pictureUploads"
> >
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -235,7 +235,7 @@
<el-col :span="24" v-if="form.status==2"> <el-col :span="24" v-if="form.status==2">
<el-form-item label="附件" prop="files_list"> <el-form-item label="附件" prop="files_list">
<el-upload class="upload-demo" :on-success="handlefilesuccess" :data="uploadOther" <el-upload multiple class="upload-demo" :on-success="handlefilesuccess" :data="uploadOther"
action="/api/admin/upload-file" :on-remove="handlefileRemove" :before-remove="beforefileRemove" action="/api/admin/upload-file" :on-remove="handlefileRemove" :before-remove="beforefileRemove"
:on-exceed="handlefileExceed" :file-list="filesList"> :on-exceed="handlefileExceed" :file-list="filesList">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>

7
src/views/dashboard/index.vue
Unescape View File

@ -179,7 +179,7 @@ export default {
width: 120 width: 120
}, },
{ {
field: "admin_id", field: "username",
title: "提交人", title: "提交人",
type: "string", type: "string",
align: "center", align: "center",
@ -216,7 +216,7 @@ export default {
width:120 width:120
}, },
{ {
field: "admin_id", field: "username",
title: "提交人", title: "提交人",
type: "string", type: "string",
align: "center", align: "center",
@ -342,6 +342,7 @@ export default {
for(var m of response.data){ for(var m of response.data){
m.typeName = m.type==1?"日常雨水设施":"在建工地巡查" m.typeName = m.type==1?"日常雨水设施":"在建工地巡查"
m.username = m.admin?m.admin.name:""
} }
this.tableData = response.data; this.tableData = response.data;
@ -356,7 +357,7 @@ export default {
}).then(response => { }).then(response => {
for(var m of response.data){ for(var m of response.data){
m.typeName = (m.type==1?"雨水管道疏挖":(m.type==2?"雨水管道疏通":(m.type==3?"汛期助排":"污泥外运"))) m.typeName = (m.type==1?"雨水管道疏挖":(m.type==2?"雨水管道疏通":(m.type==3?"汛期助排":"污泥外运")))
m.username = m.admin?m.admin.name:""
} }
this.mainData = response.data; this.mainData = response.data;
}).catch(error => { }).catch(error => {

5
src/views/rain/basic/site.vue
Unescape View File

@ -58,7 +58,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="工地编号" prop="number"> <el-form-item label="工地编号" prop="number">
<el-input v-model="form.number" placeholder="请填写工地编号" autocomplete="off"></el-input> <el-input disabled v-model="form.number" placeholder="请填写工地编号" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -298,6 +298,7 @@
var topHeight = 50; //页面 头部 var topHeight = 50; //页面 头部
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight; that.tableHeight = tableHeight;
getparameteritem('siteType').then(res => { getparameteritem('siteType').then(res => {
that.siteType = res.detail that.siteType = res.detail
}) })
@ -352,6 +353,8 @@
that.info(obj) that.info(obj)
}else{ }else{
that.mapform = ['','','']; that.mapform = ['','',''];
let timeNumber = new Date().getTime()
that.form.number = timeNumber
} }
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },

59
src/views/rain/inspection/inspection.vue
Unescape View File

@ -107,7 +107,7 @@
<el-dialog :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%"> <el-dialog :title="rainTitle" :visible.sync="dialogFormDetailVisible" width="60%">
<div class="dialogConcent"> <div class="dialogConcent">
<el-scrollbar style="flex: 1"> <el-scrollbar style="flex: 1">
<!-- 疏通疏挖 --> <!-- 日常雨水设施 -->
<el-form v-if="rainType==1" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" <el-form v-if="rainType==1" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth"> :label-width="formLabelWidth">
<el-row> <el-row>
@ -120,6 +120,16 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="覆盖范围" prop="scope">
{{form.scope}}米
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在点位" prop="point_name">
{{form.point_name}}
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
{{form.address}} {{form.address}}
@ -142,7 +152,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check"> <el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads"> ref="pictureUploads">
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
@ -181,7 +191,7 @@
</el-col> </el-col>
<el-col :span="24" v-if="form.is_scene==1"> <el-col :span="24" v-if="form.is_scene==1">
<el-form-item label="处理后照片" prop="files_end_list" class="files_check"> <el-form-item label="处理后照片" prop="files_end_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
ref="pictureUploads"> ref="pictureUploads">
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
@ -333,7 +343,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check"> <el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads"> ref="pictureUploads">
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
@ -456,6 +466,19 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="覆盖范围(米)" prop="scope">
<el-input v-model="form.scope" type="number" placeholder="请填写覆盖范围" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" placeholder="请填写点位名称" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
<avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map> <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
@ -478,8 +501,9 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list"> <el-form-item label="现场照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUpload" :auto-upload="true" :data="uploadOther" ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -526,8 +550,9 @@
</el-col> </el-col>
<el-col :span="24" v-if="form.is_scene==1"> <el-col :span="24" v-if="form.is_scene==1">
<el-form-item label="处理后照片" prop="files_end_list"> <el-form-item label="处理后照片" prop="files_end_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList"
ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -582,7 +607,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="工地编号" prop="number"> <el-form-item label="工地编号" prop="number">
<el-input v-model="form.number" placeholder="工地编号" autocomplete="off"></el-input> <el-input v-model="form.number" disabled placeholder="工地编号" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -617,8 +642,9 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list"> <el-form-item label="现场照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload class="upload-demo" multiple drag action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUpload" :auto-upload="true" :data="uploadOther" ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-error="handleError"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -788,6 +814,8 @@
ask_content_id: "", ask_content_id: "",
is_unusual: 0, is_unusual: 0,
is_scene: 0, is_scene: 0,
point_name:"",
scope:"",
result: "", result: "",
tip: "", tip: "",
longitude: "", longitude: "",
@ -795,7 +823,6 @@
address: "", address: "",
files_list: [], files_list: [],
files_end_list: [], files_end_list: [],
building_site_id: "", building_site_id: "",
name: "", name: "",
number: "", number: "",
@ -894,6 +921,12 @@
}, },
methods: { 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]') { if (Object.prototype.toString.call(val) === '[object Object]') {
this.mapform = [val.longitude, val.latitude, val.address] this.mapform = [val.longitude, val.latitude, val.address]
this.form.longitude = val.longitude this.form.longitude = val.longitude
@ -1207,6 +1240,14 @@
file.photoType = "after" file.photoType = "after"
this.dealFilesList = fileList this.dealFilesList = fileList
} }
this.$message({
message: '上传成功',
type: 'success'
});
},
handleError(err,file,fileList){
this.$message.error('上传失败，重新上传');
}, },
resetrainType() { resetrainType() {

509
src/views/rain/maintain/maintain.vue
Unescape View File

@ -7,11 +7,7 @@
<slot> <slot>
<div> <div>
<el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区"> <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in selects.areasList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
<!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> --> <!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> -->
@ -28,8 +24,8 @@
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button ghost size="small" @click="show(scope.row)" type="primary" <Button ghost size="small" @click="show(scope.row)" type="primary" style="margin-left: 10px;"
style="margin-left: 10px;" v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4">查看</Button> v-if="scope.row['status']==2||scope.row['status']==3||scope.row['status']==4">查看</Button>
<Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary" <Button v-if="scope.row['status']==0" ghost size="small" @click="edit(scope.row)" type="primary"
style="margin-left: 10px;">编辑</Button> style="margin-left: 10px;">编辑</Button>
@ -37,13 +33,15 @@
style="margin-left: 10px;">审核</Button> style="margin-left: 10px;">审核</Button>
<Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary" <Button v-if="scope.row['status']==1" ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">办结</Button> style="margin-left: 10px;">办结</Button>
<Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> <Button ghost size="small" v-if="scope.row['status']==0||scope.row['status']==1" @click="del(scope.row)"
type="error" style="margin-left: 10px;">删除</Button>
</div> </div>
<div v-else-if="column.type=='type'"> <div v-else-if="column.type=='type'">
<el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag> <el-tag v-if="scope.row[column.field]==1">雨水管道疏挖</el-tag>
<el-tag v-if="scope.row[column.field]==2">雨水管道疏通</el-tag> <el-tag v-if="scope.row[column.field]==2">雨水管道疏通</el-tag>
<el-tag v-if="scope.row[column.field]==3">汛期助排</el-tag> <el-tag v-if="scope.row[column.field]==3">汛期助排</el-tag>
<el-tag v-if="scope.row[column.field]==4">污泥外运</el-tag> <el-tag v-if="scope.row[column.field]==4">污泥外运</el-tag>
<el-tag v-if="scope.row[column.field]==5">出水口排查</el-tag>
</div> </div>
<div v-else-if="column.type=='status'"> <div v-else-if="column.type=='status'">
<el-tag v-if="scope.row[column.field]==0">待审核</el-tag> <el-tag v-if="scope.row[column.field]==0">待审核</el-tag>
@ -76,6 +74,7 @@
<el-radio v-model="rainType" label="2">雨水管道疏通</el-radio> <el-radio v-model="rainType" label="2">雨水管道疏通</el-radio>
<el-radio v-model="rainType" label="3">汛期助排</el-radio> <el-radio v-model="rainType" label="3">汛期助排</el-radio>
<el-radio v-model="rainType" label="4">污泥外运</el-radio> <el-radio v-model="rainType" label="4">污泥外运</el-radio>
<el-radio v-model="rainType" label="5">出水口排查</el-radio>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -89,8 +88,33 @@
<div class="dialogConcent"> <div class="dialogConcent">
<el-scrollbar style="flex: 1"> <el-scrollbar style="flex: 1">
<!-- 疏通疏挖 --> <!-- 疏通疏挖 -->
<el-form v-if="rainType==1||rainType==2" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==1||rainType==2||rainType==5" :model="formdetail" :rules="{}" ref="formdetail"
label-position="right" :label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="24">
<el-form-item label="养护内容" prop="title_id">
<div v-for="item in maintaninList">
<div v-if="item.id==form.title_id">
{{item.value}}
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="24" v-if="rainType==5">
<el-form-item label="出水口编号" prop="number">
{{form.number}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="rainType==1||rainType==2">
<el-form-item label="覆盖范围" prop="scope">
{{form.scope}}米
</el-form-item>
</el-col>
<el-col :span="24" v-if="rainType==1||rainType==2">
<el-form-item label="点位名称" prop="point_name">
{{form.point_name}}
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
{{form.address}} {{form.address}}
@ -113,9 +137,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check"> <el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads" ref="pictureUploads">
>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
@ -151,9 +174,8 @@
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list" class="files_check"> <el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
ref="pictureUploads" :file-list="dealFilesList" ref="pictureUploads">
>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
@ -174,8 +196,8 @@
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0" >无</el-radio> <el-radio :label="0">无</el-radio>
<el-radio :label="1" >有</el-radio> <el-radio :label="1">有</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -190,18 +212,10 @@
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
<el-table <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
:data="rainMaintainLogs" <el-table-column prop="created_at" label="日期" width="180">
style="width: 90%;margin: 0 auto;">
<el-table-column
prop="created_at"
label="日期"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="content" label="内容">
prop="content"
label="内容"
>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="end_type" prop="end_type"
@ -209,16 +223,10 @@
> >
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column prop="type_name" label="操作结果">
prop="type_name"
label="操作结果"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="adminName" label="操作人" width="180">
prop="adminName"
label="操作人"
width="180">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -230,7 +238,8 @@
<!-- 汛期助排 --> <!-- 汛期助排 -->
<el-form v-if="rainType==3" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==3" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
@ -254,9 +263,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check"> <el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads" ref="pictureUploads">
>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
@ -286,9 +294,8 @@
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list" class="files_check"> <el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
ref="pictureUploads" :file-list="dealFilesList" ref="pictureUploads">
>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
@ -309,8 +316,8 @@
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0" >无</el-radio> <el-radio :label="0">无</el-radio>
<el-radio :label="1" >有</el-radio> <el-radio :label="1">有</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -324,29 +331,15 @@
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
<el-table <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
:data="rainMaintainLogs" <el-table-column prop="created_at" label="日期" width="180">
style="width: 90%;margin: 0 auto;">
<el-table-column
prop="created_at"
label="日期"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="content" label="内容">
prop="content"
label="内容"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="type_name" label="操作结果">
prop="type_name"
label="操作结果"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="adminName" label="操作人" width="180">
prop="adminName"
label="操作人"
width="180">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -362,7 +355,8 @@
<!-- 污泥外运 --> <!-- 污泥外运 -->
<el-form v-if="rainType==4" :model="formdetail" :rules="{}" ref="formdetail" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==4" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="外运时间" prop="date"> <el-form-item label="外运时间" prop="date">
@ -381,9 +375,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check"> <el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads" ref="pictureUploads">
>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt=""> <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
@ -403,8 +396,8 @@
<el-col :span="24" v-if="nowstatus==1"> <el-col :span="24" v-if="nowstatus==1">
<el-form-item label="有无违法转办" prop="end_type"> <el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type"> <el-radio-group v-model="formdetail.end_type">
<el-radio :label="0" >无</el-radio> <el-radio :label="0">无</el-radio>
<el-radio :label="1" >有</el-radio> <el-radio :label="1">有</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -418,29 +411,15 @@
<el-form-item label="处理日志" prop=""> <el-form-item label="处理日志" prop="">
</el-form-item> </el-form-item>
<el-table <el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
:data="rainMaintainLogs" <el-table-column prop="created_at" label="日期" width="180">
style="width: 90%;margin: 0 auto;">
<el-table-column
prop="created_at"
label="日期"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="content" label="内容">
prop="content"
label="内容"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="type_name" label="操作结果">
prop="type_name"
label="操作结果"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="adminName" label="操作人" width="180">
prop="adminName"
label="操作人"
width="180">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -453,10 +432,14 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="resetFormDetail('formdetail')">取 消</el-button> <el-button @click="resetFormDetail('formdetail')">取 消</el-button>
<el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核</el-button> <el-button v-if="nowstatus==0" type="primary" v-preventReClick @click="submitFormDetail('formdetail','1')">审核
<el-button v-if="nowstatus==1" type="warning" v-preventReClick @click="submitFormDetail('formdetail','4')">缺陷办结</el-button> </el-button>
<el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结</el-button> <el-button v-if="nowstatus==1" type="warning" v-preventReClick @click="submitFormDetail('formdetail','4')">
<el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回</el-button> 缺陷办结</el-button>
<el-button v-if="nowstatus==1" type="primary" v-preventReClick @click="submitFormDetail('formdetail','2')">办结
</el-button>
<el-button v-if="nowstatus==1" type="danger" v-preventReClick @click="submitFormDetail('formdetail','3')">退回
</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -469,11 +452,37 @@
<div class="dialogConcent"> <div class="dialogConcent">
<el-scrollbar style="flex: 1"> <el-scrollbar style="flex: 1">
<!-- 疏通疏挖 --> <!-- 疏通疏挖 -->
<el-form v-if="rainType==1||rainType==2" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==1||rainType==2||rainType==5" :model="form" :rules="rules" ref="form"
label-position="right" :label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="养护内容" prop="title_id">
<el-select class="width100" v-model="form.title_id" placeholder="请选择养护内容">
<el-option v-for="item in maintaninList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="rainType==5">
<el-form-item label="出水口编号" prop="number">
<el-input v-model="form.number" placeholder="请填写出水口编号" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12" v-if="rainType==1||rainType==2">
<el-form-item label="覆盖范围(米)" prop="scope">
<el-input type="number" v-model="form.scope" placeholder="请填写覆盖范围" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="rainType==1||rainType==2">
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" placeholder="请填写点位名称" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
<avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform" ></avue-input-map> <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -493,8 +502,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list"> <el-form-item label="现场照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
:auto-upload="true" :data="uploadOther" ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -514,33 +523,35 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="是否解决" prop="is_solve"> <el-form-item label="是否解决" prop="is_solve">
<el-radio-group v-model="form.is_solve"> <el-radio-group v-model="form.is_solve">
<el-radio :label="0" >否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1" >是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="是否违法" prop="is_law"> <el-form-item label="是否违法" prop="is_law">
<el-radio-group v-model="form.is_law"> <el-radio-group v-model="form.is_law">
<el-radio :label="0" >否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1" >是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="临时处理办法" prop="deal_content"> <el-form-item label="临时处理办法" prop="deal_content">
<el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off"></el-input> <el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理结果" prop="deal_result"> <el-form-item label="处理结果" prop="deal_result">
<el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off"></el-input> <el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list"> <el-form-item label="处理后照片" prop="files_deal_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" :file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -565,11 +576,12 @@
<!-- 汛期助排 --> <!-- 汛期助排 -->
<el-form v-if="rainType==3" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==3" :model="form" :rules="rules" ref="form" label-position="right"
:label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
<avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform" ></avue-input-map> <avue-input-map :params="mapparams" placeholder="请选择地图" v-model="mapform"></avue-input-map>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -589,8 +601,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="现场照片" prop="files_list"> <el-form-item label="现场照片" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
:auto-upload="true" :data="uploadOther" ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -610,25 +622,27 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="是否解决" prop="is_solve"> <el-form-item label="是否解决" prop="is_solve">
<el-radio-group v-model="form.is_solve"> <el-radio-group v-model="form.is_solve">
<el-radio :label="0" >否</el-radio> <el-radio :label="0">否</el-radio>
<el-radio :label="1" >是</el-radio> <el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="临时处理办法" prop="deal_content"> <el-form-item label="临时处理办法" prop="deal_content">
<el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off"></el-input> <el-input type="textarea" v-model="form.deal_content" placeholder="请填写临时处理办法" autocomplete="off">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理结果" prop="deal_result"> <el-form-item label="处理结果" prop="deal_result">
<el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off"></el-input> <el-input type="textarea" v-model="form.deal_result" placeholder="请填写处理结果" autocomplete="off">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.is_solve==1"> <el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list"> <el-form-item label="处理后照片" prop="files_deal_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="dealFilesList" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther" :file-list="dealFilesList" ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -656,17 +670,13 @@
<!-- 污泥外运 --> <!-- 污泥外运 -->
<el-form v-if="rainType==4" :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth"> <el-form v-if="rainType==4" :model="form" :rules="rules" ref="form" label-position="right"
:label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="外运时间" prop="date"> <el-form-item label="外运时间" prop="date">
<el-date-picker <el-date-picker class="width100" v-model="form.date" type="datetime" placeholder="选择日期时间"
class="width100" value-format="yyyy-MM-dd HH:mm:ss">
v-model="form.date"
type="datetime"
placeholder="选择日期时间"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -682,8 +692,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="files_list"> <el-form-item label="附件" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
:auto-upload="true" :data="uploadOther" ref="pictureUpload" :auto-upload="true" :data="uploadOther"
:on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"> :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
@ -735,12 +745,19 @@
storedischarge, storedischarge,
savedischarge, savedischarge,
storemire, storemire,
savemire savemire,
storewater,
savewater
} from '../../../api/rain/maintain.js' } from '../../../api/rain/maintain.js'
import { import {
getToken getToken
} from '@/utils/auth' } from '@/utils/auth'
import { listarea } from '../../../api/basic/area.js' import {
listarea
} from '../../../api/basic/area.js'
import {
getparameteritem
} from '../../../api/system/dictionary.js'
import LxHeader from "@/components/LxHeader/index.vue"; import LxHeader from "@/components/LxHeader/index.vue";
import AvueMap from 'avue-plugin-map' import AvueMap from 'avue-plugin-map'
@ -752,27 +769,27 @@
data() { data() {
return { return {
tableHeight: 0, tableHeight: 0,
rainTypeVisible:false, rainTypeVisible: false,
rainType:"1", rainType: "1",
dialogFormVisible: false, dialogFormVisible: false,
dialogFormDetailVisible:false, dialogFormDetailVisible: false,
formLabelWidth: "120px", formLabelWidth: "120px",
dialogImageUrl:"", dialogImageUrl: "",
dialogVisible: false, dialogVisible: false,
rainTitle:"雨水管道疏挖", rainTitle: "雨水管道疏挖",
tableData: [], tableData: [],
mapparams:{ mapparams: {
zoom: 11, zoom: 11,
}, },
mapform:[], mapform: [],
tableHeight: 0, tableHeight: 0,
searchFields: { searchFields: {
area_id: "" area_id: ""
}, },
selects:{ selects: {
areasList:[{ areasList: [{
id:"", id: "",
name:"所有" name: "所有"
}] }]
}, },
paginations: { paginations: {
@ -780,39 +797,43 @@
page_size: 15, page_size: 15,
total: 0 total: 0
}, },
filesList:[], filesList: [],
dealFilesList:[], dealFilesList: [],
rainMaintainLogs:[], rainMaintainLogs: [],
end_types:0, end_types: 0,
disabled:false, disabled: false,
uploadOther:{ uploadOther: {
token:"" token: ""
}, },
idname:"", idname: "",
nowstatus:0, nowstatus: 0,
maintaninList: [],
form: { form: {
content:"", content: "",
is_solve:"", title_id: "",
is_law:"", scope: "",
deal_content:"", point_name: '',
deal_result:"", is_solve: "",
address:"", is_law: "",
longitude:"", deal_content: "",
latitude:"", deal_result: "",
files_list:[], address: "",
files_deal_list:[], longitude: "",
date:"", latitude: "",
address:"", files_list: [],
files_deal_list: [],
date: "",
address: "",
}, },
formdetail:{ formdetail: {
status:0, status: 0,
end_type:0, end_type: 0,
content:"" content: ""
}, },
rules: { rules: {
content:[{ content: [{
required: true, required: true,
message: '请填写描述', message: '请填写描述',
trigger: 'blur', trigger: 'blur',
@ -824,28 +845,28 @@
title: "地址/排放点", title: "地址/排放点",
type: "string", type: "string",
align: "left", align: "left",
width:360 width: 360
}, },
{ {
field: "area_info", field: "area_info",
title: "所属片区", title: "所属片区",
type: "format", type: "format",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "type", field: "type",
title: "类型", title: "类型",
type: "type", type: "type",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "status", field: "status",
title: "状态", title: "状态",
type: "status", type: "status",
align: "center", align: "center",
width:180 width: 180
}, },
// { // {
// field: "end_type", // field: "end_type",
@ -859,21 +880,21 @@
title: "提交人", title: "提交人",
type: "admin", type: "admin",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "created_at", field: "created_at",
title: "提交日期", title: "提交日期",
type: "string", type: "string",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "操作", field: "操作",
title: "操作", title: "操作",
width: 220, width: 220,
type: "opt", type: "opt",
fixed:"right" fixed: "right"
} }
], ],
} }
@ -883,7 +904,7 @@
this.load(); this.load();
}, },
watch:{ watch: {
mapform(newVal, oldVal) { mapform(newVal, oldVal) {
this.form.longitude = newVal[0]; this.form.longitude = newVal[0];
this.form.latitude = newVal[1]; this.form.latitude = newVal[1];
@ -909,14 +930,18 @@
page_size: 99 page_size: 99
}).then(res => { }).then(res => {
for(var m of res.data){ for (var m of res.data) {
that.selects.areasList.push({ that.selects.areasList.push({
id:m.id, id: m.id,
name:m.name name: m.name
}) })
} }
}) })
getparameteritem('maintainContent').then(res => {
that.maintaninList = res.detail
})
}, },
handleCurrentChange(page) { handleCurrentChange(page) {
this.paginations.page = page; this.paginations.page = page;
@ -945,31 +970,35 @@
that.rainType = result.type; that.rainType = result.type;
that.nowstatus = result.status; that.nowstatus = result.status;
that.formdetail.id = result.id that.formdetail.id = result.id
if(result.rain_maintain_logs){ if (result.rain_maintain_logs) {
for(var k of result.rain_maintain_logs){ for (var k of result.rain_maintain_logs) {
k.adminName = k.admin?k.admin.name : "" k.adminName = k.admin ? k.admin.name : ""
} }
} }
that.rainMaintainLogs = result.rain_maintain_logs; that.rainMaintainLogs = result.rain_maintain_logs;
that.end_types = result.end_type that.end_types = result.end_type
if(that.rainType==1){ if (that.rainType == 1) {
that.rainTitle = "雨水管道疏挖" that.rainTitle = "雨水管道疏挖"
}else if(that.rainType==2){ } else if (that.rainType == 2) {
that.rainTitle = "雨水管道疏通" that.rainTitle = "雨水管道疏通"
}else if(that.rainType==3){ } else if (that.rainType == 3) {
that.rainTitle = "汛期助排" that.rainTitle = "汛期助排"
}else if(that.rainType==4){ } else if (that.rainType == 4) {
that.rainTitle = "污泥外运" that.rainTitle = "污泥外运"
}else{ } else if (that.rainType == 5) {
that.rainTitle = "出水口排查"
} else {
that.rainTitle = "雨水管道疏挖" that.rainTitle = "雨水管道疏挖"
} }
switch(result.type){ switch (result.type) {
case 1: case 1:
case 2: case 2:
that.form = result.circulation_info; that.form = result.circulation_info;
that.form.circulation_id = result.circulation_id; that.form.circulation_id = result.circulation_id;
that.idname = "circulation_id" that.idname = "circulation_id"
that.mapform = [result.circulation_info.longitude,result.circulation_info.latitude,result.circulation_info.address] that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result
.circulation_info.address
]
let _files = []; let _files = [];
for (var mod of result.circulation_info.circulation_files) { for (var mod of result.circulation_info.circulation_files) {
let m = Object.assign({}, mod); let m = Object.assign({}, mod);
@ -994,7 +1023,9 @@
that.form = result.help_discharge_info; that.form = result.help_discharge_info;
that.form.help_discharge_id = result.help_discharge_id; that.form.help_discharge_id = result.help_discharge_id;
that.idname = "help_discharge_id" that.idname = "help_discharge_id"
that.mapform = [result.help_discharge_info.longitude,result.help_discharge_info.latitude,result.help_discharge_info.address] that.mapform = [result.help_discharge_info.longitude, result.help_discharge_info.latitude, result
.help_discharge_info.address
]
let discharge_files = []; let discharge_files = [];
for (var mod of result.help_discharge_info.help_discharge_files) { for (var mod of result.help_discharge_info.help_discharge_files) {
let m = Object.assign({}, mod); let m = Object.assign({}, mod);
@ -1028,7 +1059,34 @@
m.photoType = "before"; m.photoType = "before";
mire_files.push(m); mire_files.push(m);
} }
that.filesList =mire_files; that.filesList = mire_files;
break;
case 5:
that.form = result.out_water_info;
that.form.out_water_id = result.out_water_id;
that.idname = "out_water_id"
that.mapform = [result.out_water_info.longitude, result.out_water_info.latitude, result.out_water_info
.address
]
let water_files = [];
for (var mod of result.out_water_info.out_water_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
water_files.push(m);
}
that.filesList = water_files;
let water_filesafter = [];
for (var mod of result.out_water_info.out_water_deal_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "after";
water_filesafter.push(m);
}
that.dealFilesList = water_filesafter;
break; break;
} }
@ -1037,7 +1095,7 @@
}) })
}, },
show(obj){ show(obj) {
this.dialogFormDetailVisible = true; this.dialogFormDetailVisible = true;
this.info(obj) this.info(obj)
}, },
@ -1047,11 +1105,11 @@
this.form = this.$options.data().form this.form = this.$options.data().form
that.filesList = []; that.filesList = [];
that.dealFilesList = []; that.dealFilesList = [];
that.mapform = ['','','']; that.mapform = ['', '', ''];
if (obj) { if (obj) {
that.info(obj); that.info(obj);
this.dialogFormVisible = true; this.dialogFormVisible = true;
}else{ } else {
this.dialogFormVisible = false this.dialogFormVisible = false
this.rainTypeVisible = true this.rainTypeVisible = true
} }
@ -1080,7 +1138,7 @@
submitForm(formName) { submitForm(formName) {
var that = this; var that = this;
var listUrlbefore=[] var listUrlbefore = []
for (var m of this.filesList) { for (var m of this.filesList) {
m.photoType = "before"; m.photoType = "before";
if (m.response) if (m.response)
@ -1107,7 +1165,7 @@
this.form.files_deal_list = listUrlafter this.form.files_deal_list = listUrlafter
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
that.submitAll(that.rainType,that.form[this.idname]) that.submitAll(that.rainType, that.form[this.idname])
} else { } else {
this.$Message.error('数据校验失败'); this.$Message.error('数据校验失败');
console.log('error submit!!'); console.log('error submit!!');
@ -1115,7 +1173,7 @@
} }
}); });
}, },
submitFormDetail(formName,status){ submitFormDetail(formName, status) {
var that = this; var that = this;
that.formdetail.status = status that.formdetail.status = status
@ -1136,16 +1194,16 @@
var that = this; var that = this;
that.filesList = []; that.filesList = [];
that.dealFilesList = []; that.dealFilesList = [];
that.mapform = ['','','']; that.mapform = ['', '', ''];
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
that.dialogFormVisible = false; that.dialogFormVisible = false;
that.dialogFormDetailVisible = false; that.dialogFormDetailVisible = false;
}, },
resetFormDetail(formName){ resetFormDetail(formName) {
var that = this; var that = this;
that.filesList = []; that.filesList = [];
that.dealFilesList = []; that.dealFilesList = [];
that.mapform = ['','','']; that.mapform = ['', '', ''];
that.form = {}; that.form = {};
that.rainMaintainLogs = [] that.rainMaintainLogs = []
that.end_types = 0; that.end_types = 0;
@ -1170,7 +1228,7 @@
} }
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
console.log("file",file) console.log("file", file)
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
this.dialogVisible = true; this.dialogVisible = true;
}, },
@ -1186,40 +1244,38 @@
} }
}, },
resetrainType(){ resetrainType() {
this.rainTypeVisible = false this.rainTypeVisible = false
}, },
submitRainType(){ submitRainType() {
var that = this var that = this
this.rainTypeVisible = false this.rainTypeVisible = false
console.log(this.rainType); console.log(this.rainType);
if(that.rainType==1){ if (that.rainType == 1) {
that.rainTitle = "雨水管道疏挖" that.rainTitle = "雨水管道疏挖"
}else if(that.rainType==2){ } else if (that.rainType == 2) {
that.rainTitle = "雨水管道疏通" that.rainTitle = "雨水管道疏通"
}else if(that.rainType==3){ } else if (that.rainType == 3) {
that.rainTitle = "汛期助排" that.rainTitle = "汛期助排"
}else if(that.rainType==4){ } else if (that.rainType == 4) {
that.rainTitle = "污泥外运" that.rainTitle = "污泥外运"
}else{ } else {
that.rainTitle = "雨水管道疏挖" that.rainTitle = "雨水管道疏挖"
} }
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
submitAll(type,id){ submitAll(type, id) {
var that = this; var that = this;
// return // return
that.form.type = type; that.form.type = type;
switch(parseInt(type)){ switch (parseInt(type)) {
case 1: case 1:
case 2: case 2:
console.log("789")
if (id) { if (id) {
console.log("456");
savecirculation(that.form).then(response => { savecirculation(that.form).then(response => {
this.$Message.success('操作成功'); this.$Message.success('操作成功');
that.load(); that.load();
@ -1228,7 +1284,6 @@
//reject(error) //reject(error)
}) })
} else { } else {
console.log("123")
storecirculation(that.form).then(response => { storecirculation(that.form).then(response => {
this.$Message.success('操作成功'); this.$Message.success('操作成功');
that.load(); that.load();
@ -1276,6 +1331,25 @@
}) })
} }
break; break;
case 5:
if (id) {
savewater(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
} else {
storewater(that.form).then(response => {
this.$Message.success('操作成功');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
}
break;
} }
@ -1294,16 +1368,21 @@
.dialogConcent { .dialogConcent {
overflow-y: auto; overflow-y: auto;
} }
.width100{
width:100%; .width100 {
width: 100%;
} }
.files_check .el-upload.el-upload--picture-card{
.files_check .el-upload.el-upload--picture-card {
display: none; display: none;
} }
.vm10 input{
height:32px;vertical-align: middle; .vm10 input {
height: 32px;
vertical-align: middle;
} }
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up{
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px; line-height: 30px;
} }
</style> </style>

2
src/views/rain/order/order.vue
Unescape View File

@ -105,7 +105,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="files_list"> <el-form-item label="附件" prop="files_list">
<el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload" <el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList" ref="pictureUpload"
:auto-upload="true" :data="uploadOther" :auto-upload="true" :data="uploadOther"
:on-success="handlesuccess"> :on-success="handlesuccess">
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>

Write Preview
Loading…
Cancel
Save