From b4c057a08d234bfd2ae1eed7b6f4e9b104f1c6ac Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 24 Feb 2023 11:08:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/components/assemble/index.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/assemble/index.vue b/src/components/assemble/index.vue
index c0bc7c7..0de4036 100644
--- a/src/components/assemble/index.vue
+++ b/src/components/assemble/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-02-23 09:09:09
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-23 17:33:32
+ * @LastEditTime: 2023-02-24 09:03:59
* @FilePath: \srs-police-affairs\src\components\assemble\index.vue
* @Description: 聚合图标点的点击事件
*
@@ -34,7 +34,7 @@
<el-table-column :show-overflow-tooltip="true" prop="name" label="设备名称" min-width="320%"></el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="channelId" label="通道编号"
min-width="160%"></el-table-column>
- <el-table-column :show-overflow-tooltip="true" prop="policeStationName" label="所属派出所"
+ <el-table-column :show-overflow-tooltip="true" prop="deptName" label="所属派出所"
min-width="140%"></el-table-column>
<el-table-column label="设备状态">
<template slot-scope="scope">
@@ -56,6 +56,8 @@
@current-change="handleCurrentChange"></el-pagination>
</div>
</el-dialog>
+
+ <play-video ref="videoBox"></play-video>
</div>
</template>
@@ -86,7 +88,7 @@
computed: {
currentData () {
return this.searchData.filter((item, index) =>
- index > (this.pages.current - 1) * this.pages.size && index <= this.pages.current * this.pages.size
+ index >= (this.pages.current - 1) * this.pages.size && index < this.pages.current * this.pages.size
)
}
},
@@ -104,6 +106,7 @@
layerName: 'cameraLayers',
ids: e.target.id,
cb (data) {
+ console.log(data, 456)
that.tableData = data
that.searchData = data
that.pages.current = 1
@@ -128,8 +131,10 @@
* @description: 视频播放
* @return {*}
*/
- play () {
+ // 设备的视频播放
+ play (row) {
+ this.$refs.videoBox.play(row)
},
/**
--
Gitblit v1.9.3