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

src/views/components/filterCity/index.vue

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

src/views/designPlatform/userDemonList.vue

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

src/views/map/mapdraft/mapmanage/edit.vue

@@ -12,7 +12,7 @@
           @submit.native.prevent
         >
           <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
                 v-for="item in skinCodeList"
                 :key="item.code"