管式墒情历史记录页面样式优化 11/15

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
     "versionName" : "1.2.2",
@@ -45,6 +45,7 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_COMPONENT_ENABLED_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.DISABLE_KEYGUARD\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",

pages/environment/gshistory.vue

@@ -6,57 +6,59 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="历史数据"></uni-nav-bar>
 			</view>
 		</view>
-		<view class="selecttimes" @click="tiemshow=!tiemshow">
-			<view class="timesbox">
-				<image
-					:src="'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
-					mode=""></image>
-				<p>{{timetab(begintime)}}</p>
-				<p class="or">~</p>
-				<p>{{timetab(end)}}</p>
-				<u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon>
-			</view>
-			<u-calendar v-model="tiemshow" mode="range" @change="tiemchange"></u-calendar>
-		</view>
-		<view class="shuju_one">
-			<view class="canvastishi" v-if="!canvastishiTF && !dataloadingtf">
-				暂无数据
-			</view>
-			<view class="canvastishi" v-if="dataloadingtf">
-				<p class="dataloading">加载中</p>
+		<view class="his_box" >
+			<view class="selecttimes" @click="tiemshow=!tiemshow">
+				<view class="timesbox">
+					<image
+						:src="'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						mode=""></image>
+					<p>{{timetab(begintime)}}</p>
+					<p class="or">~</p>
+					<p>{{timetab(end)}}</p>
+					<u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon>
+				</view>
+				<u-calendar v-model="tiemshow" mode="range" @change="tiemchange"></u-calendar>
 			</view>
-			<canvas v-show="!tiemshow" canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
-				@touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true
-				:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
-		</view>
-		<view class="condition">
-			<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
-				<table class="table">
-					<tr class="tr">
-						<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
-					</tr>
-					<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
-						<td class="td">{{items.uptime|timeFormat()}}</td>
-						<td class="td">{{items.ats}}</td>
-						<td class="td">{{items.at}}</td>
-						<td class="td" v-for="(item,index) in items.temp" :key="'c'+index">{{item}}</td>
-						<td class="td" v-for="(item,index) in items.swc" :key="'d'+index">{{item}}</td>
-						<td class="td">{{items.atm}}</td>
-					</tr>
-					<tr class="tr" v-if="forbidden">
-						<td class="td" v-for="item in 13">暂无数据</td>
-					</tr>
-				</table>
-			</scroll-view>
-			<view class="pagenumber">
-				<button @click="prev">上一页</button>
-				<view class="pagenumber_page">
-					第 {{page}} 页
+			<view class="shuju_one">
+				<view class="canvastishi" v-if="!canvastishiTF && !dataloadingtf">
+					暂无数据
+				</view>
+				<view class="canvastishi" v-if="dataloadingtf">
+					<p class="dataloading">加载中</p>
 				</view>
-				<view class="pagenumber_page">
-					共 {{pagesum}} 页
+				<canvas v-show="!tiemshow" canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
+					@touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true
+					:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
+			</view>
+			<view class="condition">
+				<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
+					<table class="table">
+						<tr class="tr">
+							<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
+						</tr>
+						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
+							<td class="td">{{items.uptime|timeFormat()}}</td>
+							<td class="td">{{items.ats}}</td>
+							<td class="td">{{items.at}}</td>
+							<td class="td" v-for="(item,index) in items.temp" :key="'c'+index">{{item}}</td>
+							<td class="td" v-for="(item,index) in items.swc" :key="'d'+index">{{item}}</td>
+							<td class="td">{{items.atm}}</td>
+						</tr>
+						<tr class="tr" v-if="forbidden">
+							<td class="td" v-for="item in 13">暂无数据</td>
+						</tr>
+					</table>
+				</scroll-view>
+				<view class="pagenumber">
+					<button @click="prev">上一页</button>
+					<view class="pagenumber_page">
+						第 {{page}} 页
+					</view>
+					<view class="pagenumber_page">
+						共 {{pagesum}} 页
+					</view>
+					<button @click="next">下一页</button>
 				</view>
-				<button @click="next">下一页</button>
 			</view>
 		</view>
 	</view>
@@ -269,14 +271,17 @@
 </script>
 
 <style lang="scss">
+	.his_box{
+		width: 100%;
+		top: 200rpx;
+		position: relative;
+	}
 	.selecttimes {
 		width: 90%;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 10rpx 20rpx;
 		box-sizing: border-box;
-		position: relative;
 		margin: 0 auto;
-		top: 200rpx;
 		font-size: 28rpx;
 
 		.timesbox {
@@ -308,10 +313,8 @@
 	}
 
 	.shuju_one {
-		position: absolute;
-		top: 140px;
 		width: 90%;
-		left: 5%;
+		margin: 20px auto;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding-top: 20rpx;
 		height: 550rpx;
@@ -345,19 +348,14 @@
 	}
 
 	.condition {
-		position: absolute;
-		top: 437px;
 		display: flex;
 		flex-wrap: wrap;
 		width: 90%;
-		left: 5%;
 		box-shadow: 0 0 10rpx #bcb9ca;
-		margin-bottom: 30rpx;
-
+		margin: 0 auto 30rpx;
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
-
 			.tr {
 				display: flex;
 				overflow: hidden;

pages/login/login.vue

@@ -205,8 +205,8 @@
 			upgrade() {
 				console.log(this.appName)
 				// var url = this.value + "/app_file/" + this.appName
-				// var appName = "big_data2"//中性
-				var appName = "big_data"//云飞
+				var appName = "big_data2"//中性
+				// var appName = "big_data"//云飞
 				var url = "http://hnyfwlw.com/app/"+appName+".apk"
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例，并非真实的资源

pages/my/about/about.vue

@@ -2,11 +2,11 @@
 	<view>
 		<view class="line"></view>
 		<view class="logo-box">
-			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
+			<!-- <image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image> -->
 			<view class="version">
-				<view>
+				<!-- <view>
 					云飞物联网
-				</view>
+				</view> -->
 				<view>
 					当前版本号
 				</view>
@@ -15,7 +15,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="line"></view>
+		<!-- <view class="line"></view>
 		<view class="part">
 			<view class="info-item">
 				<text class="tit">技术支持</text>
@@ -43,7 +43,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -59,9 +59,9 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="bottom">
+		<!-- <view class="bottom">
 			©河南云飞科技发展有限公司
-		</view>
+		</view> -->
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>
@@ -146,9 +146,9 @@
 				// console.log(this.appName)
 				// ---------------------------------------------------------------------------------------------------------------------------
 				//中性版
-				// this.appName = "big_data2"
+				this.appName = "big_data2"
 				//标准版
-				this.appName = "big_data"
+				// this.appName = "big_data"
 				var url = "http://hnyfwlw.com/app/" + this.appName + ".apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({

pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="pingtai" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					关于我们
-					<!-- 关于更新 -->
+					<!-- 关于我们 -->
+					关于更新
 					<p class="update" v-if="updateTF">NEW</p>
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>