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

src/jmapNew/theme/xian_01/menus/menuStation.vue

@@ -131,12 +131,12 @@ export default {
             }
         },
         doShow(point) {
-            console.log(this.selected);
-            // if (this.selected)
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
+            if (this.selected.ciStation) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
             }
         },
         doClose() {

src/router/index_Common.js

@@ -134,7 +134,7 @@ const JsxtApply = () => import('@/views/jsxt/apply/index');
 const RefereeList = () => import('@/views/jsxt/refereeList/index');
 
 import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
-import { getSessionStorage } from '@/utils/auth';
+// import { getSessionStorage } from '@/utils/auth';
 
 /**
  * Note: sub-menu only appear when route children.length >= 1

src/utils/baseUrl.js

@@ -6,7 +6,7 @@ export function getBaseUrl() {
         // 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://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

src/views/competitionManage/create.vue

@@ -73,7 +73,8 @@ export default {
                 name: '',
                 startDate: '',
                 endDate: '',
-                mapId: ''
+                mapId: '',
+                optionalRoles: ['DISPATCHER']
             },
             pickerOptions: {
                 disabledDate(time) {

src/views/jsxt/apply/index.vue

@@ -326,7 +326,8 @@ export default {
                     name: this.formModel.name,
                     organization: this.formModel.company,
                     position: this.formModel.job,
-                    vdCode: this.formModel.phoneCode
+                    vdCode: this.formModel.phoneCode,
+                    role: 'DISPATCHER'
                 };
                 if (this.$route.query.raceId) {
                     postSignUp(this.$route.query.raceId, param).then(res => {

src/views/newMap/newMapdraft/mapoperate/station.vue

@@ -118,6 +118,7 @@ export default {
             lazy: true,
             // field: '',
             chargeStation:[],
+            relStationList: [], // 车站列表
             controlled:false,
             editModel: {
                 centralized: false,
@@ -145,6 +146,7 @@ export default {
                 kmPostFontColor: '#FFFFFF',
                 isShowControlMode: '',
                 chargeStationCodeList:[],
+                relStationCodeList: [], // 联锁站关联车站列表
                 position: { x: 0, y: 0 },
                 kilometerPosition: { x: 0, y: 0 }, // 公里标偏移坐标
                 // controlled:false,
@@ -238,6 +240,7 @@ export default {
                             { prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox', disabled:this.controlled, change:true, deviceChange:this.changeCentralized },
                             { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList, isHidden: !this.isZcCode, disabled:true },
                             { prop: 'chargeStationCodeList', label: this.$t('map.chargeStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.chargeStation, isHidden: !this.isZcCode, deviceChange:this.changeChargeStation},
+                            { prop: 'relStationCodeList', label: '联锁站关联车站:', type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.relStationList, isHidden: !this.idCiStation, deviceChange:this.changeChargeRelStation},
                             { prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' }
                         ]
                     }
@@ -279,6 +282,9 @@ export default {
         },
         isZcCode() {
             return this.editModel.centralized;
+        },
+        idCiStation() {
+            return this.editModel.ciStation;
         }
     },
     watch: {
@@ -310,9 +316,7 @@ export default {
                     return !data.centralized && data.code != this.editModel.code && !(beCentralizedStation[data.code] && beCentralizedStation[data.code] != this.editModel.code);
                 });
                 this.controlled = !!beCentralizedStation[selected.code];
-                // this.chargeStation = this.stationList.filter(data=>{
-                //     return !data.centralized && data.code != this.editModel.code && !(data.controlled && data.concentrateStationCode != this.editModel.code);
-                // });
+                this.relStationList = JSON.parse(JSON.stringify(this.stationList));
             }
         },
         changeControlMode(data) {
@@ -354,6 +358,11 @@ export default {
             }
             this.edit();
         },
+        changeChargeRelStation(data) {
+            if (data.length > 0) {
+                // this.relStationList
+            }
+        },
         changeCentralized(data) {
             if (!data) {
                 // 将当前车站选为非集中站