|
|
@@ -8,23 +8,20 @@
|
|
|
<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-form-item>
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="开放时间">
|
|
|
- <el-input v-model="form.businessHours"/>
|
|
|
+ <el-form-item label="名称">
|
|
|
+ <el-input v-model="form.baseDataInfo.name" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="等级">
|
|
|
<el-select v-model="form.grade" placeholder="请选择" clearable>
|
|
|
- <el-option label="一星" value="ONE_STAR"/>
|
|
|
- <el-option label="二星" value="TWO_STAR"/>
|
|
|
- <el-option label="三星" value="THREE_STAR"/>
|
|
|
- <el-option label="四星" value="FOUR_STAR"/>
|
|
|
- <el-option label="五星" value="FIVE_STAR"/>
|
|
|
+ <el-option label="一星" value="ONE_STAR" />
|
|
|
+ <el-option label="二星" value="TWO_STAR" />
|
|
|
+ <el-option label="三星" value="THREE_STAR" />
|
|
|
+ <el-option label="四星" value="FOUR_STAR" />
|
|
|
+ <el-option label="五星" value="FIVE_STAR" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -39,33 +36,33 @@
|
|
|
:on-success="uploadSuccess"
|
|
|
:auto-upload="true"
|
|
|
>
|
|
|
- <i slot="default" class="el-icon-plus"/>
|
|
|
+ <i slot="default" class="el-icon-plus" />
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="地址">
|
|
|
- <el-input v-model="form.address"/>
|
|
|
+ <el-input v-model="form.baseDataInfo.address" />
|
|
|
</el-form-item>
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="联系人">
|
|
|
- <el-input v-model="form.contacts"/>
|
|
|
+ <el-input v-model="form.baseDataInfo.contacts" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="联系电话">
|
|
|
- <el-input v-model="form.contactNumber"/>
|
|
|
+ <el-input v-model="form.baseDataInfo.contactNumber" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="标注位置">
|
|
|
- <a-map-marker id="amapcontainer" :position="[lng, lat]" @click="aMapClick"/>
|
|
|
+ <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.baseDataInfo.brief" type="textarea" rows="10" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -88,7 +85,9 @@ export default {
|
|
|
visible: false,
|
|
|
isLoading: false,
|
|
|
listAllAuthorities: [],
|
|
|
- form: {},
|
|
|
+ form: {
|
|
|
+ baseDataInfo: {}
|
|
|
+ },
|
|
|
fileList: [],
|
|
|
map: null,
|
|
|
marker: null,
|
|
|
@@ -108,18 +107,26 @@ export default {
|
|
|
this.visible = true
|
|
|
this.isLoading = false
|
|
|
this.fileList = []
|
|
|
-
|
|
|
- if (data.litpics) {
|
|
|
- data.litpics.forEach(o => {
|
|
|
- this.fileList.push({ url: o })
|
|
|
- })
|
|
|
+ this.form = {
|
|
|
+ baseDataInfo: {}
|
|
|
}
|
|
|
- this.form = Object.assign({}, data)
|
|
|
- if (this.form.grade) {
|
|
|
- this.form.grade = this.form.grade.name
|
|
|
+
|
|
|
+ if (data && data.baseDataInfo) {
|
|
|
+ const baseDataInfo = data.baseDataInfo
|
|
|
+ if (baseDataInfo.litpics) {
|
|
|
+ baseDataInfo.litpics.forEach(o => {
|
|
|
+ this.fileList.push({ url: o })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.lng = baseDataInfo?.lng
|
|
|
+ this.lat = baseDataInfo?.lat
|
|
|
+
|
|
|
+ this.form = Object.assign({}, data)
|
|
|
+
|
|
|
+ if (this.form.grade) {
|
|
|
+ this.form.grade = this.form.grade.name
|
|
|
+ }
|
|
|
}
|
|
|
- this.lng = data.lng
|
|
|
- this.lat = data.lat
|
|
|
},
|
|
|
aMapClick(e) {
|
|
|
this.lng = e.lnglat.lng
|
|
|
@@ -131,7 +138,7 @@ export default {
|
|
|
litpics.push(o.url)
|
|
|
})
|
|
|
this.isLoading = true
|
|
|
- const param = { ...this.form, lng: this.lng, lat: this.lat, litpics }
|
|
|
+ const param = { ...this.form, baseDataInfo: { ...this.form.baseDataInfo, lng: this.lng, lat: this.lat, litpics }}
|
|
|
console.log(param)
|
|
|
if (this.form.id) {
|
|
|
updateById(this.form.id, param).then(() => {
|
