优化一些页面

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.12.0",
-    "versionCode" : 1120,
+    "versionName" : "1.13.0",
+    "versionCode" : 1130,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/cb/xctdetail/xctset.vue

@@ -64,14 +64,14 @@
 			<u-select v-model="etShow" mode="single-column" :list="list" @confirm="etConfirm"></u-select>
 		</view>
 		<view class="setitem">
-			震动时间(min)：
-			<slider :value="equipContrlForm.shake_sec" show-value="true" :min="10" :max="60"
+			震动时间(s)：
+			<slider :value="equipContrlForm.shake_sec" show-value="true" :min="0" :max="300"
 				@change="sliderChange($event,'shake_sec')" block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="setitem">
 			数据上传(min)：
-			<slider :value="equipContrlForm.dat_f" show-value="true" :min="10" :max="60"
-				@change="sliderChange($event,'dat_f')" block-color="#57C878" activeColor="#57C878" step="1" />
+			<slider :value="equipContrlForm.dat_f" show-value="true" :min="5" :max="60"
+				@change="sliderChange($event,'dat_f')" block-color="#57C878" activeColor="#57C878" step="5" />
 		</view>
 		<view class="submit-box">
 			<u-button @click="submit" type="success">确定</u-button>

pages/cb/xy/equip-set/xyhistoryile.vue

@@ -59,7 +59,7 @@
 							<td class="td">{{items.d_h_t.cv}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 							<td class="td">{{items.d_h_t.bs}}</td>
-							<td class="td">{{items.d_h_t.cs?"充电":"非充电"}}</td>
+							<td class="td">{{items.d_h_t.cs != 0 ?"充电":"非充电"}}</td>
 							<td class="td">{{items.d_h_t.infr_ct}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>
 						</tr>
@@ -78,7 +78,7 @@
 							<td class="td">{{items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.bs}}</td>
-							<td class="td">{{items.d_h_t.cs?"充电":"非充电"}}</td>
+							<td class="td">{{items.d_h_t.cs != 0 ?"充电":"非充电"}}</td>
 							<td class="td">{{items.d_h_t.infr_ct}}</td>
 						</tr>
 						<tr class="tr" v-if="forbidden">
@@ -509,7 +509,7 @@
 			margin: 20rpx auto;
 
 			.table {
-				width: 1672px;
+				width: 1400px;
 			}
 
 			.tr {

pages/environment/history.vue

@@ -178,8 +178,8 @@
 				obj.name = res.conf[eindex]
 				var arr = []
 				for (var i = 0; i < res.data.length; i++) {
-					if (parseFloat(res.data[i].dat[eindex]) != -99.99) {
-						arr.unshift(parseFloat(res.data[i].dat[eindex]))
+					if (parseFloat(((res.data[i].dat)[0][eindex].split('#'))[0]) != -99.99) {
+						arr.unshift(parseFloat(((res.data[i].dat)[0][eindex].split('#'))[0]))
 					}
 				}
 				obj.data = arr
@@ -189,7 +189,7 @@
 				this.canvastishiTF = linearr.some((item) => {
 					return item.data.length != 0;
 				})
-				console.log(this.canvastishiTF)
+				console.log(obj)
 				this.showColumn("canvasColumnA", xtitle, linearr)
 			},
 			confirmFun(index) {

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/ddb54850-c764-11ef-8397-fbb6aaedc536
+https://app.liuyingyong.cn/build/download/450a6150-ce70-11ef-a153-2d7e2c149411

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.2.118: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.2.163:8003" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://8.136.98.49:8002" : "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//智控
 }