admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx：修改视频监控

Browse Source
This commit is contained in:
Rain_ 2025-09-25 09:21:56 +08:00
parent d68f12ca90
commit f534ffbed1
9 changed files with 208 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
components/tree-node/newIndex.vue
View File

@ -2,16 +2,18 @@
<view class="tree-content-compontent">
<view class="content-box" @click="toggleNodes(item)">
<text class="box-text">{{ item.groupName }}</text>
<view @click.stop="expandFn">
<text class="box-text1" v-if="item.children.length > 0">{{ item.children.length }}</text>
<!-- <u-icon name="arrow-right" color="#B3B3B3" size="40"
<view @click.stop="expandFn">
<text class="box-text1" v-if="item.children.length > 0">{{ item.totalNum || 0 }}</text>
<!-- <u-icon name="arrow-right" color="#B3B3B3" size="40"
v-if="!expanded && item.children && item.children.length" style="margin-right: 10rpx;"></u-icon>
<u-icon name="arrow-down" color="#B3B3B3" size="40"
v-if="expanded && item.children && item.children.length" style="margin-right: 10rpx;"></u-icon> -->
<u-icon v-if="!expanded && item.children && item.children.length" name="arrow-right" color="#B3B3B3" size="40"></u-icon>
<u-icon v-if="expanded && item.children && item.children.length" name="arrow-down" color="#B3B3B3" size="40"></u-icon>
</view>
<image v-if="(!item.children || !item.children.length)" style="width:55rpx;height:40rpx;"
<u-icon v-if="!expanded && item.children && item.children.length" name="arrow-right" color="#B3B3B3"
size="40"></u-icon>
<u-icon v-if="expanded && item.children && item.children.length" name="arrow-down" color="#B3B3B3"
size="40"></u-icon>
</view>
<image v-if="(!item.children || !item.children.length) && !iconShow" style="width:55rpx;height:40rpx;"
src="../../static/videoControlIcon/videoIcon1.png" mode="">
</image>
<!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode="">
@ -20,7 +22,7 @@
<view class="sub-component">
<view :class="expanded == true ? 'expandedStyle' : ''"
v-if="item.children && item.children.length && expanded">
<tree-menu v-for="child in item.children" :key="child.id" :item="child" :treeIndex="treeIndex + 1"
<tree-menu :iconShow="iconShow" v-for="child in item.children" :key="child.id" :item="child" :treeIndex="treeIndex + 1"
@clickItem="clickTreeItem"></tree-menu>
</view>
</view>
@ -30,7 +32,7 @@
<script>
export default {
name: 'TreeMenu',
props: ['item', 'treeIndex'],
props: ['item', 'treeIndex', 'iconShow'],
data() {
return {
expanded: false,
@ -57,7 +59,7 @@
<style lang="scss" scoped>
.tree-content-compontent {
background: white;
border-bottom: 2rpx solid #F7F7F7;
border-bottom: 2rpx solid #F7F7F7;
.content-box {
display: flex;
@ -67,7 +69,7 @@
position: relative;
// border-bottom: 2px solid #D6D6D6;
> .box-text {
>.box-text {
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 30rpx;
@ -79,12 +81,13 @@
overflow: hidden;
text-overflow: ellipsis;
}
.box-text1 {
font-weight: 500;
font-size: 28rpx;
color: #B3B3B3;
padding: 0 28rpx;
}
.box-text1 {
font-weight: 500;
font-size: 28rpx;
color: #B3B3B3;
padding: 0 28rpx;
}
}
.sub-component {
@ -92,7 +95,7 @@
.tree-content-compontent {
background: #FFFFFF;
border: none;
border: none;
}
}

5
main.js
View File

@ -107,7 +107,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'// 测试环境h5
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5
Vue.prototype.url_config = 'http://gszhdz.crpower.com.cn:9809/' // 敦煌环境h5
} else {
// 生产环境
@ -130,9 +130,10 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://101.43.164.214:11112/'// 新金湾
// Vue.prototype.work_url = 'http://101.43.164.214:11137'// 新金湾地址 通用
Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' // 测试环境h5
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' // 测试环境h5
// Vue.prototype.url_config = 'http://10.36.27.195:9809/' // 敦煌环境h5
Vue.prototype.url_config = 'http://gszhdz.crpower.com.cn:9809/' // 敦煌环境h5
// Vue.prototype.url_config = 'https://192.168.1.2/'// 青海中水北方
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' // 潮州项目h5

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
"versionName" : "1.7.8",
"versionCode" : 178,
"versionName" : "1.7.9",
"versionCode" : 179,
"transformPx" : false,
"sassImplementationName" : "node-sass",
/* 5+App特有相关 */

76
pages/areaTree/areaTree.vue
View File

@ -18,13 +18,13 @@
<text v-if="pageType=='video'&&item.projectName">({{item.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'&&item.projectName">
<image v-show="item.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 9px;height: 10px;"></image>
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 10px;height: 10px;"></image>
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 8px;height: 13px;"></image>
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 8px;height: 11px;"></image>
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<uni-icons2 v-show="item.showSon&&item.list" class="arrow" type="arrowup" size="20"></uni-icons2>
<uni-icons2 v-show="!item.showSon&&item.list" class="arrow" type="arrowdown" size="20">
@ -38,13 +38,13 @@
<text v-if="pageType=='video'&&item2.projectName">({{item2.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'&&item2.projectName">
<image v-show="item2.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 9px;height: 10px;"></image>
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item2.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 10px;height: 10px;"></image>
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item2.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 8px;height: 13px;"></image>
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item2.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 8px;height: 11px;"></image>
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<uni-icons2 v-show="item2.showSon&&item2.list" class="arrow" type="arrowup" size="20">
</uni-icons2>
@ -59,14 +59,14 @@
v-if="pageType=='video'&&item3.projectName">({{item3.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'&&item3.projectName">
<image v-show="item3.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 9px;height: 10px;"></image>
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;"></image>
<image v-show="item3.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png" style="width: 10px;height: 10px;">
src="/static/offline_alarm.png" style="width: 20rpx;height: 20rpx;">
</image>
<image v-show="item3.standardTemperatureAlarmNum!=0" class="icon-status"
src="/static/temp_alarm.png" style="width: 8px;height: 13px;"></image>
src="/static/temp_alarm.png" style="width: 16rpx;height: 13px;"></image>
<image v-show="item3.standardHumidityAlarmNum!=0" class="icon-status"
src="/static/humi_alarm.png" style="width: 8px;height: 11px;"></image>
src="/static/humi_alarm.png" style="width: 16rpx;height: 11px;"></image>
</view>
<!-- <uni-icons2 v-show="item3.showSon&&item3.list" class="arrow" type="arrowup" size="20"></uni-icons2>
<uni-icons2 v-show="!item3.showSon&&item3.list" class="arrow" type="arrowdown" size="20"></uni-icons2> -->
@ -78,17 +78,17 @@
v-if="pageType=='video'&&item4.projectName">({{item4.videoNum}})</text>
<view class="statusBox" v-if="pageType=='markRoom'">
<image v-show="item4.standardDevStopUsingNum!=0" class="icon-status"
src="/static/no_alarm.png" style="width: 9px;height: 10px;">
src="/static/no_alarm.png" style="width: 18rpx;height: 20rpx;">
</image>
<image v-show="item4.standardDevNotOnline!=0" class="icon-status"
src="/static/offline_alarm.png"
style="width: 10px;height: 10px;"></image>
style="width: 20rpx;height: 20rpx;"></image>
<image v-show="item4.standardTemperatureAlarmNum!=0"
class="icon-status" src="/static/temp_alarm.png"
style="width: 8px;height: 13px;"></image>
style="width: 16rpx;height: 13px;"></image>
<image v-show="item4.standardHumidityAlarmNum!=0"
class="icon-status" src="/static/humi_alarm.png"
style="width: 8px;height: 11px;"></image>
style="width: 16rpx;height: 11px;"></image>
</view>
</view>
</view>
@ -176,7 +176,8 @@
viewVideoListFn(item) {
if (this.pageType == 'video') {
uni.navigateTo({
url: '../videoManage/videoList?sn=' + item.projectSn
// url: '../videoManage/videoList?sn=' + item.projectSn
url: '../videoManage/videoGroup?sn=' + item.projectSn
})
} else if (this.pageType == 'markRoom') {
uni.setStorageSync('projectDetail', JSON.stringify({
@ -260,7 +261,7 @@
align-items: center;
.icon-status {
margin-left: 8px;
margin-left: 16rpx;
}
}
@ -271,16 +272,16 @@
}
// .areaTreeBox{
// padding: 0 10px;
// padding: 0 20rpx;
// }
.areaInner {
border-bottom: 1px solid rgba(221, 221, 221, 0.67);
}
.areaTitle {
font-size: 15px;
font-size: 30rpx;
border-bottom: 1px solid rgba(221, 221, 221, 0.67);
padding: 10px 15px;
padding: 20rpx 30rpx;
}
.arrow {
@ -290,16 +291,16 @@
.areaTitle2 {
font-size: 14px;
padding: 10px 15px 10px 30px;
padding: 20rpx 30rpx 20rpx 30px;
}
.projectTitle {
font-size: 14px;
padding: 10px 15px 10px 30px;
padding: 20rpx 30rpx 20rpx 30px;
}
.projectTitle2 {
padding-left: 50px;
padding-left: 100rpx;
}
.projectBox {
@ -307,22 +308,25 @@
}
.uni-input {
border-radius: 15px;
margin: 10px 10px;
border-radius: 30rpx;
margin: 20rpx 20rpx;
background-color: #f2f2f2;
height: 30px;
line-height: 30px;
padding: 0 20px;
font-size: 14px;
height: 60rpx;
line-height: 60rpx;
padding: 0 40rpx;
font-size: 28rpx;
width: 65%;
}
.uni-form-item {
position: relative;
}
.mini-btn {
position: absolute;
right: 15px;
top: 55px;
border-radius: 15px;
height: 30px;
line-height: 30px;
right: 30rpx;
top: 50%;
transform: translateY(-50%);
border-radius: 30rpx;
height: 60rpx;
line-height: 60rpx;
}
</style>

57
pages/projectEnd/bridgeCraneMonitor/index.vue
View File

@ -28,7 +28,7 @@
</view>
</u-collapse-item>
</u-collapse>
<u-tabs :bar-height="4" :font-size="28" active-color="#498CEC" inactive-color="#B3B3B3" :bar-width="140"
<u-tabs :bar-height="6" :font-size="28" active-color="#498CEC" inactive-color="#B3B3B3" :bar-width="140"
:list="list" :is-scroll="false" :current="current" @change="currentChange"></u-tabs>
</view>
<view class="content">
@ -73,7 +73,7 @@
<view></view>
</view>
</view>
<view class="bridge-video" v-if="!videoShow && videoFlag">
<view class="bridge-video" v-if="!videoShow && videoFlag && !bridgeInfo.collapseFlag">
<!-- APP环境使用web-view -->
<!-- #ifdef APP-PLUS -->
<video v-if="!isYsy" class="videoBox" id="myVideo" :custom-cache="false"
@ -210,8 +210,14 @@
</view>
<view class="box-main2-box_roll">
<view class="box-main2-box" v-for="(item,index) in countAlarmByCodeList" :key="index">
<view class="bg_color" :style="{'background-color': colorList[index]}"></view>
<view>{{item.name}}</view>
<view>
<view class="bg_color" :style="{'background-color': colorList[index]}"></view>
<view class="single-line">{{item.name}}</view>
</view>
<view>
<view class="mr_20">{{item.num}}次</view>
<view>{{percentageUp(item.num)}}%</view>
</view>
</view>
</view>
</template>
@ -480,11 +486,16 @@
videoId: "",
projectVideoConfig: {},
videoFlag: true,
webviewStyles: {
width: "100%",
height: "100%"
}
}
},
onLoad(opts) {
this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'));
this.getBridgeCraneDevList();
this.currentChange(this.current);
},
mounted() {
var that = this
@ -505,7 +516,7 @@
// 选择目标节点并获取其信息
query.select('.bridge-video').boundingClientRect(data => {
console.log(data.top); // 输出节点信息
if((that.mobileTopHeight + 44) < data.top) {
if ((that.mobileTopHeight + 44) < data.top) {
that.videoFlag = true;
} else {
that.videoFlag = false;
@ -883,7 +894,16 @@
const find = alarmTypeCodeList.find((item) => item.id == val);
return find ? find.title : "--";
};
}
},
percentageUp() {
return (count) => {
const countTotal = this.countAlarmByCodeList.reduce((prev, item) => {
prev += item.num;
return prev
}, 0)
return (count / countTotal * 100).toFixed(2)
}
},
},
}
</script>
@ -1315,11 +1335,32 @@
justify-content: space-between;
.box-main2-box {
width: 50%;
width: 100%;
font-size: 28rpx;
color: #1A1A1A;
display: flex;
align-items: center;
justify-content: space-between;
>view:first-child {
width: 65%;
}
>view {
display: flex;
align-items: center;
}
.single-line {
width: 90%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.mr_20 {
margin-right: 20rpx;
}
.bg_color {
width: 32rpx;
@ -1329,7 +1370,7 @@
}
}
>view:nth-child(n + 3) {
>view:nth-child(n + 2) {
margin-top: 26rpx;
}
}

6
pages/videoManage/playBackList.vue
View File

@ -63,6 +63,7 @@
}
],
tabActive: 0,
projectSn: "",
};
},
onLoad(options) {
@ -70,6 +71,9 @@
this.pageSupportData = JSON.parse(options.obj)
this.pageNo = 1;
this.timeRange = [dateformat(new Date(), "yyyy-MM-dd"), dateformat(new Date(), "yyyy-MM-dd")]
if(options.sn) {
this.projectSn = options.sn;
}
this.loadData()
},
onReachBottom() {
@ -86,7 +90,7 @@
this.tabActive = val;
if (this.tabActive == 0) {
uni.redirectTo({
url: `playVideo?tabActive=${this.tabActive}`
url: `playVideo?tabActive=${this.tabActive}&sn=${this.projectSn}`
})
}
},

123
pages/videoManage/playVideo.vue
View File

@ -25,53 +25,55 @@
<web-view :src="ysyPlayUrl" :style="webviewStyles" :webview-styles="webviewConfig"></web-view>
<!-- #endif -->
</view>
<view class="videoName">
<view class="view-set" @click="setSpeed">
<image src="@/static/videoControlIcon/view-set.png" class="bg"></image>
<text>球机转速</text>
<view class="video-box">
<view class="videoName">
<view class="view-set" @click="setSpeed">
<image src="@/static/videoControlIcon/view-set.png" class="bg"></image>
<text>球机转速</text>
</view>
<!-- {{videoInfo.videoName}} -->
<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn"
@click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
</view>
<!-- {{videoInfo.videoName}} -->
<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn"
@click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
<view class="videoOperateBox">
<!-- <text class="desc">当前云台速度：{{ this.opSize }}</text> -->
<view class="box">
<image src="@/static/videoControlIcon/bg1.png" class="bg"></image>
<view class="pic top" :class="{'topActive': typeName == 'UP' && videoFlag}"
@click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left" :class="{'leftActive': typeName == 'LEFT' && videoFlag}"
@click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom" :class="{'bottomActive': typeName == 'DOWN' && videoFlag}"
@click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right" :class="{'rightActive': typeName == 'RIGHT' && videoFlag}"
@click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<!-- <view class="pic center" @click="stop()"></view> -->
</view>
<!-- <view class="box2">
<view class="zoom zoomin"
:style="{backgroundImage: typeName == 'ZOOM_OUT' && videoFlag?'url(@/static/videoControlIcon/2.png)':'url(@/static/videoControlIcon/1.png)'}"
@click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
<view class="zoom zoomout"
:style="{backgroundImage: typeName == 'ZOOM_IN' && videoFlag?'url(@/static/videoControlIcon/4.png)':'url(@/static/videoControlIcon/3.png)'}"
@click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
</view> -->
<view @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')" class="box-left box-main">
<u-icon name="minus" color="#EFEFEF" size="60"></u-icon>
</view>
<view @click="controlVideoFn(0,0,0.2,'ZOOM_IN')" class="box-right box-main">
<u-icon name="plus" color="#EFEFEF" size="60"></u-icon>
</view>
<!-- <view class="video-playback" v-if="videoConfig.videoType != 1" @click="toBackList">
视频回放
</view> -->
<!-- <view class="set-speed">
<u-button @click="setSpeed" type="primary">设置球机转动速度</u-button>
</view> -->
</view>
<!-- #ifdef H5 -->
<view class="voice-icon" @click="btnStart"></view>
<!-- #endif -->
</view>
<view class="videoOperateBox">
<!-- <text class="desc">当前云台速度：{{ this.opSize }}</text> -->
<view class="box">
<image src="@/static/videoControlIcon/bg1.png" class="bg"></image>
<view class="pic top" :class="{'topActive': typeName == 'UP' && videoFlag}"
@click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left" :class="{'leftActive': typeName == 'LEFT' && videoFlag}"
@click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom" :class="{'bottomActive': typeName == 'DOWN' && videoFlag}"
@click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right" :class="{'rightActive': typeName == 'RIGHT' && videoFlag}"
@click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<!-- <view class="pic center" @click="stop()"></view> -->
</view>
<!-- <view class="box2">
<view class="zoom zoomin"
:style="{backgroundImage: typeName == 'ZOOM_OUT' && videoFlag?'url(@/static/videoControlIcon/2.png)':'url(@/static/videoControlIcon/1.png)'}"
@click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
<view class="zoom zoomout"
:style="{backgroundImage: typeName == 'ZOOM_IN' && videoFlag?'url(@/static/videoControlIcon/4.png)':'url(@/static/videoControlIcon/3.png)'}"
@click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
</view> -->
<view @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')" class="box-left box-main">
<u-icon name="minus" color="#EFEFEF" size="60"></u-icon>
</view>
<view @click="controlVideoFn(0,0,0.2,'ZOOM_IN')" class="box-right box-main">
<u-icon name="plus" color="#EFEFEF" size="60"></u-icon>
</view>
<!-- <view class="video-playback" v-if="videoConfig.videoType != 1" @click="toBackList">
视频回放
</view> -->
<!-- <view class="set-speed">
<u-button @click="setSpeed" type="primary">设置球机转动速度</u-button>
</view> -->
</view>
<!-- #ifdef H5 -->
<view class="voice-icon" @click="btnStart"></view>
<!-- #endif -->
<u-tabbar :value="tabActive" @change="handleChangeTab" :list="tabList" activeColor="#498CEC"
inactiveColor="#4D4D4D"></u-tabbar>
@ -157,15 +159,23 @@
sosSDK: null,
taskCode: [], // 对讲任务码
useConfigInfo: {},
webviewStyles: {
width: "100%",
height: "100%"
}
};
},
onLoad(options) {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
//videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
// this.url = options.url
this.tabActive = options.tabActive;
this.videoInfo = uni.getStorageSync('videoInfo');
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
if (options.sn) {
this.projectSn = options.sn;
} else {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
}
this.opSize = Number(uni.getStorageSync('videoOpSize') || 20);
this.streamType = this.videoInfo.defaultStreamType;
console.log(7777, this.videoInfo)
@ -355,7 +365,7 @@
url: `./playBackList?obj=${JSON.stringify({
...this.videoResponseInfo,
...this.videoInfo
})}&tabActive=${this.tabActive}`
})}&tabActive=${this.tabActive}&sn=${this.projectSn}`
})
},
changeStreamFn() {
@ -498,6 +508,11 @@
</script>
<style lang="scss" scoped>
.video-box {
position: relative;
height: 900rpx;
}
.voice-main {
padding: 36rpx 26rpx 18rpx;
height: 400rpx;
@ -593,7 +608,8 @@
background-size: 100% 100%;
position: absolute;
left: 50%;
bottom: 186rpx;
// bottom: 186rpx;
bottom: 0;
transform: translateX(-50%);
}
@ -622,7 +638,7 @@
/* #ifdef H5 */
.fullHeight {
background-color: #F4F5FD;
height: 100vh;
min-height: 100vh;
}
/* #endif */
@ -630,7 +646,7 @@
/* #ifdef MP-WEIXIN */
.fullHeight {
background-color: #F4F5FD;
height: 100vh;
min-height: 100vh;
}
/* #endif */
@ -638,8 +654,9 @@
/* #ifdef APP-PLUS */
.fullHeight {
background-color: #F4F5FD;
height: auto;
padding-bottom: 60rpx;
// height: auto;
// padding-bottom: 60rpx;
min-height: 100vh;
}
/* #endif */

12
pages/videoManage/videoGroup.vue
View File

@ -12,7 +12,7 @@
</view>
</view>
<view class="content-part" :style="{ 'padding-top': statusBarHeight + 110 + 'px' }">
<tree-menu v-for="(item,index) in treeData" :key="item.id" :item="item" :treeIndex="treeIndex"
<tree-menu :iconShow="true" v-for="(item,index) in treeData" :key="item.id" :item="item" :treeIndex="treeIndex"
@clickItem="clickTreeItem"></tree-menu>
</view>
<levitatedsphere :x="100" :y="80"></levitatedsphere>
@ -37,16 +37,20 @@
searchName: "",
}
},
onLoad() {
onLoad(options) {
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
if(options.sn){
this.projectSn = options.sn;
}else {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
}
this.getVideoGroup();
},
methods: {
clickTreeItem(item) {
console.log(item, 777888)
uni.navigateTo({
url: './videoList?obj=' + JSON.stringify(item)
url: `./videoList?obj=${JSON.stringify(item)}&sn=${this.projectSn}`
})
},
getVideoGroup() {

13
pages/videoManage/videoList.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="fullHeight">
<scroll-view scroll-y="true">
<scroll-view scroll-y="true" style="background-color: #EFF3F7;">
<view class="fixedheader">
<headers :showBack="true" :themeType="true">
<view class="headerName"> 视频播放列表 </view>
@ -58,7 +58,13 @@
if (options.obj) {
this.groupInfo = JSON.parse(options.obj)
}
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
console.log(options)
if(options.sn) {
this.projectSn = options.sn;
} else {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
}
this.getUseProjectVideoConfig();
},
methods: {
@ -87,7 +93,7 @@
// if(item.liveRadioUrl){
uni.navigateTo({
// url:'./playVideo?url='+item.liveRadioUrl,
url: `playVideo?tabActive=${0}`
url: `playVideo?tabActive=${0}&&sn=${this.projectSn}`
})
// }
@ -229,6 +235,7 @@
padding: 20rpx 26rpx;
position: relative;
display: flex;
background-color: #EFF3F7;
.uni-input {
border: 2rpx solid #e4e4e4;