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

2020-06-24 14:06:48 +08:00 · 2020-06-24 14:06:48 +08:00 · 5715c7cc98
commit 5715c7cc98
parent eec3d47b84 e71f74a769
25 changed files with 263 additions and 123 deletions
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@ -5,6 +5,7 @@
    <switch-cmd-control ref="switchCmdControl" />
    <speed-cmd-control ref="speedCmdControl" />
    <notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
+    <set-fault ref="setFault" pop-class="xian-01__systerm" />
  </div>
 </template>

--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@ -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'; // 张赛
--- a/src/views/iscs/iscsDesign/demonList.vue
+++ b/src/views/iscs/iscsDesign/demonList.vue
@ -81,20 +81,34 @@ export default {
                        {
                            name: 'FAS界面',
                            mode: 'fas',
-                            id: '1',
+                            id: 'fas',
                            type: 'system',
                            children: [
                                {
                                    name: '站厅报警',
                                    mode: 'fas',
-                                    id: '11',
-                                    type: 'interface'
+                                    id: 'stationHall',
+                                    type: 'system',
+                                    children: [
+                                        {
+                                            name: '站厅报警',
+                                            mode: 'fas',
+                                            id: 'stationHall',
+                                            type: 'interface'
+                                        }
+                                    ]
                                },
                                {
                                    name: '站台报警',
                                    mode: 'fas',
-                                    id: '14',
-                                    type: 'interface'
+                                    id: 'stand',
+                                    type: 'system',
+                                    children: {
+                                        name: '站台报警',
+                                        mode: 'fas',
+                                        id: 'stand',
+                                        type: 'interface'
+                                    }
                                },
                                {
                                    name: '站台报警-公共',
--- a/src/views/iscs/iscsSystem/config/acs/standACS.vue
+++ b/src/views/iscs/iscsSystem/config/acs/standACS.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('61');
+        this.$refs.iscsPlate.show('acs', 'acs', 'stand');
    },
    methods: {}
 };
--- a/src/views/iscs/iscsSystem/config/acs/stationHallACS.vue
+++ b/src/views/iscs/iscsSystem/config/acs/stationHallACS.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('62');
+        this.$refs.iscsPlate.show('acs', 'acs', 'stationHall');
    },
    methods: {}
 };
--- a/src/views/iscs/iscsSystem/config/afc/afc.vue
+++ b/src/views/iscs/iscsSystem/config/afc/afc.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('51');
+        this.$refs.iscsPlate.show('afc', 'afc', 'afc');
    },
    methods: {}
 };
--- a/src/views/iscs/iscsSystem/config/bas/bigSystem.vue
+++ b/src/views/iscs/iscsSystem/config/bas/bigSystem.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('21');
+        this.$refs.iscsPlate.show('bas', 'bigSystem', 'bigSystem');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/electricEscalator.vue
+++ b/src/views/iscs/iscsSystem/config/bas/electricEscalator.vue
@ -19,7 +19,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('26');
+        this.$refs.iscsPlate.show('bas', 'electricEscalator', 'electricEscalator');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/lightingSystem.vue
+++ b/src/views/iscs/iscsSystem/config/bas/lightingSystem.vue
@ -23,15 +23,15 @@ export default {
            const device = this.$store.state.iscs.selected;
            if (device && device._type === 'IscsButton' && device.function === 'GoEPS') {
                this.width = 1520;
-                this.$refs.iscsPlate.iscsLoadData('25');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'lightingSystem', 'epsSystem');
            } else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
                this.width = 1220;
-                this.$refs.iscsPlate.iscsLoadData('24');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'lightingSystem', 'lightingSystem');
            }
        }
    },
    mounted() {
-        this.$refs.iscsPlate.show('24');
+        this.$refs.iscsPlate.show('bas', 'lightingSystem', 'lightingSystem');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/smallSystem.vue
+++ b/src/views/iscs/iscsSystem/config/bas/smallSystem.vue
@ -23,18 +23,18 @@ export default {
            const device = this.$store.state.iscs.selected;
            if (device && device._type === 'IscsButton' && device.function === 'GoBMiniSystem') { // 至B端小系统
                this.width = 1400;
-                this.$refs.iscsPlate.iscsLoadData('22-1');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'smallSystem', 'bSide');
            } else if (device && device._type === 'IscsButton' && device.function === 'GoAMiniSystem1') { // 至A端小系统(一) 默认
                this.width = 1200;
-                this.$refs.iscsPlate.iscsLoadData('22');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'smallSystem', 'aSideOne');
            } else if (device && device._type === 'IscsButton' && device.function === 'GoAMiniSystem2') { // 至A端小系统(二)
                this.width = 1200;
-                this.$refs.iscsPlate.iscsLoadData('22-2');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'smallSystem', 'aSideTwo');
            }
        }
    },
    mounted() {
-        this.$refs.iscsPlate.show('22');
+        this.$refs.iscsPlate.show('bas', 'smallSystem', 'aSideOne');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/stationNet.vue
+++ b/src/views/iscs/iscsSystem/config/bas/stationNet.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('210');
+        this.$refs.iscsPlate.show('bas', 'stationNet', 'stationNet');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
+++ b/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
@ -22,16 +22,15 @@ export default {
            const device = this.$store.state.iscs.selected;
            if (device && device._type === 'IscsButton' && device.function === 'GoJetFan') {
                this.width = 1150;
-                this.$refs.iscsPlate.iscsLoadData('29');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'tunnelVentilation', 'jetFan');
            } else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
                this.width = 1300;
-                this.$refs.iscsPlate.iscsLoadData('28');
+                this.$refs.iscsPlate.iscsLoadData('bas', 'tunnelVentilation', 'tunnelVentilation');
            }
