Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/jmap/shape/Train/index.js

@@ -16,14 +16,14 @@ export default class Train extends Group {
         this.z = 40;
         this.size = 0;
         this.section = null;
-		this.fontSize = style.Train.common.useSelfText?style.Train.common.nameFontSize || style.Train.common.trainTextFontSize:model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
+        this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
-		this.nameFormat = style.Train.common.useSelfFormat?style.Train.trainBody.trainNameFormat:model.nameFormat || style.Train.trainBody.trainNameFormat;
+        this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
         if ( style.Train.trainBody.specialTrainType.length > 0) {
             style.Train.trainBody.specialTrainType.some((item) =>{
                 if (model.type === item.type) {
                     this.nameFormat = item.nameFormat;
-					model.serviceNumber = item.serviceNumber?item.serviceNumber : model.serviceNumber;
+                    model.serviceNumber = item.serviceNumber ? item.serviceNumber : model.serviceNumber;
                     return true;
                 }
             });
@@ -127,6 +127,7 @@ export default class Train extends Group {
         this.trainB && this.trainB.setSShow(false);
         this.trainB && this.trainB.setDShow(false);
         this.trainB && this.trainB.setAShow(false);
+
         this.trainL && this.trainL.setLineShow(false);
         this.trainR && this.trainR.setLineShow(false);
         this.trainL && this.trainL.setArrowShow(false);
@@ -135,7 +136,7 @@ export default class Train extends Group {
 
     // 设置服务号状态类型
     setServerNoType(type) {
-		if (this.style.Train.trainStatusStyle.serverNoType.length>0) {
+        if (this.style.Train.trainStatusStyle.serverNoType.length > 0) {
             const flag = this.style.Train.trainStatusStyle.serverNoType.some((item) =>{
                 if (type === item.type) {
                     this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
@@ -150,7 +151,7 @@ export default class Train extends Group {
 
     // 设置目的地状态
     setDestinationStatus(status) {
-		if (this.style.Train.trainStatusStyle.destinationStatus.length>0) {
+        if (this.style.Train.trainStatusStyle.destinationStatus.length > 0) {
             const flag = this.style.Train.trainStatusStyle.destinationStatus.some((item) =>{
                 if (status === item.status) {
                     switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
@@ -188,14 +189,24 @@ export default class Train extends Group {
     }
 
     // 设置运行方向状态类型
-	setDirectionType(type) {
+    setDirectionType(type, flag) {
         if (this.style.Train.trainStatusStyle.directionType.length > 0) {
-			this.style.Train.trainStatusStyle.directionType.some((item) => {
+            this.style.Train.trainStatusStyle.directionType.forEach((item) => {
                 if (type === item.type) {
-					this.trainL && this.trainL.setLineShow(item.lineLShow);
+                    let lineLShow = item.lineLShow;
-					this.trainL && this.trainL.setArrowShow(item.arrowLShow);
+                    let arrowLShow = item.arrowLShow;
-					this.trainR && this.trainR.setLineShow(item.lineRShow);
+                    let lineRShow = item.lineRShow;
-					this.trainR && this.trainR.setArrowShow(item.arrowRShow);
+                    let arrowRShow = item.arrowRShow;
+                    if (flag) {
+                        lineLShow = !item.lineLShow;
+                        arrowLShow = !item.arrowLShow;
+                        lineRShow = !item.lineRShow;
+                        arrowRShow = !item.arrowRShow;
+                    }
+                    this.trainL && this.trainL.setLineShow(lineLShow);
+                    this.trainL && this.trainL.setArrowShow(arrowLShow);
+                    this.trainR && this.trainR.setLineShow(lineRShow);
+                    this.trainR && this.trainR.setArrowShow(arrowRShow);
                     return true;
                 }
             });
@@ -204,7 +215,7 @@ export default class Train extends Group {
     // 设置列车停止方向类型
     setDirectionStopType(type) {
         if (this.style.Train.trainStatusStyle.directionStopType.length > 0) {
-			this.style.Train.trainStatusStyle.directionStopType.some((item) => {
+            this.style.Train.trainStatusStyle.directionStopType.forEach((item) => {
                 if (type === item.type) {
                     this.trainL && this.trainL.setLineShow(item.lineLShow);
                     this.trainR && this.trainR.setLineShow(item.lineRShow);
@@ -214,13 +225,13 @@ export default class Train extends Group {
         }
     }
     // 设置运行状态
-	setRunStatus(status) {
+    setRunStatus(status, flag) {
         switch (status) {
         case '01':	// 停止
             this.setDirectionStopType(this.model.directionType); // 设置运行方向状态类型
             break;
         case '02': // 运行
-			this.setDirectionType(this.model.directionType);	// 设置运行方向状态类型
+            this.setDirectionType(this.model.directionType, flag);	// 设置运行方向状态类型
             break;
         }
 
@@ -231,7 +242,7 @@ export default class Train extends Group {
             this.style.Train.trainStatusStyle.runModeStatus.some((item) => {
                 if (status === item.status) {
                     this.trainL && this.trainL.setColor(item.trainLColor);
-					this.trainR &&this.trainR.setColor(item.trainRColor);
+                    this.trainR && this.trainR.setColor(item.trainRColor);
                     return true;
                 }
             });
@@ -273,7 +284,7 @@ export default class Train extends Group {
     }
     // 设置报警状态
     setAlarmStatus(status) {
-		if (this.style.Train.trainStatusStyle.alarmStatus.length >0) {
+        if (this.style.Train.trainStatusStyle.alarmStatus.length > 0) {
             this.style.Train.trainStatusStyle.alarmStatus.some((item) => {
                 if (status === item.status) {
                     this.trainB && this.trainB.setAShow(item.aShow);
@@ -297,11 +308,22 @@ export default class Train extends Group {
     // 设置状态
     setState(model) {
         this.model = model;
+        // let points = [];
+        const flag = false;
+        // if (this.model.sectionModel && this.model.sectionModel.points) {
+        //     points = this.model.sectionModel.points;
+        //     if (points.length) {
+        //         const pointFlag = points[0].x - points[points.length - 1].x;
+        //         if (pointFlag > 0) {
+        //             flag = true; // 方向去反
+        //         }
+        //     }
+        // }
         if (model) {
             this.recover();
             this.setServerNoType(model.serverNoType); 				// 设置服务号状态类型
             this.setDestinationStatus(model.destinationStatus);		// 设置目的地状态
-			this.setRunStatus(model.runStatus); 					// 设置运行状态
+            this.setRunStatus(model.runStatus, flag); // 设置运行状态
             this.setRunMode(model.runMode); 						// 设置运行模式
             this.setRunControlStatus(model.runControlStatus); 		// 设置运行控制状态类型
             this.setDoorStatus(model.doorStatus); 					// 设置车门状态类型

src/router/index.js

@@ -134,7 +134,7 @@ export const userSimulation = '013';	// 仿真系统
 export const userScreen = '014'; 		// 大屏系统
 export const userPlan = '015'; 			// 计划系统
 export const userDesign = '016';			// 设计系统
-const isDev = process.env.NODE_ENV === 'development';
+// const isDev = process.env.NODE_ENV === 'development';
 
 export const UrlConfig = {
     display: '/display',

src/views/approval/script/index.vue

@@ -135,9 +135,9 @@ export default {
             this.$refs.applyReject.doShow(row);
         },
         scriptPreview(index, row) {
-            // const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
+            const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
             scriptDraftRecordNotify(row.id).then(resp => {
-                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0};
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:mapInfo.lineCode};
                 this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
                 launchFullscreen();
             }).catch(error => {

src/views/demonstration/detail/index.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-// import { getPublishMapInfo } from '@/api/jmap/map';
+import { getPublishMapInfo } from '@/api/jmap/map';
 import { getGoodsTryUse } from '@/api/management/goods';
 import { PermissionType } from '@/scripts/ConstDic';
 import { launchFullscreen } from '@/utils/screen';
@@ -61,7 +61,8 @@ export default {
                 pmsList: []
             },
             jointShow: false,
-            jointGroup: ''
+            jointGroup: '',
+            lineCode:''
         };
     },
     computed: {
@@ -84,6 +85,10 @@ export default {
         mapId() {
             return this.$route.query.mapId;
         }
+        // lineCode() {
+        //     // return this.$route.query.lineCode;
+
+        // }
     },
     watch: {
         '$route': function (val) {
@@ -97,6 +102,7 @@ export default {
         async loadInitData() {
             this.loading = true;
             try {
+                const res = await getPublishMapInfo(this.mapId);
                 const resp = await getSubSystemDetail(this.$route.params.subSystem);
                 this.tryUser = 0;
                 this.loading = false;
@@ -105,7 +111,7 @@ export default {
                         id: resp.data.mapPrd.id,
                         name: resp.data.mapPrd.name,
                         mapId: this.mapId,
-                        lineCode: resp.data.mapPrd.lineCode,
+                        lineCode: res.data.lineCode,
                         remarks: resp.data.mapPrd.remarks,
                         prdType: resp.data.mapPrd.prdType,
                         prdId: resp.data.mapPrd.id,
@@ -226,6 +232,7 @@ export default {
             const data = { mapId: this.courseModel.mapId, mapPrdId: this.currentPrdId };
             this.buttonLoading = true;
             simulationNotify(data).then(resp => {
+
                 const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
                 this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
                 launchFullscreen();
@@ -235,11 +242,18 @@ export default {
             });
         },
         buy() {
-            this.buttonLoading = true;
+            this.$confirm('支付系统正在改进，如需购买请联系客服<br/>客服电话：13289398171', this.$t('global.tips'), {
-            this.$router.push({
+                confirmButtonText: this.$t('global.confirm'),
-                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+                dangerouslyUseHTMLString: true,
-                query: { permissionType: PermissionType.SIMULATION, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+                type: 'warning',
+                showCancelButton: false,
+                center: true
             });
+            // this.buttonLoading = true;
+            // this.$router.push({
+            //     path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+            //     query: { permissionType: PermissionType.SIMULATION, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+            // });
         },
         transfer() {
             this.buttonLoading = false;

src/views/designPlatform/demonList.vue

@@ -90,7 +90,7 @@ export default {
             switch (obj.type) {
             case 'scriptDesign': {
                 setSessionStorage('designType', 'scriptDesign');
-                this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}` });
+                this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?lineCode=${obj.lineCode}` });
                 break;
             }
             case 'lessonDesign': {
@@ -141,7 +141,8 @@ export default {
                             name: this.$t('designPlatform.scriptDesign'),
                             type: 'scriptDesign',
                             mapId: elem.id,
-                            cityCode: elem.cityCode
+                            cityCode: elem.cityCode,
+                            lineCode: elem.lineCode
                             // code:elem.children.find(n => { return n.name.includes("行调")})
                         });
                     elem.children.push(

src/views/display/demon/faultChoose.vue

@@ -70,8 +70,8 @@ export default {
         title() {
             return this.$t('display.faultChoose.selectFault');
         },
-        skinCode() {
+        lineCode() {
-            return this.$route.query.skinCode;
+            return this.$route.query.lineCode;
         }
     },
     mounted() {
@@ -109,7 +109,7 @@ export default {
         doShow() {
             this.dialogShow = true;
             this.queryList.data = [];
-            getFailureGenerateRules({ skin: this.skinCode, group: this.group }).then(response => {
+            getFailureGenerateRules({ skin: this.lineCode, group: this.group }).then(response => {
                 const data = response.data;
                 data.forEach(elem => {
                     this.queryList.data.push({

src/views/exam/detail/courseDetail.vue

@@ -137,11 +137,18 @@ export default {
             });
         },
         buy() {
-            this.loading = true;
+            this.$confirm('支付系统正在改进，如需购买请联系客服<br/>客服电话：13289398171', this.$t('global.tips'), {
-            this.$router.push({
+                confirmButtonText: this.$t('global.confirm'),
-                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+                dangerouslyUseHTMLString: true,
-                query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+                type: 'warning',
+                showCancelButton: false,
+                center: true
             });
+            // this.loading = true;
+            // this.$router.push({
+            //     path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+            //     query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+            // });
         },
         checkCourse() {
             this.loading = true;

src/views/jlmap/index.vue

@@ -251,14 +251,7 @@ export default {
         },
         // 右键点击事件
         onContextMenu(em) {
-            const path = window.location.href;
-            let mouseWheelFlag = false;
-            if (path.includes('design/userlist/map/draw')) {
-                mouseWheelFlag = true;
-            }
-            if (!mouseWheelFlag) { // 地图绘制无右键操作
             this.$emit('onMenu', em);
-            }
         },
         // 设置地图加载状态
         mapViewLoaded(loading) {

src/views/mapdraft/index.vue

@@ -8,7 +8,7 @@
             <el-button size="small" :disabled="!recoverStepData.length" @click="recover">恢复</el-button>
           </el-button-group>
         </div>
-        <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" />
+        <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
       </div>
       <div class="map-draft">
         <div v-show="viewDraft === 'draft'" class="box">
@@ -49,7 +49,7 @@
 </template>
 <script>
 import { saveMap, getMapDetail, verifyMap, postBuildMapImport } from '@/api/jmap/mapdraft';
-import { ViewMode, TrainingMode } from '@/scripts/ConstDic';
+import { ViewMode, TrainingMode, getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
 import JlmapVisual from '@/views/jlmap/index';
 import MapOperate from './mapoperate/index';
@@ -59,7 +59,6 @@ import { mapGetters } from 'vuex';
 import ConfigMap from './configMap';
 
 import DataRelation from './dataRelation/index';
-// import { deepAssign } from '@/utils/index';
 
 export default {
     name: 'MapView',
@@ -204,16 +203,16 @@ export default {
             this.selected = device || null;
             this.selected && this.handleSelectControlPage(device);
         },
-        // onContextmenu(em) {
+        onContextmenu(em) {
-        //     this.point = {
+            this.point = {
-        //         x: em.clientX,
+                x: em.clientX,
-        //         y: em.clientY
+                y: em.clientY
-        //     };
+            };
-        //     if (!em.deviceType) {
+            if (!em.deviceType) {
-        //         var menu = getDeviceMenuByDeviceType('Cancel');
+                var menu = getDeviceMenuByDeviceType('Cancel');
-        //         this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-        //     }
+            }
-        // },
+        },
         saveMapEvent() {
             if (this.$refs.jlmapVisual) {
                 const map = this.$store.state.map.map;

src/views/mapdraft/mapoperate/ImageControl.vue

@@ -231,7 +231,6 @@ export default {
                     cancelButtonText: this.$t('map.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/buttonDraft.vue

@@ -241,7 +241,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/counter.vue

@@ -233,7 +233,6 @@ export default {
                     cancelButtonText: this.$t('map.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/delayunlock.vue

@@ -215,7 +215,6 @@ export default {
                     cancelButtonText: this.$t('map.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/index.vue

@@ -322,9 +322,6 @@ export default {
         updateMapModel(obj) {
             this.$emit('updateMapModel', obj);
         },
-        // delMapModel(obj) {
-        //     this.$emit('delMapModel', obj);
-        // },
         setCenter(code) {
             this.$emit('setCenter', code);
         }

src/views/mapdraft/mapoperate/lcControl.vue

@@ -211,7 +211,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/limitControl.vue

@@ -202,7 +202,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/line.vue

@@ -244,7 +244,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/signal.vue

@@ -423,7 +423,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/stationcontrol.vue

@@ -232,7 +232,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', _that.selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/stationstand.vue

@@ -286,7 +286,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/switch.vue

@@ -327,7 +327,6 @@ export default {
         // 删除道岔/ 关联的道岔区段以及 道岔绑定关系
         handleDelete(selected) {
             const models = [];
-            // const remove = [];
             this.sectionList.forEach(elem => {
                 if (elem.type == '03' && elem.relSwitchCode == selected.code) {
                     models.push(deepAssign({ _type: 'Section', code: elem.code }, { _dispose: true }));
@@ -339,8 +338,6 @@ export default {
                 }
             });
             models.push(deepAssign(selected, { _dispose: true }));
-            // this.$emit('delMapModel', selected);
-            // this.$emit('delMapModel', remove);
             this.$emit('updateMapModel', models);
         },
         findLinkData(code) {
@@ -389,7 +386,6 @@ export default {
         },
         // 一键删除道岔区段
         removeSwitchSection() {
-            // const remove = [];
             const models = [];
             if (this.sectionList && this.sectionList.length) {
                 this.sectionList.forEach(elem => {
@@ -403,7 +399,6 @@ export default {
                         models.push(elem);
                     }
                 });
-                // this.$emit('delMapModel', remove);
                 this.$emit('updateMapModel', models);
             }
         },

src/views/mapdraft/mapoperate/text.vue

@@ -222,7 +222,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/train/index.vue

@@ -161,7 +161,7 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    this.$emit('delMapModel', train);
+                    this.$emit('updateMapModel', {...train, _dispose: true});
                     this.deviceSelect();
                 }).catch(() => {
                     this.$message.info(this.$t('tip.cancelledDelete'));
@@ -177,7 +177,10 @@ export default {
                 cancelButtonText: this.$t('tip.cancel'),
                 type: 'warning'
             }).then(() => {
-                this.$emit('delMapModel', this.trainList);
+                this.trainList.forEach(item => {
+                    item['_dispose'] = true;
+                });
+                this.$emit('updateMapModel', this.trainList);
                 this.deviceSelect();
             }).catch(() => {
                 this.$message.info(this.$t('tip.cancelledDelete'));

src/views/mapdraft/mapoperate/trainwindow.vue

@@ -16,7 +16,6 @@
     <el-tab-pane class="view-control" :label="$t('map.batchOperation')" name="three">
       <div style="height: 100%">
         <el-scrollbar wrap-class="scrollbar-wrapper">
-          <!-- style="display: flex;justify-content: center;" -->
           <div style="text-align:center;">
             <el-button type="danger" size="big" @click="removeTrainWindow">{{ $t('map.deleteTrainWindow') }}</el-button>
             <el-button type="primary" size="big" style="margin-top:10px" @click="createTrainWindow">{{ $t('map.createTrainWindow') }}</el-button>
@@ -59,7 +58,8 @@ export default {
                 },
                 width: 0,
                 height: 0,
-                sectionCode: ''
+                sectionCode: '',
+                isReversal: false
             },
             rules: {
                 code: [
@@ -119,7 +119,8 @@ export default {
                     map: {
                         name: this.$t('map.mapData'),
                         item: [
-                            { prop: 'sectionCode', label: this.$t('map.trainWindowSectionCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.filterSectionList }
+                            { prop: 'sectionCode', label: this.$t('map.trainWindowSectionCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.filterSectionList },
+                            { prop: 'isReversal', label: '车头翻转', type: 'checkbox' }
                         ]
                     }
                 }
@@ -155,7 +156,8 @@ export default {
                 _type: 'TrainWindow',
                 code: getUID('TrainWindow'),
                 trainWindowShow: true,
-                point: {}
+                point: {},
+                isReversal: false
             };
 
             if (opts) {
@@ -221,10 +223,11 @@ export default {
                     this.trainWindowList.forEach(elem => {
                         remove.push({
                             _type: 'TrainWindow',
-                            code: elem.code
+                            code: elem.code,
+                            _dispose: true
                         });
                     });
-                    this.$emit('delMapModel', remove);
+                    this.$emit('updateMapModel', remove);
                 }
             }).catch(() => {
                 this.$message.info(this.$t('tip.cancelledDelete'));
@@ -240,10 +243,11 @@ export default {
                 this.trainWindowList.forEach(elem => {
                     remove.push({
                         _type: 'TrainWindow',
-                        code: elem.code
+                        code: elem.code,
+                        _dispose: true
                     });
                 });
-                this.$emit('delMapModel', remove);
+                this.$emit('updateMapModel', remove);
             }
 
             if (collection && collection.length) {
@@ -284,7 +288,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/mapdraft/mapoperate/zcControl.vue

@@ -209,7 +209,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    // _that.$emit('delMapModel', selected);
                     _that.$emit('updateMapModel', {...selected, _dispose: true});
                     _that.deviceSelect();
                 }).catch(() => {

src/views/publish/publishLesson/index.vue

@@ -178,21 +178,6 @@ export default {
         },
         reloadTable() {
             this.queryList.reload();
-        },
-        handleCitySelect(form) {
-            this.queryForm.queryObject.mapId.config.data = [];
-            form.mapId = '';
-            if (!form.cityCode) {
-                this.mapList.forEach(elem => {
-                    this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name});
-                });
-            } else {
-                this.mapList.forEach(elem => {
-                    if (elem.cityCode === form.cityCode) {
-                        this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name});
-                    }
-                });
-            }
         }
     }
 };

src/views/scriptManage/home.vue

@@ -126,7 +126,7 @@ export default {
         },
         drawUp(index, row) {
             scriptRecordNotify(row.id).then(resp => {
-                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang };
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode };
                 this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
                 launchFullscreen();
             }).catch(error => {
@@ -253,7 +253,7 @@ export default {
         },
         previewScript(index, row) {
             scriptDraftRecordNotify(row.id).then(resp => {
-                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0};
+                const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode};
                 this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
                 launchFullscreen();
             }).catch(error => {

src/views/teach/detail/index.vue

@@ -157,10 +157,17 @@ export default {
             return data.name.indexOf(value) !== -1;
         },
         buy() {
-            this.$router.push({
+            this.$confirm('支付系统正在改进，如需购买请联系客服<br/>客服电话：13289398171', this.$t('global.tips'), {
-                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
+                confirmButtonText: this.$t('global.confirm'),
-                    { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdId: this.$route.query.prdId, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem }
+                dangerouslyUseHTMLString: true,
+                type: 'warning',
+                showCancelButton: false,
+                center: true
             });
+            // this.$router.push({
+            //     path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
+            //         { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdId: this.$route.query.prdId, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem }
+            // });
         },
         nodeExpand(obj, node, ele) {
             const key = obj.id;

src/views/trainRoom/index.vue

@@ -205,16 +205,21 @@ export default {
             };
 
             if (old) {
-                if (old.userRole) {
+                if (!user.userRole) {
+                    this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}被提出房间`});
+                    if (this.userId == user.id) {
+                        this.jumpOutRoom();
+                    }
+                } else if (old.userRole) {
                     if (!user.inRoom) {
-                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}退出房间`});
+                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}离线`});
                         if (this.userId == user.id) {
                             this.jumpOutRoom();
                         }
                     }
 
                     if (!old.inRoom && user.inRoom) {
-                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}进入房间`});
+                        this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}在线`});
                     }
 
                     if (user.inSimulation) {
@@ -223,11 +228,6 @@ export default {
                             this.jumpInSimulation();
                         }
                     }
-                } else {
-                    this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}被提出房间`});
-                    if (this.userId == user.id) {
-                        this.jumpOutRoom();
-                    }
                 }
             } else {
                 this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}进入房间`});