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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-06-01 11:22:08 +08:00
commit 46d5e09f7b
11 changed files with 73 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/QueryListPage/QueryForm.vue
View File

@ -510,6 +510,9 @@ export default {
if ( typeof row.selectChange === 'function') {
row.selectChange && row.selectChange(form);
}
},
getFormModel() {
return this.formModel;
}
}
};

7
src/components/QueryListPage/QueryListPage.vue
View File

@ -486,6 +486,13 @@ export default {
}
this.queryList.data = [...this.queryList.data];
},
getFormModel() {
if (this.$refs.queryForm) {
return this.$refs.queryForm.getFormModel();
} else {
return '';
}
},
sortChange(data) {
const self = this;
if (data.order && data.column.sortable == 'custom') {

2
src/jmap/shape/Switch/index.js
View File

@ -303,7 +303,7 @@ export default class Switch extends Group {
this.releaseBackground.hide();
break;
case '02':
this.relocShelter.getSection().animateStyle(true)
this.relocShelter && this.relocShelter.getSection().animateStyle(true)
.when(1000, { fill: this.style.backgroundColor })
.start();
break;

4
src/jmapNew/shape/Switch/ESwLnversion.js
View File

@ -47,6 +47,10 @@ class ESwLnversion extends Group {
this.relocShelter.stopAnimation(flag);
}
getSection() {
return this.relocShelter;
}
animateStyle(cb) {
this.eachChild((child) => {
cb(child);

10
src/jmapNew/shape/Switch/index.js
View File

@ -121,7 +121,7 @@ export default class Switch extends Group {
fill: 'rgba(0, 0, 0, 1)',
lineDash: [3, 3],
stroke: '#F00',
lineWidth: 1
lineWidth: 2
}
});
this.add(this.lossShow);
@ -333,8 +333,8 @@ export default class Switch extends Group {
this.lossShow && this.lossShow.show();
this.lossShow && this.lossShow.animateStyle(true)
.when(0, { stroke: this.style.backgroundColor })
.when(1000, { stroke: '#F00' })
.when(2000, { stroke: this.style.backgroundColor })
.when(500, { stroke: '#F00' })
.when(1000, { stroke: this.style.backgroundColor })
.start();
}
@ -462,10 +462,10 @@ export default class Switch extends Group {
if (this.model.normalPosition) {
this.releaseBackground.hide(); /** 定位*/
} else if (this.model.reversePosition) {
this.relocShelter.getSection().animateStyle(true)
this.relocShelter && this.relocShelter.getSection().animateStyle(true)
.when(1000, { fill: this.style.backgroundColor })
.start();
this.rhomboid.getSection().animateStyle(true)
this.rhomboid && this.rhomboid.getSection().animateStyle(true)
.when(1000, { fill: this.style.backgroundColor })
.start(); /** 反位*/
}

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// 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.6: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://2925963m2a.zicp.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_header">
<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="description" label="信息描述" />
<el-table-column prop="level" label="等级" />
</el-table>
<div style="width: 75%; position: relative;left: 3%;background: #FFF;margin-top: 10px;padding: 2px;display: inline-block">
<div style="width: 100%;text-align: center;font-size: 13px;padding-top:5px;">显示内容</div>
<div style="width:100%; height: 100px; border: 1px solid #000;" />
</div>
<div style="width: 15%;background: #939FAC; display: inline-block;margin-left: 6%;margin-top: 10px;">
<div class="emergency_select_button">区域详细</div>
<div style="width: 100%;text-align: center;color: #FFF;font-size: 13px;background: #121A86;">紧急信息清除</div>
<div class="emergency_select_button">清除</div>
<div style="margin-top: 10px;width: 100%;">
<div style="width: 75%;background: #FFF;padding: 2px;display: inline-block;vertical-align:top;margin-left: 3%">
<div style="width: 100%;text-align: center;font-size: 13px;padding-top:5px;">显示内容</div>
<div style="width:100%; height: 100px; border: 1px solid #000;" />
</div>
<div style="width: 15%;background: #939FAC; display: inline-block;margin-left: 2%;">
<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>
@ -25,14 +27,16 @@ export default {
data() {
return {
tableData: [],
headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'}
headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'},
cellStyle: {height:'25px'}
};
}
};
</script>
<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_select_button {
text-align: center;
@ -43,7 +47,7 @@ export default {
border-left: 2px solid #FFF;
border-right: 2px solid #898888;
border-bottom: 2px solid #898888;
margin: 5px 12px 10px;
margin: 10px auto 5px;
font-size: 14px;
line-height: 30px;
cursor:pointer;
@ -52,7 +56,7 @@ export default {
-ms-user-select:none;
user-select:none;
}
.emergency_select_button :active {
.emergency_select_button:active {
border-top: 2px solid #898888;
border-left: 2px solid #898888;
border-right: 2px solid #FFF;
@ -62,4 +66,8 @@ export default {
.el-table th{
padding: 0;
}
/deep/
.el-table td{
padding: 0;
}
</style>

11
src/views/jsxt/competition/theory/result.vue
View File

@ -98,7 +98,6 @@ export default {
this.examQuestions.push({...item.question, ...{answer: String(item.answerOptionId), score: item.score, index: i}});
});
this.totalScore = resp.data.reduce((pre, ver) => pre + ver.score, 0);
console.log(this.totalScore);
}
}).catch(error => { this.$message.error(`加载考试详情失败：${error.message}`); });
},
@ -106,8 +105,14 @@ export default {
document.querySelector('.el-header').scrollIntoView(true);
},
commit() {
const query = { raceId:this.$route.query.raceId };
this.$router.push({path: `/jsxt/home`, query: query });
if (this.$route.query.result) {
const query = { raceId:this.$route.query.raceId };
this.$router.push({path: `/refereeJsxt/home`, query: query });
} else {
const query = { raceId:this.$route.query.raceId };
this.$router.push({path: `/jsxt/home`, query: query });
}
}
}
};

16
src/views/jsxt/refereeList/index.vue
View File

@ -103,7 +103,13 @@ export default {
showControl: (row) => { return row.status == '3'; }
},
{
name: '回放',
name: '理论结果',
handleClick: this.handleTheoryResult,
type: '',
showControl: (row) => { return row.status == '5'; }
},
{
name: '实操回放',
handleClick: this.playBack,
type: '',
showControl: (row) => { return row.status == '4'; }
@ -141,7 +147,8 @@ export default {
return statusDict[status];
},
getData() {
const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1};
const formModel = this.$refs.queryListPage.getFormModel();
const params = {raceId:this.$route.query.raceId, pageSize:999, pageNum:1, name: formModel ? formModel.name : '', organization: formModel ? formModel.organization : ''};
getRaceUserList(params).then(response=>{
this.queryList.data = response.data.list;
this.refresh();
@ -153,6 +160,9 @@ export default {
}, 2000);
});
},
handleTheoryResult() {
this.$router.replace({ path: `/jsxt/theory/result?raceId=${this.$route.query.raceId}&result=true` });
},
handleAdd() {
const loading = this.$loading({
lock: true,
@ -169,7 +179,7 @@ export default {
reader.readAsText(f, 'utf-8');
reader.onload = function(e) {
const data = e.target.result;
console.log(JSON.parse(data));
// console.log(JSON.parse(data));
loadingPaper(that.$route.query.raceId, JSON.parse(data)).then(res => {
that.$message.success('试题加载成功');
loading.close();

8
src/views/newMap/jlmapNew/index.vue
View File

@ -433,7 +433,13 @@ export default {
let list = [];
nameList.forEach(item => {
if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) {
list = [...list, ...this.$store.state.map.map[item]];
if (item === 'trainList') {
this.$store.state.map.map[item].forEach(elem => {
elem && list.push(elem);
});
} else {
list = [...list, ...this.$store.state.map.map[item]];
}
}
});
this.$jlmap.updateShowStation(list, stationCode);

4
src/views/planMonitor/editTool/menus/createEmptyPlan.vue
View File

@ -219,9 +219,9 @@ export default {
for (const index in wb.Sheets) {
jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
}
// console.log(jsonData, '解析后数据');
console.log(jsonData, '解析后数据');
if (that.$route.query.lineCode == '02') {
if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) {
that.loadingDig.close();
that.$message.warning(`运行图暂无默认上行折返轨或默认下行折返轨，请输入`);
} else {