lion 4 years ago
parent da9a050438
commit ebd06ae462

@ -15,6 +15,9 @@
</script>
<script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=53919608dd142b8d4498b43bfdef0792&plugin=AMap.PlaceSearch'></script>
<script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
<!-- 天地图 -->
<script src="http://api.tianditu.gov.cn/api?v=4.0&tk=82526d64e8504a0341f775c087863825" type="text/javascript"></script>
</head>
<body>
<noscript>

@ -40,6 +40,11 @@ export const constantRoutes = [{
path: '/404',
component: () => import('@/views/404'),
hidden: true
},
{
path: '/rain/inspection/maps',
component: () => import('@/views/rain/inspection/maps'),
hidden: true
},
{

@ -87,7 +87,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.is_unusual!=0">
<el-form-item label="异常处置建议" prop="tip">
<el-input type="textarea" v-model="form.tip" placeholder="请填写异常处置建议" autocomplete="off"></el-input>
@ -127,20 +127,20 @@
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<template v-slot:footerbtn>
<el-button type="primary" v-preventReClick @click="submitForm('form')">
</el-button>
</template>
</dialogShow>
<div>
<el-dialog class="common-dialog" :visible.sync="dialogVisible">
@ -260,7 +260,7 @@
for (var m of askArr) {
that.askContentArr.push(parseInt(m))
}
that.roaddisabled = true
that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info.road.name : ""
that.mapform = [result.rain_equipment_info.longitude, result.rain_equipment_info.latitude, result

@ -0,0 +1,126 @@
<template>
<dialogShow :title="title" :is-show.sync="isShow" :width="width">
<template v-slot:content>
<div id="mapDiv" :style="{'width':'100%','height':divHeight}"></div>
</template>
</dialogShow>
</template>
<script>
import dialogShow from '@/components/dialogShow'
export default {
components: {
dialogShow
},
data() {
return {
title: "巡查点位",
width: '100%',
isShow: false,
divStyle: {
"width": "100%",
'height': '400px'
},
divHeight:"400px",
data: [
[120.63212, 31.26249, 'suzhouas',51],
[120.63212, 30.26249, 'suzhouwown2',50],
[120.55590234876, 31.320813249765, 'suzhouwown2',49],
],
map: null,
_CloudCollection: null,
lnglats: [],
markers: [],
zoom: 12
}
},
mounted() {
window.showInfo = this.showInfo;
this.getStyle()
},
methods: {
getStyle() {
var clientHeight = document.documentElement.clientHeight
console.log(clientHeight)
this.divHeight = clientHeight + 'px'
},
getMap(){
var that = this
setTimeout(function(){
that.onload()
},2000)
},
onload() {
if(!this.map){ 
this.map = new T.Map('mapDiv');
}
this.map.clearOverLays();
this.map.centerAndZoom(new T.LngLat(120.63212, 31.26249), this.zoom)
let lnglats = [];
//
var icon = new T.Icon({
iconUrl: "http://api.tianditu.gov.cn/img/map/markerA.png",
iconSize: new T.Point(19, 27),
iconAnchor: new T.Point(10, 25)
});
var arrayObj = new Array();
for (var i = 0; i < this.data.length; i++) {
var ll = new T.LngLat(this.data[i][0], this.data[i][1])
lnglats.push(ll)
var marker = new T.Marker(new T.LngLat(this.data[i][0], this.data[i][1]), {
icon: icon
});
var content = "<div>地址:" + this.data[i][2] + "</div>" +
"<div style='color:red' onClick='showInfo("+this.data[i][3]+")'>查看详情</div>"
this.map.addOverLay(marker); //
this.addClickHandler(content, marker);
arrayObj.push(marker);
}
//
var markers = new T.MarkerClusterer(this.map, {
markers: arrayObj
});
//
if (document.createElement('canvas').getContext) { //
this._CloudCollection = new T.CloudMarkerCollection(lnglats, {
color: 'blue',
SizeType: TDT_POINT_SIZE_SMALL
})
this.map.addOverLay(this._CloudCollection);
} else {
alert('此示例目前只有在IE9及以上浏览器打开');
}
},
//
addClickHandler(content, marker) {
var that = this
marker.addEventListener("click", function(e) {
that.openInfo(content, e)
});
},
//
openInfo(content, e) {
var point = e.lnglat;
this.marker = new T.Marker(point); //
var markerInfoWin = new T.InfoWindow(content, {
offset: new T.Point(0, -30)
}); //
this.map.openInfoWindow(markerInfoWin, point); //
},
showInfo(id){
this.$emit('showInfo',{id:id,type:1},'showform')
}
}
}
</script>
<style>
</style>

@ -37,7 +37,7 @@
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(filesList)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
@ -220,7 +220,7 @@
</dialogShow>
<div>
<el-dialog class="common-dialog" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
<img v-for="item in filesList" width="100%" :src="item['files'].url" alt="">
</el-dialog>
</div>
</div>
@ -355,7 +355,7 @@
_filesafter.push(m);
}
that.dealFilesList = _filesafter;
that.formclue.type = 5
that.formclue.rain_inspection_id = result.id
that.formclue.files_list = _files
@ -391,8 +391,12 @@
//reject(error)
})
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
handlePictureCardPreview(filesList) {
console.log(filesList)
// for( var m of filesList){
// }
// this.dialogImageUrl = file.url;
this.dialogVisible = true;
},

@ -49,7 +49,8 @@
<Button type="primary" @click="load(false)" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
<Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
<Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
<Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
<Button type="primary" v-if="false" @click="showMap()" style="margin-left: 10px"></Button>
</div>
</slot>
</LxHeader>
@ -117,8 +118,9 @@
:page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
</el-pagination>
</div>
</div>
</div>
<mapShow ref="mapShow" @showInfo="showMapInfo(arguments)"></mapShow>
<!-- 初始选择 -->
<el-dialog title="雨管养护类型选择" :visible.sync="rainTypeVisible" width="60%">
<div class="dialogConcent">
@ -201,14 +203,16 @@
import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
import editEquipment from '@/views/rain/inspection/components/editEquipment'
import editSite from '@/views/rain/inspection/components/editSite'
import editSite from '@/views/rain/inspection/components/editSite'
import mapShow from '@/views/rain/inspection/components/mapShow'
export default {
components: {
LxHeader,
showRainEquipmentInfo,
showRainSiteInfo,
editEquipment,
editSite
editSite,
mapShow
},
data() {
return {
@ -407,6 +411,10 @@
}
},
methods: {
showMap(){
this.$refs.mapShow.isShow = true
this.$refs.mapShow.getMap()
},
initLoad() {
var that = this;
var clientHeight = document.documentElement.clientHeight
@ -511,10 +519,12 @@
var that = this
this.rainTypeVisible = false
if (that.rainType == 1) {
this.$refs.editEquipment.infoId = ""
this.$refs.editEquipment.getEquipmentInfo()
this.$refs.editEquipment.isShow = true
} else if (that.rainType == 2) {
this.$refs.editSite.infoId = ""
this.$refs.editSite.getSiteInfo()
this.$refs.editSite.isShow = true
}
@ -523,6 +533,13 @@
this.rainTypeVisible = false
this.rainType = 1
},
showMapInfo(arr){
console.log(arr)
let obj = arr[0]
let type = arr[1]
this.showInfo(obj,type)
},
//
showInfo(obj, formtype) {
//

@ -0,0 +1,35 @@
<template>
<div>
<div id="mapDiv"></div>
<!-- <button @click = "open">点击画多边形</button> -->
</div>
</template>
<script>
export default {
data(){
return{
}
},
created(){
},
mounted(){
this.loadmap()
},
methods:{
loadmap(){
var map = new T.Map("mapDiv");
//
map.centerAndZoom(new T.LngLat(116.40969, 39.94940), 12);
//
map.enableScrollWheelZoom();
}
}
}
</script>
<style scoped>
#mapDiv {
height: 100vh;
width: 100%;
}
</style>

@ -167,7 +167,7 @@
return {
formType: "showform", // auditform endform showform
title: "雨管养护",
rainType: 1, //
rainType: "", //
width: "60%",
labelwidth: "120px",
isShow: false,
@ -231,9 +231,21 @@
this.infoId = val
},
rainType(val) {
var that = this
this.rainType = val
this.form.type = val
var that = this
if(val){
that.rainType = val
that.form.type = val
for (var m of that.yhtypeList) {
if (m.id == val) {
that.title = m.name
}
}
}else{
that.rainType = 1
that.form.type = 1
that.title = "雨水管道疏挖"
}
},
mapform(newVal, oldVal) {
this.form.longitude = newVal[0];
@ -370,7 +382,6 @@
this.form.files_deal_list = listUrlafter
that.form.title_id = this.returnTitleId(that.titleArr)
console.log("that.form", that.form)
// return
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitType(this.rainType)

@ -127,13 +127,13 @@
infoId(val) {
this.infoId = val
},
mapform(newVal, oldVal) {
this.form.longitude = newVal[0];
this.form.latitude = newVal[1];
// if(this.rainType!=4){
this.form.address = newVal[2];
// }
},
// mapform(newVal, oldVal) {
// this.form.longitude = newVal[0];
// this.form.latitude = newVal[1];
// // if(this.rainType!=4){
// this.form.address = newVal[2];
// // }
// },
},
created() {
@ -225,8 +225,8 @@
that.filesList = [];
that.roadName = ""
that.roaddisabled = false
that.mapform = ['', '', ''];
this.form = {
this.form = {
type:4
}
},
chooseRoad(val) {

@ -584,12 +584,14 @@
var that = this
this.rainTypeVisible = false
if (that.rainType == 1 || that.rainType == 2 || that.rainType == 3 || that.rainType == 5 || that.rainType ==
6 || that.rainType ==
7) {
6 || that.rainType == 7) {
console.log("a",that.rainType)
this.$refs.editCirculation.infoId = ""
this.$refs.editCirculation.rainType = that.rainType
this.$refs.editCirculation.getInfo()
this.$refs.editCirculation.isShow = true
} else if (that.rainType == 4) {
this.$refs.editMire.infoId = ""
this.$refs.editMire.getInfo()
this.$refs.editMire.isShow = true
}

@ -114,10 +114,10 @@
<showRainEquipmentInfo ref="showRainEquipmentInfo"></showRainEquipmentInfo>
<showRainSiteInfo ref="showRainSiteInfo"></showRainSiteInfo>
<!-- 查看 审核 办结 -->
<!-- <showCirculationInfo ref="showCirculationInfo" @auditSuccess="load"></showCirculationInfo>
<!-- 养护 -->
<showCirculationInfo ref="showCirculationInfo" @auditSuccess="load"></showCirculationInfo>
<showDischargeInfo ref="showDischargeInfo" @auditSuccess="load"></showDischargeInfo>
<showMireInfo ref="showMireInfo" @auditSuccess="load"></showMireInfo> -->
<showMireInfo ref="showMireInfo" @auditSuccess="load"></showMireInfo>
@ -195,7 +195,8 @@
},
tableList: {
rain_inspection_info: {},
worksheet_info: {}
worksheet_info: {},
rain_maintain_info:{}
},
rainEquipmentInfo: {},
acceptTime: "",
@ -454,21 +455,22 @@
// }
if (obj.rain_maintain_id > 0) {
this.$refs.maintain.dialogFormDetailVisible = true
// this.showinfo = true
this.$refs.maintain.info(obj.rain_maintain_id)
return
if (obj.old_type == 1 || obj.old_type == 2 || obj.old_type == 6 || obj.old_type == 7 || obj.old_type == 5) {
// this.$refs.maintain.dialogFormDetailVisible = true
// // this.showinfo = true
// this.$refs.maintain.info(obj.rain_maintain_id)
// return
let oldType = obj.rain_maintain_info?obj.rain_maintain_info.old_type:0
if (oldType == 1 || oldType == 2 || oldType == 6 || oldType == 7 || oldType == 5) {
this.$refs.showCirculationInfo.isShow = true
this.$refs.showCirculationInfo.infoId = obj.rain_maintain_id
this.$refs.showCirculationInfo.formType = 'showform'
this.$refs.showCirculationInfo.getInfo(obj.rain_maintain_id)
} else if (obj.old_type == 3) {
} else if (oldType == 3) {
this.$refs.showDischargeInfo.isShow = true
this.$refs.showDischargeInfo.infoId = obj.rain_maintain_id
this.$refs.showDischargeInfo.formType = 'showform'
this.$refs.showDischargeInfo.getInfo(obj.rain_maintain_id)
} else if (obj.old_type == 4) {
} else if (oldType == 4) {
this.$refs.showMireInfo.isShow = true
this.$refs.showMireInfo.infoId = obj.rain_maintain_id
this.$refs.showMireInfo.formType = 'showform'

@ -1,799 +0,0 @@
<template>
<!-- 审核 -->
<el-dialog class="common-dialog" :title="rainTitle" @close="changeShow" :visible.sync="dialogFormDetailVisible" width="60%">
<div class="dialogConcent">
<el-scrollbar style="flex: 1">
<!-- 疏通疏挖 -->
<el-form v-if="rainType==1||rainType==2||rainType==5||rainType==6||rainType==7" :model="formdetail" :rules="{}" ref="formdetail"
label-position="right" :label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="养护内容" prop="title_id">
{{form.title_detail}}
<!-- <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-form-item label="所在位置" prop="address">
{{form.address}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="longitude">
{{form.longitude}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="latitude">
{{form.latitude}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="content">
{{form.content}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="是否解决" prop="is_solve">
<el-tag v-if="form.is_solve==0"></el-tag>
<el-tag type="success" v-if="form.is_solve==1"></el-tag>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="是否违法" prop="is_law">
<el-tag v-if="form.is_law==0"></el-tag>
<el-tag type="success" v-if="form.is_law==1"></el-tag>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="临时处理办法" prop="deal_content">
{{form.deal_content}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理结果" prop="deal_result">
{{form.deal_result}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
:file-list="dealFilesList" ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
<el-radio :label="2">养护转办</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
<el-form-item label="养护转办类型" prop="end_type">
<el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
<el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
<el-form-item label="要求完成时间" prop="end_time">
<el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办">
<el-tag v-if="end_types==0"></el-tag>
<el-tag type="success" v-if="end_types==1"></el-tag>
<el-tag type="success" v-if="end_types==2"></el-tag>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="要求完成时间">
{{form.end_time}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="备注">
{{form.remark}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop="">
</el-form-item>
<el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
<el-table-column prop="created_at" label="日期" width="180">
</el-table-column>
<el-table-column prop="content" label="内容">
</el-table-column>
<!-- <el-table-column
prop="end_type"
label="有无违法转办"
>
</el-table-column> -->
<el-table-column prop="type_name" label="操作结果">
</el-table-column>
<el-table-column prop="adminName" label="操作人" width="180">
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-form>
<!-- 汛期助排 -->
<el-form v-if="rainType==3" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所在位置" prop="address">
{{form.address}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="longitude">
{{form.longitude}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="latitude">
{{form.latitude}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="content">
{{form.content}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="是否解决" prop="is_solve">
<el-tag v-if="form.is_solve==0"></el-tag>
<el-tag type="success" v-if="form.is_solve==1"></el-tag>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="临时处理办法" prop="deal_content">
{{form.deal_content}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理结果" prop="deal_result">
{{form.deal_result}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.is_solve==1">
<el-form-item label="处理后照片" prop="files_deal_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card"
:file-list="dealFilesList" ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
<el-radio :label="2">养护转办</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
<el-form-item label="养护转办类型" prop="end_type">
<el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
<el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
<el-form-item label="要求完成时间" prop="end_time">
<el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办">
<el-tag v-if="end_types==0"></el-tag>
<el-tag type="success" v-if="end_types==1"></el-tag>
<el-tag type="success" v-if="end_types==2"></el-tag>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="要求完成时间">
{{form.end_time}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="备注">
{{form.remark}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop="">
</el-form-item>
<el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
<el-table-column prop="created_at" label="日期" width="180">
</el-table-column>
<el-table-column prop="content" label="内容">
</el-table-column>
<el-table-column prop="type_name" label="操作结果">
</el-table-column>
<el-table-column prop="adminName" label="操作人" width="180">
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-form>
<!-- 污泥外运 -->
<el-form v-if="rainType==4" :model="formdetail" :rules="{}" ref="formdetail" label-position="right"
:label-width="formLabelWidth">
<el-row>
<el-col :span="24">
<el-form-item label="所属道路" prop="road_id">
{{roadName}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="外运时间" prop="date">
{{form.date}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备用排放点" prop="address">
{{form.address}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="描述" prop="content">
{{form.content}}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="现场照片" prop="files_list" class="files_check">
<el-upload multiple action="/api/admin/upload-file" list-type="picture-card" :file-list="filesList"
ref="pictureUploads">
<div slot="file" slot-scope="{file}">
<img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in"></i>
</span>
</span>
</div>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==0||nowstatus==1&&wf_type!=1">
<el-form-item label="备注" prop="content">
<el-input type="textarea" v-model="formdetail.content" placeholder="请填写备注"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&wf_type!=1">
<el-form-item label="有无违法转办" prop="end_type">
<el-radio-group v-model="formdetail.end_type">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
<el-radio :label="2">养护转办</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1&&formdetail.end_type==2">
<el-form-item label="养护转办类型" prop="end_type">
<el-select class="width100" v-model="formdetail.type" placeholder="请选择养护转办类型">
<el-option v-for="item in yhtypeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==2">
<el-form-item label="要求完成时间" prop="end_time">
<el-date-picker style="width:100%" v-model="formdetail.end_time" type="datetime" placeholder="选择时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==1 && formdetail.end_type==0">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formdetail.remark" placeholder="请填写备注" autocomplete="off">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="有无违法转办">
<el-tag v-if="end_types==0"></el-tag>
<el-tag type="success" v-if="end_types==1"></el-tag>
<el-tag type="success" v-if="end_types==2"></el-tag>
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="要求完成时间">
{{form.end_time}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="备注">
{{form.remark}}
</el-form-item>
</el-col>
<el-col :span="24" v-if="nowstatus==2||nowstatus==3||nowstatus==4||wf_type==1">
<el-form-item label="处理日志" prop="">
</el-form-item>
<el-table :data="rainMaintainLogs" style="width: 90%;margin: 0 auto;">
<el-table-column prop="created_at" label="日期" width="180">
</el-table-column>
<el-table-column prop="content" label="内容">
</el-table-column>
<el-table-column prop="type_name" label="操作结果">
</el-table-column>
<el-table-column prop="adminName" label="操作人" width="180">
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-form>
</el-scrollbar>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="changeShow"> </el-button>
</div>
</el-dialog>
</template>
<script>
import {
get
} from '../../../../api/rain/maintain.js'
import {
listarea
} from '../../../../api/basic/area.js'
import {
listroad
} from '../../../../api/basic/road.js'
import {
getparameteritem
} from '../../../../api/system/dictionary.js'
export default {
name:"maintainInfo",
props:{
// dialogFormDetailVisible:{
// type:Boolean,
// default:() => {
// return false
// }
// }
},
data() {
return {
rainType:6,
maintainids:0,
dialogFormDetailVisible:false,
// showdiago: this.dialogFormDetailVisible,
formLabelWidth: "120px",
dialogImageUrl: "",
dialogVisible: false,
rainTitle: "雨水管道疏挖",
tableData: [],
yhtypeList: [{
id: 1,
name: "雨水管道疏挖"
}, {
id: 2,
name: "雨水管道疏通"
},{
id: 3,
name: "汛期助排"
},{
id: 4,
name: "污泥外运"
},{
id: 5,
name: "出水口排查"
},{
id: 6,
name: "专项处理"
},{
id: 7,
name: "维修"
}],
filesList: [],
dealFilesList: [],
rainMaintainLogs: [],
end_types: 0,
disabled: false,
idname: "",
nowstatus: 0,
maintaninList: [],
form: {
content: "",
title_id: "",
scope: "",
point_name: '',
is_solve: 0,
is_law: 0,
deal_content: "",
deal_result: "",
address: "",
longitude: "",
latitude: "",
files_list: [],
files_deal_list: [],
date: "",
address: "",
road_id: ""
},
allmaintaninList:[{
id:"",
value:"所有"
}],
roadsList: [],
roadName: "",
roaddisabled: false,
roadloading: false,
formdetail: {
status: 0,
end_type: 0,
content: "",
end_time:"",
remark:""
},
wf_type: 0,
rules: {
},
}
},
created() {
// this.info()
},
watch:{
dialogFormDetailVisible(){
// this.changeShow()
this.showdiago = this.dialogFormDetailVisible
}
},
methods: {
getUserName(row) {
if (row.admin) {
return row.admin.name;
} else if (row.user) {
return row.user.name;
} else {
return "未知";
}
},
changeShow(){
this.dialogFormDetailVisible=false
// this.$emit("update:dialogFormDetailVisible", false);
// this.$emit('shows',this.dialogFormDetailVisible=false);
},
info(id) {
var that = this;
console.log("22",id)
this.form={}
get(id).then(res => {
// this.$refs['form'].resetFields();
let result = Object.assign(that.form, res);
that.rainType = result.type;
that.nowstatus = result.status;
that.formdetail.id = result.id
that.formdetail.end_type = result.end_type
that.formdetail.type = parseInt(result.type)
that.wf_type = result.end_type
if (result.rain_maintain_logs) {
for (var k of result.rain_maintain_logs) {
k.adminName = k.admin ? k.admin.name : ""
}
}
that.rainMaintainLogs = result.rain_maintain_logs;
that.end_types = result.end_type
if (that.rainType == 1) {
that.rainTitle = "雨水管道疏挖"
} else if (that.rainType == 2) {
that.rainTitle = "雨水管道疏通"
} else if (that.rainType == 3) {
that.rainTitle = "汛期助排"
} else if (that.rainType == 4) {
that.rainTitle = "污泥外运"
} else if (that.rainType == 5) {
that.rainTitle = "出水口排查"
}else if (that.rainType == 6) {
that.rainTitle = "专项处理"
}else if (that.rainType == 7) {
that.rainTitle = "维修"
} else {
that.rainTitle = "雨管养护"
}
switch (result.old_type) {
case 1:
case 2:
case 6:
case 7:
that.form = result.circulation_info;
that.form.circulation_id = result.circulation_id;
that.roaddisabled = true
that.roadName = result.circulation_info.road ? result.circulation_info.road.name : ""
that.idname = "circulation_id"
that.mapform = [result.circulation_info.longitude, result.circulation_info.latitude, result
.circulation_info.address
]
let _files = [];
for (var mod of result.circulation_info.circulation_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
_files.push(m);
}
that.filesList = _files;
let _filesafter = [];
for (var mod of result.circulation_info.circulation_deal_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "after";
_filesafter.push(m);
}
that.dealFilesList = _filesafter;
break;
case 3:
that.form = result.help_discharge_info;
that.form.help_discharge_id = result.help_discharge_id;
that.roaddisabled = true
that.roadName = result.help_discharge_info.road ? result.help_discharge_info.road.name : ""
that.idname = "help_discharge_id"
that.mapform = [result.help_discharge_info.longitude, result.help_discharge_info.latitude, result
.help_discharge_info.address
]
let discharge_files = [];
for (var mod of result.help_discharge_info.help_discharge_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
discharge_files.push(m);
}
that.filesList = discharge_files;
let discharge_filesafter = [];
for (var mod of result.help_discharge_info.help_discharge_deal_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "after";
discharge_filesafter.push(m);
}
that.dealFilesList = discharge_filesafter;
break;
case 4:
that.form = result.mire_info;
that.form.mire_id = result.mire_id;
that.roaddisabled = true
that.roadName = result.mire_info.road ? result.mire_info.road.name : ""
that.idname = "mire_id";
let mire_files = [];
for (var mod of result.mire_info.mire_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
mire_files.push(m);
}
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.roaddisabled = true
that.roadName = result.out_water_info.road ? result.out_water_info.road.name : ""
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;
}
that.form.end_time= result.end_time
that.form.remark = result.remark
}).catch(error => {
//reject(error)
})
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
}
}
}
</script>
<style lang="scss">
.dialogConcent {
overflow-y: auto;
}
.width100 {
width: 100%;
}
.files_check .el-upload.el-upload--picture-card {
display: none;
}
.vm10{
margin-right:10px;
margin-bottom:10px;
height: 32px;
vertical-align: bottom;
}
.vm10 input {
height: 32px;
vertical-align: middle;
}
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px;
}
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
line-height: 25px;
}
.selerchcontent button{
vertical-align: top;
}
</style>

@ -338,13 +338,14 @@
<el-dialog class="common-dialog" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- // -->
<maintainInfo ref="maintain"></maintainInfo>
<!-- // -->
<showRainEquipmentInfo ref="showRainEquipmentInfo"></showRainEquipmentInfo>
<showRainSiteInfo ref="showRainSiteInfo"></showRainSiteInfo>
<!-- 养护 -->
<showCirculationInfo ref="showCirculationInfo" @auditSuccess="load"></showCirculationInfo>
<showDischargeInfo ref="showDischargeInfo" @auditSuccess="load"></showDischargeInfo>
<showMireInfo ref="showMireInfo" @auditSuccess="load"></showMireInfo>
</div>
@ -365,16 +366,20 @@
} from '../../../api/basic/area.js'
import {listCommonuser} from"../../../api/common.js"
import {listaccount} from "../../../api/basic/account.js"
import LxHeader from "@/components/LxHeader/index.vue";
import maintainInfo from '@/views/rain/order/components/maintainInfo'
import LxHeader from "@/components/LxHeader/index.vue";
import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
import showRainSiteInfo from '@/views/rain/inspection/components/showRainSiteInfo'
import showCirculationInfo from '@/views/rain/maintain/components/showCirculationInfo'
import showDischargeInfo from '@/views/rain/maintain/components/showDischargeInfo'
import showMireInfo from '@/views/rain/maintain/components/showMireInfo'
export default {
components: {
LxHeader,
maintainInfo,
showRainEquipmentInfo,
showRainSiteInfo
showRainSiteInfo,
showCirculationInfo,
showDischargeInfo,
showMireInfo
},
data() {
return {
@ -410,7 +415,8 @@
},
tableList:{
rain_inspection_info:{},
worksheet_info:{}
worksheet_info:{},
rain_maintain_info:{}
},
rainEquipmentInfo:{},
acceptTime:"",
@ -652,52 +658,19 @@
that.form = result;
if(what=='ck'){
that.rainEquipmentInfo = {}
that.worksheetFiles = []
that.rainEquipmentEndFiles = []
that.rainEquipmentFiles = []
for(var m in that.tableList){
that.tableList[m] = {}
if(result[m]){
that.tableList[m] = result[m]
if(m=='worksheet_info'){
let work_files = [];
for (var mod of result[m].worksheet_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
work_files.push(m);
}
that.worksheetFiles = work_files;
that.dialogOrderFormVisible = true
}else{
that.rainEquipmentInfo = Object.assign(that.rainEquipmentInfo, result[m].rain_equipment_info)
let _files = [];
for (var mod of result[m].rain_equipment_info.rain_equipment_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
_files.push(m);
}
that.rainEquipmentFiles = _files;
let _filesafter = [];
for (var mod of result[m].rain_equipment_info.rain_equipment_end_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "after";
_filesafter.push(m);
}
that.rainEquipmentEndFiles = _filesafter;
that.dialogxcFormDetailVisible = true
}
}
that.tableList['worksheet_info'] = result['worksheet_info']
let work_files = [];
for (var mod of result['worksheet_info'].worksheet_files) {
let m = Object.assign({}, mod);
m.url = mod.files.url;
m.id = mod.files.id;
m.photoType = "before";
work_files.push(m);
}
that.worksheetFiles = work_files;
that.dialogOrderFormVisible = true
}
console.log(that.rainEquipmentInfo)
if(what=='pd'){
that.dialogFormVisible = true
}
@ -735,9 +708,23 @@
this.$refs.showRainSiteInfo.formType = 'showform'
}
}else if(obj.rain_maintain_id>0){
this.$refs.maintain.dialogFormDetailVisible = true
// this.showinfo = true
this.$refs.maintain.info(obj.rain_maintain_id)
let oldType = obj.rain_maintain_info?obj.rain_maintain_info.old_type:0
if (oldType == 1 || oldType == 2 || oldType == 6 || oldType == 7 || oldType == 5) {
this.$refs.showCirculationInfo.isShow = true
this.$refs.showCirculationInfo.infoId = obj.rain_maintain_id
this.$refs.showCirculationInfo.formType = 'showform'
this.$refs.showCirculationInfo.getInfo(obj.rain_maintain_id)
} else if (oldType == 3) {
this.$refs.showDischargeInfo.isShow = true
this.$refs.showDischargeInfo.infoId = obj.rain_maintain_id
this.$refs.showDischargeInfo.formType = 'showform'
this.$refs.showDischargeInfo.getInfo(obj.rain_maintain_id)
} else if (oldType == 4) {
this.$refs.showMireInfo.isShow = true
this.$refs.showMireInfo.infoId = obj.rain_maintain_id
this.$refs.showMireInfo.formType = 'showform'
this.$refs.showMireInfo.getInfo(obj.rain_maintain_id)
}
}else{
this.info(obj,ck)
}

Loading…
Cancel
Save