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

通用巡查去除road—id

Browse Source
master
lion 3 years ago
parent 46284bdb37
commit 6ef2804407
7 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File

16
packageA/pages/generalList/generalList.vue
Unescape View File

@ -27,29 +27,29 @@
thumb-width="36"> thumb-width="36">
<view class="" slot="body" @click="todetail(item.id)"> <view class="" slot="body" @click="todetail(item.id)">
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple">问题类别：</view> <view class="demo-layout bg-purple">问题类别：</view>
</u-col> </u-col>
<u-col span="3"> <u-col span="8">
<view class="demo-layout bg-purple-light">{{item.ask_type_detail.value}}</view> <view class="demo-layout bg-purple-light">{{item.ask_type_detail.value}}</view>
</u-col> </u-col>
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple">问题内容：</view> <view class="demo-layout bg-purple">问题内容：</view>
</u-col> </u-col>
<u-col span="3"> <u-col span="8">
<view class="demo-layout bg-purple-light">{{item.ask_content_detail.value}}</view> <view class="demo-layout bg-purple-light">{{item.ask_content_detail.value}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple">反馈科室：</view> <view class="demo-layout bg-purple">反馈科室：</view>
</u-col> </u-col>
<u-col span="3"> <u-col span="8">
<view class="demo-layout bg-purple-light">{{item.feedback_department.name}}</view> <view class="demo-layout bg-purple-light">{{item.feedback_department.name}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <!-- <u-row gutter="16">
<u-col span="3"> <u-col span="3">
<view class="demo-layout bg-purple">所属道路：</view> <view class="demo-layout bg-purple">所属道路：</view>
</u-col> </u-col>
@ -57,7 +57,7 @@
<view class="demo-layout bg-purple-light">{{item.road_name}}</view> <view class="demo-layout bg-purple-light">{{item.road_name}}</view>
</u-col> </u-col>
</u-row> </u-row> -->
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="3">
<view class="demo-layout bg-purple">描述：</view> <view class="demo-layout bg-purple">描述：</view>

16
packageA/pages/generalPatrol/generalPatrol.vue
Unescape View File

@ -1,8 +1,8 @@
<template> <template>
<view class="content"> <view class="content">
<view> <!-- <view>
所属道路：{{roadName}} 所属道路：{{roadName}}
</view> </view> -->
<u-form :model="form" ref="uForm"> <u-form :model="form" ref="uForm">
<u-form-item label="问题类型" label-position="top" prop="typeName" required> <u-form-item label="问题类型" label-position="top" prop="typeName" required>
<u-input v-model="form.typeName" type="select" :border="true" @click="typeshow = true" /> <u-input v-model="form.typeName" type="select" :border="true" @click="typeshow = true" />
@ -46,7 +46,7 @@
otherData: { otherData: {
token: "" token: ""
}, },
roadName:"", // roadName:"",
unitshow: false, unitshow: false,
typeshow: false, typeshow: false,
contentshow: false, contentshow: false,
@ -100,10 +100,10 @@
this.infoId = options.id; this.infoId = options.id;
this.showInfo(this.infoId); this.showInfo(this.infoId);
} }
if(options.roadid){ // if(options.roadid){
this.form.road_id = options.roadid // this.form.road_id = options.roadid
this.roadName = options.roadname // this.roadName = options.roadname
} // }
this.action = this.util.HOST + "/api/mobile/upload-file"; this.action = this.util.HOST + "/api/mobile/upload-file";
this.otherData.token = uni.getStorageSync("userInfo_token").access_token; this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
this.loadUnit(); this.loadUnit();
@ -223,7 +223,7 @@
that.form.typeName = result.ask_type_detail.value; that.form.typeName = result.ask_type_detail.value;
that.form.contentName = result.ask_content_detail.value; that.form.contentName = result.ask_content_detail.value;
that.form.unitName = result.feedback_department.name that.form.unitName = result.feedback_department.name
that.roadName = result.road?result.road.name:"" // that.roadName = result.road?result.road.name:""
let _files = []; let _files = [];
for (var mod of result.common_inspection_files) { for (var mod of result.common_inspection_files) {
let m = Object.assign({}, mod); let m = Object.assign({}, mod);

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

@ -10,34 +10,34 @@
<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true"> <u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
<view class="" slot="body" @click="todetail(lists.id)"> <view class="" slot="body" @click="todetail(lists.id)">
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<view class="demo-layout bg-purple-light">{{lists.ask_type_detail.value}}</view> <view class="demo-layout bg-purple-light">{{lists.ask_type_detail.value}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<view class="demo-layout bg-purple-light">{{lists.ask_content_detail.value}}</view> <view class="demo-layout bg-purple-light">{{lists.ask_content_detail.value}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<view class="demo-layout bg-purple-light">{{lists.feedback_department.name}}</view> <view class="demo-layout bg-purple-light">{{lists.feedback_department.name}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="12">
<view class="demo-layout bg-purple-light">{{lists.address}}</view> <view class="demo-layout bg-purple-light">{{lists.address}}</view>
</u-col> </u-col>
</u-row> </u-row>
@ -50,7 +50,7 @@
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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">

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

@ -10,25 +10,25 @@
<u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true"> <u-card :title="lists.created_at" padding="20" margin="20rpx" :border="true">
<view class="" slot="body" @click="todetail(lists.id)"> <view class="" slot="body" @click="todetail(lists.id)">
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<view class="demo-layout bg-purple-light">{{lists.name}}</view> <view class="demo-layout bg-purple-light">{{lists.name}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<u-tag v-if="lists.status==1" text="无异常" type="primary" /> <u-tag v-if="lists.status==1" text="无异常" type="primary" />
<u-tag v-if="lists.status==2" text="已现场处理" type="warning" /> <u-tag v-if="lists.status==2" text="已现场处理" type="warning" />
<u-tag v-if="lists.status==3" text="不可现场处理" type="error" /> <u-tag v-if="lists.status==3" text="不可现场处理" type="error" />
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple">巡查记录：</view> <view class="demo-layout bg-purple">巡查记录：</view>
</u-col> </u-col>
<u-col span="12"> <u-col span="12">
@ -36,7 +36,7 @@
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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">
@ -45,7 +45,7 @@
</u-row> </u-row>
<u-row gutter="16" v-if="lists.status==2"> <u-row gutter="16" v-if="lists.status==2">
<u-col span="3"> <u-col span="4">
<view class="demo-layout bg-purple">处理记录：</view> <view class="demo-layout bg-purple">处理记录：</view>
</u-col> </u-col>
<u-col span="12"> <u-col span="12">
@ -62,7 +62,7 @@
</u-row> </u-row>
<u-row gutter="16" v-if="lists.status==3"> <u-row gutter="16" v-if="lists.status==3">
<u-col span="3"> <u-col span="4">
<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">

12
packageB/pages/dailyList/dailyList.vue
Unescape View File

@ -26,28 +26,28 @@
:thumb="thumb" thumb-width="36"> :thumb="thumb" thumb-width="36">
<view class="" slot="body" @click="todetail(item.id)"> <view class="" slot="body" @click="todetail(item.id)">
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<view class="demo-layout bg-purple-light">{{item.name}}</view> <view class="demo-layout bg-purple-light">{{item.name}}</view>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16"> <u-row gutter="16">
<u-col span="3"> <u-col span="4">
<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="8">
<u-tag v-if="item.status==1" text="无异常" type="primary" /> <u-tag v-if="item.status==1" text="无异常" type="primary" />
<u-tag v-if="item.status==2" text="已现场处理" type="warning" /> <u-tag v-if="item.status==2" text="已现场处理" type="warning" />
<u-tag v-if="item.status==3" text="不可现场处理" type="error" /> <u-tag v-if="item.status==3" text="不可现场处理" type="error" />
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="16" v-if="item.status==3"> <u-row gutter="16" v-if="item.status==3">
<u-col span="3"> <u-col span="4">
<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="12">
{{item.address}} {{item.address}}
</u-col> </u-col>
</u-row> </u-row>

4
pages/index/index.vue
Unescape View File

@ -124,8 +124,8 @@
}); });
}, },
toview(type) { toview(type) {
// let url = "/packageA/pages/generalPatrol/generalPatrol"; let url = "/packageA/pages/generalPatrol/generalPatrol";
let url = "/road/road/road?type=general" // let url = "/road/road/road?type=general"
if (type == 2) { if (type == 2) {
url = "/pages/mine/mine" url = "/pages/mine/mine"
} }

8
road/road/road.vue
Unescape View File

@ -115,10 +115,10 @@
let totype = this.totype let totype = this.totype
let url = "/packageA/pages/generalPatrol/generalPatrol"; let url = "/packageA/pages/generalPatrol/generalPatrol";
if (totype == 'general') { // if (totype == 'general') {
url = "/packageA/pages/generalPatrol/generalPatrol?roadid=" + this.road_id + "&roadname=" + this // url = "/packageA/pages/generalPatrol/generalPatrol?roadid=" + this.road_id + "&roadname=" + this
.road_name+"&orderId="+this.orderId // .road_name+"&orderId="+this.orderId
} // }
if (totype == 'daily') { if (totype == 'daily') {
url = "/packageB/pages/dailyInspection/dailyInspection?roadid=" + this.road_id + "&roadname=" + this url = "/packageB/pages/dailyInspection/dailyInspection?roadid=" + this.road_id + "&roadname=" + this
.road_name+"&orderId="+this.orderId .road_name+"&orderId="+this.orderId

Write Preview
Loading…
Cancel
Save