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

up

Browse Source
master
lion 4 years ago
parent 3816fd4129 66ef7cea3d
commit 454f33c4fa
8 changed files with 851 additions and 210 deletions
Show Stats Download Patch File Download Diff File

3
main.js
Unescape View File

@ -31,5 +31,8 @@ Vue.prototype.util = util;
import gcoord from "@/utils/gcoord.js";
Vue.prototype.gcoord = gcoord;
import moment from "moment"
Vue.prototype.$moment = moment;
import {VueJsonp} from 'vue-jsonp' //中间有忘记大括号出现install undefind问题
Vue.use(VueJsonp)

1
package.json
Unescape View File

@ -1,5 +1,6 @@
{
"dependencies": {
"moment": "^2.29.4",
"uview-ui": "^1.8.4",
"vue-jsonp": "^2.0.0"
}

360
pages.json
Unescape View File

@ -1,179 +1,191 @@
{
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "巡查登录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "巡查养护",
"app-plus": { //uni-app项目对应节点名称为"app-plus"
"titleNView": {
"autoBackButton":false,
"buttons": [
{
"float": "left",
"type": "home"
}
]
}
}
}
}, {
"path": "pages/mine/mine",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
}
,{
"path" : "road/road/road",
"style" :
{
"navigationBarTitleText": "选择道路",
"enablePullDownRefresh": false
}
}
],
"subPackages": [{
"root": "packageA/pages",
"pages": [{
"path": "generalPatrol/generalPatrol",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}, {
"path": "generalList/generalList",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}, {
"path": "generalPatrol/viewPatrol",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}]
}, {
"root": "packageB/pages",
"pages": [{
"path": "dailyInspection/dailyInspection",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": false
}
},{
"path": "dailyList/dailyList",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": true
}
},{
"path": "dailyInfo/dailyInfo",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": false
}
}]
},{
"root": "rainmaintain",
"pages": [{
"path": "rainmaintain/rainmaintain",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": false
}
}, {
"path": "rainmaintainlist/rainmaintainList",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": true
// "disableScroll": true
}
}, {
"path": "rainmaintaininfo/rainmaintainInfo",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": false
// "disableScroll": true
{
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
}
}]
},{
"root": "raininspection",
"pages": [{
"path": "raininspection/raininspection",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": false
}
}, {
"path": "raininspectionlist/raininspectionList",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": true
// "disableScroll": true
}
}, {
"path": "raininspectioninfo/raininspectionInfo",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": false
// "disableScroll": true
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "巡查登录",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "巡查养护",
"app-plus": { //uni-app项目对应节点名称为"app-plus"
"titleNView": {
"autoBackButton": false,
"buttons": [{
"float": "left",
"type": "home"
}]
}
}
}]
}, {
"root": "order/order",
"pages": [{
"path": "order/order",
"style": {
"navigationBarTitleText": "我的工单",
"enablePullDownRefresh": false
}
},{
"path": "orderList/orderList",
"style": {
"navigationBarTitleText": "我的工单",
}
}, {
"path": "pages/mine/mine",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
}, {
"path": "road/road/road",
"style": {
"navigationBarTitleText": "选择道路",
"enablePullDownRefresh": false
}
}
],
"subPackages": [{
"root": "packageA/pages",
"pages": [{
"path": "generalPatrol/generalPatrol",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}, {
"path": "generalList/generalList",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}, {
"path": "generalPatrol/viewPatrol",
"style": {
"navigationBarTitleText": "通用巡查",
"enablePullDownRefresh": false
}
}]
}, {
"root": "packageB/pages",
"pages": [{
"path": "dailyInspection/dailyInspection",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": false
}
}, {
"path": "dailyList/dailyList",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": true
}
}, {
"path": "dailyInfo/dailyInfo",
"style": {
"navigationBarTitleText": "日常监管巡查",
"enablePullDownRefresh": false
}
}]
}, {
"root": "rainmaintain",
"pages": [{
"path": "rainmaintain/rainmaintain",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": false
}
}, {
"path": "rainmaintainlist/rainmaintainList",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": true
// "disableScroll": true
}
}, {
"path": "rainmaintaininfo/rainmaintainInfo",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": false
// "disableScroll": true
}
}, {
"path": "plan/plan",
"style": {
"navigationBarTitleText": "雨管养护",
"enablePullDownRefresh": false
// "disableScroll": true
}
}]
}, {
"root": "raininspection",
"pages": [{
"path": "raininspection/raininspection",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": false
}
}, {
"path": "raininspectionlist/raininspectionList",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": true
// "disableScroll": true
}
},{
"path": "orderInfo/orderInfo",
"style": {
"navigationBarTitleText": "我的工单",
"enablePullDownRefresh": false
// "disableScroll": true
}
}]
}],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "巡查养护",
"navigationBarBackgroundColor": "#0385e5",
"backgroundColor": "#F8F8F8"
}
// "disableScroll": true
}
}, {
"path": "raininspectioninfo/raininspectionInfo",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": false
// "disableScroll": true
}
}, {
"path": "plan/plan",
"style": {
"navigationBarTitleText": "雨管巡查",
"enablePullDownRefresh": false
// "disableScroll": true
}
}]
}, {
"root": "order/order",
"pages": [{
"path": "order/order",
"style": {
"navigationBarTitleText": "我的工单",
"enablePullDownRefresh": false
}
}, {
"path": "orderList/orderList",
"style": {
"navigationBarTitleText": "我的工单",
"enablePullDownRefresh": true
// "disableScroll": true
}
}, {
"path": "orderInfo/orderInfo",
"style": {
"navigationBarTitleText": "我的工单",
"enablePullDownRefresh": false
// "disableScroll": true
}
}]
}],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "巡查养护",
"navigationBarBackgroundColor": "#0385e5",
"backgroundColor": "#F8F8F8"
}
}

