|
@@ -56,7 +56,7 @@
|
|
|
</div>
|
|
|
<div v-show="activeTab === 'dynamicData'" style="width:100%;textAlign:left;">
|
|
|
<div class="main" style="height: 750px;">
|
|
|
- <el-table ref="multipleTable" :data="tableData" v-loading='loading' stripe height="100%" :header-cell-style="headerStyle">
|
|
|
+ <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle">
|
|
|
<el-table-column prop="InfoPointName" label="信息点名称">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
@@ -133,7 +133,6 @@ export default {
|
|
|
total: 0
|
|
|
},
|
|
|
tableData: [],
|
|
|
- loading: false,
|
|
|
headerStyle: {// 列表样式
|
|
|
backgroundColor: '#e1e4e5',
|
|
|
color: '#2b2b2b',
|
|
@@ -160,7 +159,7 @@ export default {
|
|
|
},
|
|
|
updated() { },
|
|
|
computed: {
|
|
|
- ...mapGetters('layout', ['userInfo', 'projects', 'userId', 'secret', 'projectId'])
|
|
|
+ ...mapGetters('layout', ['userId', 'secret', 'projectId'])
|
|
|
},
|
|
|
methods: {
|
|
|
getData() {
|
|
@@ -287,30 +286,30 @@ export default {
|
|
|
font-size: 16px;
|
|
|
line-height: 50px;
|
|
|
height: 50px !important;
|
|
|
- padding: 0 20px;
|
|
|
+ padding: 0 10px;
|
|
|
background-color: #3f4f62;
|
|
|
}
|
|
|
.spaceName {
|
|
|
font-size: 14px;
|
|
|
line-height: 30px;
|
|
|
- padding: 0 20px;
|
|
|
- border-bottom: 1px solid black;
|
|
|
+ margin: 0 10px;
|
|
|
+ border-bottom: 1px solid #e4e7ed;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
}
|
|
|
.el-aside {
|
|
|
color: #333;
|
|
|
border: 1px solid #e4e7ed;
|
|
|
- margin: 20px 0 0 20px;
|
|
|
+ margin: 10px 0 0 10px;
|
|
|
padding: 20px;
|
|
|
box-sizing: border-box;
|
|
|
height: 100%;
|
|
|
overflow-y: auto;
|
|
|
.aside-top {
|
|
|
overflow: hidden;
|
|
|
+ display: flex;
|
|
|
.aside-top-left {
|
|
|
- float: left;
|
|
|
- width: 300px;
|
|
|
+ flex: 3;
|
|
|
}
|
|
|
.aside-top-right {
|
|
|
float: right;
|
|
@@ -341,6 +340,7 @@ export default {
|
|
|
.el-main {
|
|
|
color: #333;
|
|
|
text-align: center;
|
|
|
+ margin: -10px;
|
|
|
}
|
|
|
.objectRelationship {
|
|
|
display: flex;
|