bug修复
This commit is contained in:
parent
31eee8d607
commit
068c5dfb1e
|
|
@ -67,11 +67,11 @@
|
|||
"stylelint": "^13.13.1",
|
||||
"stylelint-config-prettier": "^8.0.2",
|
||||
"stylelint-config-recess-order": "^2.4.0",
|
||||
"stylus": "^0.54.5",
|
||||
"stylus-loader": "^3.0.2",
|
||||
"svg-sprite-loader": "^6.0.9",
|
||||
"vab-config": "0.0.8",
|
||||
"webpackbar": "^5.0.0-3",
|
||||
"stylus": "^0.54.5",
|
||||
"stylus-loader": "^3.0.2"
|
||||
"webpackbar": "^5.0.0-3"
|
||||
},
|
||||
"gitHooks": {
|
||||
"pre-commit": "lint-staged"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-03-29 16:45:25
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-06-23 14:37:03
|
||||
* @LastEditTime: 2022-06-24 19:08:22
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
|
@ -28,10 +28,10 @@
|
|||
<!-- 站点配置 -->
|
||||
<script>
|
||||
window.SITE_CONFIG = {};
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
// 包头
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
|
||||
|
|
@ -49,10 +49,10 @@
|
|||
// window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
|
||||
// 穿透版本
|
||||
window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
|
||||
</script>
|
||||
|
||||
<link href="./leaflet/libs/leaflet/1.3.1/leaflet.css" rel="stylesheet">
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2020-07-07 16:03:23
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-06-23 17:55:06
|
||||
* @LastEditTime: 2022-06-24 18:16:44
|
||||
* @Description: 数据资源参数配置
|
||||
*/
|
||||
const newLocation = 'qingdao'
|
||||
// const newLocation = 'qingdao'
|
||||
// const newLocation = 'baotou'
|
||||
// const newLocation = 'xihaian'
|
||||
const newLocation = 'qingdao'
|
||||
|
||||
// 数据资源数据
|
||||
const whoShow = {}
|
||||
|
|
@ -57,39 +57,39 @@ if (newLocation === 'qingdao') {
|
|||
{
|
||||
name: '基础设施',
|
||||
key: 'lsjcss',
|
||||
num: 20135,
|
||||
num: '20135路',
|
||||
},
|
||||
{
|
||||
name: '数据资源',
|
||||
key: 'lsjcss',
|
||||
num: 857,
|
||||
num: '857条',
|
||||
},
|
||||
{
|
||||
name: '应用资源',
|
||||
key: 'lsjcss',
|
||||
num: 28,
|
||||
num: '28个',
|
||||
},
|
||||
]
|
||||
mapTestNum.xhaNum = [
|
||||
{
|
||||
name: '基础设施',
|
||||
key: 'xhajcss',
|
||||
num: 35282,
|
||||
num: '35282路',
|
||||
},
|
||||
{
|
||||
name: '数据资源',
|
||||
key: 'xhajcss',
|
||||
num: 11,
|
||||
num: '11条',
|
||||
},
|
||||
{
|
||||
name: '应用资源',
|
||||
key: 'xhajcss',
|
||||
num: 23,
|
||||
num: '23个',
|
||||
},
|
||||
{
|
||||
name: '组件服务',
|
||||
key: 'xhazjfw',
|
||||
num: 8,
|
||||
num: '8个',
|
||||
},
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,11 @@
|
|||
<template>
|
||||
<!-- 青岛 -->
|
||||
|
||||
<div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
|
||||
<home-header></home-header>
|
||||
<div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
|
||||
<div class="details-pageconetent-left">
|
||||
<detailsPageconetentTree />
|
||||
</div>
|
||||
<div class="details-pageconetent-left" v-else>
|
||||
<detailsPageInfrastructureTree />
|
||||
</div>
|
||||
<div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
|
||||
<div class="top" v-if="Cardsname != '知识库'">
|
||||
<div class="top-title">
|
||||
<div
|
||||
v-for="item in titleName"
|
||||
|
|
@ -147,28 +143,6 @@
|
|||
<a-empty />
|
||||
</div>
|
||||
</div>
|
||||
<div class="top" v-else-if="Cardsname === '基础设施'">
|
||||
<div class="top-title">
|
||||
<div
|
||||
v-for="item in titleName"
|
||||
:key="item.name"
|
||||
:class="item.name === Cardsname ? 'sel' : ''"
|
||||
@click="changeCards(item.name)"
|
||||
>
|
||||
<span
|
||||
class="photo"
|
||||
:style="{
|
||||
backgroundImage: `url(${item.photo}) `,
|
||||
backgroundSize: 'cover',
|
||||
}"
|
||||
></span>
|
||||
<span>{{ item.name }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="">
|
||||
<infrastructure-page></infrastructure-page>
|
||||
</div>
|
||||
</div>
|
||||
<div class="top" v-else>
|
||||
<div class="top-title">
|
||||
<div
|
||||
|
|
@ -682,9 +656,6 @@
|
|||
// import VideoSurveillance from '@/views/home/videoSurveillance'
|
||||
// 数据资源引用
|
||||
import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
|
||||
// 基础设施引用
|
||||
import InfrastructurePage from './infrastructurePage.vue'
|
||||
import detailsPageInfrastructureTree from './detailsPageInfrastructureTree.vue'
|
||||
export default defineComponent({
|
||||
setup() {
|
||||
// const store = useStore()
|
||||
|
|
@ -716,7 +687,6 @@
|
|||
// const jichusheshi=ref([
|
||||
// {
|
||||
// name:'青岛市云资源管理平台'
|
||||
|
||||
// }
|
||||
// ])
|
||||
// 模糊查询
|
||||
|
|
@ -811,7 +781,6 @@
|
|||
}
|
||||
// 免批
|
||||
const tagFlag = ref('')
|
||||
|
||||
// 视频资源
|
||||
const stateTags = ref(['在线', '离线'])
|
||||
const selStateTags = ref([])
|
||||
|
|
@ -1322,8 +1291,6 @@
|
|||
// VideoCameraOutlined,
|
||||
// VideoSurveillance,
|
||||
DetailsPageResource,
|
||||
InfrastructurePage,
|
||||
detailsPageInfrastructureTree,
|
||||
},
|
||||
beforeUnmount() {
|
||||
mybus.off('selectCardsitem')
|
||||
|
|
@ -1336,7 +1303,7 @@
|
|||
})
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.resultListSearchInput-father {
|
||||
.resultListSearchInput-father {
|
||||
background: #f3f5f9;
|
||||
padding-left: 0.2rem;
|
||||
padding-top: 0.2rem;
|
||||
|
|
@ -1351,8 +1318,8 @@
|
|||
margin-top: 0.2rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
.resultListSearchInput {
|
||||
}
|
||||
.resultListSearchInput {
|
||||
margin-left: 0.1rem;
|
||||
:deep(.ant-input) {
|
||||
width: 4rem;
|
||||
|
|
@ -1374,8 +1341,8 @@
|
|||
:deep(.ant-input-group-addon) {
|
||||
left: 0 !important;
|
||||
}
|
||||
}
|
||||
.button-reset {
|
||||
}
|
||||
.button-reset {
|
||||
border: 0;
|
||||
outline: none;
|
||||
width: 0.8rem;
|
||||
|
|
@ -1388,8 +1355,8 @@
|
|||
line-height: 0.34rem;
|
||||
margin-left: 2.5rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
.details-pageconetent {
|
||||
}
|
||||
.details-pageconetent {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
|
@ -1692,8 +1659,8 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.shrinkTag {
|
||||
}
|
||||
.shrinkTag {
|
||||
width: 0.5rem;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
|
@ -1702,12 +1669,12 @@
|
|||
span {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
.shrink {
|
||||
}
|
||||
.shrink {
|
||||
height: unset !important;
|
||||
overflow: unset !important;
|
||||
}
|
||||
.talk-monitor {
|
||||
}
|
||||
.talk-monitor {
|
||||
position: fixed;
|
||||
bottom: 0.5rem;
|
||||
right: 0.1rem;
|
||||
|
|
@ -1720,8 +1687,8 @@
|
|||
background: url('~@/assets/home/icon-talk.png');
|
||||
background-size: cover;
|
||||
}
|
||||
}
|
||||
.top-content-father {
|
||||
}
|
||||
.top-content-father {
|
||||
width: 10.87rem;
|
||||
padding-left: 0.2rem;
|
||||
// margin-bottom: .2rem;
|
||||
|
|
@ -1799,11 +1766,11 @@
|
|||
.top-content:nth-child(1) {
|
||||
margin-top: 0.41rem !important;
|
||||
}
|
||||
}
|
||||
:deep(.ant-card-grid) {
|
||||
}
|
||||
:deep(.ant-card-grid) {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
-webkit-line-clamp: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue