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

src/layout/components/Navbar.vue

@@ -113,9 +113,7 @@ export default {
     },
     mounted() {
         this.routes = this.$router.options.routes;
-        if (this.$route.fullPath.indexOf('design/userlist') >= 0) {
-            this.activePath = '/design/userlist/home';
-        } else if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
+        if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
             this.activePath = '/design/usermap/home';
         } else if (this.$route.fullPath.includes('design/lesson') || this.$route.fullPath.includes('design/script') || this.$route.fullPath.includes('design/runPlan') || this.$route.fullPath.includes('design/mapPreview')) {
             this.activePath = '/design/home';

src/views/components/filterCity/index.vue

@@ -46,9 +46,8 @@ export default {
         async loadInitData() {
             // 获取城市列表
             this.filterOptions = [];
-
-            let resp = this.$route.fullPath.includes('design/userlist') ? await this.$Dictionary.cityType() : await publisMapCityList('city_type');
-            resp = this.$route.fullPath.includes('design/userlist') ? resp : resp.data;
+            let resp = await publisMapCityList('city_type');
+            resp = resp.data;
             // const cityList = resp.sort((a, b) => {
             //     return a.code.localeCompare(b.code);
             // });

src/views/demonstration/deomonList/index.vue

@@ -21,7 +21,7 @@
         :filter-node-method="filterNode"
         :style="{height: height+'px'}"
       >
-        <div slot-scope="{ node, data }" class="list-elem custom-tree-node">
+        <div slot-scope="{ data }" class="list-elem custom-tree-node">
           <span>{{ '['+data.map.name+']'+($t('global.trainingHasStart').replace('{name}', data.creator.nickname)) }}</span>
           <el-button
             type="text"
@@ -52,7 +52,6 @@ export default {
             dialogShow: false,
             height: 120,
             trainingList: [],
-            group: '',
             loading: false,
             pageLoading: false
         };

src/views/demonstration/deomonTopic/index.vue

@@ -9,7 +9,7 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <div style="height: 80px; line-height: 80px; font-size: 16px; padding-left: 10px;">{{ roomName }}{{ $t('global.inviteJoinRoom') }}</div>
+    <div class="inviteJoinRoom">{{ roomName }}{{ $t('global.inviteJoinRoom') }}</div>
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="handleJoin">{{ $t('global.confirm') }}</el-button>
       <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
@@ -19,7 +19,6 @@
 
 <script>
 import { launchFullscreen } from '@/utils/screen';
-import { getPublishMapInfo } from '@/api/jmap/map';
 // 仿真邀请消息
 export default {
     name: 'DeomonList',
@@ -48,7 +47,6 @@ export default {
         async handleJoin() {
             try {
                 this.loading = true;
-                await getPublishMapInfo(this.mapId);
                 launchFullscreen();
                 const query = { lineCode: this.lineCode, mapId: this.mapId, group: this.group};
                 this.$router.push({path: `/jointTrainingNew`, query: query});
@@ -66,6 +64,12 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+    .inviteJoinRoom{
+        height: 80px;
+        line-height: 80px;
+        font-size: 16px;
+        padding-left: 10px;
+    }
     /deep/ {
         .el-dialog__body {
             padding: 0px 30px !important;

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

@@ -21,7 +21,7 @@
         </el-select>
       </div>
       <div class="button-box">
-        <el-button type="primary" size="mini" @click="handleScetionStationCode">{{ $t('map.setStationCode') }}</el-button>
+        <el-button type="primary" size="mini" @click="handleSectionStationCode">{{ $t('map.setStationCode') }}</el-button>
         <el-button type="" size="mini" @click="clearList">清空</el-button>
       </div>
     </div>
@@ -82,10 +82,10 @@ export default {
     mounted() {
     },
     methods: {
-        deviceChange(code) {
-            this.$emit('setCenter', code);
-            this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
-        },
+        // deviceChange(code) {
+        //     this.$emit('setCenter', code);
+        //     this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
+        // },
         deviceSelect(selected) {
             if (selected && selected._type.toUpperCase() == 'CheckBox'.toUpperCase()) {
                 this.clearModelList();
@@ -130,7 +130,7 @@ export default {
             });
         },
         // 多选区段设置集中站
-        handleScetionStationCode() {
+        handleSectionStationCode() {
             if (this.stationCode && this.seclectDeviceList && this.seclectDeviceList.length > 0) {
                 const models = [];
                 this.modelList.forEach(model => { // 通过物理区段调整逻辑区段设备集中站
@@ -155,7 +155,6 @@ export default {
         clearList() { // 清空数据
             this.stationCode = '';
             this.$store.commit('map/setSeclectDeviceList', []);
-            this.seclectDeviceList = [];
             this.modelList = [
                 {
                     type: 'Section',