chenrui 4 éve
szülő
commit
e6c1148f6f

+ 1 - 1
App.vue

@@ -1,6 +1,6 @@
 <script>
 	const uat_URL = 'https://driver.test.sxzxyj.net/gc-driver/' // 预发布
-	// const uat_URL = 'http://192.168.16.152:8304/gc-driver/' // 本地
+	// const uat_URL = 'http://192.168.16.103:8304/gc-driver/' // 本地
 	// const pro_URL = 'https://lese.sxzxyj.net/gc-driver/'  // 生产
 	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url

+ 1 - 1
api/cleared.js

@@ -15,7 +15,7 @@ export const waitToCleanList = params => {
 // 网点设备列表信息
 export const stationDevice = params => {
   return axios.request({
-    url: `device/findById/${params.stationNo}`,
+    url: `device/queryWaitCleanDeviceByStationNo/${params.stationNo}`,
     method: 'get',
   })
 }

+ 2 - 2
pages/cleared/chooseNetwork.vue

@@ -178,8 +178,8 @@
 					if (res.status == 200) {
 						res.data.list.map(item => {
 							item.checked = false
-							item.totalWeight = (item.totalWeight/1000).toFixed(2)
-							item.maxWeight = (item.maxWeight/1000).toFixed(2)
+							item.totalWeight = item.totalWeight ? (item.totalWeight/1000).toFixed(2) : 0
+							item.maxWeight = item.maxWeight ? (item.maxWeight/1000).toFixed(2) : 0
 						})
 						if(this.pageNo>1){
 							this.listdata = this.listdata.concat(res.data.list || [])

+ 7 - 7
pages/cleared/details.vue

@@ -14,49 +14,49 @@
 					<u-grid :col="3" :hover-class="none">
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number blue">{{ (item.clothes/1000).toFixed(2) }}</text>
+								<text class="cell-item-number blue">{{ item.clothes ? (item.clothes/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧衣物</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number green">{{ (item.paper/1000).toFixed(2) }}</text>
+								<text class="cell-item-number green">{{ item.paper ? (item.paper/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧纸张</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number red">{{ (item.plastic/1000).toFixed(2) }}</text>
+								<text class="cell-item-number red">{{ item.plastic ? (item.plastic/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧塑料</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{ (item.metal/1000).toFixed(2) }}</text>
+								<text class="cell-item-number yellow">{{ item.metal ? (item.metal/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧金属</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{ (item.plaMet/1000).toFixed(2) }}</text>
+								<text class="cell-item-number yellow">{{ item.plaMet ? (item.plaMet/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧金属/塑料</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{ (item.glass/1000).toFixed(2) }}</text>
+								<text class="cell-item-number yellow">{{ item.glass ? (item.glass/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧玻璃</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{ (item.recycling/1000).toFixed(2) }}</text>
+								<text class="cell-item-number yellow">{{ item.recycling ? (item.recycling/1000).toFixed(2) : 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">可回收物</view>

+ 3 - 3
pages/cleared/index.vue

@@ -13,21 +13,21 @@
 					<u-grid :col="3" :hover-class="none">
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number blue">{{item.stationNum}}</text>
+								<text class="cell-item-number blue">{{item.stationNum || 0}}</text>
 								<text class="cell-item-unit">个</text>
 							</view>
 							<view class="cell-item-exp">清运网点数</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number green">{{item.boxNum}}</text>
+								<text class="cell-item-number green">{{item.boxNum || 0}}</text>
 								<text class="cell-item-unit">个</text>
 							</view>
 							<view class="cell-item-exp">清运箱体数</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number red">{{ (item.totalWeight/1000).toFixed(2) }}</text>
+								<text class="cell-item-number red">{{ (item.totalWeight/1000).toFixed(2) || 0 }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">清运总重量</view>

+ 2 - 2
pages/index/index.vue

@@ -13,11 +13,11 @@
 							</view>
 							<view class="cell-item-info-weight">
 								<view class="cell-item-weight-bar">
-									{{ (item.totalWeight/1000).toFixed(2) }}kg
+									{{ item.totalWeight ? (item.totalWeight/1000).toFixed(2) : 0 }}kg
 									<u-badge class="badge" type="primary" bgColor="#01c9b2" count="总" :offset="[0,0]"></u-badge>
 								</view>
 								<view class="cell-item-weight-bar">
-									{{ (item.maxWeight/1000).toFixed(2) }}kg
+									{{ item.maxWeight ? (item.maxWeight/1000).toFixed(2) : 0 }}kg
 									<u-badge class="badge" type="warning" bgColor="#05695d" count="最大" :offset="[0,0]"></u-badge>
 								</view>
 							</view>

+ 1 - 1
pages/index/map.vue

@@ -57,7 +57,7 @@
 					if(res.status == 200){
 						this.markers = []
 						res.data.map((item, index) => {
-							if(item.lat && item.lng){
+							if(item.lat && item.lng){  //  经纬度为空的错误数据,网点信息不在地图上显示
 								this.markers.push({
 									id: index+1,
 									latitude: item.lat,