解决数据问题

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.9.4",
-    "versionCode" : 194,
+    "versionName" : "1.9.5",
+    "versionCode" : 195,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -119,6 +119,10 @@
                     }
                 }
             }
+        },
+        "uniStatistics" : {
+            "enable" : true,
+            "version" : "2"
         }
     },
     /* 快应用特有相关 */
@@ -132,19 +136,32 @@
             "postcss" : false,
             "es6" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : false
+        }
     },
     "mp-alipay" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : false
+        }
     },
     "mp-baidu" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : false
+        }
     },
     "mp-toutiao" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : false
+        }
     },
     "uniStatistics" : {
-        "enable" : false
+        "enable" : false,
+        "version" : "2"
     },
     "h5" : {
         "devServer" : {
@@ -168,6 +185,39 @@
                     "key" : "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
                 }
             }
+        },
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "mp-qq" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : false
         }
     }
 }

pages/cb/index/index.vue

@@ -350,8 +350,10 @@
 				})
 				this.loadingtf = false
 				console.log(res)
-				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data]
-				console.log(this.equipArr[act].list)
+				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data];
+				this.equipArr[act].list.forEach(item => {
+					item.addtime = item.uptime;
+				})
 			},
 			tabClick(index) {
 				this.width = 0

pages/cb/index/search.vue

@@ -120,6 +120,9 @@
 					}
 				})
 				this.eqlistdata = this.eqlistdata.concat(res.data)
+				this.eqlistdata.forEach(item => {
+					item.addtime = item.uptime;
+				})
 				console.log(res)
 				if (this.eqlistdata.length == 0) {
 					this.none = true

pages/cb/xy2.0/historydatas.vue

@@ -145,10 +145,10 @@
 					var arr3 = []
 					var xtitle = []
 					for (var i = 0; i < res.data.length; i++) {
-						xtitle.unshift(res.data[i].xy_addtime)
+						xtitle.push(res.data[i].xy_addtime)
 					}
 					for (var j = 0; j < this.worms.data.length; j++) {
-						arr3.unshift(this.worms.data[j].pest_num == "" ? "0" : this.worms.data[j].pest_num)
+						arr3.push(this.worms.data[j].pest_num == "" ? "0" : this.worms.data[j].pest_num)
 					}
 					console.log(arr3)
 					this.$nextTick(() => {
@@ -232,7 +232,7 @@
 					legend: {
 						position: "top"
 					},
-					fontSize: 11,
+					fontSize: 10,
 					background: '#FFFFFF',
 					pixelRatio: 1,
 					animation: true,
@@ -244,7 +244,7 @@
 						disableGrid: true,
 						type: 'grid',
 						gridType: 'dash',
-						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						itemCount: 3, //x轴单屏显示数据的数量，默认为5个
 						scrollShow: true, //新增是否显示滚动条，默认false
 						// scrollAlign: 'left', //滚动条初始位置
 						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF
@@ -309,7 +309,7 @@
 		},
 		onShow() {
 			this.end_time = +new Date() + 1000
-			this.start_time = this.end_time - 24 * 60 * 60 * 1000
+			this.start_time = this.end_time - 24 * 60 * 60 * 1000*30
 			console.log(new Date(this.end_time), new Date(this.start_time))
 			// this.history()
 			this.Chistory()

pages/cb/zjxydetail/thxydetail.vue

@@ -10,7 +10,7 @@
 				设备名称：{{equipInfo.device_name==""?"无":equipInfo.device_name}}
 			</view>
 			<view class="">
-				设备类型：中捷性诱
+				设备类型：性诱测报L
 			</view>
 			<view class="">
 				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/c6c4a750-4ff3-11ef-b5cd-3114679cde38
+https://app.liuyingyong.cn/build/download/9229f7e0-6075-11ef-afb2-d352d2b2c819

util/api.js

@@ -7,7 +7,7 @@ export const myRequest = (options) => {
 		// BASE_URL = 'http://114.55.0.7:8002'//测试
 		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.117:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
-		BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.120:8006" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.117:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
 	// BASE_URL = 'http://192.168.1.52:8003'

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	// isneutral:true//云飞智控
-	isneutral:false//智控
+	isneutral:true//云飞智控
+	// isneutral:false//智控
 }