基础设施初始化BUG修改

This commit is contained in:
a0049873 2022-09-26 11:32:14 +08:00
parent 186184c14f
commit 432ba890f6
2 changed files with 1681 additions and 1296 deletions

File diff suppressed because it is too large Load Diff

View File

@ -456,16 +456,31 @@
批量预览 批量预览
</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>
</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 = []
@ -1769,8 +1784,8 @@
} }
} }
// //
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,209 +1892,97 @@
} }
</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;
/* padding: 0.16rem; */ /* padding: 0.16rem; */
border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3); border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
.infrastructrue-tab { .infrastructrue-tab {
// background: #ffffff; // background: #ffffff;
// padding: 0.2rem; // padding: 0.2rem;
// border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3); // border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
span { span {
display: inline-block; display: inline-block;
height: 0.24rem; height: 0.24rem;
font-size: 0.14rem; font-size: 0.14rem;
line-height: 0.24rem; line-height: 0.24rem;
border: 0; border: 0;
border-radius: 0.12rem; border-radius: 0.12rem;
margin-left: 0.1rem; margin-left: 0.1rem;
text-align: center; text-align: center;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
padding: 0 0.08rem; padding: 0 0.08rem;
}
.leftType {
margin: 0.2rem 0;
margin-right: 0.06rem;
}
.down {
background: #0087ff;
color: #ffffff;
}
.tabBox {
margin-bottom: 0.16rem;
}
.tabBox:last-of-type {
margin-bottom: 0;
}
} }
.infrastructrue-content { .leftType {
display: flex; margin: 0.2rem 0;
justify-content: space-between; margin-right: 0.06rem;
padding: 0.14rem 0.2rem 0.1rem;
background: #ffffff;
.contentNum {
position: relative;
display: flex;
p {
color: #666666;
padding: 0;
margin: 0;
span {
color: #0087ff;
font-size: 0.2rem;
font-weight: 500;
}
}
p:first-of-type {
padding-right: 0.16rem;
margin-right: 0.16rem;
}
.boundary {
position: absolute;
left: 0.9rem;
top: 0.07rem;
display: block;
width: 0.02rem;
border-radius: 0.01rem;
height: 0.2rem;
background: rgba(150, 144, 144, 0.3);
}
}
.contentRight {
position: relative;
display: flex;
justify-content: space-between;
.boundary {
position: absolute;
left: 3.74rem;
top: 0.07rem;
display: block;
width: 0.02rem;
border-radius: 0.01rem;
height: 0.2rem;
background: rgba(150, 144, 144, 0.3);
}
.searchInput {
display: flex;
margin-right: 0.2rem;
.ant-input-search {
max-width: 4rem;
}
:deep(.ant-input) {
width: 2rem;
height: 0.36rem;
font-size: 0.14rem;
color: #b2b2b2;
background: #f5f5f5;
}
:deep(.ant-input-group-addon) {
display: inline-block;
margin-left: 0.1rem;
.ant-input-search-button {
width: 0.8rem;
height: 0.36rem;
background: #0558e1;
border-radius: 0.04rem;
font-size: 0.14rem;
}
}
:deep(.ant-btn) {
background: #0558e1;
border-radius: 0.04rem;
}
}
.buttonAdd {
background: #0558e1;
border-radius: 0.04rem;
height: 0.36rem;
border-color: #0558e1;
margin-left: 0.1rem;
}
}
} }
.infrastructrue-table { .down {
.ant-table-striped :deep(.table-striped) td { background: #0087ff;
background-color: #fafafa; color: #ffffff;
}
} }
.map-contain { .tabBox {
// width: 9.46rem; margin-bottom: 0.16rem;
height: 4.1rem;
margin-left: 0.16rem;
position: relative;
} }
} .tabBox:last-of-type {
.roomBackground {
background: #0058e1;
color: #ffffff;
}
.nullBackground {
background: #f3f5f9;
color: #0087ff;
}
:deep(.ant-form-item-control-input-content) {
margin-left: 0.15rem;
}
:deep(.ant-col) {
.ant-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
} }
.jinggaoD { .infrastructrue-content {
display: flex; display: flex;
align-items: center; justify-content: space-between;
} padding: 0.14rem 0.2rem 0.1rem;
.jinggaoNull { background: #ffffff;
display: none; .contentNum {
} position: relative;
.imgJinggao {
width: 0.2rem;
height: 0.2rem;
background: url('~@/assets/home/jingao.png') no-repeat;
background-size: 100%;
}
.introduction {
:deep(.ant-form-item-control) {
margin-left: -2.1rem;
}
}
.roomBox {
.leftMake {
float: left;
margin-left: -1rem;
margin-top: -0.5rem;
font-size: 0.2rem;
cursor: pointer;
.leftTop {
width: 0.6rem;
height: 1.75rem;
border-top-left-radius: 0.08rem;
border-bottom-left-radius: 0.08rem;
padding: 0.13rem;
text-align: center;
}
.leftBottom {
width: 0.6rem;
height: 1.75rem;
border-top-left-radius: 0.08rem;
border-bottom-left-radius: 0.08rem;
padding: 0.2rem 0.13rem 0.1rem 0.1rem;
text-align: center;
}
}
.roomSearch {
display: flex; display: flex;
align-items: center; p {
color: #666666;
padding: 0;
margin: 0;
span {
color: #0087ff;
font-size: 0.2rem;
font-weight: 500;
}
}
p:first-of-type {
padding-right: 0.16rem;
margin-right: 0.16rem;
}
.boundary {
position: absolute;
left: 0.9rem;
top: 0.07rem;
display: block;
width: 0.02rem;
border-radius: 0.01rem;
height: 0.2rem;
background: rgba(150, 144, 144, 0.3);
}
}
.contentRight {
position: relative;
display: flex;
justify-content: space-between;
.boundary {
position: absolute;
left: 3.74rem;
top: 0.07rem;
display: block;
width: 0.02rem;
border-radius: 0.01rem;
height: 0.2rem;
background: rgba(150, 144, 144, 0.3);
}
.searchInput { .searchInput {
display: flex; display: flex;
margin-right: 0.2rem; margin-right: 0.2rem;
margin-left: 0.2rem; .ant-input-search {
// .ant-input-search { max-width: 4rem;
// max-width: 4rem; }
// }
:deep(.ant-input) { :deep(.ant-input) {
width: 2rem; width: 2rem;
height: 0.36rem; height: 0.36rem;
@ -2094,143 +1997,255 @@
width: 0.8rem; width: 0.8rem;
height: 0.36rem; height: 0.36rem;
background: #0558e1; background: #0558e1;
border-radius: 0.06rem; border-radius: 0.04rem;
font-size: 0.14rem; font-size: 0.14rem;
} }
} }
:deep(.ant-btn) { :deep(.ant-btn) {
border-radius: 0.06rem; background: #0558e1;
border-radius: 0.04rem;
} }
} }
} .buttonAdd {
.roomTableList { background: #0558e1;
display: flex; border-radius: 0.04rem;
justify-content: space-between; height: 0.36rem;
align-items: center; border-color: #0558e1;
margin: 0.4rem 0 0.2rem 0; margin-left: 0.1rem;
.roomTime {
display: flex;
align-items: center;
:deep(.ant-space-vertical) {
flex-direction: inherit;
margin-left: 0.2rem;
}
} }
} }
.roomItem {
width: 10.3rem;
height: 2rem;
border-top: 1px #d5d4d4 solid;
display: flex;
align-items: center;
.leftImg {
width: 2.4rem;
height: 1.75rem;
margin: 0 0.3rem 0 0.15rem;
// background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%;
img {
width: 100%;
height: 100%;
}
}
.rightContent {
height: 1.75rem;
width: 5.8rem;
.topContent {
font-size: 0.2rem;
color: #000;
font-weight: 600;
}
.centerContent {
display: flex;
justify-content: space-between;
font-size: 0.14rem;
margin: 0.15rem 0 0.2rem 0;
}
}
}
:deep(.ant-pagination) {
float: right;
}
:deep(.ant-pagination) {
text-align: end;
}
} }
.infrastructrue-table {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa;
}
}
.map-contain {
// width: 9.46rem;
height: 4.1rem;
margin-left: 0.16rem;
position: relative;
}
}
.roomBackground {
background: #0058e1;
color: #ffffff;
}
.nullBackground {
background: #f3f5f9;
color: #0087ff;
}
:deep(.ant-form-item-control-input-content) {
margin-left: 0.15rem;
}
:deep(.ant-col) {
.ant-form-item {
margin-bottom: 0;
}
}
.jinggaoD {
display: flex;
align-items: center;
}
.jinggaoNull {
display: none;
}
.imgJinggao {
width: 0.2rem;
height: 0.2rem;
background: url('~@/assets/home/jingao.png') no-repeat;
background-size: 100%;
}
.introduction {
:deep(.ant-form-item-control) {
margin-left: -2.1rem;
}
}
.roomBox {
.leftMake {
float: left;
margin-left: -1rem;
margin-top: -0.5rem;
font-size: 0.2rem;
cursor: pointer;
.leftTop {
width: 0.6rem;
height: 1.75rem;
border-top-left-radius: 0.08rem;
border-bottom-left-radius: 0.08rem;
padding: 0.13rem;
text-align: center;
}
.leftBottom {
width: 0.6rem;
height: 1.75rem;
border-top-left-radius: 0.08rem;
border-bottom-left-radius: 0.08rem;
padding: 0.2rem 0.13rem 0.1rem 0.1rem;
text-align: center;
}
}
.roomSearch {
display: flex;
align-items: center;
.searchInput {
display: flex;
margin-right: 0.2rem;
margin-left: 0.2rem;
// .ant-input-search {
// max-width: 4rem;
// }
:deep(.ant-input) {
width: 2rem;
height: 0.36rem;
font-size: 0.14rem;
color: #b2b2b2;
background: #f5f5f5;
}
:deep(.ant-input-group-addon) {
display: inline-block;
margin-left: 0.1rem;
.ant-input-search-button {
width: 0.8rem;
height: 0.36rem;
background: #0558e1;
border-radius: 0.06rem;
font-size: 0.14rem;
}
}
:deep(.ant-btn) {
border-radius: 0.06rem;
}
}
}
.roomTableList {
display: flex;
justify-content: space-between;
align-items: center;
margin: 0.4rem 0 0.2rem 0;
.roomTime {
display: flex;
align-items: center;
:deep(.ant-space-vertical) {
flex-direction: inherit;
margin-left: 0.2rem;
}
}
}
.roomItem {
width: 10.3rem;
height: 2rem;
border-top: 1px #d5d4d4 solid;
display: flex;
align-items: center;
.leftImg {
width: 2.4rem;
height: 1.75rem;
margin: 0 0.3rem 0 0.15rem;
// background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%;
img {
width: 100%;
height: 100%;
}
}
.rightContent {
height: 1.75rem;
width: 5.8rem;
.topContent {
font-size: 0.2rem;
color: #000;
font-weight: 600;
}
.centerContent {
display: flex;
justify-content: space-between;
font-size: 0.14rem;
margin: 0.15rem 0 0.2rem 0;
}
}
}
:deep(.ant-pagination) {
float: right;
}
:deep(.ant-pagination) {
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 { }
.ant-modal-body { .modalClass {
height: 4rem !important; .ant-modal-body {
overflow-y: scroll !important; height: 4rem !important;
} overflow-y: scroll !important;
.ant-modal-title {
font-weight: 600;
}
.ant-modal-content {
.ant-modal-header {
border-bottom: 0 !important;
}
}
} }
.appModal { .ant-modal-title {
.ant-modal-body { font-weight: 600;
height: 4.8rem !important;
overflow-y: scroll !important;
}
.ant-modal-title {
font-weight: 600;
}
.ant-modal-content {
.ant-modal-header {
border-bottom: 0 !important;
}
}
} }
.single-preview-modal { .ant-modal-content {
.ant-modal-header { .ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat; border-bottom: 0 !important;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
} }
} }
.batch-preview-modal { }
.batch-video { .appModal {
width: 100%; .ant-modal-body {
display: grid; height: 4.8rem !important;
grid-template-columns: 50% 50%; overflow-y: scroll !important;
grid-template-rows: 50% 50%; }
justify-content: center; .ant-modal-title {
grid-row-gap: 10px; font-weight: 600;
grid-column-gap: 10px; }
} .ant-modal-content {
.ant-pagination-item-link {
background-color: #5580f7;
}
.ant-modal-header { .ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat; border-bottom: 0 !important;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
} }
} }
}
.single-preview-modal {
.ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
}
}
.batch-preview-modal {
.batch-video {
width: 100%;
display: grid;
grid-template-columns: 50% 50%;
grid-template-rows: 50% 50%;
justify-content: center;
grid-row-gap: 10px;
grid-column-gap: 10px;
}
.ant-pagination-item-link {
background-color: #5580f7;
}
.ant-modal-header {
background: url(~@/assets/home/video-background.png) no-repeat;
background-size: cover;
}
.ant-modal-title {
font-size: 0.16rem;
font-weight: 500;
color: #ffffff;
}
.anticon {
color: #ffffff;
}
}
</style> </style>