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

This commit is contained in:
wuhongjian 2022-11-29 11:57:35 +08:00
commit 97aec1843a
2 changed files with 34 additions and 3 deletions

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>

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', //