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

修改 巡查 养护 字段新增

Browse Source
master
lion 3 years ago
parent 0170589b99
commit 44988a417e
8 changed files with 227 additions and 41 deletions
Show Stats Download Patch File Download Diff File

16
order/order/orderInfo/orderInfo.vue
Unescape View File

@ -46,7 +46,7 @@
<view class="demo-layout bg-purple">现场照片：</view> <view class="demo-layout bg-purple">现场照片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in filesList"> <u-col span="12" v-for="(item,index) in filesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
@ -86,7 +86,7 @@
<view class="demo-layout bg-purple">处理后照片：</view> <view class="demo-layout bg-purple">处理后照片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in dealFilesList"> <u-col span="12" v-for="(item,index) in dealFilesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
@ -128,7 +128,17 @@
} }
this.loadDep() this.loadDep()
}, },
methods: { methods: {
imgListPreview(item){
var urlList = []
urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
uni.previewImage({
indicator:"number",
loop:true,
urls: urlList
})
},
loadDep(){ loadDep(){
var that = this var that = this
that.util.request({ that.util.request({

14
packageA/pages/generalPatrol/viewPatrol.vue
Unescape View File

@ -54,7 +54,7 @@
<view class="demo-layout bg-purple">现场图片：</view> <view class="demo-layout bg-purple">现场图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in lists.common_inspection_files"> <u-col span="12" v-for="(item,index) in lists.common_inspection_files">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
@ -88,7 +88,17 @@
this.loadInfo(options.id) this.loadInfo(options.id)
} }
}, },
methods: { methods: {
imgListPreview(item){
var urlList = []
urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
uni.previewImage({
indicator:"number",
loop:true,
urls: urlList
})
},
loadInfo: function(id) { loadInfo: function(id) {
var that = this; var that = this;
this.util.request({ this.util.request({

16
packageB/pages/dailyInfo/dailyInfo.vue
Unescape View File

@ -40,7 +40,7 @@
<view class="demo-layout bg-purple">现场图片：</view> <view class="demo-layout bg-purple">现场图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in lists.daily_inspection_files"> <u-col span="12" v-for="(item,index) in lists.daily_inspection_files">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
@ -57,7 +57,7 @@
<view class="demo-layout bg-purple">处理后照片：</view> <view class="demo-layout bg-purple">处理后照片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in lists.daily_inspection_deal_files"> <u-col span="12" v-for="(item,index) in lists.daily_inspection_deal_files">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
@ -98,7 +98,17 @@
this.loadInfo(options.id) this.loadInfo(options.id)
} }
}, },
methods: { methods: {
imgListPreview(item){
var urlList = []
urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
uni.previewImage({
indicator:"number",
loop:true,
urls: urlList
})
},
loadInfo: function(id) { loadInfo: function(id) {
var that = this; var that = this;
this.util.request({ this.util.request({

26
raininspection/raininspection/raininspection.vue
Unescape View File

@ -24,14 +24,11 @@
<u-select v-model="askShow" mode="single-column" value-name="id" label-name="value" <u-select v-model="askShow" mode="single-column" value-name="id" label-name="value"
:list="rainArr.askContentList" @confirm="confirmAskType"></u-select> :list="rainArr.askContentList" @confirm="confirmAskType"></u-select>
</u-form-item> </u-form-item>
<u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left">
<u-input type="number" v-model="form.scope" placeholder="请填写覆盖范围"/>
<u-form-item label="覆盖范围" label-position="top" prop="number"> </u-form-item>
<u-input placeholder="请填写覆盖范围" v-model="form.number" type="text" :border="true" /> <u-form-item labelWidth="180" label="点位名称" label-position="left">
<u-tag text="米" mode="dark" v-slot="right" /> <u-input v-model="form.point_name" type='text' placeholder="请填写点位名称"/>
</u-form-item>
<u-form-item label="点位名称" label-position="top" prop="number">
<u-input placeholder="请填写点位名称" v-model="form.number" type="text" :border="true" />
</u-form-item> </u-form-item>
</block> </block>
<view v-if="!formshow"> <view v-if="!formshow">
@ -90,7 +87,7 @@
<view v-if="!formshow"> <view v-if="!formshow">
<u-form-item labelWidth="180" label-position="left" label="是否违法"> <u-form-item labelWidth="180" label-position="left" label="是否违法">
<u-radio-group v-model="form.is_law"> <u-radio-group v-model="form.is_law">
<u-radio v-for="(item, index) in rainArr.laws" :key="index" :name="item.id"> <u-radio @change="lawRadioChange" v-for="(item, index) in rainArr.laws" :key="index" :name="item.id">
{{item.name}} {{item.name}}
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
@ -232,7 +229,9 @@
form: { form: {
road_id: '', road_id: '',
content: "", content: "",
ask_content_id: "", ask_content_id: "",
scope:"",
point_name:"",
is_unusual: 0, is_unusual: 0,
is_scene: 0, is_scene: 0,
result: "", result: "",
@ -342,6 +341,13 @@
// } // }
},
lawRadioChange(val){
console.log(val)
if(val==0){
this.form.break_id=""
this.lawName = ""
}
}, },
confirmBuildTypeName(val) { confirmBuildTypeName(val) {
console.log(val) console.log(val)

50
raininspection/raininspectioninfo/raininspectionInfo.vue
Unescape View File

@ -24,6 +24,30 @@
<u-col span="9"> <u-col span="9">
<view class="demo-layout bg-purple-light">{{typeName}}</view> <view class="demo-layout bg-purple-light">{{typeName}}</view>
</u-col> </u-col>
</u-row>
<u-row gutter="16" v-if="scopeShow">
<u-col span="3">
<view class="demo-layout bg-purple">巡查内容：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{askName}}</view>
</u-col>
</u-row>
<u-row gutter="16" v-if="scopeShow">
<u-col span="3">
<view class="demo-layout bg-purple">覆盖范围：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{form.scope}}米</view>
</u-col>
</u-row>
<u-row gutter="16" v-if="scopeShow">
<u-col span="3">
<view class="demo-layout bg-purple">点位名称：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{form.point_name}}</view>
</u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="3">
@ -106,7 +130,7 @@
<view class="demo-layout bg-purple">现场图片：</view> <view class="demo-layout bg-purple">现场图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in filesList"> <u-col span="12" v-for="(item,index) in filesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
@ -149,7 +173,7 @@
<view class="demo-layout bg-purple">处理后图片：</view> <view class="demo-layout bg-purple">处理后图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in dealFilesList"> <u-col span="12" v-for="(item,index) in dealFilesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
@ -172,7 +196,8 @@
data() { data() {
return { return {
formshow:true, formshow:true,
lawshow:true, lawshow:true,
scopeShow:false,
lists:{}, lists:{},
form:{}, form:{},
typeName:"", typeName:"",
@ -196,7 +221,17 @@
this.loadInfo(options.id) this.loadInfo(options.id)
} }
}, },
methods: { methods: {
imgListPreview(item){
var urlList = []
urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
uni.previewImage({
indicator:"number",
loop:true,
urls: urlList
})
},
loadInfo: function(id) { loadInfo: function(id) {
var that = this; var that = this;
this.util.request({ this.util.request({
@ -212,11 +247,12 @@
switch(result.type){ switch(result.type){
case 1: case 1:
that.typeName = "日常雨水设施" that.typeName = "日常雨水设施"
that.instype = 1 that.instype = 1
that.scopeShow = true
that.form = result.rain_equipment_info; that.form = result.rain_equipment_info;
that.form.rain_equipment_id = result.rain_equipment_id; that.form.rain_equipment_id = result.rain_equipment_id;
that.askName = result.rain_equipment_info.ask_content_detail.value that.askName = result.rain_equipment_info.ask_content_detail.value
that.areaName = result.area_info.name that.areaName = result.area_info?result.area_info.name:""
if(result.rain_equipment_info.is_unusual==1){ if(result.rain_equipment_info.is_unusual==1){
that.form.unsualName == "丢失" that.form.unsualName == "丢失"
}else if(result.rain_equipment_info.is_unusual==2){ }else if(result.rain_equipment_info.is_unusual==2){
@ -250,7 +286,7 @@
that.formshow=false that.formshow=false
that.typeName = "在建工地" that.typeName = "在建工地"
that.formshow = false that.formshow = false
that.areaName = result.area_info.name that.areaName = result.area_info?result.area_info.name:""
that.form = result.building_site_info; that.form = result.building_site_info;
that.form.buildName = result.building_site_info.building_site.name that.form.buildName = result.building_site_info.building_site.name

44
rainmaintain/rainmaintain/rainmaintain.vue
Unescape View File

@ -35,7 +35,7 @@
</u-form-item> </u-form-item>
<block v-if="!aboutShow"> <block v-if="!aboutShow">
<u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left"> <u-form-item labelWidth="180" label="覆盖范围(米)" label-position="left">
<u-input v-model="form.scope" type='text' placeholder="请填写覆盖范围"/> <u-input v-model="form.scope" type="number" placeholder="请填写覆盖范围"/>
</u-form-item> </u-form-item>
<u-form-item labelWidth="180" label="点位名称" label-position="left"> <u-form-item labelWidth="180" label="点位名称" label-position="left">
<u-input v-model="form.point_name" type='text' placeholder="请填写点位名称"/> <u-input v-model="form.point_name" type='text' placeholder="请填写点位名称"/>
@ -273,7 +273,6 @@
}, },
methods: { methods: {
confirmType(val) { confirmType(val) {
console.log(val)
var that = this var that = this
this.$refs.uForm.resetFields(); this.$refs.uForm.resetFields();
that.typeName = val[0].label that.typeName = val[0].label
@ -282,7 +281,9 @@
that.lawshow = true that.lawshow = true
that.aboutShow = false that.aboutShow = false
that.numShow = false that.numShow = false
that.filesList = []; that.filesList = [];
that.askName = ""
that.form.title_id=""
this.$refs.uUpload.clear(); this.$refs.uUpload.clear();
that.dealFilesList = []; that.dealFilesList = [];
that.form.scope = "" that.form.scope = ""
@ -408,7 +409,9 @@
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.roadName = result.circulation_info.road.name that.roadName = result.circulation_info.road?result.circulation_info.road.name:""
that.askName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:""
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);
@ -430,7 +433,38 @@
that.dealFilesList = _filesafter; that.dealFilesList = _filesafter;
that.form.type = result.type that.form.type = result.type
console.log(that.form) console.log(that.form)
break; break;
case 5:
that.typeName = "出水口排查"
that.numShow = true
that.aboutShow = true
that.form = result.out_water_info;
that.form.out_water_id = result.out_water_id
that.roadName = result.out_water_info.road?result.out_water_info.road.name:""
that.askName = result.out_water_info.title_detail?result.out_water_info.title_detail.value:""
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;
that.form.type = result.type
console.log(that.form)
break
case 3: case 3:
that.typeName = "汛期助排" that.typeName = "汛期助排"
that.lawshow = false that.lawshow = false

93
rainmaintain/rainmaintaininfo/rainmaintainInfo.vue
Unescape View File

@ -24,6 +24,38 @@
<u-col span="9"> <u-col span="9">
<view class="demo-layout bg-purple-light">{{form.typeName}}</view> <view class="demo-layout bg-purple-light">{{form.typeName}}</view>
</u-col> </u-col>
</u-row>
<u-row gutter="16">
<u-col span="3">
<view class="demo-layout bg-purple">养护内容：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{titleName}}</view>
</u-col>
</u-row>
<u-row gutter="16" v-if="watershow">
<u-col span="4">
<view class="demo-layout bg-purple">排水口编号：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{form.number}}</view>
</u-col>
</u-row>
<u-row gutter="16" v-if="!watershow">
<u-col span="3">
<view class="demo-layout bg-purple">覆盖范围：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{form.scope}}米</view>
</u-col>
</u-row>
<u-row gutter="16" v-if="!watershow">
<u-col span="3">
<view class="demo-layout bg-purple">点位名称：</view>
</u-col>
<u-col span="9">
<view class="demo-layout bg-purple-light">{{form.point_name}}</view>
</u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="3">
@ -46,7 +78,7 @@
<view class="demo-layout bg-purple">现场图片：</view> <view class="demo-layout bg-purple">现场图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in filesList"> <u-col span="12" v-for="(item,index) in filesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview(item.files.url)" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
<view v-if="formshow"> <view v-if="formshow">
@ -87,7 +119,7 @@
<view class="demo-layout bg-purple">处理后图片：</view> <view class="demo-layout bg-purple">处理后图片：</view>
</u-col> </u-col>
<u-col span="12" v-for="(item,index) in dealFilesList"> <u-col span="12" v-for="(item,index) in dealFilesList">
<u-image style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image> <u-image @click="imgListPreview" style="margin:20rpx 0" width="100%" height="300rpx" :src="item.files.url"></u-image>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
@ -114,7 +146,9 @@
data() { data() {
return { return {
formshow:true, formshow:true,
lawshow:true, lawshow:true,
titleName:"",
watershow:false,
lists:{}, lists:{},
form:{}, form:{},
filesList:[], filesList:[],
@ -130,7 +164,17 @@
this.loadInfo(options.id) this.loadInfo(options.id)
} }
}, },
methods: { methods: {
imgListPreview(item){
var urlList = []
urlList.push(item) //push中的参数为 :src="item.img_url" 中的图片地址
uni.previewImage({
indicator:"number",
loop:true,
urls: urlList
})
},
loadInfo: function(id) { loadInfo: function(id) {
var that = this; var that = this;
this.util.request({ this.util.request({
@ -170,8 +214,9 @@
that.form.type = result.type that.form.type = result.type
result.circulation_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是" result.circulation_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
result.circulation_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是" result.circulation_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
that.form.areaName = result.area_info.name that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at that.form.created_at = result.created_at
that.titleName = result.circulation_info.title_detail?result.circulation_info.title_detail.value:''
break; break;
case 3: case 3:
that.lawshow = false that.lawshow = false
@ -198,7 +243,7 @@
that.form.type = result.type that.form.type = result.type
that.form.typeName = "汛期助排" that.form.typeName = "汛期助排"
result.help_discharge_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是" result.help_discharge_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
that.form.areaName = result.area_info.name that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at that.form.created_at = result.created_at
break; break;
case 4: case 4:
@ -215,9 +260,39 @@
that.filesList =mire_files; that.filesList =mire_files;
that.form.type = result.type that.form.type = result.type
that.form.typeName = "污泥外运" that.form.typeName = "污泥外运"
that.form.areaName = result.area_info.name that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at that.form.created_at = result.created_at
break; break;
case 5:
that.watershow = true
that.form = result.out_water_info;
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;
that.form.type = result.type
that.form.typeName = "出水口排查"
result.out_water_info.is_solve==0 ? that.form.solveName="否":that.form.solveName="是"
result.out_water_info.is_law==0 ? that.form.lawName="否":that.form.lawName="是"
that.form.areaName = result.area_info?result.area_info.name:""
that.form.created_at = result.created_at
that.titleName = result.out_water_info.title_detail?result.out_water_info.title_detail.value:''
break;
} }
}, },
utilFail: function(res) { utilFail: function(res) {

9
rainmaintain/rainmaintainlist/rainmaintainList.vue
Unescape View File

@ -42,7 +42,7 @@
<view class="demo-layout bg-purple">所属片区：</view> <view class="demo-layout bg-purple">所属片区：</view>
</u-col> </u-col>
<u-col span="9"> <u-col span="9">
<view class="demo-layout bg-purple-light">{{item.area_info.name}}</view> <view class="demo-layout bg-purple-light">{{item.area_info?item.area_info.name:""}}</view>
</u-col> </u-col>
<u-col span="3"> <u-col span="3">
<view class="demo-layout bg-purple">所属道路：</view> <view class="demo-layout bg-purple">所属道路：</view>
@ -306,7 +306,12 @@
m.typeName = "污泥外运" m.typeName = "污泥外运"
m.road_name = m.mire_info.road?m.mire_info.road.name:"" m.road_name = m.mire_info.road?m.mire_info.road.name:""
break break
case 5:
m.typeName = "出水口排查"
m.road_name = m.out_water_info.road?m.out_water_info.road.name:""
break
default: default:

Write Preview
Loading…
Cancel
Save