03/04 016 017

src/main/vue/src/pages/ArContents.vue

@@ -514,6 +514,39 @@
           </el-col>
         </el-row>
 
+        <el-row :gutter="20" v-else-if="item.type=='1017'" type="flex" justify="space-between">
+          <el-col :span="8">
+            <el-form ref="form" :model="item" label-width="80px">
+              <el-form-item label="解说音频">
+                <single-vocie v-model="item.voice"></single-vocie>
+                <el-input v-model="item.voice"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="16">
+            <div style="padding:20px;text-align:center">
+              <el-button type="primary" v-if="item.voice" @click="playvoice(item.voice)" icon="el-icon-service" circle plain></el-button>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" v-else-if="item.type=='1018'" type="flex" justify="space-between">
+          <el-col :span="8">
+            <el-form ref="form" :model="item" label-width="80px">
+              <el-form-item label="解说图片">
+                <multi-upload v-model="item.remark1"></multi-upload>
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="16">
+             <el-carousel height="300px">
+              <el-carousel-item v-for="i in item.remark1" :key="i">
+                <div class="bgContent" :style="{backgroundImage:'url('+i+')'}"></div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+        </el-row>
+
         <el-row :gutter="20" v-else type="flex" justify="space-between">
           <el-col :span="8">
             <el-form ref="form" :model="item" label-width="80px">
