diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8795d6a..891804d 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -183,6 +183,16 @@
params: query,
});
}
+
+// 视频单独的弹框菜单
+export function drainageDispatchGetMenuVidoe(query) {
+ return request({
+ url: `/business/drainageMap/getMenu`,
+ method: 'get',
+ params: query,
+ });
+}
+
// 汇水分区查询关联7类数据 get id
export function getWaterRegionData(query) {
return request({
@@ -380,4 +390,4 @@
method: 'get',
params: query,
});
-}
\ No newline at end of file
+}
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8795d6a..891804d 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -183,6 +183,16 @@
params: query,
});
}
+
+// 视频单独的弹框菜单
+export function drainageDispatchGetMenuVidoe(query) {
+ return request({
+ url: `/business/drainageMap/getMenu`,
+ method: 'get',
+ params: query,
+ });
+}
+
// 汇水分区查询关联7类数据 get id
export function getWaterRegionData(query) {
return request({
@@ -380,4 +390,4 @@
method: 'get',
params: query,
});
-}
\ No newline at end of file
+}
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 777aa13..cfbc3ac 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -47,7 +47,7 @@
import bus from '@/bus';
import useUserStore from '@/store/modules/user';
import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
-import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import { drainageDispatchGetMenu, drainageDispatchGetMenuVidoe } from '@/api/MonitorAssetsOnMap';
import recordPage from '@/views/voice/recordPage/index';
import usepartitionStore from '@/store/modules/partition';
@@ -101,10 +101,6 @@
'gateStation', //闸门
'pump_water_level', //泵站液位
'outlet_water_level_city', //排口流量
-
- // 'gangqu_video', // 港渠视频、
- // 'water_logging_video', // 渍水点视频
- // 'pump_video', // 泵站视频
]);
// 基本数据
const arrid = ref([
@@ -263,6 +259,31 @@
console.log('type', type);
GetcomIDs.value = [];
let dataId = '';
+
+ if (videoList.value.includes(type)) {
+ // 视频单独的获取菜单的
+ let params = {
+ dataCode: type,
+ scene: 'basis_monitor',
+ };
+ drainageDispatchGetMenuVidoe(params).then(res => {
+ console.log('获得的菜单', res.data);
+ Getmenuarr.value = res.data;
+ if (res.data && res.data.length) {
+ res.data.map(item => {
+ GetcomIDs.value.push(item.moduleName);
+ });
+ }
+
+ dialogConfig.visible = true;
+ dialogConfig.dataCode = type;
+ dialogConfig.dataID = Getproperties.value.stCode;
+ dialogConfig.comIDs = GetcomIDs.value;
+ });
+
+ return;
+ }
+
if (arrstcode.value.includes(type)) {
dataId = Getproperties.value.stCode;
}
@@ -270,6 +291,7 @@
if (arrid.value.includes(type)) {
dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
}
+
console.log('dataId', dataId);
if (!dataId) {
//渍水调度
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8795d6a..891804d 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -183,6 +183,16 @@
params: query,
});
}
+
+// 视频单独的弹框菜单
+export function drainageDispatchGetMenuVidoe(query) {
+ return request({
+ url: `/business/drainageMap/getMenu`,
+ method: 'get',
+ params: query,
+ });
+}
+
// 汇水分区查询关联7类数据 get id
export function getWaterRegionData(query) {
return request({
@@ -380,4 +390,4 @@
method: 'get',
params: query,
});
-}
\ No newline at end of file
+}
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 777aa13..cfbc3ac 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -47,7 +47,7 @@
import bus from '@/bus';
import useUserStore from '@/store/modules/user';
import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
-import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import { drainageDispatchGetMenu, drainageDispatchGetMenuVidoe } from '@/api/MonitorAssetsOnMap';
import recordPage from '@/views/voice/recordPage/index';
import usepartitionStore from '@/store/modules/partition';
@@ -101,10 +101,6 @@
'gateStation', //闸门
'pump_water_level', //泵站液位
'outlet_water_level_city', //排口流量
-
- // 'gangqu_video', // 港渠视频、
- // 'water_logging_video', // 渍水点视频
- // 'pump_video', // 泵站视频
]);
// 基本数据
const arrid = ref([
@@ -263,6 +259,31 @@
console.log('type', type);
GetcomIDs.value = [];
let dataId = '';
+
+ if (videoList.value.includes(type)) {
+ // 视频单独的获取菜单的
+ let params = {
+ dataCode: type,
+ scene: 'basis_monitor',
+ };
+ drainageDispatchGetMenuVidoe(params).then(res => {
+ console.log('获得的菜单', res.data);
+ Getmenuarr.value = res.data;
+ if (res.data && res.data.length) {
+ res.data.map(item => {
+ GetcomIDs.value.push(item.moduleName);
+ });
+ }
+
+ dialogConfig.visible = true;
+ dialogConfig.dataCode = type;
+ dialogConfig.dataID = Getproperties.value.stCode;
+ dialogConfig.comIDs = GetcomIDs.value;
+ });
+
+ return;
+ }
+
if (arrstcode.value.includes(type)) {
dataId = Getproperties.value.stCode;
}
@@ -270,6 +291,7 @@
if (arrid.value.includes(type)) {
dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
}
+
console.log('dataId', dataId);
if (!dataId) {
//渍水调度
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
index f00b69a..acfd6af 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
@@ -60,20 +60,7 @@
],
});
const cameraName = ref('');
-const leftList = ref([
- {
- name: '视频1',
- value: '1',
- },
- {
- name: '视频2',
- value: '2',
- },
- {
- name: '视频3',
- value: '3',
- },
-]);
+const leftList = ref([]);
// 左侧点击
function leftclick(item) {
@@ -82,6 +69,7 @@
// 获取监控视频列表
function GetcameraList() {
+ console.log('props.videoList', props.videoList);
// 如果是单独视频站点的类型 就没有多个 不用查询 直接赋值点击地图获取到的stcode
if (props.videoList.includes(props.dataCode)) {
AllData.cameraIndexCode = props.dataId;
@@ -114,8 +102,14 @@
}
onMounted(() => {
+ console.log('搞什么啊', props, props.dataId);
GetcameraList();
- console.log('props', props);
+});
+onBeforeUnmount(() => {
+ if (AllData.myVideoPlayer) {
+ hideDHPlayer();
+ AllData.myVideoPlayer.destroy();
+ }
});
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 8795d6a..891804d 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -183,6 +183,16 @@
params: query,
});
}
+
+// 视频单独的弹框菜单
+export function drainageDispatchGetMenuVidoe(query) {
+ return request({
+ url: `/business/drainageMap/getMenu`,
+ method: 'get',
+ params: query,
+ });
+}
+
// 汇水分区查询关联7类数据 get id
export function getWaterRegionData(query) {
return request({
@@ -380,4 +390,4 @@
method: 'get',
params: query,
});
-}
\ No newline at end of file
+}
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 777aa13..cfbc3ac 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -47,7 +47,7 @@
import bus from '@/bus';
import useUserStore from '@/store/modules/user';
import DialogTabs from '@/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue';
-import { drainageDispatchGetMenu } from '@/api/MonitorAssetsOnMap';
+import { drainageDispatchGetMenu, drainageDispatchGetMenuVidoe } from '@/api/MonitorAssetsOnMap';
import recordPage from '@/views/voice/recordPage/index';
import usepartitionStore from '@/store/modules/partition';
@@ -101,10 +101,6 @@
'gateStation', //闸门
'pump_water_level', //泵站液位
'outlet_water_level_city', //排口流量
-
- // 'gangqu_video', // 港渠视频、
- // 'water_logging_video', // 渍水点视频
- // 'pump_video', // 泵站视频
]);
// 基本数据
const arrid = ref([
@@ -263,6 +259,31 @@
console.log('type', type);
GetcomIDs.value = [];
let dataId = '';
+
+ if (videoList.value.includes(type)) {
+ // 视频单独的获取菜单的
+ let params = {
+ dataCode: type,
+ scene: 'basis_monitor',
+ };
+ drainageDispatchGetMenuVidoe(params).then(res => {
+ console.log('获得的菜单', res.data);
+ Getmenuarr.value = res.data;
+ if (res.data && res.data.length) {
+ res.data.map(item => {
+ GetcomIDs.value.push(item.moduleName);
+ });
+ }
+
+ dialogConfig.visible = true;
+ dialogConfig.dataCode = type;
+ dialogConfig.dataID = Getproperties.value.stCode;
+ dialogConfig.comIDs = GetcomIDs.value;
+ });
+
+ return;
+ }
+
if (arrstcode.value.includes(type)) {
dataId = Getproperties.value.stCode;
}
@@ -270,6 +291,7 @@
if (arrid.value.includes(type)) {
dataId = Getproperties.value.pid ? Getproperties.value.pid : Getproperties.value.id;
}
+
console.log('dataId', dataId);
if (!dataId) {
//渍水调度
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
index f00b69a..acfd6af 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ShiPingJianKong.vue
@@ -60,20 +60,7 @@
],
});
const cameraName = ref('');
-const leftList = ref([
- {
- name: '视频1',
- value: '1',
- },
- {
- name: '视频2',
- value: '2',
- },
- {
- name: '视频3',
- value: '3',
- },
-]);
+const leftList = ref([]);
// 左侧点击
function leftclick(item) {
@@ -82,6 +69,7 @@
// 获取监控视频列表
function GetcameraList() {
+ console.log('props.videoList', props.videoList);
// 如果是单独视频站点的类型 就没有多个 不用查询 直接赋值点击地图获取到的stcode
if (props.videoList.includes(props.dataCode)) {
AllData.cameraIndexCode = props.dataId;
@@ -114,8 +102,14 @@
}
onMounted(() => {
+ console.log('搞什么啊', props, props.dataId);
GetcameraList();
- console.log('props', props);
+});
+onBeforeUnmount(() => {
+ if (AllData.myVideoPlayer) {
+ hideDHPlayer();
+ AllData.myVideoPlayer.destroy();
+ }
});
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/videoOne.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/videoOne.vue
deleted file mode 100644
index 16f461f..0000000
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/videoOne.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-
-