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

宁波问题调整

Browse Source
This commit is contained in:
fan 2021-05-25 16:33:20 +08:00
parent a42e3ecafc
commit 3b3c964636
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
View File

@ -9,9 +9,8 @@
</template> </template>
<script> <script>
import Vue from 'vue';
import Jlmap from '@/jmapNew/map'; import Jlmap from '@/jmapNew/map';
import { parser } from '@/jmapNew/utils/parser'; import { parserFactory, ParserType } from '@/jmapNew/parser';
import { deepAssign } from '@/utils/index'; import { deepAssign } from '@/utils/index';
import deviceType from '@/jmapNew/constant/deviceType'; import deviceType from '@/jmapNew/constant/deviceType';
@ -113,7 +112,8 @@ export default {
}; };
if (this.mapData.skinVO) { if (this.mapData.skinVO) {
this.mapDevice = parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig()); const parser = parserFactory(ParserType.Graph.value);
this.mapDevice = parser.parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig());
} }
}, },
loadData() { loadData() {

6
src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
View File

@ -162,9 +162,10 @@ export default {
this.tableData.forEach(item => { this.tableData.forEach(item => {
const centralizedStationCode = this.stationCentralizedMap[item.code]; const centralizedStationCode = this.stationCentralizedMap[item.code];
const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
const station = this.$store.getters['map/getDeviceByCode'](item.code);
if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') { if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') {
item.apply = false; item.apply = false;
} else if (item.controller !== this.memberId) { } else if (station.controller !== this.memberId) {
item.apply = true; item.apply = true;
} }
}); });
@ -178,9 +179,10 @@ export default {
this.tableData.forEach(item => { this.tableData.forEach(item => {
const centralizedStationCode = this.stationCentralizedMap[item.code]; const centralizedStationCode = this.stationCentralizedMap[item.code];
const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode); const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
const station = this.$store.getters['map/getDeviceByCode'](item.code);
if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') { if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') {
item.apply = false; item.apply = false;
} else if (item.controller === this.memberId) { } else if (station.controller === this.memberId) {
item.release = true; item.release = true;
} }
}); });