joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-09-25 15:34:40 +08:00
commit 1f27473d44
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/components/drapUp/index.vue
View File

@ -2,7 +2,7 @@
<div
ref="drapBox"
class="drapHeight"
:style="{width: width + 'px', height: height + 'px', top: (heightUp+61) +'px'}"
:style="{width: width + 'px', height: height + 'px', top: heightUp +'px'}"
@mousedown="mousedown"
/>
</template>
@ -43,6 +43,11 @@ export default {
heightUps: 0
};
},
computed: {
heightTotol() {
return this.$store.state.app.height - 50;
},
},
mounted() {
const oDiv = this.$refs.drapBox;
oDiv.onmousedown = () => {
@ -52,7 +57,7 @@ export default {
methods: {
mousedown(e) {
const oDiv = this.$refs.drapBox;
const maxNum = this.max || 850;
const maxNum = this.max || this.heightTotol-200;
const minNum = this.min || 150;
oDiv.onmousedown = function() {
return false;

16
src/views/designPlatform/demonList.vue
View File

@ -1,12 +1,9 @@
<template>
<div>
<el-card v-loading="loading" class="map-list-main">
<div slot="header" class="clearfix">
<span>已发布地图列表</span>
</div>
<el-card v-loading="loading" class="map-list-main" header="已发布地图列表" :style="{height: heightUp+'px'}">
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" />
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: heightUp +'px' }">
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: heightUp-123 +'px' }">
<el-tree
ref="tree"
:data="treeList"
@ -28,13 +25,10 @@
</el-scrollbar>
</el-card>
<drap-Up :height-up="heightUp" :width="width" @drapHeight="drapHeight" />
<el-card v-loading="loading" class="map-list-main">
<div slot="header" class="clearfix">
<span>我的地图列表</span>
</div>
<el-card v-loading="loading" class="map-list-main" header="我的地图列表" :style="{height: (height-heightUp)+'px'}">
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" />
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-heightUp) +'px' }">
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-heightUp-123) +'px' }">
<el-tree
ref="tree"
:data="treeList"
@ -118,7 +112,7 @@
removeSessionStorage('demonList');
},
mounted() {
this.heightUp = Number(localStore.get('upHeight')?localStore.get('upHeight'):(this.height-125)/2);
this.heightUp = Number(localStore.get('upHeight')?localStore.get('upHeight'):(this.height)/2);
},
methods: {
filterNode(value, data) {