up

src/views/home/components/SensorStatus.vue

@@ -105,21 +105,18 @@ import { goafdevstatis} from '@/api/goaf/sensor'
         goafdevstatis(){
             let   option  =JSON.parse(JSON.stringify(this.option))
             goafdevstatis().then((res)=>{
-
-                this.total=res.data.goafDevTotalNum
-
                 let pressureSensorNum=res.data.pressureSensorNum
                 let displacementSensorNum=res.data.displacementSensorNum
-                let harmfulGasSensorNum=res.data.harmfulGasSensorNum
+                // let harmfulGasSensorNum=res.data.harmfulGasSensorNum
 
                 let pressureSensorOnlineNum=res.data.pressureSensorOnlineNum
                 let displacementSensorOnlineNum=res.data.displacementSensorOnlineNum
-                let harmfulGasSensorOnlineNum=res.data.harmfulGasSensorOnlineNum               
+                // let harmfulGasSensorOnlineNum=res.data.harmfulGasSensorOnlineNum               
 
                 option.series[0].data=[pressureSensorOnlineNum,pressureSensorNum-pressureSensorOnlineNum]
                 option.series[1].data=[displacementSensorOnlineNum,displacementSensorNum-displacementSensorOnlineNum]
                 // option.series[2].data=[harmfulGasSensorOnlineNum,harmfulGasSensorNum-harmfulGasSensorOnlineNum] 
-                
+                this.total= pressureSensorNum+displacementSensorNum//res.data.goafDevTotalNum                
                 if(!this.myChart){
                     var chartDom = document.getElementById('sensor-status-chart');
                     var myChart = echarts.init(chartDom);

src/views/particulars/video.vue

@@ -179,14 +179,20 @@ import axios from 'axios'
                 }
             }).then((res) => {
                 const accessToken = res.data.data.accessToken
+                var channel = 1
+                var deviceSerial = item.deviceSerial
                 if (!accessToken) {
-                this.$message.error('获取监控token失败！')
-                return
+                    this.$message.error('获取监控token失败！')
+                    return
+                }
+                if (deviceSerial.includes('_')) {
+                    channel = item.deviceSerial.split('_')[1]
+                    deviceSerial = item.deviceSerial.split('_')[0]
                 }
-                this.videoDialogVisible = true
+                this.videoDialogVisible = true                
                 this.video = {
                 ...item,
-                src: `https://open.ys7.com/ezopen/h5/iframe?url=ezopen://open.ys7.com/${item.deviceSerial}/1.live&autoplay=1&accessToken=${accessToken}`
+                src: `https://open.ys7.com/ezopen/h5/iframe?url=ezopen://open.ys7.com/${deviceSerial}/${channel}.live&autoplay=1&accessToken=${accessToken}`
                 }
             }).catch((res) => {
                 console.error(res)