6/16

.hbuilderx/launch.json

@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+            "type": "uniCloud",
+            "default": {
+                "launchtype": "local"
+            }
+        }
+    ]
+}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "大数据平台APP",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -117,7 +117,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1cabf67f460e3a14",
+        "appid" : "wxa67985a99191095e",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -152,6 +152,11 @@
                     }
                 }
             }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
         }
     }
 }

pages/afterSale/addafter.vue

@@ -8,14 +8,29 @@
 			<view class="addafter_con">
 				<view class="addafter_con_top">
 					<p>基本信息</p>
-					<input type="number" v-model="adddata.id" placeholder="请填写设备ID" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @blur="addID" />
-					<input type="select" v-model="adddata.type" placeholder="请选择设备类型" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @click="show = true" disabled />
-					<input type="text" v-model="adddata.name" placeholder="请填写联系人名称" placeholder-style="color: #62BF89;font-size:24rpx" />
-					<input type="number" v-model="adddata.phone" placeholder="请填写联系人电话" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @blur="iphone" />
-					<input type="text" v-model="adddata.site" placeholder="请填写联系人地址" placeholder-style="color: #62BF89;font-size:24rpx" />
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="number" v-model="adddata.id" placeholder="请填写设备ID" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @blur="addID" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="select" v-model="adddata.type" placeholder="请选择设备类型" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @click="show = true" disabled />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #fff;">*</span>
+						<input type="text" v-model="adddata.name" placeholder="请填写联系人名称" placeholder-style="color: #62BF89;font-size:24rpx" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="number" v-model="adddata.phone" placeholder="请填写联系人电话" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @blur="iphone" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #fff;">*</span>
+						<input type="text" v-model="adddata.site" placeholder="请填写联系人地址" placeholder-style="color: #62BF89;font-size:24rpx" />
+					</view>
 					<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 				</view>
 				<view class="addafter_con_connect">
@@ -32,7 +47,10 @@
 								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF[index]"></image>
 							</view>
 							<view class="uploading" v-if="uploadingTF[index]">
-								<u-icon name="close" class="delete" @click="deletes(index)"></u-icon>
+								<!-- <u-icon name="close"  size="16"></u-icon> -->
+								<view class="" class="delete" @click="deletes(index)">
+									×
+								</view>
 								<image :src="imageList[index]" mode="" class="uploading" @click="examine(imageList[index])"></image>
 							</view>
 						</view>
