Merge remote-tracking branch 'origin/master'

pc/src/api/methods/index.js

@@ -28,4 +28,8 @@ export default {
 	getYewei(params) {
 		return http.post('web/data/getYewei', params)
 	},
+	//获取监控信息
+	getMonitorInfo(params) {
+		return http.post('web/toilet/getMonitorInfo', params)
+	},
 }

pc/src/components/EZUIKitJs.vue

@@ -34,9 +34,15 @@
 				next_time:Date.now()
 			}
 		},
-		mounted(){
-			this.init();
-			window.addEventListener('onresize',this.resize);
+		watch:{
+			url(val){
+				if(val){
+					this.$nextTick(()=>{
+						this.init();
+						window.addEventListener('onresize',this.resize);
+					})
+				}
+			}
 		},
 		methods: {
 			play() {

pc/src/views/site-detail.vue

@@ -123,10 +123,10 @@
 						</div>
 					</div>
 					<div class="table-body">
-						<div class="row" v-for="(item,index) in typeList.filter(one=>one.show)" :key="index">
+						<div class="row" v-for="(item,index) in list.data" :key="index">
 							<div class="cell flex_2">
-								<span class="point" :style="`background-color:${item.color}`"></span>
-								<span :style="`color:${item.color}`">{{item.name}}</span>
+								<span class="point" :style="`background-color:#09a8ae`"></span>
+								<span :style="`color:#09a8ae`">{{item.typeName}}</span>
 							</div>
 							<div class="cell flex_3">{{item.value}} {{item.unit}}</div>
 							<div class="cell">{{item.CreatedAt}}</div>
@@ -278,15 +278,14 @@
 		setup(props, {emit}) {
 			const state = reactive({
 				show:false,
-				url:'ezopen://open.ys7.com/E77565052/1.hd.live',
 				order_id:'',
 				detail: {
 					poster:[],
 					index: 0,
 					yewei:0,
 					type:1,
-					accessToken:'at.bvx2ea007tfqqdvkcb9iuhk70q6gjodm-7smdnjfh9j-1wdmw5f-mal3go2vz',
-					url:'ezopen://open.ys7.com/E77565052/1.live',
+					accessToken:'',
+					url:'',
 				},
 				showBanner:false,
 				tabs: [
@@ -328,7 +327,7 @@
 					{
 						name:'液位',
 						prop:'液位',
-						value:0.7,
+						value:0,
 						unit:'m',
 						color:'#09a8ae',
 						CreatedAt:'',
@@ -439,6 +438,18 @@
 					}
 				});
 			}
+			function getMonitorInfo() {
+				state.detail.accessToken = '';
+				state.detail.url = '';
+				api.getMonitorInfo({id:props.site_id}).then((res)=>{
+					if(res.code==0){
+						if(res.data.access_token){
+							state.detail.accessToken = res.data.access_token;
+							state.detail.url = res.data.camera_url;
+						}
+					}
+				});
+			}
 			function typeChange(type=1) {
 				switch (type) {
 					case 1:
@@ -463,11 +474,14 @@
 						getYewei();
 					}
 					if(item.value=='monitor'){
-						// getList();
+						getMonitorInfo();
 					}
-					if(item.value=='history'||item.value=='process'){
+					if(item.value=='history'){
 						getHistoryDataList();
 					}
+					if(item.value=='process'){
+						getYewei();
+					}
 					if(item.value=='order'){
 						getOrderList();
 					}
@@ -478,6 +492,16 @@
 					if(res.code==0){
 						if(res.data.value){
 							state.detail.yewei = Number(res.data.value);
+							state.typeList.forEach((item)=>{
+								item.show = false;
+								item.value = 0;
+								item.unit = '';
+								item.CreatedAt = '';
+								if(item.name=="液位"){
+									item.value = Number(res.data.value);
+									item.unit = res.data.unit;
+								}
+							});
 						}
 					}
 				});
@@ -595,21 +619,10 @@
 				}
 				state.list.page = page;
 				api.getHistoryDataList(p).then((res)=>{
-					state.typeList.forEach((item)=>{
-						item.show = false;
-						item.value = 0;
-						item.unit = '';
-						item.CreatedAt = '';
-					});
 					if(res.code==0){
 						if(Array.isArray(res.data.list)){
 							res.data.list.forEach((item)=>{
-								if(state.typeList.find(one=>one.name==item.typeName)){
-									state.typeList.find(one=>one.name==item.typeName).show = true;
-									state.typeList.find(one=>one.name==item.typeName).value = item.value;
-									state.typeList.find(one=>one.name==item.typeName).unit = item.unit;
-									state.typeList.find(one=>one.name==item.typeName).CreatedAt = myPublic.dateFormat.format(item.CreatedAt);
-								}
+								item.CreatedAt = myPublic.dateFormat.format(item.CreatedAt);
 							});
 							state.list.data = res.data.list;
 							state.list.total = res.data.total;