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

src/jmapNew/config/skinCode/ningbo_01.js

@@ -741,12 +741,12 @@ class SkinCode extends defaultStyle {
                         status: 'RMCBTC',
                         trainLColor: '#808080',
                         trainRColor: '#808080'
+                    },
+                    {
+                        status: 'NRMCBTC',
+                        trainLColor: 'rgba(0, 0, 0, 0)',
+                        trainRColor: 'rgba(0, 0, 0, 0)'
                     }
-                    // {
-                    //     status: 'NRM',
-                    //     trainLColor: '#A0522D',
-                    //     trainRColor: '#A0522D'
-                    // }
                 ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM  ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
                 communicationStatus: [
                 ] // 设置通信状态  cbtc级别CBTC  点式通信ITC 联锁级IL

src/jmapNew/shape/Train/TrainHead.js

@@ -24,7 +24,7 @@ export default class TrainHead extends Group {
                     height: style.Train.trainHead.trainHeadHeight === 'trainBox' ? style.Train.common.trainHeight : model.height
                 },
                 style: {
-                    lineWidth: 0.1,
+                    lineWidth: 0,
                     stroke: style.trainSidelineColor,
                     fill: style.Train.trainHead.trainHeadFillColor
                 }
@@ -45,7 +45,7 @@ export default class TrainHead extends Group {
                 points: points
             },
             style: {
-                lineWidth: 0.1,
+                lineWidth: 0,
                 stroke: style.trainSidelineColor,
                 fill: style.Train.trainHead.trainHeadFillColor
             }

src/store/modules/scriptRecord.js

@@ -5,7 +5,7 @@ const scriptRecord = {
     namespaced: true,
     state: {
         mapLocation: {}, // 地图定位,
-        simulationPause: true,
+        simulationPause: true, // 剧本 暂停判断
         scriptId: '',
         bgSet: false,
         isScriptCommand:false,	// 当前是否为添加剧本动作指令状态

src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue

@@ -218,8 +218,6 @@ import axios from 'axios';
 
 									this.selVal = netdata.data[i].groupNumber;
 									this.groupnum = netdata.data[i].groupNumber;
-									bindSimulationTrain(this.group,this.selVal).then(netdata => {
-
 									this.dialogVisible = true;
 									for(let i=0;i<this.trainlist.length;i++){
 										if(this.trainlist[i].groupNumber == this.groupnum){
@@ -231,8 +229,11 @@ import axios from 'axios';
 
 									this.value = this.groupnum;
 									this.nowdrive = this.groupnum;
-									}).catch(error => {
-									});
+									// bindSimulationTrain(this.group,this.selVal).then(netdata => {
+									//
+									//
+									// }).catch(error => {
+									// });
 
 								}
 							}

src/views/newMap/displayNew/demonChat.vue

@@ -85,8 +85,8 @@ export default {
                 lastData = JSON.parse(lastData);
                 const lastMemberList = [];
                 const dispatcherList = [];
-                const electricDispatcherList = [];
-                const depotDispatcherList = [];
+                // const electricDispatcherList = [];
+                // const depotDispatcherList = [];
                 const stationSupervisorList = [];
                 this.driverList = [];
                 const maintainerList = [];

src/views/planSchedule/statusBar.vue

@@ -96,7 +96,7 @@ export default {
 };
 </script>
 
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
 
     #PlanStatusBar {