@@ -71,7 +89,7 @@
 		},
 		data() {
 			return {
-				BASE_URL: 'http://182.92.193.64:8002',
+				BASE_URL: 'https://wx.hnyfwlw.com',
 				adddata:{//设备参数
 					id:'',
 					name:'',
@@ -139,8 +157,8 @@
 		},
 		methods: {
 			clickLeft(){//返回
-				uni.navigateTo({
-					url:"./index"
+				uni.navigateBack({
+					delta:1
 				})
 			},
 			gainimg(index){//添加图片
@@ -161,7 +179,7 @@
 				    success:(res)=> {
 						console.log(res)
 						uni.uploadFile({
-						    url: 'http://182.92.193.64:8002/api/api_gateway?method=after_sale.after_sale_manage.video_upload', //仅为示例，非真实的接口地址
+						    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=after_sale.after_sale_manage.video_upload', //仅为示例，非真实的接口地址
 						    filePath: res.tempFilePath,
 						    name: 'upload',
 							fileType:"video",
@@ -214,12 +232,13 @@
 					}
 				})
 				if(res!=''){
-					this.deviceid=true
-				}else{
 					this.deviceid=false
+				}else{
+					this.deviceid=true
 				}
 			},
 			btn(){//提交按钮
+				this.getID(this.adddata.id)
 				let obj ={}
 				obj.id=this.adddata.id
 				obj.type=this.adddata.type_id
@@ -230,15 +249,28 @@
 				obj.phone=this.adddata.phone
 				obj.selfList=JSON.stringify(this.selfList)
 				console.log(obj.imageList)
-				if(this.deviceid && this.adddata.type_id!=''&&this.phoneTF){
-					this.getaddafter(obj)
-				}else{
-					console.log(1)
+				// 设备号错误
+				if(this.deviceid){
 					uni.showToast({
-					    title: '设备ID和设备类型不能为空',
+					    title: '设备号错误',
 					    duration: 2000,
 						icon:"none"
 					});
+				}else if(this.adddata.type_id ==''){
+					uni.showToast({
+					    title: '设备类型不能为空',
+					    duration: 2000,
+						icon:"none"
+					});
+				}else if(this.phoneTF){
+					uni.showToast({
+					    title: '请输入正确的手机号',
+					    duration: 2000,
+						icon:'none'
+					});
+				}else{
+					console.log(1)
+					// this.getaddafter(obj)
 				}
 			},
 			actionSheetCallback(index) {//选择器选择
@@ -252,6 +284,8 @@
 					    duration: 2000,
 						icon:'none'
 					});
+					this.phoneTF=true
+				}else{
 					this.phoneTF=false
 				}
 			},
@@ -268,7 +302,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-				    url: 'http://182.92.193.64:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+				    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 				    name: 'img_file',
 				    formData: {
@@ -314,7 +348,7 @@
 				color: #62BF89;
 			}
 			input{
-				margin-top: 20rpx;
+				width: 95%;
 				background-color: #F1FAF5;
 				color: #62BF89;
 				font-size:26rpx;
@@ -369,7 +403,7 @@
 				border: 2rpx dashed #A3DABD;
 				text-align: center;
 				line-height: 160rpx;
-				margin:0 10rpx 20rpx 8rpx;
+				margin:0 8rpx 20rpx 8rpx;
 				position: relative;
 				image{
 					width: 40rpx;
@@ -386,11 +420,13 @@
 					position: absolute;
 					top: -12rpx;
 					right: -12rpx;
-					font-size: 36rpx;
+					height: 30rpx;
+					width: 30rpx;
 					background-color: #FE0000;
 					border-radius: 50%;
 					color: #ffffff;
 					z-index: 50;
+					line-height: 30rpx;
 				}
 				.deletes{
 					width: 80%;

pages/cb/cbd/equip-set/imgpage.vue

@@ -67,7 +67,7 @@
 				self:true,
 				isTop:false,
 				resultdata:{},
-				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titletext: ["24小时","近一个月", "近半年", "近一年"],
 				titleidnex:0
 			}
 		},

pages/environment/equipment.vue

@@ -32,7 +32,7 @@
 				</view>
 			</view>
 			<view class="realtime">
-				<p class="realtime_title">实时数据</p>
+				<p class="realtime_title"><span v-if="realtimeTF">实时数据</span><span v-else>实时数据(暂无数据)</span></p>
 				<view class="realtime_text">
 					<view class="realtime_text_item">
 						<view class="realtime_text_item_info" v-for="(item,index) in olddata.conf" :key="index" v-if="item" @click="oneday(item,index)">
@@ -52,7 +52,7 @@
 		<u-modal v-model="show" :title-style="{color: 'red'}" :mask-close-able="true" title="24小时数据">
 			<p class="tishiTF" v-if="tishiTF">暂无24小时数据</p>
 			<view class="slot-content" v-else>
-				<canvas v-if="canvastishiTF" canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
+				<canvas 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 class="maxdata">
 					<view class="maxdata_box">
@@ -93,7 +93,8 @@
 				onedatasMin: 0,
 				onedatasMaxtime:"",
 				onedatasMintime:"",
-				tishiTF:false
+				tishiTF:false,
+				realtimeTF:false
 			}
 		},
 		methods: {
@@ -110,13 +111,20 @@
 					}
 				})
 				this.olddata = res
+				var arr = []
 				for (var key in this.olddata.conf) {
 					if (this.olddata.conf[key].indexOf("#") != -1) {
 						this.olddata.conf[key] = this.olddata.conf[key].replace("#", "(") + ")"
 					}
 					this.olddata.dat[key] = this.olddata.dat[key].split("#")
+					arr.push(this.olddata.dat[key][0])
 				}
