20190111地图

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.xml

@@ -33,6 +33,7 @@
         <result column="keyword" property="keyword" jdbcType="VARCHAR"/>
         <result column="power" property="power" jdbcType="VARCHAR"/>
         <result column="area_map_info" property="areaMapInfo" jdbcType="VARCHAR"/>
+        <result column="ad_image" property="adImage" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -93,6 +94,7 @@
             keyword,
             power,
             area_map_info,
+            ad_image,
 
         </trim>
     </sql>
@@ -203,6 +205,9 @@
             <if test="areaMapInfo!= null">
                 area_map_info,
             </if>
+            <if test="adImage!= null">
+                ad_image,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -298,6 +303,9 @@
             <if test="areaMapInfo != null">
                 #{areaMapInfo,jdbcType=VARCHAR},
             </if>
+            <if test="adImage != null">
+                #{adImage,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.LandMark">
@@ -396,6 +404,9 @@
             <if test="areaMapInfo != null">
                 area_map_info= #{areaMapInfo,jdbcType=VARCHAR},
             </if>
+            <if test="adImage != null">
+                ad_image = #{adImage,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

src/main/java/com/izouma/awesomeadmin/model/LandMark.java

@@ -60,6 +60,11 @@ public class LandMark {
     private String power;
     private String areaMapInfo;
 
+    /**
+     * 闪屏广告图片
+     */
+    private String adImage;
+
 
     private String idStr;
 
@@ -426,5 +431,13 @@ public class LandMark {
     public void setAreaInfoList(List<AreaInfo> areaInfoList) {
         this.areaInfoList = areaInfoList;
     }
+
+    public String getAdImage() {
+        return adImage;
+    }
+
+    public void setAdImage(String adImage) {
+        this.adImage = adImage;
+    }
 }
 

src/main/vue/src/pages/AreaInfos.vue

@@ -13,7 +13,7 @@
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
-            <el-button @click="goArea" type="success" size="small" class="filter-item">区域地图
+            <el-button @click="goArea" type="success" size="small" class="filter-item" v-if="areaMapInfoShow">区域地图
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
@@ -411,6 +411,7 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
+            areaMapInfoShow: false,
         }
     },
     computed: {
@@ -455,6 +456,10 @@ export default {
                 columnList.forEach(item => {
                     var tempColumn = item;
                     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+
+                    if (tempColumn.split(',')[1] == 'landmarkId') {//如果有地标ID，显示地图。
+                        this.areaMapInfoShow = true;
+                    }
                 })
 
             }

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

@@ -40,6 +40,12 @@
                         <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>

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

@@ -53,6 +53,12 @@
 
             </el-table-column>
 
+            <el-table-column v-if="isColumnShow('adImage')" prop="adImage" label="闪屏" min-width="100">
+                <template slot-scope="{row}" v-if="row.adImage">
+                    <img :src="row.adImage" @click="showImg(row.adImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+            </el-table-column>
+
             <el-table-column v-if="isColumnShow('openDescribe')" prop="openDescribe" label="营业/开放情况" min-width="100">
             </el-table-column>
 
@@ -263,6 +269,11 @@ export default {
                     value: 'logeSprite',
                     show: true
                 },
+                {
+                    label: '闪屏',
+                    value: 'adImage',
+                    show: true
+                },
                 {
                     label: '营业/开放情况',
                     value: 'openDescribe',

src/main/vue/src/pages/ThingInfo.vue

@@ -72,7 +72,7 @@
           </el-form-item>
 
           <el-form-item prop="showDistance" label="显示距离">
-            <el-input type="number" v-model="formData.showDistance" :disabled="checkSubColumn('showDistance')"></el-input>M(最大不可超过10m)
+            <el-input type="number" v-model="formData.showDistance" :disabled="checkSubColumn('showDistance')"></el-input>M(最近距离1~2m内)
           </el-form-item>
           <el-form-item prop="templateId" label="点标组">
             <template v-if="formData.id">