@@ -915,6 +948,11 @@ export default {
           //   }
           // })
           //this.totalNumber = res.data.page.totalNumber;
+          res.data.forEach(item=>{
+            if(item.type=='1018'){
+              item.remark1=item.remark1?item.remark1.split(';'):[]
+            }
+          })
           this.tableData = res.data;
           if (index || index == 0) {
             if (res.data.length > index) {
@@ -1090,9 +1128,12 @@ export default {
       var list = [...this.tableData]
       list.forEach((item, index) => {
         if (item.id.toString() == this.eltabsPane) {
-          if (!item.name && item.type != '1010' && item.type != '1011' && item.type != '1012') {
+          if (!item.name && item.type != '1010' && item.type != '1011' && item.type != '1012'&&item.type!='1017'&&item.type!='1018') {
             this.$message.warning('请填写名称！');
-            return
+            return;
+          }
+          if(item.type=='1018'){
+            item.remark1=item.remark1.join(';');
           }
           item.modifyFlag = 'Y';
           delete item.arContentChildList;

src/main/vue/src/pages/LandMark.vue

@@ -1,135 +1,125 @@
 <template>
-    <div>
+  <div>
+    <el-tabs :value="tabVal" type="border-card">
+      <el-tab-pane label="地标信息" name="1">
+        <div :style="{height:totalHeight-120+'px'}" style="overflow:auto">
+          <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="mapName" label="地标名称">
+              <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="ownedCityId" label="所属城市Id">
+              <template>
+                <el-select v-model="formData.ownedCityId" clearable placeholder="请选择" :disabled="'ownedCityId'==subColumn">
+                  <el-option v-for="item in ownedCityIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </template>
+            </el-form-item>
+            <el-form-item prop="defaultMode" label="AR属性">
+              <el-input v-model="formData.defaultMode" :disabled="'defaultMode'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="typeId" label="地标类型">
+              <template>
+                <el-select v-model="formData.typeId" clearable placeholder="请选择" :disabled="'typeId'==subColumn">
+                  <el-option v-for="item in typeIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </template>
+            </el-form-item>
+            <el-form-item prop="markDescribe" label="地标简介">
+              <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="logeSprite" label="地点Loge图">
+              <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="logeSprite" label="地点Loge图URL">
+              <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
 
-        <el-tabs :value="tabVal" type="border-card">
-            <el-tab-pane label="地标信息" name="1">
-                <div :style="{height:totalHeight-120+'px'}" style="overflow:auto">
-                    <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
-                        <el-form-item prop="typeId" label="地标类型">
-                            <template>
-                                <el-select v-model="formData.typeId" clearable placeholder="请选择" :disabled="'typeId'==subColumn">
-                                    <el-option v-for="item in typeIdOptions" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </template>
-                        </el-form-item>
+              <div class="amap-page-container" v-if="mapDialogVisible">
+                <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+              </div>
+            </el-form-item>
+            <el-form-item prop="adImage" label="闪屏">
+              <single-upload v-model="formData.adImage" :disabled="'adImage'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="adImage" label="闪屏URL">
+              <el-input v-model="formData.adImage" :disabled="'adImage'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="showInPanel" label="是否显示">
+              <el-input v-model="formData.showInPanel" :disabled="'showInPanel'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="mapSprite" label="平面图">
+              <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="mapSprite" label="平面图URL">
+              <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="anchorImageGroupName" label="识别图组名称">
+              <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
+            </el-form-item>
 
-                        <el-form-item prop="mapName" label="地标名称">
-                            <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="ownedCityId" label="所属城市Id">
-                            <template>
-                                <el-select v-model="formData.ownedCityId" clearable placeholder="请选择" :disabled="'ownedCityId'==subColumn">
-                                    <el-option v-for="item in ownedCityIdOptions" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </template>
-                        </el-form-item>
-                        <el-form-item prop="mapSprite" label="缩略图">
-                            <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="mapSprite" label="缩略图URL">
-                            <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="logeSprite" label="地点Loge图">
-                            <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="logeSprite" label="地点Loge图URL">
-                            <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="openDescribe" label="营业/开放情况">
-                            <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="adImage" label="闪屏">
-                            <single-upload v-model="formData.adImage" :disabled="'adImage'==subColumn"></single-upload>
-                        </el-form-item>
-                        <el-form-item prop="adImage" label="闪屏URL">
-                            <el-input v-model="formData.adImage" :disabled="'adImage'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="markDescribe" label="地标简介">
-                            <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="anchorImageGroupName" label="识别图组名称">
-                            <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="defaultMode" label="模式">
-                            <el-input v-model="formData.defaultMode" :disabled="'defaultMode'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="vuforiaImageGroupId" label="识别图集ID">
-                            <el-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="vuforiaDataName" label="识别图集数据名称">
-                            <el-input v-model="formData.vuforiaDataName" :disabled="'vuforiaDataName'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="mapInfo" label="地图信息">
-                            <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="mapWidth" label="地图宽">
-                            <el-input v-model="formData.mapWidth" :disabled="'mapWidth'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="mapHeight" label="地图高">
-                            <el-input v-model="formData.mapHeight" :disabled="'mapHeight'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="mapRate" label="比率">
-                            <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="showInPanel" label="是否显示">
-                            <el-input v-model="formData.showInPanel" :disabled="'showInPanel'==subColumn"></el-input>
-                        </el-form-item>
+            <el-form-item prop="vuforiaImageGroupId" label="识别图集ID">
+              <el-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+            <el-button v-if="!showMore" type="text" @click="showMore=!showMore">高级设置</el-button>
 
-                            <div class="amap-page-container" v-if="mapDialogVisible">
-                                <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
-                            </div>
-                        </el-form-item>
+            <template v-else>
+              <el-form-item prop="openDescribe" label="营业/开放情况">
+                <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="vuforiaDataName" label="识别图集数据名称">
+                <el-input v-model="formData.vuforiaDataName" :disabled="'vuforiaDataName'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="mapInfo" label="地图信息">
+                <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="mapWidth" label="地图宽">
+                <el-input v-model="formData.mapWidth" :disabled="'mapWidth'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="mapHeight" label="地图高">
+                <el-input v-model="formData.mapHeight" :disabled="'mapHeight'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="mapRate" label="比率">
+                <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="longitude" label="经度">
+                <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="latitude" label="纬度">
+                <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="remark1" label="备注1">
+                <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="remark2" label="备注2">
+                <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="remark3" label="备注3">
+                <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
+              </el-form-item>
+              <el-form-item prop="areaMapInfo" label="区域地图信息">
+                <el-input type="textarea" v-model="formData.areaMapInfo"></el-input>
+              </el-form-item>
+              <el-form-item prop="frontLevelId" label="上级地标ID">
+                <template>
+                  <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
+                    <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                  </el-select>
+                </template>
+              </el-form-item>
+            </template>
 
-                        <el-form-item prop="longitude" label="经度">
-                            <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="latitude" label="纬度">
-                            <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="remark1" label="备注1">
-                            <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="remark2" label="备注2">
-                            <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="remark3" label="备注3">
-                            <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="keyword" label="关键词">
-                            <template>
-                                <div v-for="(item,index) in formData.keyword" style="margin-bottom:10px">
-                                    <el-input v-model="formData.keyword[index]" style="width:180px"></el-input>
-                                    <el-button @click="onDeleteKeyword(index)" type="danger">删除</el-button>
-                                </div>
-                                <el-button @click="addKeyword" type="primary">添加</el-button>
-                            </template>
-                        </el-form-item>
-                        <el-form-item prop="areaMapInfo" label="区域地图信息">
-                            <el-input type="textarea" v-model="formData.areaMapInfo"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="frontLevelId" label="上级地标ID">
-                            <template>
-                                <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
-                                    <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </template>
-                        </el-form-item>
-                        <el-form-item>
-                            <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                            <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                            <el-button @click="$router.go(-1)">取消</el-button>
-                        </el-form-item>
-                    </el-form>
-                </div>
-
-            </el-tab-pane>
-            <!-- <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
+            <el-form-item>
+              <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+              <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+              <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+      <!-- <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
 
                 <el-container>
                     <el-aside width="50%">
@@ -151,13 +141,12 @@
                         <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
                     </el-main>
                 </el-container>
-            </el-tab-pane> -->
-            <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
-                <VuforiaImageInfos></VuforiaImageInfos>
-            </el-tab-pane>
-        </el-tabs>
-
-    </div>
+      </el-tab-pane>-->
+      <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
+        <VuforiaImageInfos></VuforiaImageInfos>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 <script>
 import formValidator from '../formValidator';
@@ -168,204 +157,205 @@ import VuforiaImageInfos from '../components/VuforiaImageInfos';
 import MapInfo from '../components/MapInfo';
 import { mapState } from 'vuex'
 export default {
-    created() {
-        if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(',')[1];
+      this.subValue = this.$route.query.column.split(',')[0];
+    }
 
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/landMark/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
+    if (this.$route.query.id) {
+      this.$http.get({
+        url: '/landMark/getOne',
+        data: {
+          id: this.$route.query.id
+        }
+      }).then(res => {
+        if (res.success) {
 
-                    if (!res.data.latitude) {
-                        res.data.latitude = this.formData.latitude;
-                    }
-                    if (!res.data.longitude) {
-                        res.data.longitude = this.formData.longitude;
-                    }
+          if (!res.data.latitude) {
+            res.data.latitude = this.formData.latitude;
+          }
+          if (!res.data.longitude) {
+            res.data.longitude = this.formData.longitude;
+          }
 
-                    if (res.data.keyword) {
-                        res.data.keyword = res.data.keyword.split(',')
-                    } else {
-                        res.data.keyword = [];
-                    }
+          if (res.data.keyword) {
+            res.data.keyword = res.data.keyword.split(',')
+          } else {
+            res.data.keyword = [];
+          }
 
-                    this.formData = res.data;
+          this.formData = res.data;
 
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-                }
-            })
-        } else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
-            }
+          if (this.$route.query.column) {
+            this.formData[this.subColumn] = this.subValue;
+          }
         }
+      })
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+    }
 
 
 
 
-        this.$http.get({
-            url: '/landmarkType/all',
-            data: {
-                typeFlag: '1'
-            }
-        }).then(res => {
-            if (res.success) {
-
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.typeIdOptions.push({ label: item.typeName, value: item.id });
-                    })
-                }
-            }
-        });
+    this.$http.get({
+      url: '/landmarkType/all',
+      data: {
+        typeFlag: '1'
+      }
+    }).then(res => {
+      if (res.success) {
 
-        this.$http.get({
-            url: '/cityInfo/all'
-        }).then(res => {
-            if (res.success) {
+        if (res.data.length > 0) {
+          res.data.forEach(item => {
+            this.typeIdOptions.push({ label: item.typeName, value: item.id });
+          })
+        }
+      }
+    });
 
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.ownedCityIdOptions.push({ label: item.cityName, value: item.id });
-                    })
-                }
-            }
-        });
+    this.$http.get({
+      url: '/cityInfo/all'
+    }).then(res => {
+      if (res.success) {
 
+        if (res.data.length > 0) {
+          res.data.forEach(item => {
+            this.ownedCityIdOptions.push({ label: item.cityName, value: item.id });
+          })
+        }
+      }
+    });
 
 
-        this.$http.get({
-            url: '/landMark/all'
-        }).then(res => {
-            if (res.success) {
 
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.frontLevelIdOptions.push({ label: item.mapName, value: String(item.id) });
-                    })
-                }
-            }
-        });
-    },
-    data() {
-        return {
+    this.$http.get({
+      url: '/landMark/all'
+    }).then(res => {
+      if (res.success) {
 
-            saving: false,
-            formData: {
-                latitude: 32.05838,
-                longitude: 118.79647,
-                typeId: '',
-                keyword: [],
-            },
-            rules: {
-            },
-            ownedCityIdOptions: [],
-            frontLevelIdOptions: [],
-            typeIdOptions: [],
-            subColumn: '',
-            subValue: '',
-            mapDialogVisible: false,
-            tabVal: "1",
+        if (res.data.length > 0) {
+          res.data.forEach(item => {
+            this.frontLevelIdOptions.push({ label: item.mapName, value: String(item.id) });
+          })
         }
+      }
+    });
+  },
+  data() {
+    return {
+
+      saving: false,
+      formData: {
+        latitude: 32.05838,
+        longitude: 118.79647,
+        typeId: '',
+        keyword: [],
+      },
+      rules: {
+      },
+      ownedCityIdOptions: [],
+      frontLevelIdOptions: [],
+      typeIdOptions: [],
+      subColumn: '',
+      subValue: '',
+      mapDialogVisible: false,
+      tabVal: "1",
+      showMore:false,
+    }
+  },
+  computed: {
+    ...mapState(['totalHeight']),
+  },
+  methods: {
+    updatePoint2() {
+      this.$refs.mapInfo2.getPoint()
     },
-    computed: {
-        ...mapState(['totalHeight']),
+    editPositions(jsonp) {
+      this.$refs.PlacePositions.editRow(jsonp)
     },
-    methods: {
-        updatePoint2() {
-            this.$refs.mapInfo2.getPoint()
-        },
-        editPositions(jsonp) {
-            this.$refs.PlacePositions.editRow(jsonp)
-        },
-        addPositions(jsonp) {
-            this.$refs.PlacePositions.addEdit(jsonp)
-        },
-        updatePoint() {
-            this.$refs.mapInfo.getPoint()
-        },
-        editContents(jsonp) {
-            this.$refs.PlaceContents.editRow(jsonp)
-        },
-        addContents(jsonp) {
-            this.$refs.PlaceContents.addEdit(jsonp)
-        },
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            data.keyword = data.keyword.join();
-
-            this.$http.post({
-                url: this.formData.id ? '/landMark/update' : '/landMark/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    if (!this.formData.id) {
-                        this.$router.replace({
-                            name: '',
-                            query: {
-                                id: res.data
-                            }
-                        });
-                    }
+    addPositions(jsonp) {
+      this.$refs.PlacePositions.addEdit(jsonp)
+    },
+    updatePoint() {
+      this.$refs.mapInfo.getPoint()
+    },
+    editContents(jsonp) {
+      this.$refs.PlaceContents.editRow(jsonp)
+    },
+    addContents(jsonp) {
+      this.$refs.PlaceContents.addEdit(jsonp)
+    },
+    onSave() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
+        }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      data.keyword = data.keyword.join();
 
-                } else {
-                    this.$message.warning('失败')
-                }
+      this.$http.post({
+        url: this.formData.id ? '/landMark/update' : '/landMark/save',
+        data: data
+      }).then(res => {
+        if (res.success) {
+          this.$message.success('成功');
+          if (!this.formData.id) {
+            this.$router.replace({
+              name: '',
+              query: {
+                id: res.data
+              }
             });
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/landMark/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        coordinateSelected(data) {
-            //this.formData.address = data.formattedAddress;
-            this.formData.latitude = data.lnglat.lat;
-            this.formData.longitude = data.lnglat.lng;
-        },
-        onDeleteKeyword(index) {
-            console.log("111")
-            this.formData.keyword.splice(index, 1)
-        },
-        addKeyword() {
-            this.formData.keyword.push('')
-            console.log("222")
-        },
+          }
+
+        } else {
+          this.$message.warning('失败')
+        }
+      });
     },
-    components: {
-        CoordinateSelect, AimPlaceContents, AimPlacePositions, VuforiaImageInfos, MapInfo
-    }
+    onDelete() {
+      this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+        return this.$http.post({
+          url: '/landMark/del',
+          data: { id: this.formData.id }
+        })
+      }).then(() => {
+        this.$message.success('删除成功');
+        this.$router.go(-1);
+      }).catch(action => {
+        if (action === 'cancel') {
+          this.$message.info('删除取消');
+        } else {
+          this.$message.error('删除失败');
+        }
+      })
+    },
+    coordinateSelected(data) {
+      //this.formData.address = data.formattedAddress;
+      this.formData.latitude = data.lnglat.lat;
+      this.formData.longitude = data.lnglat.lng;
+    },
+    onDeleteKeyword(index) {
+      console.log("111")
+      this.formData.keyword.splice(index, 1)
+    },
+    addKeyword() {
+      this.formData.keyword.push('')
+      console.log("222")
+    },
+  },
+  components: {
+    CoordinateSelect, AimPlaceContents, AimPlacePositions, VuforiaImageInfos, MapInfo
+  }
 }
 </script>
 <style lang="less" scoped>

