Compare commits
3 Commits
a02c2e06b7
...
a15069b782
| Author | SHA1 | Date |
|---|---|---|
|
|
a15069b782 | |
|
|
447675f580 | |
|
|
bcceb7c34e |
|
|
@ -1,4 +1,4 @@
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
VUE_APP_BASE_API = 'http://36.133.205.221:81'
|
VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,9 @@
|
||||||
"core-js": "^3.6.5",
|
"core-js": "^3.6.5",
|
||||||
"flv.js": "^1.6.2",
|
"flv.js": "^1.6.2",
|
||||||
"flyio": "^0.6.2",
|
"flyio": "^0.6.2",
|
||||||
|
"hls.js": "^1.4.12",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
|
"mui-player": "^1.8.1",
|
||||||
"portal-vue": "^2.1.7",
|
"portal-vue": "^2.1.7",
|
||||||
"node-sass": "^6.0.1",
|
"node-sass": "^6.0.1",
|
||||||
"sass-loader": "^13.3.2",
|
"sass-loader": "^13.3.2",
|
||||||
|
|
|
||||||
11
src/App.vue
11
src/App.vue
|
|
@ -664,4 +664,15 @@ uni-page-body {
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.right-part {
|
||||||
|
.full-switch {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.left-part{
|
||||||
|
.live-mode{
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
<template>
|
||||||
|
<view class="h-full w-full">
|
||||||
|
<div ref="muiPlayer"></div>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
<script>
|
||||||
|
import 'mui-player/dist/mui-player.min.css'
|
||||||
|
import MuiPlayer from 'mui-player'
|
||||||
|
import Flv from 'flv.js'
|
||||||
|
import Hls from 'hls.js'
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
url: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
type: {
|
||||||
|
type: String,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.videoPlayer()
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
videoPlayer() {
|
||||||
|
let parse = {}
|
||||||
|
if (this.type == 'm3u8') {
|
||||||
|
parse = {
|
||||||
|
type: 'hls',
|
||||||
|
loader: Hls,
|
||||||
|
config: {
|
||||||
|
debug: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
parse = {
|
||||||
|
type: 'flv',
|
||||||
|
loader: Flv,
|
||||||
|
config: {
|
||||||
|
debug: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.mp = new MuiPlayer({
|
||||||
|
container: this.$refs.muiPlayer,
|
||||||
|
live: true,
|
||||||
|
src: this.url,
|
||||||
|
autoplay: true,
|
||||||
|
muted: true,
|
||||||
|
parse: parse,
|
||||||
|
pageHead: false,
|
||||||
|
width: '100%',
|
||||||
|
height: '100%',
|
||||||
|
autoFit:false,
|
||||||
|
objectFit: 'contain',
|
||||||
|
videoAttribute: [
|
||||||
|
{
|
||||||
|
attrKey: 'webkit-playsinline',
|
||||||
|
attrValue: 'webkit-playsinline',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
attrKey: 'playsinline',
|
||||||
|
attrValue: 'playsinline',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
attrKey: 'x5-video-player-type',
|
||||||
|
attrValue: 'h5-page',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
custom: {
|
||||||
|
footerControls: [
|
||||||
|
{
|
||||||
|
style: {},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
let _video = this.mp.video()
|
||||||
|
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.mp.on('ready', (event) => {
|
||||||
|
_video.play()
|
||||||
|
_video.addEventListener('play', (e) => {
|
||||||
|
//播放事件
|
||||||
|
this.$emit('onPlayFn')
|
||||||
|
})
|
||||||
|
_video.addEventListener('ended', (e) => {
|
||||||
|
//播放完成事件
|
||||||
|
this.$emit('onEndedFn')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<style lang="scss"></style>
|
||||||
|
|
@ -49,7 +49,8 @@ export default {
|
||||||
player.x5VideoPlayerType='h5-page'
|
player.x5VideoPlayerType='h5-page'
|
||||||
player.x5VideoPlayerFullscreen="false"
|
player.x5VideoPlayerFullscreen="false"
|
||||||
player.autoplay= true // 以上均为 video标签的属性配置
|
player.autoplay= true // 以上均为 video标签的属性配置
|
||||||
player.style = 'width: 100%;height:100%';
|
// player.poster = 'https://img.yzcdn.cn/vant/cat.jpeg'
|
||||||
|
player.style = 'width: 100%;height:100%;object-fit:cover;';
|
||||||
let videoElement = this.$refs.myPlayer;
|
let videoElement = this.$refs.myPlayer;
|
||||||
|
|
||||||
// console.log(videoElement,'videoPlayer=========')
|
// console.log(videoElement,'videoPlayer=========')
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,15 @@ export default {
|
||||||
initVideo() {
|
initVideo() {
|
||||||
let video = document.createElement('video')
|
let video = document.createElement('video')
|
||||||
video.id = this.id
|
video.id = this.id
|
||||||
video.style = 'width: 100%; height: 100%;'
|
video.style = 'width: 100%; height: 100%;object-fit:cover;'
|
||||||
video.controls = true
|
video.controls = true
|
||||||
video.preload = 'auto'
|
video.preload = 'auto'
|
||||||
|
video.setAttribute('x5-playsinline', 'true')
|
||||||
|
video.setAttribute('x-webkit-airplay', 'allow')
|
||||||
video.setAttribute('playsinline', true) //IOS微信浏览器支持小窗内播放
|
video.setAttribute('playsinline', true) //IOS微信浏览器支持小窗内播放
|
||||||
video.setAttribute('webkit-playsinline', true) //这个bai属性是ios 10中设置可以让视频在小du窗内播放,也就是不是全zhi屏播放的video标签的一个属性
|
video.setAttribute('webkit-playsinline', true) //这个bai属性是ios 10中设置可以让视频在小du窗内播放,也就是不是全zhi屏播放的video标签的一个属性
|
||||||
video.setAttribute('x5-video-player-type', 'h5') //安卓 声明启用同层H5播放器 可以在video上面加东西
|
video.setAttribute('x5-video-player-type', 'h5') //安卓 声明启用同层H5播放器 可以在video上面加东西
|
||||||
|
// video.setAttribute('poster', 'https://img.yzcdn.cn/vant/cat.jpeg')
|
||||||
let source = document.createElement('source')
|
let source = document.createElement('source')
|
||||||
source.src = this.url
|
source.src = this.url
|
||||||
video.appendChild(source)
|
video.appendChild(source)
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,9 @@
|
||||||
<u-form-item label="外部链接">
|
<u-form-item label="外部链接">
|
||||||
<u-switch v-model="form.is_blank"></u-switch>
|
<u-switch v-model="form.is_blank"></u-switch>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
<u-form-item label="重点">
|
||||||
|
<u-switch v-model="form.extends.priority"></u-switch>
|
||||||
|
</u-form-item>
|
||||||
<u-form-item label="外部链接" v-if="form.is_blank">
|
<u-form-item label="外部链接" v-if="form.is_blank">
|
||||||
<u-input v-model="form.blank_url" placeholder="请输入"></u-input>
|
<u-input v-model="form.blank_url" placeholder="请输入"></u-input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
@ -155,6 +158,7 @@ export default {
|
||||||
description: '',
|
description: '',
|
||||||
address_lng: '',
|
address_lng: '',
|
||||||
address_lat: '',
|
address_lat: '',
|
||||||
|
extends:{}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -523,7 +523,7 @@
|
||||||
this.queryDataList(true);
|
this.queryDataList(true);
|
||||||
|
|
||||||
}
|
}
|
||||||
uni.showToast({ title: data.message, icon: 'none' });
|
uni.showToast({ title: '修改成功', icon: 'none' });
|
||||||
})
|
})
|
||||||
.catch(({data}) => {
|
.catch(({data}) => {
|
||||||
hideLoading()
|
hideLoading()
|
||||||
|
|
@ -536,7 +536,7 @@
|
||||||
if(data.code==200){
|
if(data.code==200){
|
||||||
this.queryDataList(true);
|
this.queryDataList(true);
|
||||||
this.editShow = false;
|
this.editShow = false;
|
||||||
uni.showToast({ title: data.message, icon: 'none' });
|
uni.showToast({ title: '保存成功', icon: 'none' });
|
||||||
}else{
|
}else{
|
||||||
uni.showToast({ title: data.message, icon: 'none' });
|
uni.showToast({ title: data.message, icon: 'none' });
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
<view class="h-80vh flex-center">
|
<view class="h-80vh flex-center">
|
||||||
<view class="w-full">
|
<view class="w-full">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="column"
|
type="column"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chartData"
|
:chartData="chartData"
|
||||||
|
|
@ -29,6 +30,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
loadingType: 1,
|
||||||
filterParmas: {},
|
filterParmas: {},
|
||||||
searchFormSchema: [
|
searchFormSchema: [
|
||||||
{
|
{
|
||||||
|
|
@ -218,6 +220,7 @@ export default {
|
||||||
async getData() {
|
async getData() {
|
||||||
if (!this.filterParmas.device_id) {
|
if (!this.filterParmas.device_id) {
|
||||||
this.$u.toast('没有关联基地')
|
this.$u.toast('没有关联基地')
|
||||||
|
this.loadingType = 0
|
||||||
return (this.chartData = { series: [] })
|
return (this.chartData = { series: [] })
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
<div class="p-20rpx text-32rpx">
|
<div class="p-20rpx text-32rpx">
|
||||||
{{ item.lable }}
|
{{ item.lable }}
|
||||||
</div>
|
</div>
|
||||||
<qiun-data-charts type="area" :opts="opts" :chartData="item.chatOpt" />
|
<qiun-data-charts :loadingType="loadingType" type="area" :opts="opts" :chartData="item.chatOpt" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -67,6 +67,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
loadingType:1,
|
||||||
filterParmas: {},
|
filterParmas: {},
|
||||||
searchFormSchema: [
|
searchFormSchema: [
|
||||||
{
|
{
|
||||||
|
|
@ -191,6 +192,7 @@ export default {
|
||||||
async getData() {
|
async getData() {
|
||||||
this.chatList = []
|
this.chatList = []
|
||||||
if (!this.filterParmas.device_id){
|
if (!this.filterParmas.device_id){
|
||||||
|
this.loadingType = 0
|
||||||
return this.$u.toast('没有关联基地')
|
return this.$u.toast('没有关联基地')
|
||||||
}
|
}
|
||||||
const { data } = await http.get('/api/monitoring-data', {
|
const { data } = await http.get('/api/monitoring-data', {
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="optsc"
|
:opts="optsc"
|
||||||
:chartData="chart_air_temperature"
|
:chartData="chart_air_temperature"
|
||||||
|
|
@ -57,6 +58,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_air_humidity"
|
:chartData="chart_air_humidity"
|
||||||
|
|
@ -71,6 +73,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="mix"
|
type="mix"
|
||||||
:opts="opts2"
|
:opts="opts2"
|
||||||
:chartData="chart_illumination"
|
:chartData="chart_illumination"
|
||||||
|
|
@ -85,6 +88,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="mix"
|
type="mix"
|
||||||
:opts="opts2"
|
:opts="opts2"
|
||||||
:chartData="chart_rainfall"
|
:chartData="chart_rainfall"
|
||||||
|
|
@ -99,6 +103,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts3"
|
:opts="opts3"
|
||||||
:chartData="chart_wind_speed"
|
:chartData="chart_wind_speed"
|
||||||
|
|
@ -113,6 +118,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="mix"
|
type="mix"
|
||||||
:opts="opts4"
|
:opts="opts4"
|
||||||
:chartData="chart_wind_direction"
|
:chartData="chart_wind_direction"
|
||||||
|
|
@ -127,6 +133,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts3"
|
:opts="opts3"
|
||||||
:chartData="chart_noise"
|
:chartData="chart_noise"
|
||||||
|
|
@ -141,6 +148,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts3"
|
:opts="opts3"
|
||||||
:chartData="chart_pm10"
|
:chartData="chart_pm10"
|
||||||
|
|
@ -155,6 +163,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts3"
|
:opts="opts3"
|
||||||
:chartData="chart_pm25"
|
:chartData="chart_pm25"
|
||||||
|
|
@ -169,6 +178,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts3"
|
:opts="opts3"
|
||||||
:chartData="chart_co2"
|
:chartData="chart_co2"
|
||||||
|
|
@ -187,6 +197,7 @@
|
||||||
components: { QiunDataCharts },
|
components: { QiunDataCharts },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
loadingType:1,
|
||||||
optsc:{},
|
optsc:{},
|
||||||
opts: {
|
opts: {
|
||||||
dataLabel:false,//显示数据
|
dataLabel:false,//显示数据
|
||||||
|
|
@ -403,6 +414,7 @@
|
||||||
if(data.code==200){
|
if(data.code==200){
|
||||||
let _data = data.data;
|
let _data = data.data;
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
|
this.loadingType = 0
|
||||||
return this.$u.toast('没有关联基地');
|
return this.$u.toast('没有关联基地');
|
||||||
}
|
}
|
||||||
for(let item of _data){
|
for(let item of _data){
|
||||||
|
|
|
||||||
|
|
@ -138,8 +138,10 @@
|
||||||
<view class="video_li" v-for="(video, index) in videoList" :key="index">
|
<view class="video_li" v-for="(video, index) in videoList" :key="index">
|
||||||
<view class="video_cd">
|
<view class="video_cd">
|
||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<videoM3u8H5 v-if="video.video_type=='m3u8'" :url="video.video_url" :id="`m_${index}_refsM3u8`"></videoM3u8H5>
|
<!-- {{ video.video_url }} -->
|
||||||
<video-flv-h5 v-else :url="video.video_url"></video-flv-h5>
|
<LiveVideo :url="video.video_url" :type="video.video_type"></LiveVideo>
|
||||||
|
<!-- <videoM3u8H5 v-if="video.video_type=='m3u8'" :url="video.video_url" :id="`m_${index}_refsM3u8`"></videoM3u8H5>
|
||||||
|
<video-flv-h5 v-else :url="video.video_url"></video-flv-h5> -->
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom-box">
|
<view class="bottom-box">
|
||||||
|
|
@ -166,8 +168,9 @@
|
||||||
>
|
>
|
||||||
<view class="video_cd">
|
<view class="video_cd">
|
||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<videoM3u8H5 v-if="video.video_type=='m3u8'" :url="video.video_url" :id="`m_${index}_refsM3u82`" ></videoM3u8H5>
|
<LiveVideo :url="video.video_url" :type="video.video_type"></LiveVideo>
|
||||||
<video-flv-h5 v-else :url="video.video_url"></video-flv-h5>
|
<!-- <videoM3u8H5 v-if="video.video_type=='m3u8'" :url="video.video_url" :id="`m_${index}_refsM3u82`" ></videoM3u8H5>
|
||||||
|
<video-flv-h5 v-else :url="video.video_url"></video-flv-h5> -->
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom-box">
|
<view class="bottom-box">
|
||||||
|
|
@ -200,10 +203,11 @@
|
||||||
<script>
|
<script>
|
||||||
import videoFlvH5 from '@/components/video-flv-h5/video-flv-h5.vue'
|
import videoFlvH5 from '@/components/video-flv-h5/video-flv-h5.vue'
|
||||||
import videoM3u8H5 from '@/components/video-m3u8-h5/video-m3u8-h5.vue'
|
import videoM3u8H5 from '@/components/video-m3u8-h5/video-m3u8-h5.vue'
|
||||||
|
import LiveVideo from '@/components/live-video/index.vue'
|
||||||
import Request from '@/api/luch-request/index.js'
|
import Request from '@/api/luch-request/index.js'
|
||||||
const http = new Request()
|
const http = new Request()
|
||||||
export default {
|
export default {
|
||||||
components: { videoFlvH5,videoM3u8H5 },
|
components: { videoFlvH5,videoM3u8H5 ,LiveVideo},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
list: [
|
list: [
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<template v-if="loadingType!=0">
|
||||||
<!-- 电导率 -->
|
<!-- 电导率 -->
|
||||||
<view class="chart_section">
|
<view class="chart_section">
|
||||||
<view class="top_box">
|
<view class="top_box">
|
||||||
|
|
@ -82,7 +83,9 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
type="area"
|
type="area"
|
||||||
|
:loadingType="loadingType"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_conductivity"
|
:chartData="chart_conductivity"
|
||||||
/>
|
/>
|
||||||
|
|
@ -99,6 +102,8 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_humidity"
|
:chartData="chart_humidity"
|
||||||
|
|
@ -116,6 +121,8 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="optsc"
|
:opts="optsc"
|
||||||
:chartData="chart_temperature"
|
:chartData="chart_temperature"
|
||||||
|
|
@ -133,6 +140,8 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_k"
|
:chartData="chart_k"
|
||||||
|
|
@ -150,6 +159,8 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_n"
|
:chartData="chart_n"
|
||||||
|
|
@ -167,12 +178,15 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
v-if="loadingType!=0"
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_p"
|
:chartData="chart_p"
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
<!-- 设置预警值 -->
|
<!-- 设置预警值 -->
|
||||||
<u-popup v-model="warningShow" border-radius="28" width="94%" height="70%"
|
<u-popup v-model="warningShow" border-radius="28" width="94%" height="70%"
|
||||||
|
|
@ -223,6 +237,7 @@
|
||||||
components: { QiunDataCharts },
|
components: { QiunDataCharts },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
loadingType:1,
|
||||||
optsc:{},
|
optsc:{},
|
||||||
opts: {
|
opts: {
|
||||||
dataLabel:false,//显示数据
|
dataLabel:false,//显示数据
|
||||||
|
|
@ -327,7 +342,6 @@
|
||||||
},
|
},
|
||||||
//地区
|
//地区
|
||||||
change(val){
|
change(val){
|
||||||
console.log(val);
|
|
||||||
let narray = this.deviceAddressList.filter(item=>{
|
let narray = this.deviceAddressList.filter(item=>{
|
||||||
return item.value==val;
|
return item.value==val;
|
||||||
})
|
})
|
||||||
|
|
@ -429,8 +443,10 @@
|
||||||
if(data.code==200){
|
if(data.code==200){
|
||||||
let _data = data.data;
|
let _data = data.data;
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
|
this.loadingType = 0
|
||||||
return this.$u.toast('没有关联基地');
|
return this.$u.toast('没有关联基地');
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let item of _data){
|
for(let item of _data){
|
||||||
item['label'] = item.name;
|
item['label'] = item.name;
|
||||||
item['value'] = item.id;
|
item['value'] = item.id;
|
||||||
|
|
@ -458,6 +474,7 @@
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
// return this.$u.toast('监测点为空');
|
// return this.$u.toast('监测点为空');
|
||||||
}
|
}
|
||||||
|
|
||||||
let options = [];
|
let options = [];
|
||||||
for(let k in _data){
|
for(let k in _data){
|
||||||
let item = {};
|
let item = {};
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<template v-if="loadingType!=0">
|
||||||
<!-- 氯 -->
|
<!-- 氯 -->
|
||||||
<view class="chart_section">
|
<view class="chart_section">
|
||||||
<view class="top_box">
|
<view class="top_box">
|
||||||
|
|
@ -80,6 +81,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_chlorine"
|
:chartData="chart_chlorine"
|
||||||
|
|
@ -97,6 +99,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_conductivity"
|
:chartData="chart_conductivity"
|
||||||
|
|
@ -115,6 +118,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_oxygen"
|
:chartData="chart_oxygen"
|
||||||
|
|
@ -132,6 +136,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_ph"
|
:chartData="chart_ph"
|
||||||
|
|
@ -149,6 +154,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="optsc"
|
:opts="optsc"
|
||||||
:chartData="chart_temperature"
|
:chartData="chart_temperature"
|
||||||
|
|
@ -166,12 +172,14 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="cart_box">
|
<view class="cart_box">
|
||||||
<qiun-data-charts
|
<qiun-data-charts
|
||||||
|
:loadingType="loadingType"
|
||||||
type="area"
|
type="area"
|
||||||
:opts="opts"
|
:opts="opts"
|
||||||
:chartData="chart_turbidity"
|
:chartData="chart_turbidity"
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
<!-- 设置预警值 -->
|
<!-- 设置预警值 -->
|
||||||
<u-popup v-model="warningShow" border-radius="28" width="94%" height="70%"
|
<u-popup v-model="warningShow" border-radius="28" width="94%" height="70%"
|
||||||
|
|
@ -222,6 +230,7 @@
|
||||||
components: { QiunDataCharts },
|
components: { QiunDataCharts },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
loadingType:1,
|
||||||
optsc:{},
|
optsc:{},
|
||||||
opts: {
|
opts: {
|
||||||
dataLabel:false,//显示数据
|
dataLabel:false,//显示数据
|
||||||
|
|
@ -429,6 +438,7 @@
|
||||||
if(data.code==200){
|
if(data.code==200){
|
||||||
let _data = data.data;
|
let _data = data.data;
|
||||||
if(_data.length==0){
|
if(_data.length==0){
|
||||||
|
this.loadingType = 0
|
||||||
return this.$u.toast('没有关联基地');
|
return this.$u.toast('没有关联基地');
|
||||||
}
|
}
|
||||||
for(let item of _data){
|
for(let item of _data){
|
||||||
|
|
|
||||||
19
yarn.lock
19
yarn.lock
|
|
@ -5899,6 +5899,11 @@ highlight.js@^10.7.1:
|
||||||
resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.7.3.tgz"
|
resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.7.3.tgz"
|
||||||
integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
|
integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
|
||||||
|
|
||||||
|
hls.js@^1.4.12:
|
||||||
|
version "1.4.12"
|
||||||
|
resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.4.12.tgz#2022daa29d10c662387d80a5297f8330f8ef5ee2"
|
||||||
|
integrity sha512-1RBpx2VihibzE3WE9kGoVCtrhhDWTzydzElk/kyRbEOLnb1WIE+3ZabM/L8BqKFTCL3pUy4QzhXgD1Q6Igr1JA==
|
||||||
|
|
||||||
hmac-drbg@^1.0.1:
|
hmac-drbg@^1.0.1:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
resolved "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
|
resolved "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
|
||||||
|
|
@ -8049,6 +8054,11 @@ ms@2.1.3:
|
||||||
resolved "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz"
|
resolved "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz"
|
||||||
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
|
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
|
||||||
|
|
||||||
|
mui-player@^1.8.1:
|
||||||
|
version "1.8.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/mui-player/-/mui-player-1.8.1.tgz#3c0405eefeee46bfcd9535165bd022bb871bf8dd"
|
||||||
|
integrity sha512-5o0SnSyVImxT9XUO6jCMmcJ+ZyAEJeFvdeZDHHPNS/LdwhzWX4yQPNgx8nzRbcUJ749xpqEQ6uVddiexLyvvqg==
|
||||||
|
|
||||||
multicast-dns-service-types@^1.1.0:
|
multicast-dns-service-types@^1.1.0:
|
||||||
version "1.1.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.npmmirror.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"
|
resolved "https://registry.npmmirror.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"
|
||||||
|
|
@ -8131,7 +8141,7 @@ negotiator@0.6.3:
|
||||||
resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
|
resolved "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz"
|
||||||
integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
|
integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
|
||||||
|
|
||||||
neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
|
neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
|
||||||
version "2.6.2"
|
version "2.6.2"
|
||||||
resolved "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz"
|
resolved "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz"
|
||||||
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
|
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
|
||||||
|
|
@ -9922,6 +9932,13 @@ sane@^4.0.3:
|
||||||
minimist "^1.1.1"
|
minimist "^1.1.1"
|
||||||
walker "~1.0.5"
|
walker "~1.0.5"
|
||||||
|
|
||||||
|
sass-loader@^13.3.2:
|
||||||
|
version "13.3.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6"
|
||||||
|
integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==
|
||||||
|
dependencies:
|
||||||
|
neo-async "^2.6.2"
|
||||||
|
|
||||||
sass@^1.43.4:
|
sass@^1.43.4:
|
||||||
version "1.66.1"
|
version "1.66.1"
|
||||||
resolved "https://registry.npmmirror.com/sass/-/sass-1.66.1.tgz"
|
resolved "https://registry.npmmirror.com/sass/-/sass-1.66.1.tgz"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue