From 0e68368c1df02acb4e96c14b7f4a307d369f1415 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 17:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/systemSetting/device/point/index.vue | 163 +++++++++++-------------------------------------------
1 files changed, 34 insertions(+), 129 deletions(-)
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index 925d4b3..32368c0 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -1,33 +1,24 @@
<template>
<el-container style="height: 100%;">
<el-aside heigth="100%" width="200px ">
- <div style="line-height: 40px;text-align: left;padding: 0 20px 0 10px;">
- <span style="color:rgb(75, 155, 183);font-weight: 500; width: 196px;">缁勭粐鏈烘瀯</span>
- <el-input placeholder="璇疯緭鍏ユ満鏋�"></el-input>
- </div>
- <el-tree :data="treedata" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-
-
+ <department-aside @selectedDepartment="selectedDepartment" />
</el-aside>
<el-container>
<el-header style="display:flex;flex-direction: column;height: 120px;">
<div style="display:flex;justify-content: space-between;height: 80px;">
<span style="color:rgb(75, 155, 183);font-weight: 450;text-align: left; font-size: 16px;">褰撳墠鍏�8涓洃鎺х偣浣嶏紝鏈�澶氶厤缃�100璺棰戠洃鎺э紝鐩墠宸茬粡閰嶇疆200璺棰戠偣</span>
- <!-- <el-button type="primary" >鍒犻櫎</el-button> -->
</div>
<div style="height:60px;display: flex;justify-content: flex-start;">
</div>
</el-header>
<el-main style="display:flex;flex-wrap: wrap;overflow-y: scroll;">
- <div v-for="item in videoDate " style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
+ <div v-for="item in videoData" style="height: 240px ;width: 210px; position: relative;margin-left:20px ;">
<div
style="color:rgb(75, 155, 183); font-size: 11px;line-height: 18px; position: absolute; z-index: 1;left: 50px;">
- {{ item.steert }}{{ item.community }}</div>
- <video id="my-video" class="video-js" controls preload="auto" width="210px" height="150px"
- :poster="item.imageUrl" data-setup="{}">
- <source :src="item.videoUrl" type="video/mp4" />
+ {{ item.name }}{{ item.community }}</div>
+ <video id="my-video" :src="item.urlAddress" class="video-js" controls preload="auto" width="210px" height="150px">
</video>
<div class="bottonOne" @click="">鏌ョ湅瑙嗛</div>
<div class="bottonTwo">瑙嗛涓婃姤</div>
@@ -36,8 +27,8 @@
</el-main>
<el-footer>
<div style="margin-bottom:0;">
- <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
- :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev" @next-click="handleNext">
+ <el-pagination :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
+ :page-size="pageSize">
</el-pagination>
</div>
</el-footer>
@@ -143,128 +134,42 @@
color: rgb(75, 155, 183);
}
</style>
-<script src="https://vjs.zencdn.net/7.20.3/video.min.js"></script>
<script>
+import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
+import videoPoint from "@/api/system/videoPoint";
+
export default {
+ components: { departmentAside },
+ created() {
+ this.getVideoPointList();
+ },
data() {
return {
- totalNum:7,
- pageSize:10,
- videoDate:[
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- },
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- },
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- }
- ,
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- },
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- }
- ,
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- },
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- },
- {
- id:12,
- steert:"xx琛楅亾",
- community:"xxx绀惧尯",
- imageUrl:"https://img2.baidu.com/it/u=2526846893,15288996&fm=253&fmt=auto&app=138&f=JPG?w=738&h=500",
- videoUrl:"http://vali-g1.cp31.ott.cibntv.net/youku/65730720cb94e7220271a3c96/0300080100632D30A3E43019FD116537F5162F-1035-48AC-BE1B-602DF0E92893.mp4?sid=166729534400010004780_00_Bda935cf9a33346c593fc27da8e694df3&sign=db39289573d143cf6e1ad8d8dff36682&ctype=50&si=183&psid=c732c4364319e7ef4685d8f1a568015941346"
- }
- ],
- treedata: [{
- label: '濡欓珮琛楅亾',
- children: [{
- label: '鍖楄鏉�',
- children: [{
- label: '铻鸿洺鍨�'
- }]
- },{
- label: '涓滆鏉�',
- children: [{
- label: '铻鸿洺鍨�'
- }]
- },{
- label: '鍙ら櫌绀惧尯',
- children: [{
- label: '铻鸿洺鍨�'
- }]
- }]
- }, {
- label: '浜戝嘲琛楅亾',
- children: [{
- label: '涓滀涵',
- children: [{
- label: '闅旀邯'
- }]
- }, {
- label: '椹ご',
- children: [{
- label: '榫欏彛'
- }]
- }]
- }, {
- label: '鏂拌矾婀鹃晣',
- children: [{
- label: '鏂拌矾婀鹃晣',
- children: [{
- label: '鏂拌矾婀鹃晣'
- }]
- }, {
- label: '鏂拌矾婀鹃晣',
- children: [{
- label: '鏂拌矾婀鹃晣'
- }]
- }]
- }],
- defaultProps: {
- children: 'children',
- label: 'label'
- },
+ currentPage: 1,
+ totalNum: 10,
+ pageSize: 10,
+ videoData: [],
value:''
};
},
methods: {
- handleNodeClick(data) {
- console.log(data);
+ getVideoPointList(data) {
+ let communityId, streetId;
+ if (data) {
+ communityId = data.parentId;
+ streetId = data.id;
+ }
+ videoPoint.getVideoPointList({ current: this.currentPage, size: this.pageSize, communityId, streetId })
+ .then(({ records, total }) => {
+ this.videoData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message.error(err))
+ },
+ selectedDepartment(data) {
+ if (!data.children) {
+ this.getVideoPointList(data);
+ }
}
}
};
--
Gitblit v1.8.0