03/08

src/main/vue/src/pages/AreaShowPoint.vue

@@ -45,7 +45,7 @@
         </template>
         <template v-else>
           <el-form-item>
-            <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+            <el-button type="text" @closeMap="mapDialogVisible = !mapDialogVisible" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</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>

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

@@ -3,7 +3,7 @@
     <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 :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small" style="max-width: 550px;">
             <el-form-item prop="mapName" label="地标名称">
               <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
             </el-form-item>
@@ -20,7 +20,6 @@
                   <el-option v-for="item in defaultModeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </template>
-
             </el-form-item>
             <el-form-item prop="typeId" label="地标类型">
               <template>
@@ -29,7 +28,7 @@
                 </el-select>
               </template>
             </el-form-item>
-            <el-form-item prop="markDescribe" label="地标简介">
+            <el-form-item prop="markDescribe" :label="isScenicSpot?'景点简介':'地标简介'">
               <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="logeSprite" label="地点Loge图">
@@ -57,18 +56,34 @@
             <el-form-item prop="anchorImageGroupName" label="识别图组名称">
               <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="vuforiaDataName" label="识别图集名称">
+              <template>
+                <el-select v-model="formData.vuforiaImageGroupId" clearable placeholder="请选择" @change="changeVuforiaImageGroup">
+                  <el-option v-for="(item,index) in vuforiaImageGroupList" :key="item.id" :label="item.vuforiaDataName" :value="item.id"></el-option>
+                </el-select>
+              </template>
+            </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-input v-model="formData.vuforiaImageGroupId" disabled style="width:70px"></el-input>
             </el-form-item>
 
             <el-button type="text" @click="showMore=!showMore">高级设置</el-button>
 
             <template v-if="showMore">
-              <el-form-item prop="openDescribe" label="营业/开放情况">
+              <template v-if="isScenicSpot">
+                <el-form-item prop="markLevel" label="景点级别">
+                  <el-input v-model="formData.markLevel"></el-input>
+                </el-form-item>
+                <el-form-item prop="markPrice" label="门票价格">
+                  <el-input v-model="formData.markPrice"></el-input>
+                </el-form-item>
+                <el-form-item prop="busRoute" label="公交路线">
+                  <el-input v-model="formData.busRoute"></el-input>
+                </el-form-item>
+              </template>
+
+              <el-form-item prop="openDescribe" :label="isScenicSpot?'开发时间':'营业/开放情况'">
                 <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
               </el-form-item>
 
@@ -99,7 +114,7 @@
                 <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
 
                 <div class="amap-page-container" v-if="mapDialogVisible">
-                  <coordinate-select @closeMap='mapDialogVisible = !mapDialogVisible' :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+                  <coordinate-select @closeMap="mapDialogVisible = !mapDialogVisible" :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
                 </div>
               </el-form-item>
 
@@ -142,7 +157,6 @@
               <el-form-item prop="busRoute" label="公交路线">
                 <el-input v-model="formData.busRoute"></el-input>
               </el-form-item>
-
             </template>
 
             <el-form-item>
@@ -264,6 +278,14 @@ export default {
       }
     });
 
+    this.$http.get({
+      url: '/vuforiaImageGroup/all'
+    }).then(res => {
+      if (res.success) {
+        this.vuforiaImageGroupList = res.data
+      }
+    });
+
 
 
     this.$http.get({
@@ -317,13 +339,30 @@ export default {
         value: 3,
         label: 'LBS'
       }],
+      vuforiaImageGroupList: [],
 
     }
   },
   computed: {
     ...mapState(['totalHeight']),
+    isScenicSpot() {
+      //是否景区
+      if (this.formData.typeId == 18 || this.formData.typeId == 36 || this.formData.typeId == 20) {
+        return true;
+      }
+      else {
+        return false;
+      }
+    }
   },
   methods: {
+    changeVuforiaImageGroup(id) {
+      this.vuforiaImageGroupList.forEach(item => {
+        if (item.id == id) {
+          this.formData.vuforiaDataName = item.vuforiaDataName
+        }
+      })
+    },
     updatePoint2() {
       this.$refs.mapInfo2.getPoint()
     },

src/main/vue/src/pages/LandMarkCreate.vue

@@ -122,7 +122,7 @@
               <el-input v-model="formData.anchorImageGroupName" placeholder="请向运营人员索要"></el-input>
             </el-form-item>
 
-            <el-form-item prop="vuforiaDataName" label="识别图组名称">
+            <el-form-item prop="vuforiaDataName" label="识别图集名称">
               <template>
                 <el-select v-model="formData.vuforiaImageGroupId" clearable placeholder="请选择" @change="changeVuforiaImageGroup">
                   <el-option v-for="(item,index) in vuforiaImageGroupList" :key="item.id" :label="item.vuforiaDataName" :value="item.id"></el-option>