|
|
@@ -29,21 +29,7 @@
|
|
|
<el-table-column label="类型" align="center" prop="markerType" width="55" :formatter="markerTypeFormat" />
|
|
|
<el-table-column label="名称" align="center" prop="markerName" />
|
|
|
<el-table-column label="地址" align="center" prop="address" />
|
|
|
- <el-table-column label="展示图片" align="center" prop="showPictures">
|
|
|
- <template slot-scope="scope">
|
|
|
- <img v-if="scope.row.showPictures" :src="baseUrl + scope.row.showPictures" style="width: 30px; height: 30px" />
|
|
|
- <span v-else>-</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="icon图片" align="center" prop="iconPictures">
|
|
|
- <template slot-scope="scope">
|
|
|
- <img v-if="scope.row.iconPictures" :src="baseUrl + scope.row.iconPictures" style="width: 30px; height: 30px" />
|
|
|
- <span v-else>-</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="标签" align="center" prop="labelText" />
|
|
|
<el-table-column label="画图形状" align="center" prop="shapeType" :formatter="shapeTypeFormat" />
|
|
|
- <el-table-column label="简介" align="center" prop="briefContent" />
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['management:marker:edit']">修改</el-button>
|
|
|
@@ -56,8 +42,13 @@
|
|
|
|
|
|
<!-- 添加或修改标记物管理对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="80%" @close="closeDialog" append-to-body>
|
|
|
+ <el-steps :active="1" simple>
|
|
|
+ <el-step title="填写信息" icon="el-icon-edit"></el-step>
|
|
|
+ <el-step title="绘制地图" icon="el-icon-location"></el-step>
|
|
|
+ <el-step title="保存内容" icon="el-icon-check"></el-step>
|
|
|
+ </el-steps>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
- <el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
+ <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick" style="margin-top: 10px;">
|
|
|
<el-tab-pane label="基础信息" name="first">
|
|
|
<el-form-item label="标记物名称" prop="markerName"><el-input v-model="form.markerName" placeholder="请输入标记物名称" /></el-form-item>
|
|
|
<el-form-item label="标记物地址" prop="address"><el-input v-model="form.address" placeholder="请输入标记物地址" /></el-form-item>
|
|
|
@@ -67,7 +58,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属景区">
|
|
|
- <el-checkbox-group v-model="contentIdsList" @change="change">
|
|
|
+ <el-checkbox-group v-model="contentIdsList">
|
|
|
<el-checkbox v-for="(item, index) in contentList" :key="'jq' + index" :label="item.contentId">{{ item.title }}</el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</el-form-item>
|
|
|
@@ -153,8 +144,7 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
markerName: [{ required: true, message: '请输入标记物名称' }],
|
|
|
- markerType: [{ required: true, message: '请选择标记物类型' }],
|
|
|
- contentIdsList: [{ required: true, message: '请选择所属景区' }],
|
|
|
+ markerType: [{ required: true, message: '请选择标记物类型' }]
|
|
|
},
|
|
|
activeName: 'first',
|
|
|
centerLat: 29.4270023,
|
|
|
@@ -227,9 +217,6 @@ export default {
|
|
|
(this.activeName = 'first'), this.shapeChange();
|
|
|
this.resetForm('form');
|
|
|
},
|
|
|
- change(e){
|
|
|
- console.log("zx:"+JSON.stringify(e))
|
|
|
- },
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
@@ -281,6 +268,16 @@ export default {
|
|
|
this.form.labelText = this.form.labelText.join(',');
|
|
|
}
|
|
|
this.form.contentIdsList = this.contentIdsList;
|
|
|
+/* if (this.form.contentIdsList.length == 0) {
|
|
|
+ this.msgError('请关联所属景区');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (!this.form.locationSet) {
|
|
|
+ this.msgError('请在地图上绘制路线或者建筑物');
|
|
|
+ this.activeName = 'second';
|
|
|
+ this.handleClick();
|
|
|
+ return;
|
|
|
+ } */
|
|
|
if (this.form.markerId != null) {
|
|
|
updateMarker(this.form).then(response => {
|
|
|
this.msgSuccess('修改成功');
|
xiaoshushu
