diff --git a/src/components/orgTree.vue b/src/components/orgTree.vue index f56011839cfec4f7407479a878eb85e8a66a2c71..7568a3753e663a8b8bdd485a807a9593024f23ae 100644 --- a/src/components/orgTree.vue +++ b/src/components/orgTree.vue @@ -208,7 +208,7 @@ export default { .el-select-tree { width: 300px; - height: calc(100vh - 10px); + height: calc(100vh - 56px); background: rgba(255, 255, 255, 1); .tree_header { display: flex; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 9d6dfdf57a8da2ed580461ffbea69be359b20de8..adf5e2786174c3e524f3c1ce5c4b16edf6d309a7 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -25,7 +25,7 @@ export default { background: #fff; border-radius: 8px; /*50 = navbar */ - min-height: calc(100vh - 50px); + min-height: calc(100vh - 106px); width: calc(98% - 20px); position: relative; overflow: hidden; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b248be69ab0eee3794489d77a03f713fc9739e49..e9d3fe41f0d1451025f5865aa89abae57f3e44c1 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -189,6 +189,7 @@ export default { .el-dropdown-menu{ padding:5px 0; background: #2066f9; + border:none; } .el-dropdown-menu__item:not(.is-disabled):hover{ background-color: #1a52c7; diff --git a/src/styles/common.scss b/src/styles/common.scss index aae4352ce71ffaf799c0da747105ff5e3f079907..591b4609e74ef3e8f6b935af45cad4a5fdc5bade 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -23,7 +23,12 @@ .flex_clo { display: flex; flex-direction: column; + height: 880px; } .leakage-cable .leakage-top{ padding-right: 10px; } +.el-table{ + height: 613px; + overflow-y: scroll; +} diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 8449638057b980d411eeda0b3a034e2d6eadbfb8..80d9462e8abd6a343ebe953efdc5942dad734ea1 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -2,7 +2,7 @@ .main-container { background-color: #F9F9F9; - min-height: 100%; + min-height: calc(100% - 56px); transition: margin-left .28s; // margin-left: $sideBarWidth; position: relative; diff --git a/src/views/alarm/cableTime/index.vue b/src/views/alarm/cableTime/index.vue index ae97b2f927eac8c22ffb6f7c23bf5afa2f718abb..fb34961f9340626e34ae8b7867f7b5e303ca4d1b 100644 --- a/src/views/alarm/cableTime/index.vue +++ b/src/views/alarm/cableTime/index.vue @@ -38,12 +38,12 @@ </div> </template> </el-table-column> - <el-table-column prop="uploadDate" label="æœ€æ–°ä¸Šä¼ æ—¶é—´" align="center" /> - <el-table-column prop="updateDate" label="状æ€å˜åŒ–时间" align="center" /> + <el-table-column prop="uploadDate" label="æœ€æ–°ä¸Šä¼ æ—¶é—´" align="center" width="105"/> + <el-table-column prop="updateDate" label="状æ€å˜åŒ–时间" align="center" width="105"/> <el-table-column prop="confirmUser" label="确认人" align="center" /> <el-table-column prop="confirmTime" label="确认时间" align="center" /> <el-table-column - fixed="right" + label="æ“作" align="center" width="100"> diff --git a/src/views/monitor/leakageCable.vue b/src/views/monitor/leakageCable.vue index 1e34b2ae69143b6cb3c81ca3f2309850ab0e7341..ddce10809ea22a53ca4f92cc58515ed810ac97b3 100644 --- a/src/views/monitor/leakageCable.vue +++ b/src/views/monitor/leakageCable.vue @@ -123,6 +123,87 @@ export default { }, uploadDate: '2022/12/18 11:51:12' } + ,{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + },{ + name: 'STATION2未开通', + object: 'æ¼ç¼†FSU2_R1下行方å‘', + level: 'é‡è¦', + message: { + red: ['è·ç¦»ï¼š0ç±³ 驻波比:8.72'], + green: ['è·ç¦»ï¼š18ç±³ 驻波比:1.07', 'è·ç¦»ï¼š42ç±³ 驻波比:1.02'], + black: ['æ¼ç¼†ç™¾ç±³æŸè€—:2.8'] + }, + uploadDate: '2022/12/18 11:51:12' + } ], }; },