26
pages/index/index.vue
Unescape View File

@ -8,12 +8,26 @@
</u-row>
<u-row gutter="16">
<u-col span="6" v-if="isshowxc">
<view class="demo-layout bg-purple-light" @click="toviewplan(1)">
<text class="iconfont icon-zuzhijiagouguanli"></text>
<text class="navtxt">巡查计划</text>
</view>
</u-col>
<u-col span="6" v-if="isshowxc">
<view class="demo-layout bg-purple-light" @click="toview(5)">
<text class="iconfont icon-guanxianxuncha"></text>
<text class="navtxt">雨管巡查</text>
</view>
</u-col>
</u-row>
<u-row gutter="16">
<u-col span="6" v-if="isshowyh">
<view class="demo-layout bg-purple" @click="toviewplan(2)">
<text class="iconfont icon-zuzhijiagouguanli"></text>
<text class="navtxt">养护计划</text>
</view>
</u-col>
<u-col span="6" v-if="isshowyh">
<view class="demo-layout bg-purple" @click="toview(4)">
<text class="iconfont icon-guanxianyanghu"></text>
@ -123,6 +137,18 @@
}
});
},
toviewplan(type) {
var url = '/raininspection/plan/plan';
if (type == 2) {
url = "/rainmaintain/plan/plan"
}
uni.navigateTo({
url: url
})
},
toview(type) {
let url = "/packageA/pages/generalPatrol/generalPatrol";
// let url = "/road/road/road?type=general"

274
raininspection/plan/plan.vue
Unescape View File

@ -0,0 +1,274 @@
<template>
<view class="boxContent">
<view :class="mask?'list listfixed':'list'" style="padding-top: 20rpx;">
<block v-for="(item, index) in dataList">
<u-card :title="item.created_at" padding="20" margin="20rpx" :border="true">
<view class="" slot="body" >
<u-row gutter="16">
<u-col span="24">
<view class="demo-layout bg-purple-light">{{item.name}}</view>
</u-col>
</u-row>
<u-row gutter="16">
<u-col span="4">
<view class="demo-layout bg-purple">巡查频率：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">每{{item.day}}一个循环</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">所属片区：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.area_info?item.area_info.name:''}}
</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">开始日期：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.start_date}}</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">结束日期：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.end_date}}</view>
</u-col>
</u-row>
<u-row gutter="16">
<u-col span="3">
<view class="demo-layout bg-purple">描述：</view>
</u-col>
<u-col span="12">
<view class="demo-layout bg-purple-light">{{item.remark}}</view>
</u-col>
</u-row>
<div>所属道路</div>
<block v-for="(mod,index) of item.roads" :key="index">
<div style="display: flex;justify-content: space-between;height: 60px;line-height: 60px;
align-items: center;">
<div>
{{mod.road.name}}
</div>
<div>
<u-button :ripple="true" @click="toInspection(mod.road.id,mod.road.name)"
ripple-bg-color="#909399">去巡查
</u-button>
</div>
</div>
</block>
</view>
</u-card>
</block>
<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText" />
<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
</view>
</view>
</template>
<script>
export default {
data() {
return {
serachEntity: {
keyword: "",
status: "",
type: ""
},
background: {
backgroundColor: '#0385e5'
},
mask: false,
loadStatus: "loadmore",
loadText: {
loadmore: "加载更多",
nomore: "已经到底了"
},
dataList: [],
thumb: "/static/img/location.png",
currentPage: 0,
lastPage: 0,
}
},
onReachBottom: function(e) {
if (this.currentPage >= this.lastPage) {
this.loadStatus = "nomore"
return;
}
this.loadPage(this.currentPage + 1);
},
onPullDownRefresh: function(e) {
this.loadPage(1);
},
onShow: function() {
var that = this;
},
onLoad(options) {
this.loadPage(1);
},
methods: {
toInspection(road_id, road_name) {
let url = "/raininspection/raininspection/raininspection?roadid=" + road_id + "&roadname=" + road_name
uni.navigateTo({
url: url
})
},
openmask() {
this.mask = true
// this.isPullDown(false);
},
closemask() {
this.mask = false
// this.isPullDown(true);
},
tosearch() {
this.loadPage(1)
this.$refs.uDropdown.close();
},
loadPage: function(page) {
uni.hideKeyboard()
var that = this;
this.util.request({
bindThis: that,
api: '/api/mobile/plan/index',
customLoading: false,
data: {
page: page,
page_size: 4,
...that.serachEntity
},
utilSuccess: function(r) {
var res = r.data;
that.lastPage = r.last_page;
uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
if (r.total < 5) {
that.loadStatus = "nomore";
}
var hasNoMore = that.dataList.length < 4 && page > 1;
if (hasNoMore || res.length == 0 && page > 1) {
// 已加载到最后一页
that.loadStatus = "nomore";
uni.showToast({
title: '已加载到最后一页',
icon: 'none'
});
return;
}
var dataList = that.dataList;
if (page == 1) {
dataList = res;
} else {
dataList.push(...res);
}
that.currentPage = page;
that.dataList = dataList;
},
utilFail: function(res) {
uni.stopPullDownRefresh();
if (page == 1) {
that.currentPage = page;
}
this.util.alert(res);
}
});
}
}
}
</script>
<style>
.boxContent {
background: #f3f4f6;
min-height: 100vh;
}
.footer {
display: flex;
justify-content: flex-end;
}
.box-header {
position: fixed;
/* top: 0; */
width: 100%;
z-index: 99;
}
.u-row {
margin: 10rpx 0;
font-size: 28rpx;
}
.u-card {
z-index: 1;
}
</style>
<style scoped lang="scss">
.search-wrap {
background: #0385e5;
padding: 20rpx;
}
.overflowmask {
overflow: hidden;
}
.loadmore {
padding: 24rpx !important
}
.listfixed {
position: fixed;
width: 100%;
}
.u-config-wrap {
padding: 30rpx;
}
.bg-purple {
font-weight: bold;
}
.slot-content {
background-color: #FFFFFF;
padding: 24rpx;
.item-box {
margin-bottom: 50rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.item {
border: 1px solid $u-type-primary;
color: $u-type-primary;
padding: 8rpx 40rpx;
border-radius: 100rpx;
margin-top: 30rpx;
}
.active {
color: #FFFFFF;
background-color: $u-type-primary;
}
}
}
</style>