-				console.log(this.olddata)
+				console.log(this.olddata.conf)
+				console.log(arr)
+				this.realtimeTF = arr.some(function(item){
+					return item!=""
+				})
+				console.log(this.realtimeTF)
 			},
 			// weather.weather.qxz_data_chart 一天的数据
 			async onehistory() { //设备列表

pages/environment/history.vue

@@ -7,6 +7,15 @@
 			</view>
 			<view class="graph">
 				<view class="canvasbox">
+					<view class="" style="display: flex;justify-content: flex-end;">
+						<view class="schedule" @click="pickertfone=!pickertfone">
+							<p class="schedule_value">{{titletext[indexone]}}</p>
+							<p class="schedule_icon">
+								<u-icon name="arrow-down"></u-icon>
+							</p>
+						</view>
+					</view>
+					<u-picker v-model="pickertfone" mode="selector" @confirm="confirmFun" :default-selector="[indexone]" :range="titletext"></u-picker>
 					<view class="canvastishi" v-if="!canvastishiTF">
 						暂无数据
 					</view>
@@ -41,17 +50,17 @@
 						</view>
 					</view>
 				</view>
-				<view class="condition">
+				<view class="condition" v-if="scrollTF">
 					<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
 						<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
-						<table class="table">
+						<table class="table" :style="{width:300+240*datalength+'rpx'}">
 							<tr class="tr">
 								<th class="th">日期</th>
-								<th class="th" v-for="key,index in historydatas.conf" :key="'a'+index" v-if="key">{{key.replace("#","(")+")"}}</th>
+								<th class="th" v-for="key,index in historydatas.conf" :key="index" v-if="key">{{key.replace("#","(")+")"}}</th>
 							</tr>
-							<tr class="tr" v-for="(items,index) in historydatas.data" :key="'b'+index" v-if="!forbidden">
+							<tr class="tr" v-for="(items,index) in historydatas.data" :key="index" v-if="!forbidden">
 								<td class="td">{{items.time|timeFormat()}}</td>
-								<td class="td" v-for="keys in items.dat" v-if="keys">{{parseFloat(keys)==-99.99?"N/A":parseFloat(keys)}}</td>
+								<td class="td" v-for="item,indexss in datalength" :key="indexss">{{parseFloat(items.dat["e"+(indexss+1)])==-99.99?"N/A":parseFloat(items.dat["e"+(indexss+1)])}}</td>
 							</tr>
 							<tr class="tr" v-if="forbidden">
 								<td class="td" v-for="item in 10">暂无数据</td>
@@ -88,7 +97,7 @@
 				id: "",
 				begintime: '', //开始时间
 				end: '', //结束时间
-				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titletext: [],//折线图数据切换列表数据
 				titleidnex: 0,
 				pickshow: false, //选择时间一
 				picktwoshow: false, //选择时间二
@@ -104,7 +113,12 @@
 				historydatas: [],
 				page: 1,
 				forbidden: false,
-				pagesum: null
+				pagesum: null,
+				datalength:0,
+				scrollTF:true,
+				indexone:0,//折线图数据切换列表下标
+				pickertfone:false,//折线图数据切换列表
+				chartdata:{}//折线图数据
 			}
 		},
 		methods: { //weather.weather.qxz_detail
@@ -120,6 +134,18 @@
 				})
 				this.historydatas = res
 				console.log(res)
+				this.datalength=0
+				for(var key in res.conf){
+					if(res.conf[key]!=""){
+						this.datalength++
+					}
+				}
+				console.log(this.datalength)
+				if(this.datalength==0){
+					this.scrollTF = false
+				}else{
+					this.scrollTF = true
+				}
 				this.pagesum = Math.ceil(res.nums / 10) + 1
 				if (res.data.length == 0) {
 					this.forbidden = true
@@ -137,39 +163,51 @@
 					}
 				})
 				console.log(res)
+				this.chartdata = res
 				if (res.data.length == 0) {
 					this.canvastishiTF = false
 				} else {
 					this.canvastishiTF = true
-					var xtitle = []
-					var linearr = []
-					for (var i = 0; i < res.data.length; i++) {
-						var times = new Date(res.data[i].time * 1000)
-						xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
-					}
 					for (var key in res.conf) {
-						var obj = {}
-						if (res.conf[key] != "") {
-							obj.name = res.conf[key]
-						}
-						var arr = []
-						for (var i = 0; i < res.data.length; i++) {
-							if (parseFloat(res.data[i].dat[key]) != -99.99) {
-								arr.push(parseFloat(res.data[i].dat[key]))
-							}
-						}
-						obj.data = arr
-						if (obj.name) {
-							linearr.push(obj)
+						if(res.conf[key]!=""){
+							this.titletext.push(res.conf[key])
 						}
 					}
-					this.canvastishiTF = linearr.some((item) => {
-						return item.data.length != 0;
-					})
-					console.log(this.canvastishiTF)
-					this.showColumn("canvasColumnA", xtitle, linearr)
+					this.conflist(res,"e1")
 				}
 			},
