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.cloud.tencent.com/joylink/jl-nclient into dev_product

Browse Source
This commit is contained in:
fan 2019-09-29 15:38:38 +08:00
commit dae0ceff57
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/components/filterCity/index.vue
View File

@ -121,6 +121,7 @@ export default {
}, },
async loadInitData() { async loadInitData() {
// 获取城市列表 // 获取城市列表
this.filterOptions=[];
const resp = await this.$Dictionary.cityType(); const resp = await this.$Dictionary.cityType();
const cityList = resp.sort((a, b) => { const cityList = resp.sort((a, b) => {
return a.code.localeCompare(b.code); return a.code.localeCompare(b.code);

9
src/views/designPlatform/userDemonList.vue
View File

@ -78,7 +78,6 @@
loading: true, loading: true,
defaultShowKeys: [], defaultShowKeys: [],
queryFunction:getUserMapTree, queryFunction:getUserMapTree,
// queryFunction: getPublishMapTree,
filterText: '', filterText: '',
treeData: [], treeData: [],
treeList: [], treeList: [],
@ -135,6 +134,7 @@
res.data.forEach(elem=>{ res.data.forEach(elem=>{
// if(elem.children) // if(elem.children)
// { // {
elem.type="map",
elem.children=[ elem.children=[
{ {
id:'1', id:'1',
@ -200,7 +200,7 @@
this.$refs.menu.doClose(); this.$refs.menu.doClose();
}, },
showContextMenu(e, obj, node, vueElem) { showContextMenu(e, obj, node, vueElem) {
if (obj && obj.type == 'mapDesign') { if (obj && obj.type == 'map') {
e.preventDefault(); e.preventDefault();
const menu = DeviceMenu.Map; const menu = DeviceMenu.Map;
@ -209,7 +209,7 @@
y: e.clientY y: e.clientY
}; };
this.editModel = obj; this.editModel = obj;
this.editModel.skinCode = node.parent.data.id; this.editModel.skinCode = node.data.skinCode;
this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu }); this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
} }
else{ else{
@ -217,7 +217,8 @@
} }
}, },
refresh1(){ refresh1(){
this.$refs.myfilerCity.loadInitData();
this.refresh();
}, },
refresh2(){ refresh2(){
this.$refs.myfilerCity.loadInitData(); this.$refs.myfilerCity.loadInitData();

2
src/views/map/mapdraft/mapmanage/edit.vue
View File

@ -12,7 +12,7 @@
@submit.native.prevent @submit.native.prevent
> >
<el-form-item :label="$t('map.skinName')" prop="skinCode"> <el-form-item :label="$t('map.skinName')" prop="skinCode">
<el-select v-model="editModel.skinCode" :placeholder="$t('map.pleaseSelect')" size="mini"> <el-select v-model="editModel.skinCode" :placeholder="$t('map.pleaseSelect')" size="mini" disabled>
<el-option <el-option
v-for="item in skinCodeList" v-for="item in skinCodeList"
:key="item.code" :key="item.code"