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

src/views/newMap/jlmapNew/index.vue

@@ -92,9 +92,6 @@ export default {
                 if (val) {
                     this.setMap(val);
                 }
-                // } else {
-                //     this.mapViewLoaded(false);
-                // }
             } catch (error) {
                 console.log('[ERROR] ', error);
                 this.mapViewLoaded(false);

src/views/newMap/mapsystemNew/common/index.vue

@@ -12,7 +12,7 @@ import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import { letfMouseSelectDevice } from '@/api/simulation';
 import deviceType from '@/jmap/constant/deviceType';
 import JlmapVisual from '@/views/newMap/jlmapNew/index';
-import TrainingTips from '@/views/mapsystem/plugin/trainingtip';
+import TrainingTips from '@/views/newMap/mapsystemNew/plugin/trainingtip';
 
 export default {
     name: 'LessonCanvas',

src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue

@@ -22,13 +22,6 @@
             <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <!-- 是否先锁闭 -->
-        <!-- <el-form-item :label="$t('map.lockFirst') + ':'" prop="lockFirst">
-          <el-radio-group v-model="addModel.lockFirst">
-            <el-radio :label="true">{{ $t('map.are') }}</el-radio>
-            <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
-          </el-radio-group>
-        </el-form-item> -->
         <el-form-item :label="$t('map.delayUnlockingTime') + ':'" prop="delayReleaseTime">
           <el-input-number v-model="addModel.delayReleaseTime" :min="0" />
           <span>s</span>
@@ -40,7 +33,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('map.startingSignalName') + ':'" prop="startSignalCode">
-          <el-select v-model="addModel.startSignalCode" clearable :filterable="true">
+          <el-select v-model="addModel.startSignalCode" clearable filterable>
             <el-option
               v-for="item in signalList"
               :key="item.code"
@@ -54,7 +47,7 @@
           >{{ $t('map.activate') }}</el-button>
         </el-form-item>
         <el-form-item :label="$t('map.endingSignalName') + ':'" prop="endSignalCode">
-          <el-select v-model="addModel.endSignalCode" clearable :filterable="true">
+          <el-select v-model="addModel.endSignalCode" clearable filterable>
             <el-option
               v-for="item in signalList"
               :key="item.code"
@@ -74,7 +67,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('map.physicalSection') +':'" prop="routeSectionList">
-          <el-select v-model="addModel.routeSectionList" multiple :filterable="true">
+          <el-select v-model="addModel.routeSectionList" multiple filterable>
             <el-option
               v-for="item in sectionList"
               :key="item.code"
@@ -88,7 +81,7 @@
           >{{ $t('map.activate') }}</el-button>
         </el-form-item>
         <el-form-item :label="$t('map.entryTurnout')+':'" prop="routeSwitchList">
-          <el-select v-model="routeCode" clearable :filterable="true">
+          <el-select v-model="routeCode" clearable filterable>
             <el-option
               v-for="item in switchList"
               :key="item.code"
@@ -98,7 +91,7 @@
           </el-select>
           <el-button :type=" field === 'routeSwitchList' ? 'danger' : 'primary'" @click="hover('routeSwitchList')">{{ $t('map.activate') }}</el-button>
           <el-button type="primary" @click="pushSwitch(addModel.routeSwitchList, { switchCode: routeCode, normal: routeType, switchType: routeType ? '定位' : '反位' } )">{{ $t('map.add') }}</el-button>
-          <el-select v-model="routeType" :filterable="true">
+          <el-select v-model="routeType" filterable>
             <el-option
               v-for="item in SwitchLocateTypeList"
               :key="item.code"
@@ -123,7 +116,7 @@
           </el-table>
         </el-form-item>
         <el-form-item :label="$t('map.accessSideTurnoutData') + ':'" prop="routeFlankProtectionList">
-          <el-select v-model="flankCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+          <el-select v-model="flankCode" clearable filterable :placeholder="$t('map.pleaseSelect')">
             <el-option
               v-for="item in switchList"
               :key="item.code"
@@ -140,7 +133,7 @@
             @click="pushSwitch(addModel.routeFlankProtectionList, {switchCode:flankCode, normal:flankType, switchType: flankType ? '定位' : '反位'})"
           >{{ $t('map.add') }}
           </el-button>
-          <el-select v-model="flankType" :filterable="true" :placeholder="$t('map.pleaseSelect')">
+          <el-select v-model="flankType" filterable :placeholder="$t('map.pleaseSelect')">
             <el-option
               v-for="item in SwitchLocateTypeList"
               :key="item.code"
@@ -169,7 +162,7 @@
           </el-table>
         </el-form-item>
         <el-form-item label="关联站台列表:" prop="stationStandList">
-          <el-select v-model="addModel.stationStandList" multiple clearable :filterable="true" style="width: 220px;">
+          <el-select v-model="addModel.stationStandList" multiple clearable filterable style="width: 220px;">
             <el-option
               v-for="item in stationStandList"
               :key="item.code"
@@ -183,7 +176,7 @@
           >{{ $t('map.activate') }}</el-button>
         </el-form-item>
         <el-form-item :label="$t('map.hostileApproachData') + ':'" prop="conflictingRouteList">
-          <el-select v-model="addModel.conflictingRouteList" multiple clearable :filterable="true">
+          <el-select v-model="addModel.conflictingRouteList" multiple clearable filterable>
             <el-option
               v-for="item in routeList"
               :key="item.code"
@@ -380,6 +373,9 @@ export default {
             if (val) {
                 this.changeSignalSelected(val, true, 'routeSignal');
             }
+        },
+        'stationList': function(val) {
+            this.initLoad();
         }
     },
     mounted() {