+			conflist(res,eindex){
+				var xtitle = []
+				var linearr = []
+				for (var i = 0; i < res.data.length; i++) {
+					var times = new Date(res.data[i].time * 1000)
+					xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
+				}
+				var obj = {}
+				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.push(parseFloat(res.data[0].dat[eindex]))
+						}
+					}
+				obj.data = arr
+				if (obj.name) {
+						linearr.push(obj)
+					}
+				this.canvastishiTF = linearr.some((item) => {
+					return item.data.length != 0;
+				})
+				console.log(this.canvastishiTF)
+				this.showColumn("canvasColumnA", xtitle, linearr)
+			},
+			confirmFun(index){
+				console.log(index)
+				this.indexone = index[0]
+				var str = 'e'+(index[0]+1)
+				console.log(str)
+				this.conflist(this.chartdata,str)
+			},
 			pickone(e) { //开始时间
 				this.begintime = +new Date(e.year, e.month - 1, e.day, e.hour, e.minute) / 1000
 				if (this.newtime < this.oldtime) {
@@ -289,6 +327,7 @@
 			height: 550rpx;
 			position: relative;
 			box-shadow: 0 0 10rpx #bcb9ca;
+			padding-top: 20px;
 			.charts{
 			}
 			.canvastishi {
@@ -299,6 +338,26 @@
 				margin-left: -64rpx;
 				margin-top: -21rpx;
 			}
+			.schedule {
+				display: flex;
+				width: 280rpx;
+				height: 50rpx;
+				border: 2rpx solid #F0F0F0;
+				margin-right: 40rpx;
+				.schedule_value {
+					width: 70%;
+					text-align: center;
+					line-height: 50rpx;
+					font-size: 24rpx;
+				}
+			
+				.schedule_icon {
+					width: 30%;
+					background-color: #F2F2F2;
+					text-align: center;
+					line-height: 50rpx;
+				}
+			}
 		}
 
 		.none_hint {
@@ -402,12 +461,11 @@
 			width: 95%;
 			margin: 20rpx auto;
 			.table{
-				width: 1042px;
+				// width: 10420px;
 			}
 			.tr {
 				display: flex;
 				overflow: hidden;
-
 				.th,
 				.td {
 					display: inline-block;

pages/fourBase/index.vue

@@ -12,7 +12,10 @@
 					<input type="text" v-model="data.search" placeholder="请输入基地名称" @input="searchinput" />
 				</view>
 			</view>
-			<view class="bases">
+			<view class="bases_none" v-if="base_none">
+				暂无数据
+			</view>
+			<view class="bases" v-else>
 				<view class="bases_list" v-for="(items,index) in baselist" :key="index" @click="details(items.id)">
 					<view class="bases_list_bgi">
 						<image :src="items.base_img" mode=""></image>
@@ -71,7 +74,8 @@
 				jurisdiction:{
 					addbase:false,
 					alter:false
-				}
+				},
+				base_none:true
 			}
 		},
 		methods: {
@@ -82,6 +86,11 @@
 				})
 				this.baselist = this.baselist.concat(res.data)
 				console.log(this.baselist)
+				if(this.baselist.length==0){
+					this.base_none = true
+				}else{
+					this.base_none = false
+				}
 				for (var i = 0; i < this.baselist.length; i++) {
 					var arr = this.baselist[i].base_equip.split("#")
 					if (arr[0] == '') {
@@ -249,7 +258,13 @@
 			}
 		}
 	}
-
+	.bases_none{
+		width: 100%;
+		position: relative;
+		top: 200rpx;
+		font-size: 36rpx;
+		text-align: center;
+	}
 	.bases {
 		width: 100%;
 		position: relative;

pages/login/login.vue

@@ -1,12 +1,13 @@
 <template>
 	<view style="height: 100vh;">
 		<view class="status_bar"></view>
-		<view class="logo" @longpress="logoTime">
+		<view class="logo" >
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/login/8eef2e54055a5b072a5dc000919a7ae.png'" mode=""></image>
 		</view>
-		<view class="set" @click="set" v-if="setTF">
+		<!-- <view class="set" @click="set" v-if="setTF">
+		@longpress="logoTime"
 			<u-icon name="setting-fill" size="40" color="#72CD9C"></u-icon>
-		</view>
+		</view> -->
 		<form @submit="formSubmit">
 			<view class="uni-form-item uni-column">
 				<view class="username">
@@ -32,7 +33,7 @@
 		<view class="bg">
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/login/850c9307f4ef2d7dc6db1049711ab55.jpg'" mode=""></image>
 		</view>
-		<view class="setbg" v-if="setbgtf">
+		<!-- <view class="setbg" v-if="setbgtf">
 			<view class="mengban" @click.stop="setbgtf = !setbgtf"></view>
 			<view class="set_http">
 				<view class="set_http_top">
@@ -51,7 +52,7 @@
 					</scroll-view>
 				</view>
 			</view>
-		</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>
@@ -245,7 +246,6 @@
 						this.getEquipList()
 					}
 				});
-
 			},
 			arrow() {
 				this.arrowtf = !this.arrowtf
@@ -299,7 +299,6 @@
 		position: fixed;
 		bottom: 0;
 		z-index: -1;
-
 		image {
 			width: 100%;
 		}

pages/my/record/record.vue

@@ -4,80 +4,23 @@
 			<view class="records_itemtf" v-if="dataTF">
 				暂无更新记录
 			</view>
-			<view class="records_item" v-for="item,index in recordsdata" :key="index" @click="showtf(index)" v-else="dataTF">
-				<view class="records_item_top">
-					<view class="item_left">
-						<p>版本{{item.app_num}}主要更新</p>
-						<p>{{item.addtime|timeFormat()}}</p>
-					</view>
-					<view class="item_right">
-						<u-icon :name="indexnum == index?'arrow-down':'arrow-right'"></u-icon>
-					</view>
-				</view>
-				<view class="records_item_bot" v-if="indexnum == index">
-					<p v-for="items,index in item.app_desc" :key="index">{{index+1+'、'+items}}</p>
-				</view>
-			</view>
+			<u-collapse>
+				<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
+					<p v-for="items,indexs in item.body" :key="indexs">{{indexs+1+"、"+items}}</p>
+				</u-collapse-item>
+			</u-collapse>
 		</view>
 	</view>
 </template>
-<style lang="scss">
-	page {
-		background-color: #f1f1f1;
-	}
-	.records{
-		margin-top: 20rpx;
-		.records_itemtf{
-			font-size: 30rpx;
-			width: 100%;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-		}
-		.records_item{
-			margin-bottom: 10rpx;
-			.records_item_top{
-				width: 100%;
-				background-color: #FFFFFF;
-				height: 110rpx;
-				padding: 10rpx 28rpx;
-				display: flex;
-				justify-content: space-between;
-				box-sizing: border-box;
-				.item_left{
-					p{
-						color: #474747;
-					}
-					p:first-child{
-						font-size: 32rpx;
-						margin-bottom: 10rpx;
-					}
-					p:last-child{
-						font-size: 26rpx;
-					}
-				}
-				.item_right{
-					height: 110rpx;
-					line-height: 100rpx;
-				}
-			}
-			.records_item_bot{
-				padding: 10rpx 28rpx 0;
-				box-sizing: border-box;
-				p{
-					margin-bottom: 6rpx;
-				}
-			}
-		}
-	}
-</style>
+
 <script>
 	export default {
 		data() {
 			return {
 				recordsdata: [],
-				indexnum:0,
-				dataTF:false
+				indexnum: 0,
+				dataTF: false,
+				itemList: [],
 			}
 		},
 		methods: {
@@ -87,13 +30,20 @@
 				})
 				console.log(res)
 				this.recordsdata = res
-				if(res.length == 0){
+				for(var i=0;i<res.length;i++){
+					var obj ={
+						head: "版本"+res[i].app_num+"主要更新",
+						body: res[i].app_desc,
+					}
+					this.itemList.push(obj)
+				}
+				if (res.length == 0) {
 					this.dataTF = true
-				}else{
+				} else {
 					this.dataTF = false
 				}
 			},
-			showtf(index){
+			showtf(index) {
 				this.indexnum = index
 				console.log(this.indexnum)
 			}
@@ -103,3 +53,28 @@
 		}
 	}
 </script>
