wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 

# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue
This commit is contained in:
gongjiale 2022-11-29 13:51:02 +08:00
parent 9acaa0e8d3
commit 4a6ea361b6
6 changed files with 240 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
front/src/views/assertReport/components/ReservoirBottom.vue
View File

@ -4,7 +4,7 @@
<div class="platform-overview-bottom"> <div class="platform-overview-bottom">
<div class="top"><span class="title">资源汇聚总量</span></div> <div class="top"><span class="title">资源汇聚总量</span></div>
<div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing1.png" /></div> <div class="jiesheng"> <img src="../image/xing2.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing2.png" /></div>
<div class="bottom"> <div class="bottom">
<div <div
@ -18,13 +18,13 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import {
selectTotal selectTotal
} from '@/api/assertReport' } from '@/api/assertReport'
export default { export default {
components: {}, components: {},
@ -56,10 +56,10 @@
this.total=num this.total=num
}) })
} }
} }
} }
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
@keyframes turn { @keyframes turn {
0% { 0% {
border-image: linear-gradient(to right, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
@ -76,34 +76,34 @@
100% { 100% {
border-image: linear-gradient(to right, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
} }
} }
.jiesheng{ .jiesheng{
margin:8px 8px; margin:8px 8px;
text-align: center; text-align: center;
color: #f4fcfe; border-color: #107bb0; color: #f4fcfe; border-color: #107bb0;
box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
} }
.top5-content::-webkit-scrollbar { .top5-content::-webkit-scrollbar {
width: 6px; width: 6px;
/*height: 4px;*/ /*height: 4px;*/
} }
.top5-content::-webkit-scrollbar-thumb { .top5-content::-webkit-scrollbar-thumb {
background-color: #00deff; background-color: #00deff;
} }
.map-search-result::-webkit-scrollbar-track, .map-search-result::-webkit-scrollbar-track,
.top5-content::-webkit-scrollbar-track { .top5-content::-webkit-scrollbar-track {
background-color: #424748; background-color: #424748;
} }
@keyframes topup50 { @keyframes topup50 {
from { from {
top: 50%; top: 50%;
} }
to { to {
top: -100%; top: -100%;
} }
} }
.right-survey { .right-survey {
height: 100%; height: 100%;
color: #f0fafa; color: #f0fafa;
@ -163,7 +163,6 @@
.platform-overview-bottom:hover { .platform-overview-bottom:hover {
border: 2px solid; border: 2px solid;
animation: turn 5s linear infinite; animation: turn 5s linear infinite;
} }
} }
</style> </style>

BIN
front/src/views/assertReport/image/xing2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

12
front/src/views/capabilityCloud/components/DataResources.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-19 10:15:33 * @Date: 2022-06-19 10:15:33
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-27 12:52:18 * @LastEditTime: 2022-11-28 16:23:25
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -50,10 +50,10 @@
name: '总申请次数', name: '总申请次数',
num: '', num: '',
}, },
{ // {
name: '满足率', // name: '满足率',
num: '', // num: '',
}, // },
]) ])
// 右侧数据 // 右侧数据
const assignRankings = ref([ const assignRankings = ref([

141
front/src/views/home/components/H5Player.vue
View File

@ -2,7 +2,7 @@
海康H5Player 海康H5Player
--> -->
<template> <template>
<div :id="videoId" style="width: 800px; height: 600px; z-index: 9999"></div> <div :id="videoId" ref="video333" style="width: 800px; height: 600px"></div>
</template> </template>
<script> <script>
// const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备 // const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
@ -41,6 +41,7 @@
mseSupport: MSE_IS_SUPPORT, mseSupport: MSE_IS_SUPPORT,
// tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder', // tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder',
tabActive: 'decoder', tabActive: 'decoder',
videoDom: {},
urls: { urls: {
realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4', realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4',
talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S', talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
@ -70,18 +71,13 @@
}, },
created() {}, created() {},
mounted() { mounted() {
this.init() // this.init()
mybus.emit('closeLoading', true) mybus.emit('closeLoading', true)
this.createPlayer() this.createPlayer()
this.arrangeWindow() // this.arrangeWindow()
if (this.unStopable) { if (this.unStopable) {
this.videoPlay(this.videoUrl, 0)
} else {
this.realplay(this.videoUrl, 0) this.realplay(this.videoUrl, 0)
} }
//videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
//this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
}, },
watch: { watch: {
videoUrl: { videoUrl: {
@ -120,15 +116,18 @@
//szId: 'player'+this.index, //szId: 'player'+this.index,
szId: this.videoId, szId: this.videoId,
szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
iMaxSplit: 4, // iMaxSplit: 4,
iWidth: '800px', // iWidth: '800px',
iCurrentSplit: 4, // iCurrentSplit: 4,
openDebug: true, // openDebug: true,
oStyle: { // oStyle: {
borderSelect: '#FFCC00', // borderSelect: '#FFCC00',
}, // },
}) })
let that = this let that = this
that.videoDom = that.$refs.video333.querySelector('video') || {}
// that.videoDom.autoplay = false
// 事件回调绑定 // 事件回调绑定
this.player.JS_SetWindowControlCallback({ this.player.JS_SetWindowControlCallback({
windowEventSelect: function (iWndIndex) { windowEventSelect: function (iWndIndex) {
@ -138,8 +137,8 @@
pluginErrorHandler: function (iWndIndex, iErrorCode, oError) { pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {
//插件错误回调 //插件错误回调
console.log('pluginError callback: ', iWndIndex, iErrorCode, oError) console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
message.error('取流异常,请稍后尝试') // message.error('取流异常,请稍后尝试')
mybus.emit('closeLoading', false) // mybus.emit('closeLoading', false)
}, },
windowEventOver: function (iWndIndex) { windowEventOver: function (iWndIndex) {
//鼠标移过回调 //鼠标移过回调
@ -159,16 +158,26 @@
}, },
firstFrameDisplay: function (iWndIndex, iWidth, iHeight) { firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {
//首帧显示回调 //首帧显示回调
console.log( // console.log(
'firstFrame loaded callback: ', // 'firstFrame loaded callback: ',
iWndIndex, // iWndIndex,
iWidth, // iWidth,
iHeight // iHeight
) // )
// 如果是录像播放，首帧绘制完成后停止 // // 如果是录像播放，首帧绘制完成后停止
if (!that.realTime) { // if (!that.realTime) {
that.pausePlay(iWndIndex) // that.pausePlay(iWndIndex)
}
setTimeout(()=>{
console.log('为何暂停会失效？？？')
that.videoDom.pause()
}, 4000)
// that.player.JS_Visibilitychange()
var canvas = that.$refs.video333.querySelector('canvas');
var context = canvas.getContext('2d');
context.save();
// }
mybus.emit('closeLoading', false) mybus.emit('closeLoading', false)
}, },
performanceLack: function () { performanceLack: function () {
@ -191,67 +200,29 @@
// 初始化结束 // 初始化结束
// 视频预览 // 视频预览
realplay(playURL, index1) { realplay(playURL, index1) {
let that = this
this.realTime = false this.realTime = false
mybus.emit('closeLoading', true) mybus.emit('closeLoading', true)
setTimeout(() => { setTimeout(() => {
mybus.emit('closeLoading', false) mybus.emit('closeLoading', false)
}, 3000) }, 3000)
this.player.JS_Stop(0)
this.mode = 0 //解码方式：0普通模式 1高级模式 this.mode = 0 //解码方式：0普通模式 1高级模式
const { player, mode, urls } = this const { player, mode, urls } = this
// playURL = this.realplay
console.log('视频播放地址', playURL) console.log('视频播放地址', playURL)
// const startTime = {
// startTime: ,
// }
// const endTime = {
// endTime: ,
// }
player
.JS_Play(
playURL,
{ playURL, mode },
index1,
'2022-11-22T10:00:00Z',
'2022-11-22T11:00:00Z'
)
.then(
() => {
console.log('realplay success')
},
(e) => {
console.error(e)
// message.error('错误代码:' + e)
}
)
},
// 实时播放
videoPlay(playURL, index1) {
let that = this
this.realTime = true
mybus.emit('closeLoading', true)
setTimeout(() => {
mybus.emit('closeLoading', false)
}, 3000)
if (!that.unStopable) {
message.warning('预览将在约6s后停止')
setTimeout(() => {
that.stopAllPlay()
}, 6000)
}
this.mode = 0 //解码方式：0普通模式 1高级模式
const { player, mode, urls } = this
// playURL = this.realplay
console.log('视频播放地址', playURL)
// const startTime = {
// startTime: ,
// }
// const endTime = {
// endTime: ,
// }
player.JS_Play(playURL, { playURL, mode }, index1).then( player.JS_Play(playURL, { playURL, mode }, index1).then(
() => { () => {
console.log('realplay success') // console.log('暂停视频流')
// 预览时6s停止播放 mybus.emit('closeLoading', false)
// that.videoDom.muted = false
console.log('视频DOM', player)
// that.videoDom.addEventListener('play',function(){
// console.log("触发暂停");
// that.videoDom.pause()
// });
setTimeout(() => {
that.videoDom.pause()
}, 0)
}, },
(e) => { (e) => {
console.error(e) console.error(e)
@ -272,20 +243,6 @@
} }
) )
}, },
// 暂停单个视频
pausePlay(index) {
let that = this
this.player.JS_Pause(index).then(
() => {
console.log('暂停成功')
},
(e) => {
console.error(e)
// 暂停失败切换为实时播放
that.videoPlay(that.videoUrl, 0)
}
)
},
}, },
beforeUnmount() { beforeUnmount() {
console.log('关闭所有视频') console.log('关闭所有视频')

24
front/src/views/home/infrastructureApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: Light * @Author: Light
* @Date: 2022-11-18 11:53:43 * @Date: 2022-11-18 11:53:43
* @LastEditors: Light * @LastEditors: Light
* @LastEditTime: 2022-11-28 16:45:50 * @LastEditTime: 2022-11-29 11:50:25
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -28,7 +28,27 @@
</a-list-item> </a-list-item>
</template> </template>
<template #header> <template #header>
<div class="title">待申请列表</div> <div class="title">
待申请列表
<a
style="
display: inline-block;
width: 60px;
height: 18px;
line-height: 18px;
text-align: center;
background: #1890ff;
border-radius: 3px;
font-size: 12px;
color: rgb(255, 255, 255);
cursor: pointer;
margin-left: 10px;
"
href="/static/download/InstallRootCert.exe"
>
证书下载
</a>
</div>
</template> </template>
<template #footer> <template #footer>
<a-button type="primary" @click="showApply">一键申请</a-button> <a-button type="primary" @click="showApply">一键申请</a-button>

13
front/src/views/home/infrastructurePageXha.vue
View File

@ -409,7 +409,8 @@
v-loading="spinningHome" v-loading="spinningHome"
element-loading-text="Loading..." element-loading-text="Loading..."
element-loading-svg-view-box="-10, -10, 50, 50" element-loading-svg-view-box="-10, -10, 50, 50"
element-loading-background="rgba(122, 122, 122, 0.8)" element-loading-background="rgba(122, 122, 122, 0.9)"
:element-loading-svg="svg"
> >
<video-surveillance></video-surveillance> <video-surveillance></video-surveillance>
</div> </div>
@ -714,6 +715,16 @@
const spinning = ref(true) const spinning = ref(true)
const whoShow1 = ref(whoShow) const whoShow1 = ref(whoShow)
const isXiHaiAn = whoShow1.value.itShowXiHaiAn const isXiHaiAn = whoShow1.value.itShowXiHaiAn
const svg = `
<path class="path" d="
M 30 15
L 28 17
M 25.61 25.61
A 15 15, 0, 0, 1, 15 30
A 15 15, 0, 1, 1, 27.99 7.5
L 15 15
" style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
`
const options = reactive({ const options = reactive({
width: '912px', //播放器宽度 width: '912px', //播放器宽度
height: '513px', //播放器高度 height: '513px', //播放器高度