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

修改 巡查养护字段 工地

Browse Source
master
lion 3 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;
}, },

87
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>
@ -119,6 +119,16 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
</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>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="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="">
@ -446,15 +456,28 @@
<el-scrollbar style="flex: 1"> <el-scrollbar style="flex: 1">
<!-- 日常雨水设施 --> <!-- 日常雨水设施 -->
<el-form v-if="rainType==1" :model="form" :rules="rules" ref="form" label-position="right" <el-form v-if="rainType==1" :model="form" :rules="rules" ref="form" label-position="right"
:label-width="formLabelWidth"> :label-width="formLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="巡查内容" prop="ask_content_id">
<el-select class="width100" v-model="form.ask_content_id" placeholder="请选择巡查内容">
<el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="巡查内容" prop="ask_content_id"> <el-col :span="12">
<el-select class="width100" v-model="form.ask_content_id" placeholder="请选择巡查内容"> <el-form-item label="覆盖范围(米)" prop="scope">
<el-option v-for="item in equiementList" :key="item.id" :label="item.value" :value="item.id"> <el-input v-model="form.scope" type="number" placeholder="请填写覆盖范围" autocomplete="off"></el-input>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <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>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="所在位置" prop="address"> <el-form-item label="所在位置" prop="address">
@ -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}">
@ -787,7 +813,9 @@
content: "", content: "",
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: "",
@ -893,7 +920,13 @@
} }
}, },
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
@ -1206,7 +1239,15 @@
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() {

2441
src/views/rain/maintain/maintain.vue
View File

File diff suppressed because it is too large Load Diff

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