+<style lang="scss">
+	page {
+		background-color: #f1f1f1;
+	}
+
+	.u-collapse-item {
+		width: 100%;
+		// height: 110rpx;
+		padding: 10rpx 28rpx;
+		justify-content: space-between;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+	}
+	.records {
+		margin-top: 20rpx;
+		.records_itemtf {
+			font-size: 30rpx;
+			width: 100%;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+		}
+	}
+</style>

pages/webview.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="webview">
 		<web-view :src="url" id="webcon" @message="handleMessage">
-
 		</web-view>
 	</view>
 </template>
@@ -18,31 +17,15 @@
 		onLoad(options) {
 			this.device_id = options.device_id
 			this.accessToken = options.accessToken
-			this.url = "/style/html/h52.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
-			// uni.setStorage({
-			// 	key: 'obj',
-			// 	data: JSON.stringify({
-			// 		device_id: this.device_id,
-			// 		accessToken: this.accessToken
-			// 	})
-			// })
+			this.url = "http://192.168.1.112:8002/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
 			//设置 webview 界面的状态栏的 title
 			uni.setNavigationBarTitle({
 				title: '监控详情'
 			});
-
-			// this.getWebviewPage()
 		},
 		methods: {
 			getWebviewPage(id) {
 				this.url = "/static/h5.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
-				// uni.setStorage({
-				// 	key: 'obj',
-				// 	data: JSON.stringify({
-				// 		device_id: this.device_id,
-				// 		accessToken: this.accessToken
-				// 	})
-				// })
 				//设置 webview 界面的状态栏的 title
 				uni.setNavigationBarTitle({
 					title: '监控详情'

project.config.json

@@ -21,9 +21,8 @@
     "checkSiteMap": false,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
+    "useMultiFrameRuntime": false,
     "useApiHook": true,
-    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -41,7 +40,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.1",
-  "appid": "wx1cabf67f460e3a14",
+  "appid": "wx8b73392672bcdac0",
   "projectname": "miniprogram-1",
   "debugOptions": {
     "hidedInDevtools": []
@@ -52,6 +51,8 @@
     "servePath": ""
   },
   "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
       "list": []

style/html/h52.html

@@ -1,14 +1,9 @@
 <!DOCTYPE html>
 <html lang=zh-CN>
 	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+		 <meta charset="utf-8" />
+    	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
 		<style type="text/css">
 			body {
 				margin: 0;
@@ -40,8 +35,8 @@
 			}
 
 			.direc {
-				width: 400px;
-				height: 400px;
+				width: 150px;
+				height: 150px;
 				background: url('http://static.yfpyx.com/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
@@ -75,13 +70,11 @@
 			}
 
 			#box {
-				height: 800px;
+				height: 300px;
 				width: 100%;
 				background: #000;
 			}
 		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
-
 	</head>
 	<body>
 		<div id="box"></div>
@@ -113,9 +106,11 @@
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 	<!-- uni 的 SDK -->
-	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
+	<script type="text/javascript" src="http://static.yfpyx.com/bigdata_app/js/ezuikit.js"></script>
 	<script type="text/javascript">
 		//上下左右和拍照
+		// aler(123)
+		console.log(123)
 		var str = window.location.search.substr(1)
 		var arr = str.split('&')
 		var device_id = arr[0].split('=')[1]
@@ -166,8 +161,6 @@
 			});
 		}
 		$(function() {
-			// var width = $('.direc').width()
-			// $('.direc').height(width)
 			$.ajax({
 				type: "POST",
 				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
@@ -181,10 +174,8 @@
 				console.log(data)
 				var hlsHdSrc = data.hlsHd;
 				var rtmpHdSrc = data.rtmpHd;
-				// console.log($("#box"))
-				// $("#box").innerHTML(1234)
 				var playHtml =
-					`<video id="myPlayer" autoplay   poster='' controls playsInline  webkit-playsinline src="${hlsHdSrc}"  style="width:100%; height:100%;"></video>`;
+					`<video id="myPlayer" autoplay   poster='' controls playsInline  webkit-playsinline src="http://hls01open.ys7.com/openlive/fe1a632be91b4df69f061b766872f974.hd.m3u8"  style="width:100%; height:100%;"></video>`;
 				$("#box").html(playHtml)
 				var myVideo = new EZUIKit.EZUIPlayer("myPlayer");
 				setTimeout(() => {
@@ -192,33 +183,6 @@
 				}, 150);
 
 			})
-
-			// setTimeout(() => {
-			// 	var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-			// 	var player = new EZUIKit.EZUIPlayer({
-			// 		id: 'myPlayer',
-			// 		url: url,
-			// 		autoplay: true,
-			// 		accessToken: accessToken,
-			// 		decoderPath: 'js',
-			// 		width: 1000,
-			// 		height: 800,
-			// 	});
-			// 	player.play();
-			// }, 1000)
-
 		})
-		document.addEventListener('UniAppJSBridgeReady', function() {
-			uni.webView.getEnv(function(res) {
-				console.log(res)
-				console.log('当前环境：' + JSON.stringify(res));
-			});
-			uni.postMessage({
-				data: {
-					action: 'postMessage'
-				}
-			});
-			// uni.webView.navigateTo(...)
-		});
 	</script>
 </html>

unpackage/dist/dev/mp-weixin/pages/afterSale/addafter.json

@@ -5,7 +5,6 @@
   "usingComponents": {
     "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar",
     "u-action-sheet": "/uview-ui/components/u-action-sheet/u-action-sheet",
-    "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-modal": "/uview-ui/components/u-modal/u-modal",
     "kps-image-cutter": "/components/ksp-image-cutter/ksp-image-cutter"
   }

unpackage/dist/dev/mp-weixin/pages/afterSale/addafter.wxss

@@ -46,7 +46,7 @@ page {
   color: #62BF89;
 }
 .addafter_con .addafter_con_top input {
-  margin-top: 20rpx;
+  width: 95%;
   background-color: #F1FAF5;
   color: #62BF89;
   font-size: 26rpx;
@@ -108,7 +108,7 @@ page {
   border: 2rpx dashed #A3DABD;
   text-align: center;
   line-height: 160rpx;
-  margin: 0 10rpx 20rpx 8rpx;
+  margin: 0 8rpx 20rpx 8rpx;
   position: relative;
 }
 .addafter_con .imgvideo .imgvideo_img image, .addafter_con .imgvideo .imgvideo_video image {
@@ -126,11 +126,13 @@ page {
   position: absolute;
   top: -12rpx;
   right: -12rpx;
-  font-size: 36rpx;
+  height: 30rpx;
+  width: 30rpx;
   background-color: #FE0000;
   border-radius: 50%;
   color: #ffffff;
   z-index: 50;
+  line-height: 30rpx;
 }
 .addafter_con .imgvideo .imgvideo_img .deletes, .addafter_con .imgvideo .imgvideo_video .deletes {
   width: 80%;

unpackage/dist/dev/mp-weixin/pages/environment/history.wxss

@@ -35,6 +35,7 @@
   height: 550rpx;
   position: relative;
   box-shadow: 0 0 10rpx #bcb9ca;
+  padding-top: 20px;
 }
 .graph .canvasbox .canvastishi {
   font-size: 32rpx;
@@ -44,6 +45,27 @@
   margin-left: -64rpx;
   margin-top: -21rpx;
 }
+.graph .canvasbox .schedule {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  width: 280rpx;
+  height: 50rpx;
+  border: 2rpx solid #F0F0F0;
+  margin-right: 40rpx;
+}
+.graph .canvasbox .schedule .schedule_value {
+  width: 70%;
+  text-align: center;
+  line-height: 50rpx;
+  font-size: 24rpx;
+}
+.graph .canvasbox .schedule .schedule_icon {
+  width: 30%;
+  background-color: #F2F2F2;
+  text-align: center;
+  line-height: 50rpx;
+}
 .graph .none_hint {
   font-size: 32rpx;
   font-weight: 700;
@@ -144,9 +166,6 @@
   width: 95%;
   margin: 20rpx auto;
 }
-.condition .scroll-X .table {
-  width: 1042px;
-}
 .condition .scroll-X .tr {
   display: -webkit-box;
   display: -webkit-flex;

unpackage/dist/dev/mp-weixin/pages/fourBase/index.wxss

@@ -57,6 +57,13 @@
   margin-top: 10rpx;
   font-size: 28rpx;
 }
+.bases_none {
+  width: 100%;
+  position: relative;
+  top: 200rpx;
+  font-size: 36rpx;
+  text-align: center;
+}
 .bases {
   width: 100%;
   position: relative;

unpackage/dist/dev/mp-weixin/pages/my/record/record.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "版本更新记录详情",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-collapse": "/uview-ui/components/u-collapse/u-collapse",
+    "u-collapse-item": "/uview-ui/components/u-collapse-item/u-collapse-item"
   }
 }

unpackage/dist/dev/mp-weixin/pages/my/record/record.wxss

@@ -27,51 +27,24 @@
 page {
   background-color: #f1f1f1;
 }
-.records {
-  margin-top: 20rpx;
-}
-.records .records_itemtf {
-  font-size: 30rpx;
+.u-collapse-item {
   width: 100%;
-  height: 100rpx;
-  line-height: 100rpx;
-  text-align: center;
-}
-.records .records_item {
-  margin-bottom: 10rpx;
-}
-.records .records_item .records_item_top {
-  width: 100%;
-  background-color: #FFFFFF;
-  height: 110rpx;
   padding: 10rpx 28rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
           justify-content: space-between;
   box-sizing: border-box;
+  margin-bottom: 20rpx;
+  background-color: #FFFFFF;
 }
-.records .records_item .records_item_top .item_left ._p {
-  color: #474747;
-}
-.records .records_item .records_item_top .item_left ._p:first-child {
-  font-size: 32rpx;
-  margin-bottom: 10rpx;
-}
-.records .records_item .records_item_top .item_left ._p:last-child {
-  font-size: 26rpx;
+.records {
+  margin-top: 20rpx;
 }
-.records .records_item .records_item_top .item_right {
-  height: 110rpx;
+.records .records_itemtf {
+  font-size: 30rpx;
+  width: 100%;
+  height: 100rpx;
   line-height: 100rpx;
-}
-.records .records_item .records_item_bot {
-  padding: 10rpx 28rpx 0;
-  box-sizing: border-box;
-}
-.records .records_item .records_item_bot ._p {
-  margin-bottom: 6rpx;
+  text-align: center;
 }
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -4,30 +4,56 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "minified": true,
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
     "postcss": false,
-    "es6": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wx1cabf67f460e3a14",
-  "projectname": "大数据平台APP",
+  "appid": "wxa67985a99191095e",
+  "projectname": "云飞智控",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": 3,
       "list": [
         {
           "name": "about",

unpackage/dist/dev/mp-weixin/sitemap78.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-collapse-item/u-collapse-item.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-collapse-item/u-collapse-item.wxss

@@ -0,0 +1,79 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-collapse-head.data-v-31fbc7f8 {
+  position: relative;
+
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+  color: #303133;
+  font-size: 30rpx;
+  line-height: 1;
+  padding: 24rpx 0;
+  text-align: left;
+}
+.u-collapse-title.data-v-31fbc7f8 {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  overflow: hidden;
+}
+.u-arrow-down-icon.data-v-31fbc7f8 {
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+  margin-right: 20rpx;
+  margin-left: 14rpx;
+}
+.u-arrow-down-icon-active.data-v-31fbc7f8 {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+  -webkit-transform-origin: center center;
+          transform-origin: center center;
+}
+.u-collapse-body.data-v-31fbc7f8 {
+  overflow: hidden;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+.u-collapse-content.data-v-31fbc7f8 {
+  overflow: hidden;
+  font-size: 28rpx;
+  color: #909399;
+  text-align: left;
+}
+

unpackage/dist/dev/mp-weixin/uview-ui/components/u-collapse/u-collapse.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-collapse/u-collapse.wxml

@@ -0,0 +1 @@
+<view class="u-collapse data-v-e4ce3c40"><slot></slot></view>

unpackage/dist/dev/mp-weixin/uview-ui/components/u-collapse/u-collapse.wxss

@@ -0,0 +1,27 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+