diff --git a/src/views/equipmentCenter/videoManage/cameraList.vue b/src/views/equipmentCenter/videoManage/cameraList.vue
index ea9526d0..1a193112 100644
--- a/src/views/equipmentCenter/videoManage/cameraList.vue
+++ b/src/views/equipmentCenter/videoManage/cameraList.vue
@@ -10,10 +10,10 @@
-
{{ $t('message.videoManage.equipment_list.name') }}：{{
- i.videoInfo.deviceName
+ i.videoName
}}
- -
+
+
-
-
+
-
-
+
-->
+
-
-
+
-->
+
-
+ -->
+
+
+ 通道号：{{ i.verificationCode }}
- -
+
-
{
+ console.log('result=========数据',result);
if (result.success) {
this.cameraList = result.result
console.log('videoInfo', this.videoInfo, '视频列表', this.cameraList)
@@ -392,20 +399,21 @@ export default {
console.log('编辑的item', obj)
},
beforeDelete(itemId) {
+ console.log('删除的设备信息', itemId)
+
this.Popup.delete = true
this.Popup.params.itemId = itemId.itemId
- this.Popup.title = itemId.videoInfo.deviceName
- console.log('删除的设备', itemId.videoInfo.deviceName)
+ this.Popup.title = itemId.videoName
},
ToDelete() {
deleteVideoItemApi({ itemId: this.Popup.params.itemId }).then(
(result) => {
console.log('删除成功', result)
- if (result.success) {
+
this.$message.success(result.message)
this.Popup.newVideo = false
this.getSelectVideoItemListByTypeApi()
- }
+
}
)
}
diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue
index 72080425..77248c60 100644
--- a/src/views/equipmentCenter/videoManage/videoConfig.vue
+++ b/src/views/equipmentCenter/videoManage/videoConfig.vue
@@ -545,7 +545,6 @@
diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
index 3e92de37..a4df6030 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue
@@ -49,6 +49,15 @@ export default {
data() {
return {
contentList: [
+ {
+ time: '2023-04-02',
+ question: 1,
+ utils: '中国建筑第四工程局有限公司',
+ safe: '王昊',
+ type: '安全',
+ position: '地下室',
+ change: '是'
+ },
{
time: '2023-03-16',
question: 1,
diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
index 634927c0..79aff5bd 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
@@ -43,6 +43,141 @@ export default {
data() {
return {
dataList: [
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴首层梁板',
+ quantity: 1131.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴首层梁板',
+ quantity: 1131.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴首层梁板',
+ quantity: 1131.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1/2轴-4轴xD-H轴首层型钢梁',
+ quantity: 97.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1/2轴-4轴xD-H轴首层型钢梁',
+ quantity: 97.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层钢管柱',
+ quantity: 30
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层钢管柱',
+ quantity: 30
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层型钢柱 ',
+ quantity: 112.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层型钢柱 ',
+ quantity: 112.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层外墙 ',
+ quantity: 282.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层外墙 ',
+ quantity: 282.5
+ },
+ {
+ date: '2023/3/26',
+ building: '1-4轴×C-K轴负一层外墙 ',
+ quantity: 282.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1/2轴-4轴×D-H轴首层型钢梁 ',
+ quantity: 70.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1/2轴-4轴×D-H轴首层型钢梁 ',
+ quantity: 70.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层外墙 ',
+ quantity: 488
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层外墙 ',
+ quantity: 488
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层外墙 ',
+ quantity: 488
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层内墙、柱 ',
+ quantity: 375.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层内墙、柱 ',
+ quantity: 375.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层内墙、柱 ',
+ quantity: 375.5
+ },
+ {
+ date: '2023/3/23',
+ building: '负一层核心筒剪力墙、柱 ',
+ quantity: 333
+ },
+ {
+ date: '2023/3/23',
+ building: '负一层核心筒剪力墙、柱 ',
+ quantity: 333
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴首层梁、板 ',
+ quantity: 1288.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴首层梁、板 ',
+ quantity: 1288.5
+ },
+ {
+ date: '2023/3/23',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴首层梁、板 ',
+ quantity: 1288.5
+ },
+ {
+ date: '2023/3/20',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层钢管柱 ',
+ quantity: 103
+ },
+ {
+ date: '2023/3/20',
+ building: '1-4轴×A-C轴及4-8轴×A-K轴负一层钢管柱 ',
+ quantity: 103
+ },
{
date: '2023/3/1',
building: '1-4轴×C-K轴及1-1/2轴往西5.5米×A-C轴负一层梁板 ',
diff --git a/src/views/projectFront/videoManage/ysyNew.vue b/src/views/projectFront/videoManage/ysyNew.vue
index 68c12fed..918a1368 100644
--- a/src/views/projectFront/videoManage/ysyNew.vue
+++ b/src/views/projectFront/videoManage/ysyNew.vue
@@ -17,13 +17,14 @@
:key="item"
:class="select == 1 ? 'width' : select == 2 ? 'width2' : 'width3'"
style="position: relative"
+ @click="pieceClick(item)"
>
@@ -89,25 +90,33 @@ export default {
searchList: [],
devList: [],
demoList: [],
- sceencount: 1, // 当前窗口是几分屏（1、4、9）
- indextest: 0
+ indextest: 0,
+ Istrue: false,
}
},
- created() {},
+ created() { },
mounted() {
//向父组件取的数据
this.devList = this.$props.ysyParams
console.log('this.$props.ysyParams', this.$props.ysyParams)
- this.ysyBtn(this.devList, this.indextest, this.sceencount)
+ this.ysyBtn(this.devList, this.indextest, this.select)
},
watch: {
ysyParams: function (a, b) {
console.log('父组件传递的数据 ysyParams :', a)
- this.indextest++
console.log('父组件传递的数据 this.devList :', this.devList)
- var index = this.devList.findIndex((item) => item.url == a[0].url)
- this.selectVideoFirst = index + 1
+ if (this.select == 1) {
+ var index = this.devList.findIndex((item) => item.url == a[0].url)
+ this.selectVideoFirst = index + 1
+ } else {
+ var index = this.devList.findIndex((item) => item.url == a[0].url)
+ let devs = []
+ devs.push(this.devList[index])
+ console.log('块的点击事件：', devs)
+ this.ysyBtn(devs, this.indextest, this.select)
+ }
+
// this.select = 1
// this.devList.forEach((item, index) => {
// if (item.url == a[0].url) {
@@ -153,19 +162,40 @@ export default {
})
},
methods: {
+ mouseenterName() {
+ this.Istrue = true;
+ },
+ mouseleaveName() {
+ this.Istrue = false;
+ },
+ pieceClick(item) {
+ this.indextest = item
+ // let devs = []
+ // devs.push(this.devList[item - 1])
+ console.log('块的点击事件：', item)
+ // this.ysyBtn(devs,item+1,this.select)
+ },
// 视频播放数据 视频容器id（所在窗口） 当前窗口是几分屏（1、4、9）
- ysyBtn(item) {
+ ysyBtn(item, indeBtn, selectIndex) {
+
item.forEach((item2, index) => {
+ let container;
+ console.log('块的点击事件：', indeBtn)
+ if (indeBtn == 0) {
+ container = `video-container${index + 1}`;
+ } else {
+ container = `video-container${indeBtn}`;
+ }
console.log('item :', item2 + 'index', index)
var player = new EZUIKit.EZUIKitPlayer({
autoplay: true,
audio: '0',
- id: `video-container${index + 1}`, // 视频容器ID
+ id: container, // 视频容器ID
accessToken: item2.token,
url: item2.url, // 初始化写死一个离线或者找不到的设备，避免初始化无法创建播放器；
template: 'simple',
- width: this.$refs.videoBox.offsetWidth,
- height: this.$refs.videoBox.offsetHeight
+ width: this.$refs.videoBox.offsetWidth / selectIndex,
+ height: this.$refs.videoBox.offsetHeight / selectIndex
})
item2.player = player
})
@@ -176,6 +206,7 @@ export default {