320
rainmaintain/plan/plan.vue
Unescape View File

@ -0,0 +1,320 @@
<template>
<view class="boxContent">
<view :class="mask?'list listfixed':'list'" style="padding-top: 20rpx;">
<block v-for="(item, index) in dataList">
<u-card :title="item.road.name" @click="toMaintain(item.road.id,item.road.name)" sub-title="去养护" padding="20"
margin="20rpx" :border="true">
<view class="" slot="body" >
<u-row gutter="16">
<u-col span="24">
<view class="demo-layout bg-purple-light">{{item.name}}</view>
</u-col>
</u-row>
<u-row gutter="16">
<u-col span="4">
<view class="demo-layout bg-purple">所属片区：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.area_info?item.area_info.name:''}}
</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">开始日期：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.start_date}}</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">结束日期：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{item.end_date}}</view>
</u-col>
<u-col span="4">
<view class="demo-layout bg-purple">养护类型：</view>
</u-col>
<u-col span="8">
<view class="demo-layout bg-purple-light">{{toReturnType(item.item_type)}}</view>
</u-col>
<u-col span="5">
<view class="demo-layout bg-purple">窨井（座）：</view>
</u-col>
<u-col span="1">
<view class="demo-layout bg-purple-light">{{item.inspection_well}}</view>
</u-col>
<u-col span="5">
<view class="demo-layout bg-purple">边井（座）：</view>
</u-col>
<u-col span="1">
<view class="demo-layout bg-purple-light">{{item.side_well}}</view>
</u-col>
<u-col span="5">
<view class="demo-layout bg-purple">主管数：</view>
</u-col>
<u-col span="1">
<view class="demo-layout bg-purple-light">{{item.master_pipe}}</view>
</u-col>
<u-col span="5">
<view class="demo-layout bg-purple">支管数：</view>
</u-col>
<u-col span="1">
<view class="demo-layout bg-purple-light">{{item.branch_pipe}}</view>
</u-col>
</u-row>
</view>
</u-card>
</block>
<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText" />
<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
</view>
</view>
</template>
<script>
export default {
data() {
return {
serachEntity: {
keyword: "",
status: "",
type: "",
date: "2022-10",
area_id: ""
},
background: {
backgroundColor: '#0385e5'
},
mask: false,
loadStatus: "loadmore",
loadText: {
loadmore: "加载更多",
nomore: "已经到底了"
},
rainTypes: [{
id: 1,
name: "雨水管道疏挖"
},
{
id: 2,
name: "雨水管道疏通"
},
{
id: 3,
name: "汛期助排"
},
{
id: 4,
name: "污泥外运"
},
{
id: 5,
name: "出水口排查"
},
{
id: 6,
name: "专项处理"
},
{
id: 7,
name: "维修"
}
],
dataList: [],
thumb: "/static/img/location.png",
currentPage: 0,
lastPage: 0,
}
},
onReachBottom: function(e) {
if (this.currentPage >= this.lastPage) {
this.loadStatus = "nomore"
return;
}
this.loadPage(this.currentPage + 1);
},
onPullDownRefresh: function(e) {
this.loadPage(1);
},
onShow: function() {
var that = this;
},
onLoad(options) {
this.serachEntity.date = this.$moment().format("YYYY-MM");
this.loadPage(1);
},
methods: {
toReturnType(type) {
return this.rainTypes.filter(m => {
return m.id == type
})[0].name
},
toMaintain(road_id, road_name) {
let url = "/rainmaintain/rainmaintain/rainmaintain?roadid=" + road_id + "&roadname=" + road_name
uni.navigateTo({
url: url
})
},
openmask() {
this.mask = true
// this.isPullDown(false);
},
closemask() {
this.mask = false
// this.isPullDown(true);
},
tosearch() {
this.loadPage(1)
this.$refs.uDropdown.close();
},
loadPage: function(page) {
uni.hideKeyboard()
var that = this;
this.util.request({
bindThis: that,
api: '/api/mobile/maintain-plan/index',
customLoading: false,
data: {
page: page,
page_size: 4,
...that.serachEntity
},
utilSuccess: function(r) {
var res = r.data;
that.lastPage = r.last_page;
uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
if (r.total < 5) {
that.loadStatus = "nomore";
}
var hasNoMore = that.dataList.length < 4 && page > 1;
if (hasNoMore || res.length == 0 && page > 1) {
// 已加载到最后一页
that.loadStatus = "nomore";
uni.showToast({
title: '已加载到最后一页',
icon: 'none'
});
return;
}
var dataList = that.dataList;
if (page == 1) {
dataList = res;
} else {
dataList.push(...res);
}
that.currentPage = page;
that.dataList = dataList;
},
utilFail: function(res) {
uni.stopPullDownRefresh();
if (page == 1) {
that.currentPage = page;
}
this.util.alert(res);
}
});
}
}
}
</script>
<style>
.boxContent {
background: #f3f4f6;
min-height: 100vh;
}
.footer {
display: flex;
justify-content: flex-end;
}
.box-header {
position: fixed;
/* top: 0; */
width: 100%;
z-index: 99;
}
.u-row {
margin: 10rpx 0;
font-size: 28rpx;
}
.u-card {
z-index: 1;
}
</style>
<style scoped lang="scss">
.search-wrap {
background: #0385e5;
padding: 20rpx;
}
.overflowmask {
overflow: hidden;
}
.loadmore {
padding: 24rpx !important
}
.listfixed {
position: fixed;
width: 100%;
}
.u-config-wrap {
padding: 30rpx;
}
.bg-purple {
font-weight: bold;
}
.slot-content {
background-color: #FFFFFF;
padding: 24rpx;
.item-box {
margin-bottom: 50rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.item {
border: 1px solid $u-type-primary;
color: $u-type-primary;
padding: 8rpx 40rpx;
border-radius: 100rpx;
margin-top: 30rpx;
}
.active {
color: #FFFFFF;
background-color: $u-type-primary;
}
}
}
</style>

