update

src/router/index.js

@@ -53,31 +53,31 @@ export const asyncRoutes = [
         path: 'scenery',
         name: 'BzBaseScenery',
         component: () => import('@/views/bz/base/scenery/index'),
-        meta: { title: '景区' }
+        meta: { title: '景区', authorities: ['bz.base.scenery.find'] }
       },
       {
         path: 'holidayVillage',
         name: 'BzBaseHolidayVillage',
         component: () => import('@/views/bz/base/holidayVillage/index'),
-        meta: { title: '度假村' }
+        meta: { title: '度假村', authorities: ['bz.base.holiday.village.find'] }
       },
       {
         path: 'hotel',
         name: 'BzBaseHotel',
         component: () => import('@/views/bz/base/hotel/index'),
-        meta: { title: '酒店' }
+        meta: { title: '酒店', authorities: ['bz.base.hotel.find'] }
       },
       {
         path: 'homeStay',
         name: 'BzBaseHomeStay',
         component: () => import('@/views/bz/base/homeStay/index'),
-        meta: { title: '民宿' }
+        meta: { title: '民宿', authorities: ['bz.base.home.stay.find'] }
       },
       {
         path: 'tourist',
         name: 'BzBaseTourist',
         component: () => import('@/views/bz/base/tourist/index'),
-        meta: { title: '旅行社' }
+        meta: { title: '旅行社', authorities: ['bz.base.tourist.find'] }
       }
     ]
   },

src/views/bz/base/scenery/DialogForm.vue

@@ -3,56 +3,70 @@
     v-if="visible"
     :title="form.id?'编辑场馆':'新建场馆'"
     :visible.sync="visible"
-    width="900px"
+    width="1200px"
   >
-    <el-form v-loading="isLoading" :model="form" label-width="100px">
-      <el-row>
+    <el-form v-loading="isLoading" :model="form" label-width="100px" label-position="top">
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="名称">
-            <el-input v-model="form.name" />
+            <el-input v-model="form.name"/>
           </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="开放时间">
-            <el-input v-model="form.businessHours" />
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开放时间">
+                <el-input v-model="form.businessHours"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="等级">
+                <el-select v-model="form.grade" placeholder="请选择">
+                  <el-option label="A" value="A"/>
+                  <el-option label="AA" value="AA"/>
+                  <el-option label="AAA" value="AAA"/>
+                  <el-option label="AAAA" value="AAAA"/>
+                  <el-option label="AAAAA" value="AAAAA"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="图片">
+            <el-upload
+              :file-list="fileList"
+              action="#"
+              list-type="picture-card"
+              name="fileData"
+              :http-request="uploaderHandle"
+              :on-success="uploadSuccess"
+              :auto-upload="true"
+            >
+              <i slot="default" class="el-icon-plus"/>
+            </el-upload>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="图片">
-        <el-upload
-          :file-list="fileList"
-          action="#"
-          list-type="picture-card"
-          name="fileData"
-          :http-request="uploaderHandle"
-          :on-success="uploadSuccess"
-          :auto-upload="true"
-        >
-          <i slot="default" class="el-icon-plus" />
-        </el-upload>
-      </el-form-item>
-      <el-form-item label="地址">
-        <el-input v-model="form.address" />
-      </el-form-item>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="联系人">
-            <el-input v-model="form.contacts" />
+          <el-form-item label="地址">
+            <el-input v-model="form.address"/>
           </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="联系人">
+                <el-input v-model="form.contacts"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话">
+                <el-input v-model="form.contactNumber"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="联系电话">
-            <el-input v-model="form.contactNumber" />
+          <el-form-item label="标注位置">
+            <a-map-marker id="amapcontainer" :position="[lng, lat]" @click="aMapClick"/>
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-form-item label="简介">
-        <el-input v-model="form.brief" type="textarea" rows="10" />
+        <el-input v-model="form.brief" type="textarea" rows="10"/>
       </el-form-item>
-
-      <div id="amapcontainer" style="width: 100%;height: 400px" />
-
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
@@ -64,10 +78,11 @@
 <script>
 
 import { uploaderHandle } from '@/api/upload'
