diff --git a/packages/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
index fa6e3f77..c0ea5caf 100644
--- a/packages/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
@@ -13,18 +13,13 @@
-
-
{{ m.name }}
-
-
- 关闭视频
-
+ class="videoBox"
+ v-for="(m, i) in monitors"
+ :key="m.id"
+ @mouseenter.stop="m.isShowPlayBtn = true"
+ @mouseleave.stop="m.isShowPlayBtn = false"
+ :style="currentSplitStyle">
+
@@ -47,7 +42,7 @@
import {mapState} from 'vuex'
import DeviceSlider from "../components/deviceSlider";
import LocateDialog from "../components/locateDialog";
-import AiMonitor from "dvcp-dv-ui/components/AiMonitor/AiMonitor";
+import AiMonitor from "../components/AiSlwVideo";
export default {
name: "AppISManage",
diff --git a/packages/IntelligentSecurity/components/AiSlwVideo.vue b/packages/IntelligentSecurity/components/AiSlwVideo.vue
new file mode 100644
index 00000000..a1447df1
--- /dev/null
+++ b/packages/IntelligentSecurity/components/AiSlwVideo.vue
@@ -0,0 +1,332 @@
+
+
+
+
{{ name }}
+
+
+ 关闭视频
+
+
+
+
+
+
+ 实时
+ 历史
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index 72409299..a7a6b9b9 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -136,6 +136,12 @@
+
diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue
index c465f0c2..b24f25c3 100644
--- a/packages/bigscreen/designer/components/RenderElement.vue
+++ b/packages/bigscreen/designer/components/RenderElement.vue
@@ -6,7 +6,7 @@
v-if="data.type !== 'display'"
:title="data.title"
:border="data.border || ''">
-
+
-
+
@@ -42,6 +42,11 @@
default: () => []
},
+ summaryTitle: {
+ type: String,
+ default: ''
+ },
+
keys: {
type: String,
default: 'key'
diff --git a/vue.config.js b/vue.config.js
index f365a93e..d1c02023 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -64,7 +64,7 @@ module.exports = {
proxy: {
//设置代理,可解决跨5
'/lan': {
- target: 'http://192.168.1.87:9000',
+ target: 'https://sdtestweb.sdvillage.cn',
changeOrigin: true,
pathRewrite: {
//地址重写