reghao 1 éve
szülő
commit
a2ccbf0c09
4 módosított fájl, 230 hozzáadás és 20 törlés
  1. 6 1
      src/api/map.js
  2. 2 2
      src/components/layout/NavBar.vue
  3. 222 14
      src/views/home/AMap.vue
  4. 0 3
      src/views/home/Timeline.vue

+ 6 - 1
src/api/map.js

@@ -4,7 +4,8 @@ const mapAPI = {
   center: '/api/mall/map/center',
   markers: '/api/mall/map/markers',
   markerInfoApi: '/api/mall/map/marker',
-  location: '/api/mall/map/location'
+  location: '/api/mall/map/location',
+  mainland: '/api/mall/map/cn',
 }
 
 export function getMapCenter() {
@@ -22,3 +23,7 @@ export function getMapMarkers(type) {
 export function sendClickedLocation(loc) {
   return post(mapAPI.location, loc)
 }
+
+export function getMainLand() {
+  return get(mapAPI.mainland)
+}

+ 2 - 2
src/components/layout/NavBar.vue

@@ -31,7 +31,7 @@
         </el-menu-item>
       </el-menu>
     </el-col>
-    <el-col :md="8">
+    <el-col :md="6">
       <ul class="el-menu--horizontal el-menu">
         <li class="el-menu-item">
           <el-autocomplete
@@ -48,7 +48,7 @@
         </li>
       </ul>
     </el-col>
-    <el-col :md="6">
+    <el-col :md="8">
       <ul class="el-menu--horizontal el-menu">
         <li class="el-menu-item">
           <el-dropdown v-if="user">

+ 222 - 14
src/views/home/AMap.vue

@@ -3,15 +3,21 @@
     <el-col :md="24">
       <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
         <el-card class="box-card">
-          <div class="text item amap-wrapper">
-            <el-select v-model="selectedOption" placeholder="选择标签" @change="onChange">
+          <div slot="header" class="clearfix">
+<!--            <el-select v-model="selectedOption" placeholder="选择标签" @change="onChange">
               <el-option
                 v-for="(item, index) in selectOptions"
                 :key="index"
                 :label="item.name"
                 :value="item.value"
               />
-            </el-select>
+            </el-select>-->
+            <el-cascader
+              v-model="value"
+              :options="options1"
+              @change="handleChange"></el-cascader>
+          </div>
+          <div class="text item amap-wrapper">
             <el-amap
               class="amap-box"
               :vid="'amap-vue'"
@@ -34,15 +40,6 @@
         </el-card>
       </el-row>
     </el-col>
-    <!--    <el-col :md="12">
-      <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
-        <el-card class="box-card">
-          <div class="text item amap-wrapper">
-            <span>另一个地图</span>
-          </div>
-        </el-card>
-      </el-row>
-    </el-col>-->
 
     <!-- marker 内容弹窗   -->
     <el-dialog
@@ -98,7 +95,7 @@ VueAMap.initAMapApiLoader({
 
 import { lazyAMapApiLoaderInstance } from 'vue-amap'
 const amapManager = new VueAMap.AMapManager()
-import { getMapMarkers, getMarkerInfo } from '@/api/map'
+import {getMainLand, getMapMarkers, getMarkerInfo} from '@/api/map'
 
 export default {
   data() {
@@ -166,11 +163,219 @@ export default {
           name: '分类4',
           value: 4
         }
-      ]
+      ],
+      value: [],
+      options1: [],
+      options: [
+        {
+        value: 'zhinan',
+        label: '指南',
+        children: [
+          {
+          value: 'shejiyuanze',
+          label: '设计原则',
+          children: [{
+            value: 'yizhi',
+            label: '一致'
+          }, {
+            value: 'fankui',
+            label: '反馈'
+          }, {
+            value: 'xiaolv',
+            label: '效率'
+          }, {
+            value: 'kekong',
+            label: '可控'
+          }]
+        }, {
+          value: 'daohang',
+          label: '导航',
+          children: [{
+            value: 'cexiangdaohang',
+            label: '侧向导航'
+          }, {
+            value: 'dingbudaohang',
+            label: '顶部导航'
+          }]
+        }]
+      },
+        {
+        value: 'zujian',
+        label: '组件',
+        children: [
+          {
+          value: 'basic',
+          label: 'Basic',
+          children: [{
+            value: 'layout',
+            label: 'Layout 布局'
+          }, {
+            value: 'color',
+            label: 'Color 色彩'
+          }, {
+            value: 'typography',
+            label: 'Typography 字体'
+          }, {
+            value: 'icon',
+            label: 'Icon 图标'
+          }, {
+            value: 'button',
+            label: 'Button 按钮'
+          }]
+        }, {
+          value: 'form',
+          label: 'Form',
+          children: [{
+            value: 'radio',
+            label: 'Radio 单选框'
+          }, {
+            value: 'checkbox',
+            label: 'Checkbox 多选框'
+          }, {
+            value: 'input',
+            label: 'Input 输入框'
+          }, {
+            value: 'input-number',
+            label: 'InputNumber 计数器'
+          }, {
+            value: 'select',
+            label: 'Select 选择器'
+          }, {
+            value: 'cascader',
+            label: 'Cascader 级联选择器'
+          }, {
+            value: 'switch',
+            label: 'Switch 开关'
+          }, {
+            value: 'slider',
+            label: 'Slider 滑块'
+          }, {
+            value: 'time-picker',
+            label: 'TimePicker 时间选择器'
+          }, {
+            value: 'date-picker',
+            label: 'DatePicker 日期选择器'
+          }, {
+            value: 'datetime-picker',
+            label: 'DateTimePicker 日期时间选择器'
+          }, {
+            value: 'upload',
+            label: 'Upload 上传'
+          }, {
+            value: 'rate',
+            label: 'Rate 评分'
+          }, {
+            value: 'form',
+            label: 'Form 表单'
+          }]
+        }, {
+          value: 'data',
+          label: 'Data',
+          children: [{
+            value: 'table',
+            label: 'Table 表格'
+          }, {
+            value: 'tag',
+            label: 'Tag 标签'
+          }, {
+            value: 'progress',
+            label: 'Progress 进度条'
+          }, {
+            value: 'tree',
+            label: 'Tree 树形控件'
+          }, {
+            value: 'pagination',
+            label: 'Pagination 分页'
+          }, {
+            value: 'badge',
+            label: 'Badge 标记'
+          }]
+        }, {
+          value: 'notice',
+          label: 'Notice',
+          children: [{
+            value: 'alert',
+            label: 'Alert 警告'
+          }, {
+            value: 'loading',
+            label: 'Loading 加载'
+          }, {
+            value: 'message',
+            label: 'Message 消息提示'
+          }, {
+            value: 'message-box',
+            label: 'MessageBox 弹框'
+          }, {
+            value: 'notification',
+            label: 'Notification 通知'
+          }]
+        }, {
+          value: 'navigation',
+          label: 'Navigation',
+          children: [{
+            value: 'menu',
+            label: 'NavMenu 导航菜单'
+          }, {
+            value: 'tabs',
+            label: 'Tabs 标签页'
+          }, {
+            value: 'breadcrumb',
+            label: 'Breadcrumb 面包屑'
+          }, {
+            value: 'dropdown',
+            label: 'Dropdown 下拉菜单'
+          }, {
+            value: 'steps',
+            label: 'Steps 步骤条'
+          }]
+        }, {
+          value: 'others',
+          label: 'Others',
+          children: [{
+            value: 'dialog',
+            label: 'Dialog 对话框'
+          }, {
+            value: 'tooltip',
+            label: 'Tooltip 文字提示'
+          }, {
+            value: 'popover',
+            label: 'Popover 弹出框'
+          }, {
+            value: 'card',
+            label: 'Card 卡片'
+          }, {
+            value: 'carousel',
+            label: 'Carousel 走马灯'
+          }, {
+            value: 'collapse',
+            label: 'Collapse 折叠面板'
+          }]
+        }]
+      }, {
+        value: 'ziyuan',
+        label: '资源',
+        children: [{
+          value: 'axure',
+          label: 'Axure Components'
+        }, {
+          value: 'sketch',
+          label: 'Sketch Templates'
+        }, {
+          value: 'jiaohu',
+          label: '组件交互文档'
+        }]
+      }]
     }
   },
   created() {
     document.title = '地图'
+
+    getMainLand().then(resp => {
+      if (resp.code === 0) {
+        this.options1 = resp.data
+        console.log(this.options1)
+      }
+    })
   },
   methods: {
     mapInit(o) {
@@ -351,6 +556,9 @@ export default {
     },
     onChange() {
       this.getMapMarkersWrapper(this.selectedOption)
+    },
+    handleChange(value) {
+      console.log(value)
     }
   }
 }

+ 0 - 3
src/views/home/Timeline.vue

@@ -39,9 +39,6 @@
             </el-tabs>
           </el-row>
         </el-col>
-        <el-col :md="8">
-          <user-avatar-card :user-avatar="userInfo" />
-        </el-col>
       </el-row>
     </el-scrollbar>
   </el-row>