update

src/api/bz/base/baseInfo.js

@@ -1,24 +0,0 @@
-import request from '@/utils/request'
-
-export function findSelectByKeyword(keyword, dataType) {
-  return request({
-    url: '/bz/base/findSelectByKeyword',
-    method: 'post',
-    params: { keyword, dataType }
-  })
-}
-
-export const findByMapBounds = (maxlng, maxlat, minlng, minlat, dataType) => {
-  return request({
-    url: '/bz/base/findByMapBounds',
-    method: 'POST',
-    params: { maxlng, maxlat, minlng, minlat, dataType }
-  })
-}
-
-export const findByGroupByDataType = () => {
-  return request({
-    url: '/bz/base/findByGroupByDataType',
-    method: 'POST'
-  })
-}

src/api/bz/base/holidayVillage.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/base/holiday/village/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/base/holiday/village/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/base/holiday/village/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/base/holiday/village/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/api/bz/base/homeStay.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/base/home/stay/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/base/home/stay/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/base/home/stay/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/base/home/stay/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/api/bz/base/hotel.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/base/hotel/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/base/hotel/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/base/hotel/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/base/hotel/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/api/bz/base/tourist.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/base/tourist/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/base/tourist/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/base/tourist/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/base/tourist/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/api/bz/base/venue.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/base/venue/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/base/venue/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/base/venue/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/base/venue/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/api/bz/base/scenery.js → src/api/equipment/equipment_passenger.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function findPage(data) {
   return request({
-    url: '/bz/base/scenery/findPage',
+    url: '/equipment/passenger/findPage',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function findPage(data) {
 
 export function save(data) {
   return request({
-    url: '/bz/base/scenery/save',
+    url: '/equipment/passenger/save',
     method: 'post',
     data
   })
@@ -18,7 +18,7 @@ export function save(data) {
 
 export function updateById(id, data) {
   return request({
-    url: '/bz/base/scenery/updateById',
+    url: '/equipment/passenger/updateById',
     method: 'post',
     params: { id },
     data
@@ -27,7 +27,7 @@ export function updateById(id, data) {
 
 export function deleteByIds(ids) {
   return request({
-    url: '/bz/base/scenery/deleteByIds',
+    url: '/equipment/passenger/deleteByIds',
     method: 'post',
     data: ids
   })

src/api/place/passenger_equipment.js

@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function findPage(data) {
-  return request({
-    url: '/bz/passenger/equipment/findPage',
-    method: 'post',
-    data
-  })
-}
-
-export function save(data) {
-  return request({
-    url: '/bz/passenger/equipment/save',
-    method: 'post',
-    data
-  })
-}
-
-export function updateById(id, data) {
-  return request({
-    url: '/bz/passenger/equipment/updateById',
-    method: 'post',
-    params: { id },
-    data
-  })
-}
-
-export function deleteByIds(ids) {
-  return request({
-    url: '/bz/passenger/equipment/deleteByIds',
-    method: 'post',
-    data: ids
-  })
-}

src/components/SelectBaseInfoData.vue

@@ -1,6 +1,6 @@
 <template>
   <el-select
-    v-model="value"
+    v-model="modelValue"
     :multiple="multiple"
     filterable
     remote
@@ -31,10 +31,6 @@ export default {
       type: Boolean,
       default: false
     },
-    dataType: {
-      type: String,
-      default: ''
-    },
     value: {
       type: [String, Number, Array],
       default: ''
@@ -43,10 +39,12 @@ export default {
   data: function() {
     return {
       options: [],
-      loading: false
+      loading: false,
+      modelValue: null
     }
   },
   mounted() {
+    this.modelValue = this.value
     if (this.value) {
       this.remoteMethod(this.value)
     }

src/router/index.js

@@ -32,16 +32,16 @@ Vue.use(Router)
 
 export const asyncRoutes = [
   {
-    path: '/passenger',
+    path: '/equipment',
     component: Layout,
     name: 'Passenger',
-    meta: { icon: 'el-icon-pie-chart', authorities: ['bz.passenger.equipment.find'] },
+    meta: { icon: 'el-icon-pie-chart', title: '设备管理', authorities: ['equipment.passenger.find'] },
     children: [
       {
-        path: 'equipment',
-        name: 'PassengerEquipment',
+        path: 'passenger',
+        name: 'EquipmentPassenger',
         component: () => import('@/views/passenger/equipment'),
-        meta: { title: '客流数据采集', authorities: ['bz.passenger.equipment.find'] }
+        meta: { title: '客流数据采集', authorities: ['equipment.passenger.find'] }
       },
       {
         path: 'equipment/detail/:id',

src/views/passenger/equipment/DialogForm.vue

@@ -6,29 +6,36 @@
   >
     <el-form v-loading="isLoading" :model="form" label-width="100px" label-position="top">
       <el-row :gutter="24">
-        <el-col :span="16">
-          <el-form-item label="点位分布">
-            <select-base-info-data v-model="form.placeBaseInfoId" :multiple="false" :data-type="form.placeBaseInfoId"/>
+        <el-col :span="12">
+          <el-row :gutter="24">
+            <el-col :span="16">
+              <el-form-item label="点位分布">
+                <select-base-info-data v-model="form.placeBaseInfoId" :multiple="false"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="备注说明">
+            <el-input v-model="form.brief"/>
           </el-form-item>
+          <el-form-item label="图片">
+            <el-upload
+              :file-list="fileList"
+              action="#"
+              list-type="picture-card"
+              name="fileData"
+              :http-request="uploaderHandle"
+              :on-success="uploadSuccess"
+              :on-remove="handleRemove"
+              :auto-upload="true"
+            >
+              <i slot="default" class="el-icon-plus"/>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <tencent-map id="amapcontainer" :position="[lat,lng]" @click="mapClick"/>
         </el-col>
       </el-row>
-      <el-form-item label="说明">
-        <el-input v-model="form.brief"/>
-      </el-form-item>
-      <el-form-item label="图片">
-        <el-upload
-          :file-list="fileList"
-          action="#"
-          list-type="picture-card"
-          name="fileData"
-          :http-request="uploaderHandle"
-          :on-success="uploadSuccess"
-          :on-remove="handleRemove"
-          :auto-upload="true"
-        >
-          <i slot="default" class="el-icon-plus"/>
-        </el-upload>
-      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
@@ -41,17 +48,19 @@
 
 import { uploaderHandle } from '@/api/upload'
 import SelectBaseInfoData from '@/components/SelectBaseInfoData'
-import { save, updateById } from '@/api/place/passenger_equipment'
+import { save, updateById } from '@/api/equipment/equipment_passenger'
+import TencentMap from '@/components/TencentMap'
 
 export default {
-  components: { SelectBaseInfoData },
+  components: { SelectBaseInfoData, TencentMap },
   data() {
     return {
       visible: false,
       isLoading: false,
-      listAllAuthorities: [],
       form: {},
-      fileList: []
+      fileList: [],
+      lng: null,
+      lat: null
     }
   },
   computed: {},
@@ -66,18 +75,27 @@ export default {
       file.url = res.url
       this.fileList = fileList
     },
+    mapClick(e) {
+      this.lng = e.latLng.lng
+      this.lat = e.latLng.lat
+    },
     open(data) {
       this.visible = true
       this.isLoading = false
-      this.fileList = []
       this.form = {}
+      this.fileList = []
+      this.lng = null
+      this.lat = null
+
       if (data && data.id) {
         if (data.litpics) {
           data.litpics.forEach(o => {
             this.fileList.push({ url: o })
           })
         }
-        this.form = Object.assign({}, data, { dataType: data.dataType.name })
+        this.lng = data.lng
+        this.lat = data.lat
+        this.form = Object.assign({}, data)
       }
     },
     handleSubmit() {
@@ -86,7 +104,7 @@ export default {
         litpics.push(o.url)
       })
       this.isLoading = true
-      const param = { ...this.form, litpics }
+      const param = { ...this.form, lng: this.lng, lat: this.lat, litpics }
       if (this.form.id) {
         updateById(this.form.id, param).then(() => {
           this.visible = false

src/views/passenger/equipment/index.vue

@@ -1,22 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryForm" inline size="small">
-      <el-form-item label="点位类型">
-        <el-select v-model="queryForm.dataType" placeholder="请选择" clearable @change="onDataTypeChange">
-          <el-option label="场馆" value="VENUE" />
-          <el-option label="景区" value="SCENERY" />
-          <el-option label="度假村" value="HOLIDAY_VILLAGE" />
-          <el-option label="酒店" value="HOTEL" />
-          <el-option label="民宿" value="HOME_STAY" />
-          <el-option label="旅行社" value="TOURIST" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="点位分布">
-        <select-base-bz-data v-model="queryForm.bzId" :multiple="false" :data-type="queryForm.dataType" :disabled="disabledSelectBz" />
+        <select-base-bz-data v-model="queryForm.placeBaseInfoId" :multiple="false"/>
+      </el-form-item>
+      <el-form-item label="备注说明">
+        <el-input v-model="queryForm.brief" placeholder="备注说明"/>
       </el-form-item>
       <el-form-item label="时间维度">
         <el-date-picker
-          v-model="queryForm.serviceBeginTime"
+          v-model="queryForm.rangeDate"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -28,7 +21,7 @@
     <el-row class="action-bar-container" type="flex" justify="end">
       <el-button type="primary" size="small" @click.native="fetchData">查询</el-button>
       <el-button-group>
-        <el-button v-permission="['bz.passenger.equipment.add']" size="small" @click.native="$refs.dialogForm.open({})">
+        <el-button v-permission="['equipment.passenger.add']" size="small" @click.native="$refs.dialogForm.open({})">
           新建
         </el-button>
       </el-button-group>
@@ -60,12 +53,12 @@
         </el-row>
       </div>
       <div class="clearfix action-btns">
-        <el-button v-permission="['bz.passenger.equipment.edit']" type="text" @click="$refs.dialogForm.open(item)">编辑</el-button>
-        <el-button v-permission="['bz.passenger.equipment.delete']" type="text" @click="deleteByIds([item.id])">删除</el-button>
+        <el-button v-permission="['equipment.passenger.edit']" type="text" @click="$refs.dialogForm.open(item)">编辑</el-button>
+        <el-button v-permission="['equipment.passenger.delete']" type="text" @click="deleteByIds([item.id])">删除</el-button>
         <el-button type="text" @click="goToDetail(item.id)">详情</el-button>
       </div>
     </el-card>
-    <div style="clear: both" />
+    <div style="clear: both"/>
     <el-pagination
       class="pagination-container"
       background
@@ -74,7 +67,7 @@
       :page-size="pageData.pageSize"
       @current-change="paginationChange"
     />
-    <dialog-form ref="dialogForm" @ok="fetchData" />
+    <dialog-form ref="dialogForm" @ok="fetchData"/>
   </div>
 </template>
 <style type="text/css">
@@ -83,7 +76,7 @@
 }
 </style>
 <script>
-import { deleteByIds, findPage } from '@/api/place/passenger_equipment'
+import { deleteByIds, findPage } from '@/api/equipment/equipment_passenger'
 import { dateTimeFormatter } from '@/utils/formater'
 import DialogForm from './DialogForm'
 import SelectBaseBzData from '@/components/SelectBaseInfoData'

src/views/place/baseInfo/DialogForm.vue

@@ -76,7 +76,7 @@
 <script>
 
 import { uploaderHandle } from '@/api/upload'
-import { findDataBaseInfoExtends, save, updateById, findAllDataType, findDataTypeExtendColumn } from '@/api/place/base_info'
+import { findDataBaseInfoExtends, save, updateById, findAllDataType } from '@/api/place/base_info'
 import TencentMap from '@/components/TencentMap'
 import ExtendColumn from '@/components/ExtendColumn'