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 2022-07-19 14:04:08 +08:00
commit 226f0fd71b
3 changed files with 329 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -35,8 +35,8 @@ export default class SignalButton extends Group {
return item.includes('ctc');
});
const ctcArcList = ['OCCLUSION', 'RECOVERY', 'CHANGE_DIRECTION', 'ACCIDENT', 'DEPART_ASSIST', 'PICK_ASSIST', 'ASSIST'];
const typeList = []
if (queryCtc && ctcArcList.includes(model.type)){
const typeList = [];
if (queryCtc && ctcArcList.includes(model.type)) {
this.arcShape = new Arc({
zlevel: this.zlevel,
z: this.z,
@ -52,9 +52,9 @@ export default class SignalButton extends Group {
}
});
this.add(this.arcShape);
} else if (this.style.SignalButton
&& this.style.SignalButton.shape === 'roundWithDock'
&& typeList.includes(model.type)) {
} else if (this.style.SignalButton &&
this.style.SignalButton.shape === 'roundWithDock' &&
typeList.includes(model.type)) {
const circle1 = new Circle({
zlevel: this.zlevel,
z: this.z + 2,
@ -68,7 +68,7 @@ export default class SignalButton extends Group {
lineWidth: 1,
fill: fillColor
}
})
});
const circle2 = new Circle({
zlevel: this.zlevel,
z: this.z + 1,
@ -80,7 +80,7 @@ export default class SignalButton extends Group {
style: {
fill: '#000'
}
})
});
const circle3 = new Circle({
zlevel: this.zlevel,
z: this.z,
@ -92,16 +92,16 @@ export default class SignalButton extends Group {
style: {
fill: '#eee'
}
})
this.arcShape = circle1
this.add(circle1).add(circle2).add(circle3)
});
this.arcShape = circle1;
this.add(circle1).add(circle2).add(circle3);
} else {
this.rectButton = new Rect({
zlevel: this.zlevel,
z: this.z,
shape: {
x: model.position.x,
y: model.position.y,
x: computedPosition.x,
y: computedPosition.y,
width: 14,
height: 14
},

1
src/views/newMap/displayNew/selectStation.vue
View File

@ -42,7 +42,6 @@ export default {
this.initStationListMode();
},
'$store.state.training.simulationUserList': function(val) {
console.log('----------11');
this.initData();
},
'$store.state.socket.simulationRoleList':function(list) {

35
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
View File

@ -54,7 +54,7 @@
:value="item.code"
/>
</el-select>
<el-button :type="field === 'signalCode'? 'danger':'primary'" @click="hover('signalCode')">{{$t('map.activate')}}</el-button>
<el-button :type="field === 'signalCode'? 'danger':'primary'" @click="hover('signalCode')">{{ $t('map.activate') }}</el-button>
</el-form-item>
<el-form-item label="闭塞类型:" prop="runModel">
<el-select v-model="addModel.runModel" :placeholder="$t('map.pleaseSelect')">
@ -110,13 +110,13 @@
</div>
</template>
<script>
import { setUID } from '@/jmapNew/utils/Uid';
import { deepAssign } from '@/utils/index';
import { saveAssist } from '@/api/assist';
import { mapGetters } from 'vuex';
import ConstConfig from '@/scripts/ConstConfig';
import { queryAssistListPaged } from '@/api/assist';
export default {
// import { setUID } from '@/jmapNew/utils/Uid';
import { deepAssign } from '@/utils/index';
import { saveAssist } from '@/api/assist';
import { mapGetters } from 'vuex';
import ConstConfig from '@/scripts/ConstConfig';
import { queryAssistListPaged } from '@/api/assist';
export default {
name:'BigRouteInfo',
props: {
selected: {
@ -134,7 +134,7 @@
},
data() {
var checkSectionList = (rule, value, callback) => {
if (!value || value.length === 0){
if (!value || value.length === 0) {
callback(new Error('请选择关联区段！'));
} else {
callback();
@ -160,11 +160,11 @@
},
rules: {
'name':[
{ required: true, message: '请输入名称', trigger: 'blur' },
{ required: true, message: '请输入名称', trigger: 'blur' }
],
'stationCode':[
{ required: true, message: '请选择关联车站', trigger: 'blur' },
{ required: true, message: '请选择关联车站', trigger: 'change' },
{ required: true, message: '请选择关联车站', trigger: 'change' }
],
'labelEnum': [
{ required: true, message: '请选择运行方向', trigger: 'change' }
@ -181,13 +181,6 @@
],
'runStatus': [
{ required: true, message: '请选择默认状态', trigger: 'change' }
],
'relativeStationCode': [
{ required: true, message: '请选择相对运行车站', trigger: 'blur' },
{ required: true, message: '请选择相对运行车站', trigger: 'change' }
],
'relativeLabelEnum': [
{ required: true, message: '请选择相对运行方向', trigger: 'change' }
]
},
runModelList: [
@ -216,7 +209,7 @@
methods:{
initPage() {
if (this.mapInfo) {
queryAssistListPaged({pageNum: 1, pageSize: 999},this.mapInfo.id).then(resp => {
queryAssistListPaged({pageNum: 1, pageSize: 999}, this.mapInfo.id).then(resp => {
this.relativeList = resp.data.list;
});
}
@ -234,7 +227,7 @@
} else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'stationCode'.toUpperCase()) {
this.addModel.stationCode = selected.code;
this.field = '';
} else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'signalCode'.toUpperCase()){
} else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'signalCode'.toUpperCase()) {
this.addModel.signalCode = selected.code;
this.field = '';
} else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'relativeStationCode'.toUpperCase()) {
@ -279,7 +272,7 @@
}
}
}
};
};
</script>
<style lang="scss" scoped>
.BigRouteInfo{