-import AMapLoader from '@amap/amap-jsapi-loader'
-import { save, updateById } from '@/api/bz/base/venue'
+import AMapMarker from '@/components/AMapMarker'
+import { save, updateById } from '@/api/bz/base/scenery'
 
 export default {
+  components: { AMapMarker },
   data() {
     return {
       visible: false,
@@ -92,50 +107,31 @@ export default {
     open(data) {
       this.visible = true
       this.isLoading = false
-      this.form = Object.assign({}, data)
-      this.initMap()
-    },
-    initMap() {
-      const _this = this
-      AMapLoader.load({
-        key: '173fa0186964179b9c6f43d59f72172f',
-        version: '2.0',
-        plugins: ['AMap.ToolBar', 'AMap.Scale']
-      }).then((AMap) => {
-        this.map = new AMap.Map('amapcontainer', {
-          zoom: 15
-        })
+      this.fileList = []
 
-        _this.map.on('click', function(e) {
-          _this.lng = e.lnglat.lng
-          _this.lat = e.lnglat.lat
-          if (_this.marker) {
-            _this.marker.setPosition([e.lnglat.lng, e.lnglat.lat])
-          } else {
-            _this.marker = new AMap.Marker({
-              position: [e.lnglat.lng, e.lnglat.lat],
-              clickable: true,
-              map: _this.map
-            })
-          }
+      if (data.litpics) {
+        data.litpics.forEach(o => {
+          this.fileList.push({ url: o })
         })
-      }).catch(e => {
-        console.log(e)
-      })
+      }
+      this.form = Object.assign({}, data)
+      this.form.grade = this.form.grade.name
+      this.lng = data.lng
+      this.lat = data.lat
+    },
+    aMapClick(e) {
+      this.lng = e.lnglat.lng
+      this.lat = e.lnglat.lat
     },
     handleSubmit() {
-      console.log(this.fileList)
-      console.log(this.lng)
-      console.log(this.lat)
-      console.log(this.form)
       const litpics = []
       this.fileList.forEach(o => {
         litpics.push(o.url)
       })
       this.isLoading = true
       const param = { ...this.form, lng: this.lng, lat: this.lat, litpics }
+      console.log(param)
       if (this.form.id) {
-        console.log(param)
         updateById(this.form.id, param).then(() => {
           this.visible = false
           this.$emit('ok')

src/views/bz/base/scenery/index.vue

@@ -2,12 +2,20 @@
   <div class="app-container">
     <el-form :model="queryForm" inline size="small">
       <el-form-item label="关键词">
-        <el-input v-model="queryForm.keyword" placeholder="关键词" />
+        <el-input v-model="queryForm.keyword" placeholder="关键词"/>
       </el-form-item>
       <el-form-item label="联系电话">
-        <el-input v-model="queryForm.contactNumber" placeholder="联系电话" />
+        <el-input v-model="queryForm.contactNumber" placeholder="联系电话"/>
+      </el-form-item>
+      <el-form-item label="等级">
+        <el-select v-model="queryForm.grade" placeholder="请选择">
+          <el-option label="A" value="A"/>
+          <el-option label="AA" value="AA"/>
+          <el-option label="AAA" value="AAA"/>
+          <el-option label="AAAA" value="AAAA"/>
+          <el-option label="AAAAA" value="AAAAA"/>
+        </el-select>
       </el-form-item>
-
     </el-form>
     <el-row class="action-bar-container" type="flex" justify="end">
       <el-button type="primary" size="small" @click.native="fetchData">查询</el-button>
@@ -28,23 +36,30 @@
       highlight-current-row
       @selection-change="selectionChange"
     >
-      <el-table-column type="selection" width="55" />
-      <el-table-column label="ID" prop="id" width="150" />
-      <el-table-column label="名称" prop="name" />
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="ID" prop="id" width="150"/>
+      <el-table-column label="名称" prop="name"/>
+      <el-table-column label="等级" prop="grade.text"/>
       <el-table-column label="缩略图">
         <template slot-scope="scope">
           {{ scope.row.litpics.length }}张
         </template>
       </el-table-column>
-      <el-table-column label="简介" prop="brief" />
-      <el-table-column label="地址" prop="address" />
-      <el-table-column label="联系人" prop="contacts" />
-      <el-table-column label="联系电话" prop="contactNumber" />
-      <el-table-column label="位置信息">
+      <el-table-column label="简介" prop="brief"/>
+      <el-table-column label="地址" prop="address"/>
+      <el-table-column label="联系人" prop="contacts"/>
+      <el-table-column label="联系电话" prop="contactNumber"/>
+      <el-table-column label="位置信息" width="200">
         <template slot-scope="scope">
           [ {{ scope.row.lng }}, {{ scope.row.lat }} ]
         </template>
       </el-table-column>
+
+      <el-table-column label="操作" width="70" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="['app.key.edit']" type="text" @click.native="$refs.dialogForm.open(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination
       class="pagination-container"
@@ -54,7 +69,7 @@
       :page-size="pageData.pageSize"
       @current-change="paginationChange"
     />
-    <dialog-form ref="dialogForm" @ok="fetchData" />
+    <dialog-form ref="dialogForm" @ok="fetchData"/>
   </div>
 </template>
 

src/views/bz/base/venue/index.vue

@@ -47,7 +47,6 @@
       </el-table-column>
       <el-table-column label="操作" width="70" fixed="right">
         <template slot-scope="scope">
-
           <el-button v-permission="['app.key.edit']"  type="text" @click.native="$refs.dialogForm.open(scope.row)">编辑</el-button>
         </template>
       </el-table-column>