diff --git a/src/api/point/site_management.js b/src/api/point/site_management.js index 4d91bdd..15f920a 100644 --- a/src/api/point/site_management.js +++ b/src/api/point/site_management.js @@ -77,4 +77,61 @@ export function algList(id) { method: 'get', // data:query }) -} \ No newline at end of file +} +export function vl(){ + return request({ + url: `/patrol/preset/camera/vl`, + method: 'get', + // data:query + }) +} +// 获取摄像头列表 +export function listByEqIdAndChannelId(data){ + return request({ + url: `/patrol/preset/listByEqIdAndChannelId`, + method: 'get', + params:data + }) +} + +// 点击摄像头列表 +export function realtime(data){ + return request({ + url: `/patrol/video/realtime`, + method: 'get', + params:data + }) +} + +// 云台控制 +export function PZT(data){ + return request({ + url: `/patrol/videotape/ptz`, + method: 'get', + params:data + }) +} +// 云台控制fi +export function fi(data){ + return request({ + url: `/patrol/videotape/ptz/fi`, + method: 'get', + params:data + }) +} +// 编辑预置点名称 +export function goto(data){ + return request({ + url: `/patrol/preset/goto`, + method: 'get', + params:data + }) +} +// 预置点下发 +export function presetDotDistribute (params) { + return request({ + url: '/patrol/preset/issue', + method: 'get', + params: params + }) +} diff --git a/src/assets/video/1.mp4 b/src/assets/video/1.mp4 new file mode 100644 index 0000000..9469d80 Binary files /dev/null and b/src/assets/video/1.mp4 differ diff --git a/src/components/videoPlayer/index.vue b/src/components/videoPlayer/index.vue index b34b4c7..e21cf79 100644 --- a/src/components/videoPlayer/index.vue +++ b/src/components/videoPlayer/index.vue @@ -43,7 +43,7 @@ export default { sources: [ { type: "video/mp4", - src: "", + src: require("../../assets/video/1.mp4"), }, ], poster: "", // 封面地址 diff --git a/src/views/point/components/site_VideoDialog.vue b/src/views/point/components/site_VideoDialog.vue new file mode 100644 index 0000000..9326211 --- /dev/null +++ b/src/views/point/components/site_VideoDialog.vue @@ -0,0 +1,455 @@ + + + \ No newline at end of file diff --git a/src/views/point/site_management.vue b/src/views/point/site_management.vue index e0e8b8b..8c8265b 100644 --- a/src/views/point/site_management.vue +++ b/src/views/point/site_management.vue @@ -433,9 +433,9 @@ }} - + -
- +
@@ -498,7 +498,7 @@ v-model="value" :placeholder="$t('site_management.PleaseSelectAPresetPoint')" > - + @@ -550,8 +550,7 @@ -
- + --> { + // if(res.code==200){ + // this.dialogPointTree=res.data; + // } + // }) + this.pointDialogDataName = this.$t( "site_management.BindVisibleLightMonitoringPoints" ); + } else { - this.bindingMonitorPointTitle = this.$t( + // this.bindingMonitorPointTitle = this.$t( + // "site_management.BindThermalImagingMonitoringPoints" + // ); + this.pointDialogDataName = this.$t( "site_management.BindThermalImagingMonitoringPoints" ); } - - this.bindingMonitorPointDialogVisible = true; - }, - clickFun() {}, - renderHeader(h, { column, $index }, type) { - let that = this; - return h("div", [ - // 列名称 - h("span", column.label), - // 按钮 - h( - "el-button", - { - props: { - type: "text", - size: "small", - }, - style: "margin-left: 5px;", - on: { - click: function () { - that.clickButton(type); - }, - }, - }, - this.$t("share.addTo") - ), - ]); - }, - clickButton(type) { - console.log("我点击了" + type + "的列"); + this.pointDialogShow=true; + // this.bindingMonitorPointDialogVisible = true; }, + // clickFun() {}, + // renderHeader(h, { column, $index }, type) { + // let that = this; + // return h("div", [ + // // 列名称 + // h("span", column.label), + // // 按钮 + // h( + // "el-button", + // { + // props: { + // type: "text", + // size: "small", + // }, + // style: "margin-left: 5px;", + // on: { + // click: function () { + // that.clickButton(type); + // }, + // }, + // }, + // this.$t("share.addTo") + // ), + // ]); + // }, + // clickButton(type) { + // console.log("我点击了" + type + "的列"); + // }, InspectionHandleClose() { this.InspectionDialogVisible = false; }, @@ -1191,6 +1215,19 @@ export default { } }); }, + + // 绑定可见光监测点点击树事件 + handleMonitor(e){ + if (e.eqpbookId) { + // console.log(e,'点击了') + listByEqIdAndChannelId({channelCode:e.channelCode,patroldeviceCode:e.patroldeviceCode}).then(res=>{ + console.log(e,'摄像头列表') + if(res.code==200){ + this.listByEqIdAndChanneData=res.data; + } + }) + } + } }, }; @@ -1228,117 +1265,117 @@ export default { .tabsBtn { text-align: center; } -.bindingMonitorPointTree { - width: 100%; - height: 37vh; - overflow-y: scroll; -} -.bindingMonitorPointDiv { - width: 100%; - height: 40vh; - // background: red; -} -.PTZ-content { - width: 170px; - margin: 10px auto; - position: relative; - img { - width: 100%; - } -} -.r-ti2-pos { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - div { - position: absolute; - z-index: 999; - width: 20px; - height: 15px; - cursor: pointer; - } - div:first-child { - top: 32px; - left: 75px; - } - div:nth-child(2) { - top: 50px; - left: 102px; - } - div:nth-child(3) { - top: 77px; - right: 30px; - } - div:nth-child(4) { - bottom: 56px; - left: 102px; - } - div:nth-child(5) { - bottom: 36px; - left: 75px; - } - div:nth-child(6) { - bottom: 56px; - right: 100px; - } - div:nth-child(7) { - bottom: 80px; - left: 30px; - } - div:nth-child(8) { - top: 50px; - right: 102px; - } -} -.r-ti3 { - width: 100%; - display: flex; - padding-top: 10px; - -webkit-box-pack: justify; - justify-content: space-between; -} -.r-ti3-d1 { - width: 76px; - position: relative; - img { - width: 100%; - } - .r-ti3-d2 { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - div:first-child { - width: 50%; - height: 100%; - position: absolute; - top: 0; - left: 0; - cursor: pointer; - } - div:nth-child(2) { - width: 50%; - height: 100%; - position: absolute; - top: 0; - right: 0; - cursor: pointer; - } - } -} -.r-ti4 { - padding-top: 20px; - img { - width: 24px; - height: 24px; - position: relative; - top: 6px; - cursor: pointer; - } -} +// .bindingMonitorPointTree { +// width: 100%; +// height: 37vh; +// overflow-y: scroll; +// } +// .bindingMonitorPointDiv { +// width: 100%; +// height: 40vh; +// // background: red; +// } +// .PTZ-content { +// width: 170px; +// margin: 10px auto; +// position: relative; +// img { +// width: 100%; +// } +// } +// .r-ti2-pos { +// position: absolute; +// top: 0; +// left: 0; +// width: 100%; +// height: 100%; +// div { +// position: absolute; +// z-index: 999; +// width: 20px; +// height: 15px; +// cursor: pointer; +// } +// div:first-child { +// top: 32px; +// left: 75px; +// } +// div:nth-child(2) { +// top: 50px; +// left: 102px; +// } +// div:nth-child(3) { +// top: 77px; +// right: 30px; +// } +// div:nth-child(4) { +// bottom: 56px; +// left: 102px; +// } +// div:nth-child(5) { +// bottom: 36px; +// left: 75px; +// } +// div:nth-child(6) { +// bottom: 56px; +// right: 100px; +// } +// div:nth-child(7) { +// bottom: 80px; +// left: 30px; +// } +// div:nth-child(8) { +// top: 50px; +// right: 102px; +// } +// } +// .r-ti3 { +// width: 100%; +// display: flex; +// padding-top: 10px; +// -webkit-box-pack: justify; +// justify-content: space-between; +// } +// .r-ti3-d1 { +// width: 76px; +// position: relative; +// img { +// width: 100%; +// } +// .r-ti3-d2 { +// position: absolute; +// top: 0; +// left: 0; +// width: 100%; +// height: 100%; +// div:first-child { +// width: 50%; +// height: 100%; +// position: absolute; +// top: 0; +// left: 0; +// cursor: pointer; +// } +// div:nth-child(2) { +// width: 50%; +// height: 100%; +// position: absolute; +// top: 0; +// right: 0; +// cursor: pointer; +// } +// } +// } +// .r-ti4 { +// padding-top: 20px; +// img { +// width: 24px; +// height: 24px; +// position: relative; +// top: 6px; +// cursor: pointer; +// } +// } .intelligenceType { cursor: pointer; color: #409eff;