src/main/vue/src/pages/LandMarks.vue

@@ -36,7 +36,7 @@
             <el-table-column v-if="isColumnShow('mapName')" prop="mapName" label="地标名称" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('ownedCityId')" prop="ownedCityId" label="所属城市Id" min-width="100">
+            <!-- <el-table-column v-if="isColumnShow('ownedCityId')" prop="ownedCityId" label="所属城市Id" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('mapSprite')" prop="mapSprite" label="缩略图" min-width="100">
@@ -44,7 +44,7 @@
                     <img :src="row.mapSprite" @click="showImg(row.mapSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
                 </template>
 
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column v-if="isColumnShow('logeSprite')" prop="logeSprite" label="地点Loge图" min-width="100">
                 <template slot-scope="{row}" v-if="row.logeSprite">
@@ -59,22 +59,22 @@
                 </template>
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('openDescribe')" prop="openDescribe" label="营业/开放情况" min-width="100">
+            <!-- <el-table-column v-if="isColumnShow('openDescribe')" prop="openDescribe" label="营业/开放情况" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('markDescribe')" prop="markDescribe" label="地标简介" min-width="100">
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column v-if="isColumnShow('anchorImageGroupName')" prop="anchorImageGroupName" label="识别图组名称" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('defaultMode')" prop="defaultMode" label="模式" min-width="100">
-            </el-table-column>
+            <!-- <el-table-column v-if="isColumnShow('defaultMode')" prop="defaultMode" label="模式" min-width="100">
+            </el-table-column> -->
 
             <el-table-column v-if="isColumnShow('vuforiaImageGroupId')" prop="vuforiaImageGroupId" label="识别图集ID" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('vuforiaDataName')" prop="vuforiaDataName" label="识别图集数据名称" min-width="100">
+            <!-- <el-table-column v-if="isColumnShow('vuforiaDataName')" prop="vuforiaDataName" label="识别图集数据名称" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('mapInfo')" prop="mapInfo" label="地图信息" min-width="100">
@@ -93,9 +93,9 @@
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('longitude')" prop="longitude" label="经度" min-width="100">
-            </el-table-column>
+            </el-table-column> -->
 
-            <el-table-column v-if="isColumnShow('latitude')" prop="latitude" label="纬度" min-width="100">
+            <el-table-column v-if="isColumnShow('defaultMode')" prop="defaultMode" label="AR内容" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="备注1" min-width="100">
@@ -107,8 +107,8 @@
             <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
-            </el-table-column>
+            <!-- <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
+            </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right" width="220">
                 <template slot-scope="scope">
                     <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图