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

Compare commits

base: joylink:ae826ac205ad03e544001f5345538d56bcad033e
Branches Tags
joylink:master
joylink:develop
joylink:local-test
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest
...
compare: joylink:92c66ab4d6bd1428eb4941d6e83a6fd64b23d167
Branches Tags
joylink:develop
joylink:local-test
joylink:master
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest

2 Commits
ae826ac205 ... 92c66ab4d6

Author SHA1 Message Date
joylink_fanyuhong
92c66ab4d6 画面管理处理设备map为空 2024-09-29 14:11:41 +08:00
joylink_fanyuhong
5a7c5fdbeb 成都三号线折返进路办理调整 2024-09-29 14:11:09 +08:00
14 changed files with 16 additions and 15 deletions
Show Stats Expand all files Collapse all files

3
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -572,7 +572,8 @@ export default {
}; };
let flag = false; let flag = false;
this.routeList.forEach(item => { this.routeList.forEach(item => {
if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) { const endSignalCode = item.endButtonSignalCode || item.endSignalCode;
if (item.startSignalCode === deviceList[0].code && endSignalCode === deviceList[1].code) {
operate.param = {routeCode: item.code, signalCode: deviceList[0].code}; operate.param = {routeCode: item.code, signalCode: deviceList[0].code};
this.deviceList = []; this.deviceList = [];
flag = true; flag = true;

4
src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
View File

@ -299,7 +299,7 @@ export default {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'lucency'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'lucency');
if (picture) { if (picture) {
this.$jlmap.updateShowStation(list, ''); this.$jlmap.updateShowStation(list, '');
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {
@ -320,7 +320,7 @@ export default {
if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'chainStation'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'chainStation');
if (picture) { if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {

2
src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
View File

@ -100,7 +100,7 @@ export default {
this.show = true this.show = true
this.$nextTick(() => { this.$nextTick(() => {
const picData = this.mapData.pictureList.find(pic => pic.stationCodes.includes(stationCode) && pic.type === 'regionBatchOperation') const picData = this.mapData.pictureList.find(pic => pic.stationCodes.includes(stationCode) && pic.type === 'regionBatchOperation')
this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap) this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap || {})
const list = [] const list = []
for (const deviceCode in picData.deviceMap) { for (const deviceCode in picData.deviceMap) {
list.push(deviceCode) list.push(deviceCode)

2
src/views/designPlatform/bigScreen.vue
View File

@ -131,7 +131,7 @@ export default {
picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
} }
if (picture) { if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {

2
src/views/newMap/display/terminals/bigScreen.vue
View File

@ -49,7 +49,7 @@ export default {
if (this.mapData && this.mapData.pictureList) { if (this.mapData && this.mapData.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
if (picture) { if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {

2
src/views/newMap/display/terminals/dispatchWork.vue
View File

@ -97,7 +97,7 @@ export default {
list.push(this.mapDevice[key]); list.push(this.mapDevice[key]);
deviceList.push(key); deviceList.push(key);
} }
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
setTimeout(() => { setTimeout(() => {
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
const trainingDetail = this.$store.state.trainingNew.trainingDetail; const trainingDetail = this.$store.state.trainingNew.trainingDetail;

2
src/views/newMap/display/terminals/emergencyDispatchWork.vue
View File

@ -61,7 +61,7 @@ export default {
if (this.mapData && this.mapData.pictureList) { if (this.mapData && this.mapData.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
if (picture) { if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {

2
src/views/newMap/display/terminals/interlockWork.vue
View File

@ -82,7 +82,7 @@ export default {
deviceList.push(key); deviceList.push(key);
} }
this.$jlmap.updateShowStation(list); this.$jlmap.updateShowStation(list);
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
setTimeout(() => { setTimeout(() => {
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin); this.$jlmap.updateTransform(picture.scaling, picture.origin);

2
src/views/newMap/display/terminals/lineMonitor.vue
View File

@ -89,7 +89,7 @@ export default {
list.push(this.mapDevice[key]); list.push(this.mapDevice[key]);
deviceList.push(key); deviceList.push(key);
} }
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
setTimeout(() => { setTimeout(() => {
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
const trainingDetail = this.$store.state.trainingNew.trainingDetail; const trainingDetail = this.$store.state.trainingNew.trainingDetail;

2
src/views/newMap/display/terminals/localWork.vue
View File

@ -117,7 +117,7 @@ export default {
deviceList.push(key); deviceList.push(key);
} }
this.$jlmap.updateShowStation(list); this.$jlmap.updateShowStation(list);
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
setTimeout(() => { setTimeout(() => {
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
const trainingDetail = this.$store.state.trainingNew.trainingDetail; const trainingDetail = this.$store.state.trainingNew.trainingDetail;

2
src/views/newMap/display/terminals/trafficTerminalWork.vue
View File

@ -92,7 +92,7 @@ export default {
deviceList.push(key); deviceList.push(key);
} }
this.$jlmap.updateShowStation(list); this.$jlmap.updateShowStation(list);
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin); this.$jlmap.updateTransform(picture.scaling, picture.origin);
this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]); this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);

2
src/views/newMap/display/terminals/troDetailWork.vue
View File

@ -118,7 +118,7 @@ export default {
list.push(this.mapDevice[key]); list.push(this.mapDevice[key]);
deviceList.push(key); deviceList.push(key);
} }
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
setTimeout(() => { setTimeout(() => {
this.$jlmap.updatePicture(deviceList); this.$jlmap.updatePicture(deviceList);
const trainingDetail = this.$store.state.trainingNew.trainingDetail; const trainingDetail = this.$store.state.trainingNew.trainingDetail;

2
src/views/newMap/display/terminals/troWork.vue
View File

@ -48,7 +48,7 @@ export default {
if (this.mapData && this.mapData.pictureList) { if (this.mapData && this.mapData.pictureList) {
const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
if (picture) { if (picture) {
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap || {});
const deviceList = []; const deviceList = [];
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;
for (const deviceCode in mapDevice) { for (const deviceCode in mapDevice) {

2
src/views/newMap/mapDraftPicture/index.vue
View File

@ -451,7 +451,7 @@ export default {
this.$refs.mapOperate.pictureChanged(pictureName); this.$refs.mapOperate.pictureChanged(pictureName);
const pictureModel = this.$store.state.map.map.pictureList.find(elem => elem.name == pictureName); const pictureModel = this.$store.state.map.map.pictureList.find(elem => elem.name == pictureName);
const deviceMap = pictureModel ? pictureModel.deviceMap : {}; const deviceMap = pictureModel ? pictureModel.deviceMap : {};
this.$store.dispatch('map/setPictureDeviceMap', deviceMap); this.$store.dispatch('map/setPictureDeviceMap', deviceMap || {});
const deviceList = []; const deviceList = [];
const map = this.$store.state.map.map; const map = this.$store.state.map.map;
const mapDevice = this.$store.state.map.mapDevice; const mapDevice = this.$store.state.map.mapDevice;