diff --git a/front/public/static/download/InstallRootCert.exe b/front/public/static/download/InstallRootCert.exe new file mode 100644 index 00000000..625e0c6d Binary files /dev/null and b/front/public/static/download/InstallRootCert.exe differ diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 40e1683b..b07326f7 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -225,14 +225,51 @@ style="cursor: pointer" @click=" openView( - backUrl + 'resource/hls/getHls/?key=' + val.channelId + 'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1' ) " > - {{ backUrl + 'resource/hls/getHls/?key=' + val.channelId }} + {{ 'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1' }} +
@@ -319,12 +356,18 @@ dept.deptName = infrastructure.deptName } const showThis = () => { + console.log('props.refObj.enclosure',props.refObj); window.open( window.SITE_CONFIG.previewUrl + 'hisense_office/onlinePreview?url=' + - btoa(encodeURI(props.refObj.enclosure)) + btoa(encodeURI(props.refObj)) ) } + //下载海康客户端 + const downLoadClient = () => { + let url = "https://open.hikvision.com/download/5c67f1e2f05948198c909700?type=10"; + window.open( url, '_blank') + } const showArr = ref([]) console.log(props.refObj, '=====================================') const endThis = (instanceId) => { @@ -518,6 +561,8 @@ }) } const openView = (url) => { + console.log('valval',url); + //http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=37021100421318000090&protocol=wss&transmode=1&streamType=1 window.open(url, '_blank') } @@ -566,6 +611,10 @@ width: 2.5rem; } } + .downButton{ + display: flex; + justify-content: normal; + } } } .bottom { @@ -592,7 +641,7 @@ .box { margin-left: 0.1rem; .ability { - height: 1.6rem; + height: 2.0rem; display: flex; border-bottom: 1px #eee solid; padding: 0.1rem 0; @@ -700,6 +749,10 @@ position: relative; } } + .button-bottom{ + margin-top: 0; + margin-bottom: 10px; + } } .DownloadAttachment { position: absolute;