75
road/road/road.vue
Unescape View File

@ -1,6 +1,5 @@
<template>
<view class="boxContent">
<view class="box-header">
<view class="search-wrap">
<!-- 如果使用u-search组件，必须要给v-model绑定一个变量 -->
@ -11,6 +10,7 @@
</view>
<view :class="mask?'list listfixed':'list'" style="padding-top: 100rpx;">
<view class='showclear' v-if='showClear'>附近道路:</view>
<u-radio-group :wrap="true">
<u-radio @change="radioChange" v-for="(item, index) in dataList" :key="index"
@ -23,6 +23,7 @@
</u-radio-group>
<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText" />
<u-empty text="暂无数据" margin-top="200" v-if="dataList.length==0" mode="list"></u-empty>
</view>
<view class="box-footer">
@ -58,7 +59,8 @@
totype: "",
road_id: "",
road_name: "",
orderId:""
orderId: "",
locinfo: null
}
},
@ -78,41 +80,44 @@
onLoad(options) {
let that = this;
that.totype = options.type;
that.orderId = options.orderId?options.orderId:""
that.orderId = options.orderId ? options.orderId : ""
uni.getLocation({
type: "wgs84",
geocode: true,
success(res) {
var loc = null
console.log(typeof(window.android))
if (typeof(window.android)!=undefined&&typeof(window.android)!="undefined") {
loc = window.android.getLocInfo();
if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
that.locinfo = loc = window.android.getLocInfo();
}
if (loc) {
that.latitude = JSON.parse(loc).lat;
that.longitude = JSON.parse(loc).lon;
} else {
that.latitude = res.latitude;
that.longitude = res.longitude;
if (res) {
that.latitude = res.latitude;
that.longitude = res.longitude;
}
}
that.loadPage(1);
}
})
},
methods: {
towhichtype() {
if(this.road_id==""){
uni.showToast({
icon: "none",
title: "请选择道路",
complete() {
},
duration: 2000
})
return
}
towhichtype() {
if (this.road_id == "") {
uni.showToast({
icon: "none",
title: "请选择道路",
complete() {},
duration: 2000
})
return
}
let totype = this.totype
let url = "/packageA/pages/generalPatrol/generalPatrol";
// if (totype == 'general') {
@ -121,14 +126,15 @@
// }
if (totype == 'daily') {
url = "/packageB/pages/dailyInspection/dailyInspection?roadid=" + this.road_id + "&roadname=" + this
.road_name+"&orderId="+this.orderId
.road_name + "&orderId=" + this.orderId
}
if (totype == 'rainmaintain') {
url = "/rainmaintain/rainmaintain/rainmaintain?roadid=" + this.road_id + "&roadname=" + this.road_name+"&orderId="+this.orderId
url = "/rainmaintain/rainmaintain/rainmaintain?roadid=" + this.road_id + "&roadname=" + this
.road_name + "&orderId=" + this.orderId
}
if (totype == 'raininspection') {
url = "/raininspection/raininspection/raininspection?roadid=" + this.road_id + "&roadname=" + this
.road_name+"&orderId="+this.orderId
.road_name + "&orderId=" + this.orderId
}
uni.navigateTo({
url: url
@ -139,16 +145,15 @@
this.road_id = arr[0]
this.road_name = arr[1]
},
tosearch() {
if(this.keyword==""){
uni.showToast({
icon: "none",
title: "请输入关键字",
complete() {
},
duration: 2000
})
return
tosearch() {
if (this.keyword == "") {
uni.showToast({
icon: "none",
title: "请输入关键字",
complete() {},
duration: 2000
})
return
}
// this.latitude = ""
// this.longitude = ""
@ -159,7 +164,7 @@
url: "../rainmaintain/rainmaintain?id=" + id
})
},
loadPage: function(page) {
uni.hideKeyboard()
var that = this;
@ -175,7 +180,7 @@
name: that.keyword,
},
utilSuccess: function(r) {
if (that.longitude != "") {
if (that.longitude && that.longitude != "" && that.longitude != "0") {
// var res = r;
that.showClear = true
that.loadStatus = "nomore";
@ -334,4 +339,4 @@
}
}
}
</style>
</style>

2
utils/util.js
Unescape View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
import md5 from "./md5.min";
const HOSTARR = {
//'development': 'http://192.168.60.100:9001',
@ -555,5 +556,4 @@ module.exports = {
getUserInfo: getUserInfo,
toast: toast,
isValidCardID: isValidCardID,
};

Write Preview
Loading…
Cancel
Save