Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
7c924dcec5
@ -35,7 +35,7 @@ export function getTopic(type, group, stationCode) {
|
||||
topic = `/queue/simulation/${group}/ctc`;
|
||||
break;
|
||||
case 'CTC_MANAGE':
|
||||
topic = `/queue/simulation/ctc/manage/${group}`;
|
||||
topic = `/queue/simulation/${group}/ctc/manage`;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -219,7 +219,6 @@ export default {
|
||||
this.loading = true;
|
||||
const param = {stationCode:this.addModel.stationCode, runPlanParamList:[this.addModel]};
|
||||
commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{
|
||||
debugger;
|
||||
if (valid) {
|
||||
this.doClose();
|
||||
}
|
||||
@ -401,12 +400,6 @@ export default {
|
||||
// top: -18px;
|
||||
// }
|
||||
|
||||
// .chengdou-03__systerm .el-dialog .context {
|
||||
// height: 100px;
|
||||
// border: 2px inset #E2E2E2;
|
||||
// overflow-y: scroll;
|
||||
// }
|
||||
|
||||
// .chengdou-03__systerm .el-dialog .notice {
|
||||
// margin-left: 62px;
|
||||
// line-height: 30px;
|
||||
|
@ -103,11 +103,11 @@ export default {
|
||||
});
|
||||
if (!findTab) {
|
||||
this.currentTabs.push(Object.assign( {name:name}, nameMap[name]));
|
||||
this.$nextTick(()=>{
|
||||
this.$refs[this.activeTab][0].loadStation();
|
||||
});
|
||||
}
|
||||
this.activeTab = name;
|
||||
this.$nextTick(()=>{
|
||||
this.$refs[this.activeTab][0].loadStation();
|
||||
});
|
||||
},
|
||||
quit() {
|
||||
window.close();
|
||||
@ -296,4 +296,10 @@ border-left: 1px #94b6f0 solid;border-right: 1px #c9d3e0 solid;}
|
||||
.datie-02__systerm .el-dialog span.el-input__suffix .el-input__icon{
|
||||
line-height:22px;
|
||||
}
|
||||
.datie-02__systerm .el-dialog .context {
|
||||
height: 100px;
|
||||
border: 2px inset #E2E2E2;
|
||||
overflow-y: scroll;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
|
@ -75,6 +75,7 @@ export default {
|
||||
this.$emit('loadStationData', data.id);
|
||||
},
|
||||
loadStation() {
|
||||
this.treeList[0].children = [];
|
||||
this.stationList.forEach(station => {
|
||||
if (!station.depot) {
|
||||
this.treeList[0].children.push({id:station.code, label:station.name});
|
||||
|
@ -21,7 +21,7 @@
|
||||
</div>
|
||||
<div class="trainFixedPathRMenuR">
|
||||
<span class="trainFixedPathRVer">版本号</span>
|
||||
<el-button class="trainFixedPathButton" size="small">备份</el-button>
|
||||
<el-button class="trainFixedPathButton" size="small" @click="exportData">备份</el-button>
|
||||
<el-button class="trainFixedPathButton" size="small">更新至生效区</el-button>
|
||||
<el-button class="trainFixedPathButton" size="small">导入</el-button>
|
||||
<el-button class="trainFixedPathButton" size="small">比较</el-button>
|
||||
@ -232,6 +232,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { now} from '@/utils/date';
|
||||
import TerminalStationList from './terminalStationList';
|
||||
import AddRunplan from './addRunplan';
|
||||
import { copyAssign } from '@/utils/index';
|
||||
@ -267,6 +268,19 @@ export default {
|
||||
noticeInfo() {
|
||||
this.$emit('noticeInfo');
|
||||
},
|
||||
exportData() {
|
||||
const currentDay = now().replace(/(-|:)|\s/g, '');
|
||||
const content = new Blob(
|
||||
[JSON.stringify({stationCode:this.currentStationCode, runPlanParamList:this.tableData})]
|
||||
);
|
||||
const urlObject = window.URL || window.webkitURL || window;
|
||||
const url = urlObject.createObjectURL(content);
|
||||
const el = document.createElement('a');
|
||||
el.href = url;
|
||||
el.download = `TRAIN_WAY_LIST-${currentDay}.json`;
|
||||
el.click();
|
||||
urlObject.revokeObjectURL(url);
|
||||
},
|
||||
handleData() {
|
||||
this.tableData = [];
|
||||
const railCtcStationManageRpMsg = copyAssign({}, this.$store.state.socket.railCtcStationManageRpMsg);
|
||||
|
Loading…
Reference in New Issue
Block a user