-            // console.log(this.width, '宽度');
        }
    },
    mounted() {
-        this.$refs.iscsPlate.show('28');
+        this.$refs.iscsPlate.show('bas', 'tunnelVentilation', 'tunnelVentilation');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/waterSupply.vue
+++ b/src/views/iscs/iscsSystem/config/bas/waterSupply.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('27');
+        this.$refs.iscsPlate.show('bas', 'waterSupply', 'waterSupply');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/bas/waterSystem.vue
+++ b/src/views/iscs/iscsSystem/config/bas/waterSystem.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('23');
+        this.$refs.iscsPlate.show('bas', 'waterSystem', 'waterSystem');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@ -8,7 +8,7 @@
 import Vue from 'vue';
 import Iscs from '@/iscs/iscs';
 import { parser } from '@/iscs/utils/parser';
-import iscsData from '@/iscs/constant/iscsData';
+import {getIscsData} from '@/iscs/constant/iscsData';

 export default {
    name: 'Iscs',
@ -78,8 +78,8 @@ export default {
        this.iscsDestroy();
    },
    methods: {
-        show (deviceCode) {
-            if (!deviceCode) {
+        show (mode, system, part) {
+            if (!mode || !system || !part) {
                return;
            }
            document.getElementById(this.iscsId).oncontextmenu = function (e) {
@ -87,7 +87,7 @@ export default {
            };
            this.iscsDestroy();
            this.loading = true;
-            const data = parser(iscsData[deviceCode], {width: this.widthCanvas, height: this.canvasHeight});
+            const data = parser(getIscsData(mode, system, part), {width: this.widthCanvas, height: this.canvasHeight});
            this.$iscs = new Iscs({
                dom: document.getElementById(this.iscsId),
                config: {
@ -109,8 +109,8 @@ export default {
            if (this.$route.params.mode) {
                this.$iscs.on('selected', this.onSelected, this);
            }
-            this.setIscs(data, iscsData[deviceCode]);
-            this.$store.dispatch('iscs/setIscsData', iscsData[deviceCode]);
+            this.setIscs(data, getIscsData(mode, system, part));
+            this.$store.dispatch('iscs/setIscsData', getIscsData(mode, system, part));
            window.document.oncontextmenu = function () {
                return false;
            };
@ -118,8 +118,8 @@ export default {
        setIscs(data, oldData) {
            this.$iscs.setIscs(oldData, data);
        },
-        iscsLoadData(deviceCode) {
-            this.$iscs.loadData(parser(iscsData[deviceCode], {width: this.widthCanvas, height: this.canvasHeight}));
+        iscsLoadData(mode, system, part) {
+            this.$iscs.loadData(parser(getIscsData(mode, system, part), {width: this.widthCanvas, height: this.canvasHeight}));
        },
        // 点击选择事件
        onSelected(em) {
--- a/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue
+++ b/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue
@ -17,7 +17,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('43');
+        this.$refs.iscsPlate.show('cctv', 'centralDeviceState', 'centralDeviceState');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
+++ b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
@ -102,9 +102,9 @@
    </div>
    <div class="cctv-box-content">
      <div style="position: relative;width: 75px;left: 10px;">
-        <div id="cctv-41" class="cctv-box-content-btn" @click="changeCCTV('41')">站厅</div>
-        <div id="cctv-42" class="cctv-box-content-btn" @click="changeCCTV('42')">站台</div>
-        <div id="cctv-44" class="cctv-box-content-btn" @click="changeCCTV('44')">云台</div>
+        <div id="cctv-stationHall" class="cctv-box-content-btn" @click="changeCCTV('stationHall')">站厅</div>
+        <div id="cctv-stand" class="cctv-box-content-btn" @click="changeCCTV('stand')">站台</div>
+        <div id="cctv-holder" class="cctv-box-content-btn" @click="changeCCTV('holder')">云台</div>
      </div>
      <div class="cctv-box-content-draw" :style="{marginLeft: left, marginTop: top}">
        <iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="height" />
@ -132,7 +132,7 @@ export default {
    },
    data() {
        return {
-            selectedCCTV: '41',
+            selectedCCTV: 'stationHall',
            descriptionList: [],
            textarea: '',
            value: '',
@ -184,8 +184,8 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('41');
-        const cctvBtn = document.getElementById('cctv-41');
+        this.$refs.iscsPlate.show('cctv', 'cctv', 'stationHall');
+        const cctvBtn = document.getElementById('cctv-stationHall');
        cctvBtn.setAttribute('class', 'cctv-box-content-btn active');
    },
    methods: {
@ -197,13 +197,13 @@ export default {
            this.selectedCCTV = id;
            this.left = '0px';
            this.top = '0px';
-            if (id == '41') {
+            if (id == 'stationHall') {
                this.width = 1490;
                this.height = 330;
                this.left = '-22px';
                this.top = '-20px';
            }
-            this.$refs.iscsPlate.iscsLoadData(id);
+            this.$refs.iscsPlate.iscsLoadData('cctv', 'cctv', id);
        },
        handleFrames(item) {
            this.selectedFlag = item.value;
--- a/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
+++ b/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
@ -24,19 +24,19 @@ export default {
            if (device && device._type === 'IscsButton' && device.function === 'PublicArea') {
                this.width = 1520;
                this.$nextTick(() => {
-                    this.$refs.iscsPlate.iscsLoadData('12');
+                    this.$refs.iscsPlate.iscsLoadData('fas', 'stand', 'standPublicArea');
                });
                console.log(this.width);
            } else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
                this.width = 1100;
                this.$nextTick(() => {
-                    this.$refs.iscsPlate.iscsLoadData('14');
+                    this.$refs.iscsPlate.iscsLoadData('fas', 'stand', 'stand');
                });
            }
        }
    },
    mounted() {
-        this.$refs.iscsPlate.show('14');
+        this.$refs.iscsPlate.show('fas', 'stand', 'stand');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/fire-alarm/stationHall.vue
+++ b/src/views/iscs/iscsSystem/config/fire-alarm/stationHall.vue
@ -19,7 +19,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('11');
+        this.$refs.iscsPlate.show('fas', 'stationHall', 'stationHall');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/fire-alarm/system.vue
+++ b/src/views/iscs/iscsSystem/config/fire-alarm/system.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('13');
+        this.$refs.iscsPlate.show('fas', 'systemState', 'systemState');
    },
    methods: {

--- a/src/views/iscs/iscsSystem/config/net/netState.vue
+++ b/src/views/iscs/iscsSystem/config/net/netState.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('71');
+        this.$refs.iscsPlate.show('net', 'netState', 'netState');
    },
    methods: {}
 };
--- a/src/views/iscs/iscsSystem/config/psd/psd.vue
+++ b/src/views/iscs/iscsSystem/config/psd/psd.vue
@ -18,7 +18,7 @@ export default {
        };
    },
    mounted() {
-        this.$refs.iscsPlate.show('31');
+        this.$refs.iscsPlate.show('psd', 'psd', 'psd');
    },
    methods: {}
 };
--- a/src/views/lesson/home.vue
+++ b/src/views/lesson/home.vue
@ -175,7 +175,7 @@ export default {
            this.$refs.queryListPage.refresh(true);
        },
        lessonCreate() {
-            this.$router.push({ path: `${UrlConfig.design.lessonEdit}/lessonCreate`, query: {mapId: this.$route.params.mapId, cityCode: this.$route.query.cityCode, drawWay: this.$route.query.drawWay} });
+            this.$router.push({ path: `${UrlConfig.design.lessonEdit}/lessonCreate`, query: {mapId: this.$route.params.mapId, cityCode: this.$route.query.cityCode, drawWay: this.$route.query.drawWay, lineCode: this.$route.query.lineCode} });
        },
        lessonCreateByPublish() {
            this.$nextTick(() => {
--- a/src/views/lesson/lessoncategory/edit/chapter/list.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue
@ -246,7 +246,6 @@ export default {
                    this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
                    this.trainingTypeList = trainingOperateConfigList;
                    this.trainingOperateTypeMap = operateTypeMap;
-                    // console.log(this.$route.query.drawWay, trainingOperateConfigList);
                } else {
                    this.$message.error(this.$t('error.failedToObtainTrainingType'));
                }