joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

iscs调整

Browse Source
This commit is contained in:
fan 2020-06-01 10:32:02 +08:00
parent c395fcbcff
commit 76990e129e
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/map.js
View File

@ -289,6 +289,7 @@ class Jlmap {
setUpdateMapDevice(list) { setUpdateMapDevice(list) {
store.dispatch('map/updateMapDevice', list); store.dispatch('map/updateMapDevice', list);
(list || []).forEach(elem => { (list || []).forEach(elem => {
const code = elem.code; const code = elem.code;
const type = elem._type; const type = elem._type;
if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') { if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') {

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

34
src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue
View File

@ -2,19 +2,21 @@
<div class="emergency_release"> <div class="emergency_release">
<div class="emergency_release_header"> <div class="emergency_release_header">
<div class="emergency_header_text">中心PIS紧急信息一览</div> <div class="emergency_header_text">中心PIS紧急信息一览</div>
<el-table v-model="tableData" :header-cell-style="headerCellStyle" height="50%" style="width: 94%; position: relative;left: 3%"> <el-table :data="tableData" :header-cell-style="headerCellStyle" :cell-style="cellStyle" :height="'60%'" style="width: 94%; position: relative;left: 3%;">
<el-table-column prop="time" label="时间" width="150" /> <el-table-column prop="time" label="时间" width="150" />
<el-table-column prop="description" label="信息描述" /> <el-table-column prop="description" label="信息描述" />
<el-table-column prop="level" label="等级" /> <el-table-column prop="level" label="等级" />
</el-table> </el-table>
<div style="width: 75%; position: relative;left: 3%;background: #FFF;margin-top: 10px;padding: 2px;display: inline-block"> <div style="margin-top: 10px;width: 100%;">
<div style="width: 100%;text-align: center;font-size: 13px;padding-top:5px;">显示内容</div> <div style="width: 75%;background: #FFF;padding: 2px;display: inline-block;vertical-align:top;margin-left: 3%">
<div style="width:100%; height: 100px; border: 1px solid #000;" /> <div style="width: 100%;text-align: center;font-size: 13px;padding-top:5px;">显示内容</div>
</div> <div style="width:100%; height: 100px; border: 1px solid #000;" />
<div style="width: 15%;background: #939FAC; display: inline-block;margin-left: 6%;margin-top: 10px;"> </div>
<div class="emergency_select_button">区域详细</div> <div style="width: 15%;background: #939FAC; display: inline-block;margin-left: 2%;">
<div style="width: 100%;text-align: center;color: #FFF;font-size: 13px;background: #121A86;">紧急信息清除</div> <div class="emergency_select_button">区域详细</div>
<div class="emergency_select_button">清除</div> <div style="width: 100%;text-align: center;color: #FFF;font-size: 13px;background: #121A86;height: 30px;line-height: 30px;">紧急信息清除</div>
<div class="emergency_select_button">清除</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -25,14 +27,16 @@ export default {
data() { data() {
return { return {
tableData: [], tableData: [],
headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'} headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'},
cellStyle: {height:'25px'}
}; };
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.emergency_release{padding:20px;} .emergency_release{padding:20px;height: 100%;}
.emergency_release_header{height: 100%;}
.emergency_header_text{margin-top:10px;text-align: center;color: #9af1ec;font-size: 18px;padding-bottom: 10px;} .emergency_header_text{margin-top:10px;text-align: center;color: #9af1ec;font-size: 18px;padding-bottom: 10px;}
.emergency_select_button { .emergency_select_button {
text-align: center; text-align: center;
@ -43,7 +47,7 @@ export default {
border-left: 2px solid #FFF; border-left: 2px solid #FFF;
border-right: 2px solid #898888; border-right: 2px solid #898888;
border-bottom: 2px solid #898888; border-bottom: 2px solid #898888;
margin: 5px 12px 10px; margin: 10px auto 5px;
font-size: 14px; font-size: 14px;
line-height: 30px; line-height: 30px;
cursor:pointer; cursor:pointer;
@ -52,7 +56,7 @@ export default {
-ms-user-select:none; -ms-user-select:none;
user-select:none; user-select:none;
} }
.emergency_select_button :active { .emergency_select_button:active {
border-top: 2px solid #898888; border-top: 2px solid #898888;
border-left: 2px solid #898888; border-left: 2px solid #898888;
border-right: 2px solid #FFF; border-right: 2px solid #FFF;
@ -62,4 +66,8 @@ export default {
.el-table th{ .el-table th{
padding: 0; padding: 0;
} }
/deep/
.el-table td{
padding: 0;
}
</style> </style>