实训平台和设计平台地图列表代码调整

2020-04-15 15:06:51 +08:00 · 2020-04-15 15:06:51 +08:00 · fec4e33719
commit fec4e33719
parent 6826089595
9 changed files with 24 additions and 69 deletions
--- a/src/jmapNew/theme/beijing_01/operationConfig.js
+++ b/src/jmapNew/theme/beijing_01/operationConfig.js
@ -533,7 +533,7 @@ export default {
            productTypes: ['01'],
            stepVOList: [
                { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3050', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'}
+                { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'}
            ]
        },
        {
--- a/src/store/getters.js
+++ b/src/store/getters.js
@ -2,7 +2,6 @@ const getters = {
    routers: state => state.permission.routes,
    addRouters: state => state.permission.addRouters,
    sidebar: state => state.app.sidebar,
-    lessonbar: state => state.app.lessonBar,
    device: state => state.app.device,
    token: state => state.user.token,
    avatar: state => state.user.avatar,
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@ -74,8 +74,9 @@ export default {
        if (this.project === 'designxty' || this.project === 'designgzb' || this.project === 'designhyd') {
            this.refresh();
        }
-        if (this.$route.query.mapId) {
-            this.defaultShowKeys = [this.$route.query.mapId];
+        if (this.$route.query.mapId || this.$route.params.mapId) {
+            const mapId = this.$route.query.mapId || this.$route.params.mapId;
+            this.defaultShowKeys = [mapId];
        }
    },
    methods: {
--- a/src/views/designPlatform/index.vue
+++ b/src/views/designPlatform/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-wrapper">
-    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+    <div class="examList" :style="{width: widthLeft+'px'}">
      <demon-list ref="demonList" :width="widthLeft" />
    </div>
    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
@ -11,7 +11,6 @@
 </template>

 <script>
-import { mapGetters } from 'vuex';
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import { launchFullscreen } from '@/utils/screen';
@ -26,24 +25,17 @@ export default {
    },
    data() {
        return {
-            listShow: true,
            widthLeft: Number(localStore.get('LeftWidth')) || 450,
            productList: [],
            currentWidth: ''
        };
    },
    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
        width() {
            return this.$store.state.app.width;
        }
    },
    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        },
        widthLeft(val) {
            this.setMapResize(val);
        },
--- a/src/views/designUser/index.vue
+++ b/src/views/designUser/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-wrapper">
    <map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
-    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+    <div class="examList" :style="{width: widthLeft+'px'}">
      <demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
    </div>
    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
@ -12,7 +12,6 @@
 </template>

 <script>
-import { mapGetters } from 'vuex';
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import { launchFullscreen } from '@/utils/screen';
@ -29,24 +28,17 @@ export default {
    },
    data() {
        return {
-            listShow: true,
            widthLeft: Number(localStore.get('LeftWidth')) || 450,
            productList: [],
            lineCode: ''
        };
    },
    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
        width() {
            return this.$store.state.app.width;
        }
    },
    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        },
        widthLeft(val) {
            this.setMapResize(val);
        },
--- a/src/views/iscs/iscsDesign/index.vue
+++ b/src/views/iscs/iscsDesign/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-wrapper">
    <map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
-    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+    <div class="examList" :style="{width: widthLeft+'px'}">
      <demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
    </div>
    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
@ -12,7 +12,6 @@
 </template>

 <script>
-import { mapGetters } from 'vuex';
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import { launchFullscreen } from '@/utils/screen';
@ -29,23 +28,16 @@ export default {
    },
    data() {
        return {
-            listShow: true,
            widthLeft: Number(localStore.get('LeftWidth')) || 450,
            lineCode: ''
        };
    },
    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
        width() {
            return this.$store.state.app.width;
        }
    },
    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        },
        widthLeft(val) {
            this.setMapResize(val);
        },
--- a/src/views/newMap/newDesignUser/index.vue
+++ b/src/views/newMap/newDesignUser/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-wrapper">
    <map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
-    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+    <div class="examList" :style="{width: widthLeft+'px'}">
      <demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
    </div>
    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
@ -12,7 +12,6 @@
 </template>

 <script>
-import { mapGetters } from 'vuex';
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import { launchFullscreen } from '@/utils/screen';
@ -29,24 +28,17 @@ export default {
    },
    data() {
        return {
-            listShow: true,
            widthLeft: Number(localStore.get('LeftWidth')) || 450,
            productList: [],
            lineCode: ''
        };
    },
    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
        width() {
            return this.$store.state.app.width;
        }
    },
    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        },
        widthLeft(val) {
            this.setMapResize(val);
        },
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@ -3,7 +3,7 @@
    <div class="clearfix">
      <span>{{ $t('global.mapList') }}</span>
    </div>
-    <div style="height: calc(100% - 47px);">
+    <div class="left-map-list">
      <filter-city v-if="project==='login' || project === 'hyd'" ref="filerCity" filter-empty :local-param-name="localParamName" @filterSelectChange="refresh" />
      <el-input v-if="project==='login' ||project === 'hyd'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
      <div style="height: calc(100% - 76px); overflow: auto;">
@ -49,12 +49,6 @@ export default {
    components: {
        FilterCity
    },
-    props: {
-        height: {
-            type: Number,
-            required: true
-        }
-    },
    data() {
        return {
            loading: true,
@ -213,9 +207,11 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
    .clearfix{
+        width:100%;
        height: 47px;
        line-height: 47px;
        padding-left: 17px;
+        position:absolute;
    }
    .back-home {
        float: right;
@ -225,15 +221,22 @@ export default {
         color: #3ea726;
     }
    }
+    .left-map-list{
+        width: 100%;
+        height: 100%;
+        padding-top: 47px;
+    }
+    .map-list-main{
+        text-align:left;
+        height: 100%;
+        position: relative;
+    }
 </style>
 <style>
    .el-tree {
        overflow-x: hidden;
    }
-    .map-list-main{
-        text-align:left;
-        height: 100%;
-    }
+
    .el-tree-node.is-current>.el-tree-node__content {
        background-color: #e4e3e3 !important;
    }
--- a/src/views/trainingPlatform/index.vue
+++ b/src/views/trainingPlatform/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-wrapper">
-    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-      <demon-list ref="demonList" :height="height" @goRoutePath="goRoutePath" />
+    <div class="examList" :style="{width: widthLeft+'px'}">
+      <demon-list ref="demonList" @goRoutePath="goRoutePath" />
    </div>
    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
    <transition>
@ -11,7 +11,6 @@
 </template>

 <script>
-import { mapGetters } from 'vuex';
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import { launchFullscreen } from '@/utils/screen';
@ -26,18 +25,11 @@ export default {
    },
    data() {
        return {
-            listShow: true,
            widthLeft: 450,
            productList: []
        };
    },
    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
-        height() {
-            return this.$store.state.app.height - 50;
-        },
        width() {
            return this.$store.state.app.width;
        },
@ -45,18 +37,10 @@ export default {
            return this.$store.state.user.id;
        }
    },
-    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        }
-    },
    mounted() {
        this.widthLeft = Number(localStore.get('LeftWidth')) ? Number(localStore.get('LeftWidth')) : 450;
    },
    methods: {
-        refresh() {
-            this.$refs && this.$refs.demonList && this.$refs.demonList.refresh();
-        },
        drapWidth(width) {
            this.widthLeft = Number(width);
        },