基础设施初始化BUG修改
This commit is contained in:
parent
186184c14f
commit
432ba890f6
File diff suppressed because it is too large
Load Diff
|
@ -456,15 +456,30 @@
|
||||||
批量预览
|
批量预览
|
||||||
</a-button>
|
</a-button>
|
||||||
<!-- 添加至申购车 -->
|
<!-- 添加至申购车 -->
|
||||||
<a-button type="primary" @click="addShoppingCart" class="buttonAdd" v-if="!cloudResourcesFlag">
|
<a-button
|
||||||
|
type="primary"
|
||||||
|
@click="addShoppingCart"
|
||||||
|
class="buttonAdd"
|
||||||
|
v-if="!cloudResourcesFlag"
|
||||||
|
>
|
||||||
添加至申购车
|
添加至申购车
|
||||||
</a-button>
|
</a-button>
|
||||||
<!-- 一键申请 -->
|
<!-- 一键申请 -->
|
||||||
<a-button type="primary" @click="apply" class="buttonAdd" v-if="!cloudResourcesFlag">
|
<a-button
|
||||||
|
type="primary"
|
||||||
|
@click="apply"
|
||||||
|
class="buttonAdd"
|
||||||
|
v-if="!cloudResourcesFlag"
|
||||||
|
>
|
||||||
一键申请
|
一键申请
|
||||||
</a-button>
|
</a-button>
|
||||||
<!-- 申请政务云资源 -->
|
<!-- 申请政务云资源 -->
|
||||||
<a-button type="primary" @click="applyCloudResources" class="buttonAdd" v-if="cloudResourcesFlag">
|
<a-button
|
||||||
|
type="primary"
|
||||||
|
@click="applyCloudResources"
|
||||||
|
class="buttonAdd"
|
||||||
|
v-if="cloudResourcesFlag"
|
||||||
|
>
|
||||||
我要申请政务云资源
|
我要申请政务云资源
|
||||||
</a-button>
|
</a-button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -899,7 +914,7 @@
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tabClick(0, '政务云资源')
|
tabClick(0, '政务云资源')
|
||||||
getCamera()
|
// getCamera()
|
||||||
}
|
}
|
||||||
|
|
||||||
mybus.off('getListByParentId')
|
mybus.off('getListByParentId')
|
||||||
|
@ -920,7 +935,7 @@
|
||||||
const tabList = ref([
|
const tabList = ref([
|
||||||
{
|
{
|
||||||
title: '设施类型',
|
title: '设施类型',
|
||||||
content: ['政务云资源','视频资源', '感知资源', '城市云脑会客厅'],
|
content: ['政务云资源', '视频资源', '感知资源', '城市云脑会客厅'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '视频标签',
|
title: '视频标签',
|
||||||
|
@ -1340,13 +1355,13 @@
|
||||||
selectedList.value = []
|
selectedList.value = []
|
||||||
if (clickList.value[indexFather].content.indexOf(name) != -1) {
|
if (clickList.value[indexFather].content.indexOf(name) != -1) {
|
||||||
if (name == '视频资源') {
|
if (name == '视频资源') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
room.value = true
|
room.value = true
|
||||||
tableHeight.value = 330
|
tableHeight.value = 330
|
||||||
showMap.value = true
|
showMap.value = true
|
||||||
tabList.value[1].title = '视频标签'
|
tabList.value[1].title = '视频标签'
|
||||||
} else if (name == '政务云资源') {
|
} else if (name == '政务云资源') {
|
||||||
cloudResourcesFlag.value = true;
|
cloudResourcesFlag.value = true
|
||||||
room.value = true
|
room.value = true
|
||||||
tableHeight.value = 600
|
tableHeight.value = 600
|
||||||
showMap.value = false
|
showMap.value = false
|
||||||
|
@ -1355,7 +1370,7 @@
|
||||||
pagination.value.total = 0
|
pagination.value.total = 0
|
||||||
tabList.value[1].title = '政务云资源分类'
|
tabList.value[1].title = '政务云资源分类'
|
||||||
} else if (name == '感知资源') {
|
} else if (name == '感知资源') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
room.value = true
|
room.value = true
|
||||||
tableHeight.value = 330
|
tableHeight.value = 330
|
||||||
showMap.value = true
|
showMap.value = true
|
||||||
|
@ -1363,7 +1378,7 @@
|
||||||
dataSource2.value = []
|
dataSource2.value = []
|
||||||
pagination.value.total = 0
|
pagination.value.total = 0
|
||||||
} else if (name == '城市云脑会客厅') {
|
} else if (name == '城市云脑会客厅') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
// room.value = false
|
// room.value = false
|
||||||
// wrjFlag.value = true
|
// wrjFlag.value = true
|
||||||
// showMap.value = false
|
// showMap.value = false
|
||||||
|
@ -1380,7 +1395,7 @@
|
||||||
} else {
|
} else {
|
||||||
if (name == '视频资源') {
|
if (name == '视频资源') {
|
||||||
wrjFlag.value = false
|
wrjFlag.value = false
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
tableHeight.value = 330
|
tableHeight.value = 330
|
||||||
showMap.value = true
|
showMap.value = true
|
||||||
tabList.value[1].content = []
|
tabList.value[1].content = []
|
||||||
|
@ -1408,7 +1423,7 @@
|
||||||
emits('add', 1)
|
emits('add', 1)
|
||||||
getCamera()
|
getCamera()
|
||||||
} else if (name == '政务云资源') {
|
} else if (name == '政务云资源') {
|
||||||
cloudResourcesFlag.value = true;
|
cloudResourcesFlag.value = true
|
||||||
tableHeight.value = 600
|
tableHeight.value = 600
|
||||||
showMap.value = false
|
showMap.value = false
|
||||||
dataSource.value = []
|
dataSource.value = []
|
||||||
|
@ -1431,7 +1446,7 @@
|
||||||
wrjFlag.value = false
|
wrjFlag.value = false
|
||||||
emits('add', 2)
|
emits('add', 2)
|
||||||
} else if (name == '感知资源') {
|
} else if (name == '感知资源') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
tableHeight.value = 330
|
tableHeight.value = 330
|
||||||
showMap.value = true
|
showMap.value = true
|
||||||
clickList.value[1].content = []
|
clickList.value[1].content = []
|
||||||
|
@ -1445,7 +1460,7 @@
|
||||||
wrjFlag.value = false
|
wrjFlag.value = false
|
||||||
emits('add', 3)
|
emits('add', 3)
|
||||||
} else if (name == '无人机') {
|
} else if (name == '无人机') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
room.value = true
|
room.value = true
|
||||||
tableHeight.value = 600
|
tableHeight.value = 600
|
||||||
showMap.value = false
|
showMap.value = false
|
||||||
|
@ -1466,7 +1481,7 @@
|
||||||
})
|
})
|
||||||
wrjFlag.value = true
|
wrjFlag.value = true
|
||||||
} else if (name == '单兵设备') {
|
} else if (name == '单兵设备') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
room.value = true
|
room.value = true
|
||||||
tableHeight.value = 600
|
tableHeight.value = 600
|
||||||
showMap.value = false
|
showMap.value = false
|
||||||
|
@ -1487,7 +1502,7 @@
|
||||||
})
|
})
|
||||||
wrjFlag.value = true
|
wrjFlag.value = true
|
||||||
} else if (name == '城市云脑会客厅') {
|
} else if (name == '城市云脑会客厅') {
|
||||||
cloudResourcesFlag.value = false;
|
cloudResourcesFlag.value = false
|
||||||
showMap.value = false
|
showMap.value = false
|
||||||
dataSource.value = []
|
dataSource.value = []
|
||||||
dataSource2.value = []
|
dataSource2.value = []
|
||||||
|
@ -1770,7 +1785,7 @@
|
||||||
}
|
}
|
||||||
// 申请政务云资源
|
// 申请政务云资源
|
||||||
const applyCloudResources = () => {
|
const applyCloudResources = () => {
|
||||||
window.open("http://15.72.183.88:8760/yzy/login")
|
window.open('http://15.72.183.88:8760/yzy/login')
|
||||||
}
|
}
|
||||||
// 表格
|
// 表格
|
||||||
const dataSource = ref([])
|
const dataSource = ref([])
|
||||||
|
@ -1877,7 +1892,7 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
.infrastructrueBox {
|
.infrastructrueBox {
|
||||||
padding: 0.2rem;
|
padding: 0.2rem;
|
||||||
// background: #f3f5f9;
|
// background: #f3f5f9;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
|
@ -2011,42 +2026,42 @@
|
||||||
margin-left: 0.16rem;
|
margin-left: 0.16rem;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.roomBackground {
|
.roomBackground {
|
||||||
background: #0058e1;
|
background: #0058e1;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
.nullBackground {
|
.nullBackground {
|
||||||
background: #f3f5f9;
|
background: #f3f5f9;
|
||||||
color: #0087ff;
|
color: #0087ff;
|
||||||
}
|
}
|
||||||
:deep(.ant-form-item-control-input-content) {
|
:deep(.ant-form-item-control-input-content) {
|
||||||
margin-left: 0.15rem;
|
margin-left: 0.15rem;
|
||||||
}
|
}
|
||||||
:deep(.ant-col) {
|
:deep(.ant-col) {
|
||||||
.ant-form-item {
|
.ant-form-item {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.jinggaoD {
|
.jinggaoD {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.jinggaoNull {
|
.jinggaoNull {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
.imgJinggao {
|
.imgJinggao {
|
||||||
width: 0.2rem;
|
width: 0.2rem;
|
||||||
height: 0.2rem;
|
height: 0.2rem;
|
||||||
background: url('~@/assets/home/jingao.png') no-repeat;
|
background: url('~@/assets/home/jingao.png') no-repeat;
|
||||||
background-size: 100%;
|
background-size: 100%;
|
||||||
}
|
}
|
||||||
.introduction {
|
.introduction {
|
||||||
:deep(.ant-form-item-control) {
|
:deep(.ant-form-item-control) {
|
||||||
margin-left: -2.1rem;
|
margin-left: -2.1rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.roomBox {
|
.roomBox {
|
||||||
.leftMake {
|
.leftMake {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: -1rem;
|
margin-left: -1rem;
|
||||||
|
@ -2157,15 +2172,15 @@
|
||||||
:deep(.ant-pagination) {
|
:deep(.ant-pagination) {
|
||||||
text-align: end;
|
text-align: end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
.wrj {
|
.wrj {
|
||||||
.ant-modal-body {
|
.ant-modal-body {
|
||||||
height: 700px !important;
|
height: 700px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.modalClass {
|
.modalClass {
|
||||||
.ant-modal-body {
|
.ant-modal-body {
|
||||||
height: 4rem !important;
|
height: 4rem !important;
|
||||||
overflow-y: scroll !important;
|
overflow-y: scroll !important;
|
||||||
|
@ -2178,8 +2193,8 @@
|
||||||
border-bottom: 0 !important;
|
border-bottom: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.appModal {
|
.appModal {
|
||||||
.ant-modal-body {
|
.ant-modal-body {
|
||||||
height: 4.8rem !important;
|
height: 4.8rem !important;
|
||||||
overflow-y: scroll !important;
|
overflow-y: scroll !important;
|
||||||
|
@ -2192,8 +2207,8 @@
|
||||||
border-bottom: 0 !important;
|
border-bottom: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.single-preview-modal {
|
.single-preview-modal {
|
||||||
.ant-modal-header {
|
.ant-modal-header {
|
||||||
background: url(~@/assets/home/video-background.png) no-repeat;
|
background: url(~@/assets/home/video-background.png) no-repeat;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
|
@ -2206,8 +2221,8 @@
|
||||||
.anticon {
|
.anticon {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.batch-preview-modal {
|
.batch-preview-modal {
|
||||||
.batch-video {
|
.batch-video {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: grid;
|
display: grid;
|
||||||
|
@ -2232,5 +2247,5 @@
|
||||||
.anticon {
|
.anticon {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue