添加字段20181206

src/main/java/com/izouma/awesomeadmin/dao/AimPlaceInfoMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.AimPlaceInfo;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.AimPlaceInfoMapper")
+public interface AimPlaceInfoMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(AimPlaceInfo record);
+
+    AimPlaceInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(AimPlaceInfo record);
+
+    List<AimPlaceInfo> queryAllAimPlaceInfo(AimPlaceInfo record);
+
+    List<AimPlaceInfo> queryAimPlaceInfoByPage(Map<String, Object> parameter);
+
+    int delete(AimPlaceInfo record);
+
+    AimPlaceInfo queryAimPlaceInfo(AimPlaceInfo record);
+
+    List<AimPlaceInfo> query(AimPlaceInfo record);
+}
+

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

@@ -0,0 +1,452 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AimPlaceInfo{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String name;
+    private String type;
+    private String ownedLandMarkId;
+    private String arContentGroupId;
+    private String arKitPosX;
+    private String arKitPosY;
+    private String arKitPosZ;
+    private String arKitScale;
+    private String arKitAngle;
+    private String arKitShowLenth;
+    private String gyroPosX;
+    private String gyroPosY;
+    private String gyroPosZ;
+    private String gyroPosScale;
+    private String gyroPosAngle;
+    private String gyroPosShowLenth;
+    private String vuforiaImageInfoAreaMarking;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+    private String remark4;
+    private String remark5;
+    private String remark6;
+    private Integer mapIndex;
+    private String posX;
+    private String posY;
+    private String posZ;
+    private String remark7;
+    private String remark8;
+    private String remark9;
+    private String frontLevelId;
+    private String icon;
+    private Integer iconRank;
+    private String aloneFlag;
+    private String autoPlay;
+    private String autoDisplay;
+    private String showLevel;
+    private String templateId;
+    private String power;
+    private String areaId;
+    private String thingId;
+    private String aimGroupId;
+    private String templateAimId;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public String getName(){
+        return this.name;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+    public String getType(){
+        return this.type;
+    }
+
+    public void setType(String type){
+        this.type = type;
+    }
+    public String getOwnedLandMarkId(){
+        return this.ownedLandMarkId;
+    }
+
+    public void setOwnedLandMarkId(String ownedLandMarkId){
+        this.ownedLandMarkId = ownedLandMarkId;
+    }
+    public String getArContentGroupId(){
+        return this.arContentGroupId;
+    }
+
+    public void setArContentGroupId(String arContentGroupId){
+        this.arContentGroupId = arContentGroupId;
+    }
+    public String getArKitPosX(){
+        return this.arKitPosX;
+    }
+
+    public void setArKitPosX(String arKitPosX){
+        this.arKitPosX = arKitPosX;
+    }
+    public String getArKitPosY(){
+        return this.arKitPosY;
+    }
+
+    public void setArKitPosY(String arKitPosY){
+        this.arKitPosY = arKitPosY;
+    }
+    public String getArKitPosZ(){
+        return this.arKitPosZ;
+    }
+
+    public void setArKitPosZ(String arKitPosZ){
+        this.arKitPosZ = arKitPosZ;
+    }
+    public String getArKitScale(){
+        return this.arKitScale;
+    }
+
+    public void setArKitScale(String arKitScale){
+        this.arKitScale = arKitScale;
+    }
+    public String getArKitAngle(){
+        return this.arKitAngle;
+    }
+
+    public void setArKitAngle(String arKitAngle){
+        this.arKitAngle = arKitAngle;
+    }
+    public String getArKitShowLenth(){
+        return this.arKitShowLenth;
+    }
+
+    public void setArKitShowLenth(String arKitShowLenth){
+        this.arKitShowLenth = arKitShowLenth;
+    }
+    public String getGyroPosX(){
+        return this.gyroPosX;
+    }
+
+    public void setGyroPosX(String gyroPosX){
+        this.gyroPosX = gyroPosX;
+    }
+    public String getGyroPosY(){
+        return this.gyroPosY;
+    }
+
+    public void setGyroPosY(String gyroPosY){
+        this.gyroPosY = gyroPosY;
+    }
+    public String getGyroPosZ(){
+        return this.gyroPosZ;
+    }
+
+    public void setGyroPosZ(String gyroPosZ){
+        this.gyroPosZ = gyroPosZ;
+    }
+    public String getGyroPosScale(){
+        return this.gyroPosScale;
+    }
+
+    public void setGyroPosScale(String gyroPosScale){
+        this.gyroPosScale = gyroPosScale;
+    }
+    public String getGyroPosAngle(){
+        return this.gyroPosAngle;
+    }
+
+    public void setGyroPosAngle(String gyroPosAngle){
+        this.gyroPosAngle = gyroPosAngle;
+    }
+    public String getGyroPosShowLenth(){
+        return this.gyroPosShowLenth;
+    }
+
+    public void setGyroPosShowLenth(String gyroPosShowLenth){
+        this.gyroPosShowLenth = gyroPosShowLenth;
+    }
+    public String getVuforiaImageInfoAreaMarking(){
+        return this.vuforiaImageInfoAreaMarking;
+    }
+
+    public void setVuforiaImageInfoAreaMarking(String vuforiaImageInfoAreaMarking){
+        this.vuforiaImageInfoAreaMarking = vuforiaImageInfoAreaMarking;
+    }
+    public String getRemark1(){
+        return this.remark1;
+    }
+
+    public void setRemark1(String remark1){
+        this.remark1 = remark1;
+    }
+    public String getRemark2(){
+        return this.remark2;
+    }
+
+    public void setRemark2(String remark2){
+        this.remark2 = remark2;
+    }
+    public String getRemark3(){
+        return this.remark3;
+    }
+
+    public void setRemark3(String remark3){
+        this.remark3 = remark3;
+    }
+    public String getRemark4(){
+        return this.remark4;
+    }
+
+    public void setRemark4(String remark4){
+        this.remark4 = remark4;
+    }
+    public String getRemark5(){
+        return this.remark5;
+    }
+
+    public void setRemark5(String remark5){
+        this.remark5 = remark5;
+    }
+    public String getRemark6(){
+        return this.remark6;
+    }
+
+    public void setRemark6(String remark6){
+        this.remark6 = remark6;
+    }
+    public Integer getMapIndex(){
+        return this.mapIndex;
+    }
+
+    public void setMapIndex(Integer mapIndex){
+        this.mapIndex = mapIndex;
+    }
+    public String getPosX(){
+        return this.posX;
+    }
+
+    public void setPosX(String posX){
+        this.posX = posX;
+    }
+    public String getPosY(){
+        return this.posY;
+    }
+
+    public void setPosY(String posY){
+        this.posY = posY;
+    }
+    public String getPosZ(){
+        return this.posZ;
+    }
+
+    public void setPosZ(String posZ){
+        this.posZ = posZ;
+    }
+    public String getRemark7(){
+        return this.remark7;
+    }
+
+    public void setRemark7(String remark7){
+        this.remark7 = remark7;
+    }
+    public String getRemark8(){
+        return this.remark8;
+    }
+
+    public void setRemark8(String remark8){
+        this.remark8 = remark8;
+    }
+    public String getRemark9(){
+        return this.remark9;
+    }
+
+    public void setRemark9(String remark9){
+        this.remark9 = remark9;
+    }
+    public String getFrontLevelId(){
+        return this.frontLevelId;
+    }
+
+    public void setFrontLevelId(String frontLevelId){
+        this.frontLevelId = frontLevelId;
+    }
+    public String getIcon(){
+        return this.icon;
+    }
+
+    public void setIcon(String icon){
+        this.icon = icon;
+    }
+    public Integer getIconRank(){
+        return this.iconRank;
+    }
+
+    public void setIconRank(Integer iconRank){
+        this.iconRank = iconRank;
+    }
+    public String getAloneFlag(){
+        return this.aloneFlag;
+    }
+
+    public void setAloneFlag(String aloneFlag){
+        this.aloneFlag = aloneFlag;
+    }
+    public String getAutoPlay(){
+        return this.autoPlay;
+    }
+
+    public void setAutoPlay(String autoPlay){
+        this.autoPlay = autoPlay;
+    }
+    public String getAutoDisplay(){
+        return this.autoDisplay;
+    }
+
+    public void setAutoDisplay(String autoDisplay){
+        this.autoDisplay = autoDisplay;
+    }
+    public String getShowLevel(){
+        return this.showLevel;
+    }
+
+    public void setShowLevel(String showLevel){
+        this.showLevel = showLevel;
+    }
+    public String getTemplateId(){
+        return this.templateId;
+    }
+
+    public void setTemplateId(String templateId){
+        this.templateId = templateId;
+    }
+    public String getPower(){
+        return this.power;
+    }
+
+    public void setPower(String power){
+        this.power = power;
+    }
+    public String getAreaId(){
+        return this.areaId;
+    }
+
+    public void setAreaId(String areaId){
+        this.areaId = areaId;
+    }
+    public String getThingId(){
+        return this.thingId;
+    }
+
+    public void setThingId(String thingId){
+        this.thingId = thingId;
+    }
+    public String getAimGroupId(){
+        return this.aimGroupId;
+    }
+
+    public void setAimGroupId(String aimGroupId){
+        this.aimGroupId = aimGroupId;
+    }
+    public String getTemplateAimId(){
+        return this.templateAimId;
+    }
+
+    public void setTemplateAimId(String templateAimId){
+        this.templateAimId = templateAimId;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/service/AimPlaceInfoService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimPlaceInfo;
+
+
+/**
+*  service接口类
+*/
+public interface AimPlaceInfoService{
+
+    List<AimPlaceInfo> getAimPlaceInfoList(AimPlaceInfo record);
+
+    List<AimPlaceInfo> getAimPlaceInfoByPage(Page page, AimPlaceInfo record);
+
+    AimPlaceInfo getAimPlaceInfoById(String id);
+
+    AimPlaceInfo getAimPlaceInfo(AimPlaceInfo record);
+
+    boolean createAimPlaceInfo(AimPlaceInfo record);
+
+    boolean deleteAimPlaceInfo(AimPlaceInfo record);
+
+    boolean updateAimPlaceInfo(AimPlaceInfo record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/AimPlaceInfoServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.AimPlaceInfo;
+import com.izouma.awesomeadmin.service.AimPlaceInfoService;
+import com.izouma.awesomeadmin.dao.AimPlaceInfoMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class AimPlaceInfoServiceImpl implements AimPlaceInfoService{
+
+    private static Logger logger = Logger.getLogger(AimPlaceInfoServiceImpl.class);
+
+    @Autowired
+    private AimPlaceInfoMapper aimPlaceInfoMapper;
+
+    @Override
+    public List<AimPlaceInfo> getAimPlaceInfoList(AimPlaceInfo record) {
+
+        logger.info("getAimPlaceInfoList");
+        try {
+
+        return aimPlaceInfoMapper.queryAllAimPlaceInfo(record);
+        } catch (Exception e) {
+        logger.error("getAimPlaceInfoList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<AimPlaceInfo> getAimPlaceInfoByPage(Page page, AimPlaceInfo record) {
+
+        logger.info("getAimPlaceInfoByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return aimPlaceInfoMapper.queryAimPlaceInfoByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getAimPlaceInfoByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimPlaceInfo getAimPlaceInfoById(String id) {
+
+        logger.info("getAimPlaceInfoyId");
+        try {
+
+            return aimPlaceInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getAimPlaceInfoById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public AimPlaceInfo getAimPlaceInfo(AimPlaceInfo record) {
+
+        logger.info("getAimPlaceInfo");
+        try {
+
+            return aimPlaceInfoMapper.queryAimPlaceInfo(record);
+        } catch (Exception e) {
+        logger.error("getAimPlaceInfo", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createAimPlaceInfo(AimPlaceInfo record) {
+
+        logger.info("createAimPlaceInfo");
+        try {
+
+            int updates = aimPlaceInfoMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createAimPlaceInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteAimPlaceInfo(AimPlaceInfo record) {
+
+        logger.info("deleteAimPlaceInfo");
+        try {
+
+             int updates = aimPlaceInfoMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteAimPlaceInfo", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateAimPlaceInfo(AimPlaceInfo record) {
+
+        logger.info("updateAimPlaceInfo");
+        try {
+
+            int updates = aimPlaceInfoMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateAimPlaceInfo", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/web/AimPlaceInfoController.java

@@ -0,0 +1,200 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.AimPlaceInfo;
+import com.izouma.awesomeadmin.service.AimPlaceInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/aimPlaceInfo")
+public class AimPlaceInfoController {
+
+    @Autowired
+    private AimPlaceInfoService aimPlaceInfoService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(AimPlaceInfo record) {
+        List<AimPlaceInfo> pp = aimPlaceInfoService.getAimPlaceInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getAimPlaceInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getAimPlaceInfo(@RequestParam(required = false, value = "id") String id) {
+        AimPlaceInfo data = aimPlaceInfoService.getAimPlaceInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(AimPlaceInfo record) {
+        AimPlaceInfo data = aimPlaceInfoService.getAimPlaceInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, AimPlaceInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<AimPlaceInfo> pp =aimPlaceInfoService.getAimPlaceInfoByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(AimPlaceInfo record) {
+        boolean num = aimPlaceInfoService.createAimPlaceInfo(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateAimPlaceInfo(AimPlaceInfo record) {
+        boolean num = aimPlaceInfoService.updateAimPlaceInfo(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteAimPlaceInfo(AimPlaceInfo record) {
+
+        boolean num = aimPlaceInfoService.deleteAimPlaceInfo(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, AimPlaceInfo record) throws Exception {
+
+    List<AimPlaceInfo> aimPlaceInfos = aimPlaceInfoService.getAimPlaceInfoList(record);
+
+
+        String sheetName = "aim_place_info";
+        String titleName = "点标信息表数据表";
+        String fileName = "点标信息表表";
+        int columnNumber = 49;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "类别" ,   "所属地标ID" ,   "AR内容组ID" ,   "ArKit坐标X" ,   "ArKit坐标Y" ,   "ArKit坐标Z" ,   "ArKit缩放" ,   "ArKit角度" ,   "ArKit一定距离显示" ,   "Gyro坐标X" ,   "Gyro坐标Y" ,   "Gyro坐标Z" ,   "Gyro缩放" ,   "Gyro角度" ,   "Gyro一定距离显示" ,   "Gyro绑定识别图区域标记编号" ,   "模型X" ,   "模型Y" ,   "模型Z" ,   "显示摄像头前" ,   "备注5" ,   "备注6" ,   "地图index" ,   "坐标X" ,   "坐标Y" ,   "坐标Z" ,   "备注7" ,   "备注8" ,   "备注9" ,   "上级ID" ,   "图标" ,   "图标顺序" ,   "是否独占" ,   "自动触发" ,   "自动显示" ,   "显示层级" ,   "上级模板" ,   "权限" ,   "区域ID" ,   "事物ID" ,   "点标组ID" ,   "模板点标ID"  };
+        String[][] dataList = new String[aimPlaceInfos.size()][49];
+
+        for (int i = 0; i < aimPlaceInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(aimPlaceInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(aimPlaceInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(aimPlaceInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(aimPlaceInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(aimPlaceInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(aimPlaceInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(aimPlaceInfos.get(i).getName());
+                        dataList[i][7] = String.valueOf(aimPlaceInfos.get(i).getType());
+                        dataList[i][8] = String.valueOf(aimPlaceInfos.get(i).getOwnedLandMarkId());
+                        dataList[i][9] = String.valueOf(aimPlaceInfos.get(i).getArContentGroupId());
+                        dataList[i][10] = String.valueOf(aimPlaceInfos.get(i).getArKitPosX());
+                        dataList[i][11] = String.valueOf(aimPlaceInfos.get(i).getArKitPosY());
+                        dataList[i][12] = String.valueOf(aimPlaceInfos.get(i).getArKitPosZ());
+                        dataList[i][13] = String.valueOf(aimPlaceInfos.get(i).getArKitScale());
+                        dataList[i][14] = String.valueOf(aimPlaceInfos.get(i).getArKitAngle());
+                        dataList[i][15] = String.valueOf(aimPlaceInfos.get(i).getArKitShowLenth());
+                        dataList[i][16] = String.valueOf(aimPlaceInfos.get(i).getGyroPosX());
+                        dataList[i][17] = String.valueOf(aimPlaceInfos.get(i).getGyroPosY());
+                        dataList[i][18] = String.valueOf(aimPlaceInfos.get(i).getGyroPosZ());
+                        dataList[i][19] = String.valueOf(aimPlaceInfos.get(i).getGyroPosScale());
+                        dataList[i][20] = String.valueOf(aimPlaceInfos.get(i).getGyroPosAngle());
+                        dataList[i][21] = String.valueOf(aimPlaceInfos.get(i).getGyroPosShowLenth());
+                        dataList[i][22] = String.valueOf(aimPlaceInfos.get(i).getVuforiaImageInfoAreaMarking());
+                        dataList[i][23] = String.valueOf(aimPlaceInfos.get(i).getRemark1());
+                        dataList[i][24] = String.valueOf(aimPlaceInfos.get(i).getRemark2());
+                        dataList[i][25] = String.valueOf(aimPlaceInfos.get(i).getRemark3());
+                        dataList[i][26] = String.valueOf(aimPlaceInfos.get(i).getRemark4());
+                        dataList[i][27] = String.valueOf(aimPlaceInfos.get(i).getRemark5());
+                        dataList[i][28] = String.valueOf(aimPlaceInfos.get(i).getRemark6());
+                        dataList[i][29] = String.valueOf(aimPlaceInfos.get(i).getMapIndex());
+                        dataList[i][30] = String.valueOf(aimPlaceInfos.get(i).getPosX());
+                        dataList[i][31] = String.valueOf(aimPlaceInfos.get(i).getPosY());
+                        dataList[i][32] = String.valueOf(aimPlaceInfos.get(i).getPosZ());
+                        dataList[i][33] = String.valueOf(aimPlaceInfos.get(i).getRemark7());
+                        dataList[i][34] = String.valueOf(aimPlaceInfos.get(i).getRemark8());
+                        dataList[i][35] = String.valueOf(aimPlaceInfos.get(i).getRemark9());
+                        dataList[i][36] = String.valueOf(aimPlaceInfos.get(i).getFrontLevelId());
+                        dataList[i][37] = String.valueOf(aimPlaceInfos.get(i).getIcon());
+                        dataList[i][38] = String.valueOf(aimPlaceInfos.get(i).getIconRank());
+                        dataList[i][39] = String.valueOf(aimPlaceInfos.get(i).getAloneFlag());
+                        dataList[i][40] = String.valueOf(aimPlaceInfos.get(i).getAutoPlay());
+                        dataList[i][41] = String.valueOf(aimPlaceInfos.get(i).getAutoDisplay());
+                        dataList[i][42] = String.valueOf(aimPlaceInfos.get(i).getShowLevel());
+                        dataList[i][43] = String.valueOf(aimPlaceInfos.get(i).getTemplateId());
+                        dataList[i][44] = String.valueOf(aimPlaceInfos.get(i).getPower());
+                        dataList[i][45] = String.valueOf(aimPlaceInfos.get(i).getAreaId());
+                        dataList[i][46] = String.valueOf(aimPlaceInfos.get(i).getThingId());
+                        dataList[i][47] = String.valueOf(aimPlaceInfos.get(i).getAimGroupId());
+                        dataList[i][48] = String.valueOf(aimPlaceInfos.get(i).getTemplateAimId());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/AimGroupInfos.vue

@@ -58,6 +58,10 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/aimPlaceInfos',query:{column:scope.row.areaId+',areaId'+';'+scope.row.cityId+',cityId'
+                     +';'+scope.row.landmarkId+',ownedLandMarkId'+';'+scope.row.id+',aimGroupId'+';'+scope.row.thingId+',thingId'
+                     +';'+scope.row.aimTemplateId+',templateId'}})" type="primary" size="small" plain>点标
+                    </el-button>
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>

src/main/vue/src/pages/AimPlaceInfo.vue

@@ -0,0 +1,407 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="name" label="名称">
+                <el-input v-model="formData.name" :disabled="checkSubColumn('name')"></el-input>
+            </el-form-item>
+            <el-form-item prop="type" label="类别">
+                <el-input v-model="formData.type" :disabled="checkSubColumn('type')"></el-input>
+            </el-form-item>
+            <el-form-item prop="ownedLandMarkId" label="所属地标ID">
+                <template>
+                    <el-select v-model="formData.ownedLandMarkId" clearable placeholder="请选择" :disabled="checkSubColumn('ownedLandMarkId')">
+                        <el-option v-for="item in ownedLandMarkIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="arContentGroupId" label="AR内容组ID">
+                <el-input v-model="formData.arContentGroupId" :disabled="checkSubColumn('arContentGroupId')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitPosX" label="ArKit坐标X">
+                <el-input v-model="formData.arKitPosX" :disabled="checkSubColumn('arKitPosX')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitPosY" label="ArKit坐标Y">
+                <el-input v-model="formData.arKitPosY" :disabled="checkSubColumn('arKitPosY')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitPosZ" label="ArKit坐标Z">
+                <el-input v-model="formData.arKitPosZ" :disabled="checkSubColumn('arKitPosZ')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitScale" label="ArKit缩放">
+                <el-input v-model="formData.arKitScale" :disabled="checkSubColumn('arKitScale')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitAngle" label="ArKit角度">
+                <el-input v-model="formData.arKitAngle" :disabled="checkSubColumn('arKitAngle')"></el-input>
+            </el-form-item>
+            <el-form-item prop="arKitShowLenth" label="ArKit一定距离显示">
+                <el-input v-model="formData.arKitShowLenth" :disabled="checkSubColumn('arKitShowLenth')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosX" label="Gyro坐标X">
+                <el-input v-model="formData.gyroPosX" :disabled="checkSubColumn('gyroPosX')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosY" label="Gyro坐标Y">
+                <el-input v-model="formData.gyroPosY" :disabled="checkSubColumn('gyroPosY')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosZ" label="Gyro坐标Z">
+                <el-input v-model="formData.gyroPosZ" :disabled="checkSubColumn('gyroPosZ')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosScale" label="Gyro缩放">
+                <el-input v-model="formData.gyroPosScale" :disabled="checkSubColumn('gyroPosScale')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosAngle" label="Gyro角度">
+                <el-input v-model="formData.gyroPosAngle" :disabled="checkSubColumn('gyroPosAngle')"></el-input>
+            </el-form-item>
+            <el-form-item prop="gyroPosShowLenth" label="Gyro一定距离显示">
+                <el-input v-model="formData.gyroPosShowLenth" :disabled="checkSubColumn('gyroPosShowLenth')"></el-input>
+            </el-form-item>
+            <el-form-item prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号">
+                <el-input v-model="formData.vuforiaImageInfoAreaMarking" :disabled="checkSubColumn('vuforiaImageInfoAreaMarking')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark1" label="模型X">
+                <el-input v-model="formData.remark1" :disabled="checkSubColumn('remark1')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark2" label="模型Y">
+                <el-input v-model="formData.remark2" :disabled="checkSubColumn('remark2')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark3" label="模型Z">
+                <el-input v-model="formData.remark3" :disabled="checkSubColumn('remark3')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark4" label="显示摄像头前">
+                <el-input v-model="formData.remark4" :disabled="checkSubColumn('remark4')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark5" label="备注5">
+                <el-input v-model="formData.remark5" :disabled="checkSubColumn('remark5')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark6" label="备注6">
+                <el-input v-model="formData.remark6" :disabled="checkSubColumn('remark6')"></el-input>
+            </el-form-item>
+            <el-form-item prop="mapIndex" label="地图index">
+                <el-input v-model="formData.mapIndex" :disabled="checkSubColumn('mapIndex')"></el-input>
+            </el-form-item>
+            <el-form-item prop="posX" label="坐标X">
+                <el-input v-model="formData.posX" :disabled="checkSubColumn('posX')"></el-input>
+            </el-form-item>
+            <el-form-item prop="posY" label="坐标Y">
+                <el-input v-model="formData.posY" :disabled="checkSubColumn('posY')"></el-input>
+            </el-form-item>
+            <el-form-item prop="posZ" label="坐标Z">
+                <el-input v-model="formData.posZ" :disabled="checkSubColumn('posZ')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark7" label="备注7">
+                <el-input v-model="formData.remark7" :disabled="checkSubColumn('remark7')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark8" label="备注8">
+                <el-input v-model="formData.remark8" :disabled="checkSubColumn('remark8')"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark9" label="备注9">
+                <el-input v-model="formData.remark9" :disabled="checkSubColumn('remark9')"></el-input>
+            </el-form-item>
+            <el-form-item prop="frontLevelId" label="上级ID">
+                <template>
+                    <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="checkSubColumn('frontLevelId')">
+                        <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 prop="icon" label="图标">
+                <single-upload v-model="formData.icon" :disabled="checkSubColumn('icon')"></single-upload>
+            </el-form-item>
+            <el-form-item prop="iconRank" label="图标顺序">
+                <el-input type="number" v-model="formData.iconRank" :disabled="checkSubColumn('iconRank')"></el-input>
+            </el-form-item>
+            <el-form-item prop="aloneFlag" label="是否独占">
+                <el-switch v-model="formData.aloneFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('aloneFlag')">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="autoPlay" label="自动触发">
+                <el-switch v-model="formData.autoPlay" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('autoPlay')">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="autoDisplay" label="自动显示">
+                <el-switch v-model="formData.autoDisplay" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('autoDisplay')">
+                </el-switch>
+            </el-form-item>
+            <el-form-item prop="showLevel" label="显示层级">
+                <el-input type="number" v-model="formData.showLevel" :disabled="checkSubColumn('showLevel')"></el-input>
+            </el-form-item>
+            <el-form-item prop="templateId" label="上级模板">
+                <template>
+                    <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="checkSubColumn('templateId')">
+                        <el-option v-for="item in templateIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="areaId" label="区域ID">
+                <template>
+                    <el-select v-model="formData.areaId" clearable placeholder="请选择" :disabled="checkSubColumn('areaId')">
+                        <el-option v-for="item in areaIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="thingId" label="事物ID">
+                <template>
+                    <el-select v-model="formData.thingId" clearable placeholder="请选择" :disabled="checkSubColumn('thingId')">
+                        <el-option v-for="item in thingIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="aimGroupId" label="点标组ID">
+                <template>
+                    <el-select v-model="formData.aimGroupId" clearable placeholder="请选择" :disabled="checkSubColumn('aimGroupId')">
+                        <el-option v-for="item in aimGroupIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="templateAimId" label="模板点标ID">
+                <template>
+                    <el-select v-model="formData.templateAimId" clearable placeholder="请选择" :disabled="checkSubColumn('templateAimId')">
+                        <el-option v-for="item in templateAimIdOptions" :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>
+</template>
+<script>
+import formValidator from '../formValidator'
+
+export default {
+    created() {
+        if (this.$route.query.column) {
+
+            var columnList = this.$route.query.column.split(';')
+            columnList.forEach(item => {
+                var tempColumn = item;
+                this.subColumnList.push(tempColumn.split(',')[1]);
+            })
+
+        }
+
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/aimPlaceInfo/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        var columnList = this.$route.query.column.split(';')
+                        columnList.forEach(item => {
+                            var tempColumn = item;
+                            this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                        })
+
+                    }
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
+                    this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                })
+
+            }
+        }
+
+
+
+
+        this.$http.get({
+            url: '/landMark/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.ownedLandMarkIdOptions.push({ label: item.mapName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/aimPlaceInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.frontLevelIdOptions.push({ label: item.name, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/aimTemplate/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.templateIdOptions.push({ label: item.templateName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/areaInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.areaIdOptions.push({ label: item.areaName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/thingInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.thingIdOptions.push({ label: item.thingName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/aimGroupInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.aimGroupIdOptions.push({ label: item.groupName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/aimTemplateAim/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.templateAimIdOptions.push({ label: item.aimName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name:
+                    [
+                        { required: true, message: '请输入 名称', trigger: 'blur' },
+                    ],
+            },
+            ownedLandMarkIdOptions: [],
+            frontLevelIdOptions: [],
+            templateIdOptions: [],
+            areaIdOptions: [],
+            thingIdOptions: [],
+            aimGroupIdOptions: [],
+            templateAimIdOptions: [],
+            subColumn: '',
+            subValue: '',
+            subColumnList: [],
+        }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/aimPlaceInfo/update' : '/aimPlaceInfo/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/aimPlaceInfo/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('删除失败');
+                }
+            })
+        },
+        checkSubColumn(value) {
+            if (this.$route.query.column) {
+                if (this.subColumnList.indexOf(value) >= 0) {
+                    return true;
+                }
+
+            }
+            return false;
+        },
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/AimPlaceInfos.vue

@@ -0,0 +1,886 @@
+<template>
+    <div>
+        <div class="filters-container">
+
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/aimPlaceInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('name')" prop="name" label="名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('type')" prop="type" label="类别" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('ownedLandMarkId')" prop="ownedLandMarkId" label="所属地标ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arContentGroupId')" prop="arContentGroupId" label="AR内容组ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitPosX')" prop="arKitPosX" label="ArKit坐标X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitPosY')" prop="arKitPosY" label="ArKit坐标Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitPosZ')" prop="arKitPosZ" label="ArKit坐标Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitScale')" prop="arKitScale" label="ArKit缩放" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitAngle')" prop="arKitAngle" label="ArKit角度" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arKitShowLenth')" prop="arKitShowLenth" label="ArKit一定距离显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosX')" prop="gyroPosX" label="Gyro坐标X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosY')" prop="gyroPosY" label="Gyro坐标Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosZ')" prop="gyroPosZ" label="Gyro坐标Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosScale')" prop="gyroPosScale" label="Gyro缩放" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosAngle')" prop="gyroPosAngle" label="Gyro角度" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gyroPosShowLenth')" prop="gyroPosShowLenth" label="Gyro一定距离显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImageInfoAreaMarking')" prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="模型X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="模型Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="模型Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark4')" prop="remark4" label="显示摄像头前" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark5')" prop="remark5" label="备注5" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark6')" prop="remark6" label="备注6" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapIndex')" prop="mapIndex" label="地图index" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posX')" prop="posX" label="坐标X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posY')" prop="posY" label="坐标Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posZ')" prop="posZ" label="坐标Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark7')" prop="remark7" label="备注7" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark8')" prop="remark8" label="备注8" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark9')" prop="remark9" label="备注9" 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('icon')" prop="icon" label="图标" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('iconRank')" prop="iconRank" label="图标顺序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('aloneFlag')" prop="aloneFlag" label="是否独占" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('autoPlay')" prop="autoPlay" label="自动触发" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('autoDisplay')" prop="autoDisplay" label="自动显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('showLevel')" prop="showLevel" label="显示层级" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('templateId')" prop="templateId" label="上级模板" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('areaId')" prop="areaId" label="区域ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('thingId')" prop="thingId" label="事物ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('aimGroupId')" prop="aimGroupId" label="点标组ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('templateAimId')" prop="templateAimId" label="模板点标ID" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/ArContents',query:{column:scope.row.id+',aimPlaceId'}})" type="primary" size="small" plain>ar内容
+                    </el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '名称',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '类别',
+                    value: 'type',
+                    show: true
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'ownedLandMarkId',
+                    show: true
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'arContentGroupId',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标X',
+                    value: 'arKitPosX',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标Y',
+                    value: 'arKitPosY',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标Z',
+                    value: 'arKitPosZ',
+                    show: true
+                },
+                {
+                    label: 'ArKit缩放',
+                    value: 'arKitScale',
+                    show: true
+                },
+                {
+                    label: 'ArKit角度',
+                    value: 'arKitAngle',
+                    show: true
+                },
+                {
+                    label: 'ArKit一定距离显示',
+                    value: 'arKitShowLenth',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标X',
+                    value: 'gyroPosX',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标Y',
+                    value: 'gyroPosY',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标Z',
+                    value: 'gyroPosZ',
+                    show: true
+                },
+                {
+                    label: 'Gyro缩放',
+                    value: 'gyroPosScale',
+                    show: true
+                },
+                {
+                    label: 'Gyro角度',
+                    value: 'gyroPosAngle',
+                    show: true
+                },
+                {
+                    label: 'Gyro一定距离显示',
+                    value: 'gyroPosShowLenth',
+                    show: true
+                },
+                {
+                    label: 'Gyro绑定识别图区域标记编号',
+                    value: 'vuforiaImageInfoAreaMarking',
+                    show: true
+                },
+                {
+                    label: '模型X',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '模型Y',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '模型Z',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '显示摄像头前',
+                    value: 'remark4',
+                    show: true
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5',
+                    show: true
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6',
+                    show: true
+                },
+                {
+                    label: '地图index',
+                    value: 'mapIndex',
+                    show: true
+                },
+                {
+                    label: '坐标X',
+                    value: 'posX',
+                    show: true
+                },
+                {
+                    label: '坐标Y',
+                    value: 'posY',
+                    show: true
+                },
+                {
+                    label: '坐标Z',
+                    value: 'posZ',
+                    show: true
+                },
+                {
+                    label: '备注7',
+                    value: 'remark7',
+                    show: true
+                },
+                {
+                    label: '备注8',
+                    value: 'remark8',
+                    show: true
+                },
+                {
+                    label: '备注9',
+                    value: 'remark9',
+                    show: true
+                },
+                {
+                    label: '上级ID',
+                    value: 'frontLevelId',
+                    show: true
+                },
+                {
+                    label: '图标',
+                    value: 'icon',
+                    show: true
+                },
+                {
+                    label: '图标顺序',
+                    value: 'iconRank',
+                    show: true
+                },
+                {
+                    label: '是否独占',
+                    value: 'aloneFlag',
+                    show: true
+                },
+                {
+                    label: '自动触发',
+                    value: 'autoPlay',
+                    show: true
+                },
+                {
+                    label: '自动显示',
+                    value: 'autoDisplay',
+                    show: true
+                },
+                {
+                    label: '显示层级',
+                    value: 'showLevel',
+                    show: true
+                },
+                {
+                    label: '上级模板',
+                    value: 'templateId',
+                    show: true
+                },
+                {
+                    label: '区域ID',
+                    value: 'areaId',
+                    show: true
+                },
+                {
+                    label: '事物ID',
+                    value: 'thingId',
+                    show: true
+                },
+                {
+                    label: '点标组ID',
+                    value: 'aimGroupId',
+                    show: true
+                },
+                {
+                    label: '模板点标ID',
+                    value: 'templateAimId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'name'
+                },
+                {
+                    label: '类别',
+                    value: 'type'
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'owned_land_mark_id'
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'ar_content_group_id'
+                },
+                {
+                    label: 'ArKit坐标X',
+                    value: 'ar_kit_pos_x'
+                },
+                {
+                    label: 'ArKit坐标Y',
+                    value: 'ar_kit_pos_y'
+                },
+                {
+                    label: 'ArKit坐标Z',
+                    value: 'ar_kit_pos_z'
+                },
+                {
+                    label: 'ArKit缩放',
+                    value: 'ar_kit_scale'
+                },
+                {
+                    label: 'ArKit角度',
+                    value: 'ar_kit_angle'
+                },
+                {
+                    label: 'ArKit一定距离显示',
+                    value: 'ar_kit_show_lenth'
+                },
+                {
+                    label: 'Gyro坐标X',
+                    value: 'gyro_pos_x'
+                },
+                {
+                    label: 'Gyro坐标Y',
+                    value: 'gyro_pos_y'
+                },
+                {
+                    label: 'Gyro坐标Z',
+                    value: 'gyro_pos_z'
+                },
+                {
+                    label: 'Gyro缩放',
+                    value: 'gyro_pos_scale'
+                },
+                {
+                    label: 'Gyro角度',
+                    value: 'gyro_pos_angle'
+                },
+                {
+                    label: 'Gyro一定距离显示',
+                    value: 'gyro_pos_show_lenth'
+                },
+                {
+                    label: 'Gyro绑定识别图区域标记编号',
+                    value: 'vuforia_image_info_area_marking'
+                },
+                {
+                    label: '模型X',
+                    value: 'remark1'
+                },
+                {
+                    label: '模型Y',
+                    value: 'remark2'
+                },
+                {
+                    label: '模型Z',
+                    value: 'remark3'
+                },
+                {
+                    label: '显示摄像头前',
+                    value: 'remark4'
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5'
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6'
+                },
+                {
+                    label: '地图index',
+                    value: 'map_index'
+                },
+                {
+                    label: '坐标X',
+                    value: 'pos_x'
+                },
+                {
+                    label: '坐标Y',
+                    value: 'pos_y'
+                },
+                {
+                    label: '坐标Z',
+                    value: 'pos_z'
+                },
+                {
+                    label: '备注7',
+                    value: 'remark7'
+                },
+                {
+                    label: '备注8',
+                    value: 'remark8'
+                },
+                {
+                    label: '备注9',
+                    value: 'remark9'
+                },
+                {
+                    label: '上级ID',
+                    value: 'front_level_id'
+                },
+                {
+                    label: '图标',
+                    value: 'icon'
+                },
+                {
+                    label: '图标顺序',
+                    value: 'icon_rank'
+                },
+                {
+                    label: '是否独占',
+                    value: 'alone_flag'
+                },
+                {
+                    label: '自动触发',
+                    value: 'auto_play'
+                },
+                {
+                    label: '自动显示',
+                    value: 'auto_display'
+                },
+                {
+                    label: '显示层级',
+                    value: 'show_level'
+                },
+                {
+                    label: '上级模板',
+                    value: 'template_id'
+                },
+                {
+                    label: '区域ID',
+                    value: 'area_id'
+                },
+                {
+                    label: '事物ID',
+                    value: 'thing_id'
+                },
+                {
+                    label: '点标组ID',
+                    value: 'aim_group_id'
+                },
+                {
+                    label: '模板点标ID',
+                    value: 'template_aim_id'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+            }
+
+            if (this.$route.query.column) {
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                })
+
+            }
+
+            this.$http.get({
+                url: '/aimPlaceInfo/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/aimPlaceInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/aimPlaceInfo/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/aimPlaceInfo/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/AreaInfo.vue

@@ -3,7 +3,7 @@
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
             <el-form-item prop="cityId" label="城市ID">
                 <template>
-                    <el-select v-model="formData.cityId" clearable placeholder="请选择" :disabled="'cityId'==subColumn">
+                    <el-select v-model="formData.cityId" clearable placeholder="请选择" :disabled="checkSubColumn('cityId')">
                         <el-option v-for="item in cityIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
@@ -11,47 +11,47 @@
             </el-form-item>
             <el-form-item prop="landmarkId" label="地标ID">
                 <template>
-                    <el-select v-model="formData.landmarkId" clearable placeholder="请选择" :disabled="'landmarkId'==subColumn">
+                    <el-select v-model="formData.landmarkId" clearable placeholder="请选择" :disabled="checkSubColumn('landmarkId')">
                         <el-option v-for="item in landmarkIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
             <el-form-item prop="areaName" label="区域名称">
-                <el-input v-model="formData.areaName" :disabled="'areaName'==subColumn"></el-input>
+                <el-input v-model="formData.areaName" :disabled="checkSubColumn('areaName')"></el-input>
             </el-form-item>
             <el-form-item prop="areaType" label="区域类型">
                 <template>
-                    <el-select v-model="formData.areaType" clearable placeholder="请选择" :disabled="'areaType'==subColumn">
+                    <el-select v-model="formData.areaType" clearable placeholder="请选择" :disabled="checkSubColumn('areaType')">
                         <el-option v-for="item in areaTypeOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
             <el-form-item prop="rankLevel" label="优先级">
-                <el-input type="number" v-model="formData.rankLevel" :disabled="'rankLevel'==subColumn"></el-input>
+                <el-input type="number" v-model="formData.rankLevel" :disabled="checkSubColumn('rankLevel')"></el-input>
             </el-form-item>
             <el-form-item prop="allowEdit" label="允许编辑">
-                <el-switch v-model="formData.allowEdit" active-color="#13ce66" inactive-color="#ff4949" :disabled="'allowEdit'==subColumn">
+                <el-switch v-model="formData.allowEdit" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('allowEdit')">
                 </el-switch>
             </el-form-item>
             <el-form-item prop="allowNavigate" label="允许导航">
-                <el-switch v-model="formData.allowNavigate" active-color="#13ce66" inactive-color="#ff4949" :disabled="'allowNavigate'==subColumn">
+                <el-switch v-model="formData.allowNavigate" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('allowNavigate')">
                 </el-switch>
             </el-form-item>
             <el-form-item prop="publicArea" label="公共区域">
-                <el-switch v-model="formData.publicArea" active-color="#13ce66" inactive-color="#ff4949" :disabled="'publicArea'==subColumn">
+                <el-switch v-model="formData.publicArea" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('publicArea')">
                 </el-switch>
             </el-form-item>
             <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+                <el-input v-model="formData.remark" :disabled="checkSubColumn('remark')"></el-input>
             </el-form-item>
             <el-form-item prop="icon" label="ICON">
-                <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+                <single-upload v-model="formData.icon" :disabled="checkSubColumn('icon')"></single-upload>
                 图片格式为png,分辨率64*64
             </el-form-item>
             <el-form-item prop="icon" label="ICON">
-                <el-input v-model="formData.icon" :disabled="'icon'==subColumn"></el-input>
+                <el-input v-model="formData.icon" :disabled="checkSubColumn('icon')"></el-input>
             </el-form-item>
             <el-form-item prop="keyword" label="关键词">
                 <template>
@@ -63,35 +63,35 @@
                 </template>
             </el-form-item>
             <el-form-item prop="video" label="视频">
-                <single-upload v-model="formData.video" :disabled="'video'==subColumn"></single-upload>
+                <single-upload v-model="formData.video" :disabled="checkSubColumn('video')"></single-upload>
                 图片格式为png,分辨率512*512；视频格式为MP4，分辨率为1024*768
             </el-form-item>
             <el-form-item prop="video" label="视频">
-                <el-input v-model="formData.video" :disabled="'video'==subColumn"></el-input>
+                <el-input v-model="formData.video" :disabled="checkSubColumn('video')"></el-input>
             </el-form-item>
             <el-form-item prop="textIntroduction" label="文字介绍">
-                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="'textIntroduction'==subColumn"></el-input>
+                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="checkSubColumn('textIntroduction')"></el-input>
             </el-form-item>
             <el-form-item prop="url" label="官网">
-                <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
+                <el-input v-model="formData.url" :disabled="checkSubColumn('url')"></el-input>
             </el-form-item>
             <el-form-item prop="showDistance" label="显示距离">
-                <el-input type="number" v-model="formData.showDistance" :disabled="'showDistance'==subColumn"></el-input>
+                <el-input type="number" v-model="formData.showDistance" :disabled="checkSubColumn('showDistance')"></el-input>
                 M(最大不可超过10m)
             </el-form-item>
             <el-form-item prop="templateId" label="点标组ID">
                 <template>
-                    <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="'templateId'==subColumn">
+                    <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="checkSubColumn('templateId')">
                         <el-option v-for="item in templateIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
             <el-form-item prop="frontLevelId" label="上级ID">
-                <el-input v-model="formData.frontLevelId" :disabled="'frontLevelId'==subColumn"></el-input>
+                <el-input v-model="formData.frontLevelId" :disabled="checkSubColumn('frontLevelId')"></el-input>
             </el-form-item>
             <el-form-item prop="blockId" label="地块ID">
-                <el-input v-model="formData.blockId" :disabled="'blockId'==subColumn"></el-input>
+                <el-input v-model="formData.blockId" :disabled="checkSubColumn('blockId')"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -107,8 +107,13 @@ import formValidator from '../formValidator'
 export default {
     created() {
         if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
+
+            var columnList = this.$route.query.column.split(';')
+            columnList.forEach(item => {
+                var tempColumn = item;
+                this.subColumnList.push(tempColumn.split(',')[1]);
+            })
+
         }
 
         if (this.$route.query.id) {
@@ -127,8 +132,13 @@ export default {
                         res.data.keyword = res.data.keyword.split(',')
                     }
 
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
+                     if (this.$route.query.column) {
+                        var columnList = this.$route.query.column.split(';')
+                        columnList.forEach(item => {
+                            var tempColumn = item;
+                            this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                        })
+
                     }
 
                     this.formData.allowEdit = this.formData.allowEdit == 'Y' ? true : false;
@@ -138,9 +148,14 @@ export default {
                 }
             })
         } else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
-            }
+             if (this.$route.query.column) {
+                        var columnList = this.$route.query.column.split(';')
+                        columnList.forEach(item => {
+                            var tempColumn = item;
+                            this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                        })
+
+                    }
         }
 
 
@@ -221,6 +236,7 @@ export default {
             areaTypeOptions: [],
             subColumn: '',
             subValue: '',
+            subColumnList: [],
         }
     },
     methods: {
@@ -279,6 +295,15 @@ export default {
             this.formData.keyword.push('')
             console.log("222")
         },
+        checkSubColumn(value) {
+            if (this.$route.query.column) {
+                if (this.subColumnList.indexOf(value) >= 0) {
+                    return true;
+                }
+
+            }
+            return false;
+        },
     }
 }
 </script>

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

@@ -58,7 +58,7 @@
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('icon')" prop="icon" label="ICON" min-width="100">
-                <template slot-scope="{row}">
+                <template slot-scope="{row}" v-if="row.icon">
                     <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
                 </template>
 
@@ -68,7 +68,7 @@
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('video')" prop="video" label="视频" min-width="100">
-                <template slot-scope="{row}">
+                <template slot-scope="{row}" v-if="row.video">
                     <img :src="row.video" @click="showImg(row.video)" style="width: 100px;height: 100px;vertical-align: middle;" />
                 </template>
 
@@ -100,6 +100,8 @@
                     </el-button>
                     <el-button @click="$router.push({path:'/aimGroupInfos',query:{column:scope.row.id+',areaId'+';'+scope.row.cityId+',cityId'+';'+scope.row.landmarkId+',landmarkId'}})" type="primary" size="small" plain>点标组
                     </el-button>
+                    <el-button @click="$router.push({path:'/thingInfos',query:{column:scope.row.id+',areaId'+';'+scope.row.cityId+',cityId'+';'+scope.row.landmarkId+',landmarkId'}})" type="primary" size="small" plain>事物
+                    </el-button>
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -437,8 +439,12 @@ export default {
             }
 
             if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                })
+
             }
 
             this.$http.get({

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

@@ -111,6 +111,8 @@
             </el-button>
                     <el-button @click="$router.push({path:'/AimPlacePositions',query:{column:scope.row.id+',ownedLandMarkId'}})" type="primary" size="small" plain>目标点位置
             </el-button> -->
+                    <el-button @click="$router.push({path:'/areaInfos',query:{column:scope.row.id+',landmarkId'+';'+scope.row.ownedCityId+',cityId'}})" type="primary" size="small" plain>区域
+                    </el-button>
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="drawMapInfo(scope.row)" type="primary" size="mini" plain>地图</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>

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

@@ -1,112 +1,107 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="landmarkId" label="地标ID">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="cityId" label="城市ID">
                 <template>
-                    <el-select v-model="formData.landmarkId" clearable  placeholder="请选择" :disabled="'landmarkId'==subColumn">
-                        <el-option
-                                v-for="item in landmarkIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.cityId" clearable placeholder="请选择" :disabled="checkSubColumn('cityId')">
+                        <el-option v-for="item in cityIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="thingName" label="事物名称">
-                <el-input v-model="formData.thingName" :disabled="'thingName'==subColumn"></el-input>
+            <el-form-item prop="landmarkId" label="地标ID">
+                <template>
+                    <el-select v-model="formData.landmarkId" clearable placeholder="请选择" :disabled="checkSubColumn('landmarkId')">
+                        <el-option v-for="item in landmarkIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="thingType" label="事物类型">
+
+            <el-form-item prop="areaId" label="区域ID">
                 <template>
-                    <el-select v-model="formData.thingType" clearable  placeholder="请选择" :disabled="'thingType'==subColumn">
-                        <el-option
-                                v-for="item in thingTypeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.areaId" clearable placeholder="请选择" :disabled="checkSubColumn('areaId')">
+                        <el-option v-for="item in areaIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                <el-form-item prop="rankLevel" label="优先级">
-                <el-input type="number" v-model="formData.rankLevel" :disabled="'rankLevel'==subColumn"></el-input>
+            <el-form-item prop="thingName" label="事物名称">
+                <el-input v-model="formData.thingName" :disabled="checkSubColumn('thingName')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="allowNavigate" label="允许导航">
-                <el-switch
-                        v-model="formData.allowNavigate"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        :disabled="'allowNavigate'==subColumn">
-                </el-switch>
+            <el-form-item prop="thingType" label="事物类型">
+                <template>
+                    <el-select v-model="formData.thingType" clearable placeholder="请选择" :disabled="checkSubColumn('thingType')">
+                        <el-option v-for="item in thingTypeOptions" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <el-form-item prop="rankLevel" label="优先级">
+                <el-input type="number" v-model="formData.rankLevel" :disabled="checkSubColumn('rankLevel')"></el-input>
             </el-form-item>
-                                                                                                <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            <el-form-item prop="allowNavigate" label="允许导航">
+                <el-switch v-model="formData.allowNavigate" active-color="#13ce66" inactive-color="#ff4949" :disabled="checkSubColumn('allowNavigate')">
+                </el-switch>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="icon" label="ICON">
-                 <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                <el-form-item prop="keyword" label="关键字">
-                <el-input v-model="formData.keyword" :disabled="'keyword'==subColumn"></el-input>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="checkSubColumn('remark')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="image" label="图片">
-                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                    <el-form-item prop="textIntroduction" label="文字描述">
-                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="'textIntroduction'==subColumn"></el-input>
+            <el-form-item prop="icon" label="ICON">
+                <single-upload v-model="formData.icon" :disabled="checkSubColumn('icon')"></single-upload>
+                图片格式为png,分辨率64*64
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="showDistance" label="显示距离">
-                <el-input type="number" v-model="formData.showDistance" :disabled="'showDistance'==subColumn"></el-input>
+            <el-form-item prop="icon" label="ICON">
+                <el-input v-model="formData.icon" :disabled="checkSubColumn('icon')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="templateId" label="点标模板">
+            <el-form-item prop="keyword" label="关键词">
                 <template>
-                    <el-select v-model="formData.templateId" clearable  placeholder="请选择" :disabled="'templateId'==subColumn">
-                        <el-option
-                                v-for="item in templateIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
+                    <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="frontLevelId" label="上级ID">
-                <el-input v-model="formData.frontLevelId" :disabled="'frontLevelId'==subColumn"></el-input>
+
+            <el-form-item prop="textIntroduction" label="介绍正文">
+                <el-input type="textarea" v-model="formData.textIntroduction" :disabled="checkSubColumn('textIntroduction')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="cityId" label="城市ID">
-                <template>
-                    <el-select v-model="formData.cityId" clearable  placeholder="请选择" :disabled="'cityId'==subColumn">
-                        <el-option
-                                v-for="item in cityIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
+
+            <el-form-item prop="image" label="图片">
+                <single-upload v-model="formData.image" :disabled="checkSubColumn('image')"></single-upload>
+                图片格式为png,分辨率256*256
+            </el-form-item>
+            <el-form-item prop="image" label="图片">
+                <el-input v-model="formData.image" :disabled="checkSubColumn('image')"></el-input>
+            </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-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="areaId" label="区域ID">
+            <el-form-item prop="templateId" label="点标组">
                 <template>
-                    <el-select v-model="formData.areaId" clearable  placeholder="请选择" :disabled="'areaId'==subColumn">
-                        <el-option
-                                v-for="item in areaIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.templateId" clearable placeholder="请选择" :disabled="checkSubColumn('templateId')">
+                        <el-option v-for="item in templateIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="mapX" label="X">
-                <el-input v-model="formData.mapX" :disabled="'mapX'==subColumn"></el-input>
+            <el-form-item prop="frontLevelId" label="上级ID">
+                <el-input v-model="formData.frontLevelId" :disabled="checkSubColumn('frontLevelId')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapY" label="Y">
-                <el-input v-model="formData.mapY" :disabled="'mapY'==subColumn"></el-input>
+
+            <el-form-item prop="mapX" label="X">
+                <el-input v-model="formData.mapX" :disabled="checkSubColumn('mapX')"></el-input>
+            </el-form-item>
+            <el-form-item prop="mapY" label="Y">
+                <el-input v-model="formData.mapY" :disabled="checkSubColumn('mapY')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapIndex" label="index">
-                <el-input v-model="formData.mapIndex" :disabled="'mapIndex'==subColumn"></el-input>
+            <el-form-item prop="mapIndex" label="index">
+                <el-input v-model="formData.mapIndex" :disabled="checkSubColumn('mapIndex')"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <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>
@@ -115,172 +110,217 @@
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+
+            var columnList = this.$route.query.column.split(';')
+            columnList.forEach(item => {
+                var tempColumn = item;
+                this.subColumnList.push(tempColumn.split(',')[1]);
+            })
+
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/thingInfo/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/thingInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
+
+                    this.formData = res.data;
+
+                    if (res.data.keyword) {
+                        res.data.keyword = res.data.keyword.split(',')
                     }
-                }).then(res => {
-                    if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        this.formData = res.data;
+
+                    this.formData.allowNavigate = this.formData.allowNavigate == 'Y' ? true : false;
 
                     if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
+                        var columnList = this.$route.query.column.split(';')
+                        columnList.forEach(item => {
+                            var tempColumn = item;
+                            this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                        })
+
                     }
+
+                }
+            })
+        } else {
+            if (this.$route.query.column) {
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
+                    this.formData[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
                 })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
+
+            }
+        }
+
+
+
+
+        this.$http.get({
+            url: '/landMark/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.landmarkIdOptions.push({ label: item.mapName, value: String(item.id) });
+                    })
                 }
             }
+        });
 
-                                                                                                                                                                                                                                                    
 
 
-                        this.$http.get({
-                        url:'/landMark/all'
-                        }).then(res => {
-                        if (res.success) {
+        this.$http.get({
+            url: '/landmarkType/all?typeFlag=3'
+        }).then(res => {
+            if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.landmarkIdOptions.push({label: item.mapName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.thingTypeOptions.push({ label: item.typeName, value: String(item.id) });
+                    })
+                }
+            }
+        });
 
 
-                        this.$http.get({
-                        url:'/landmarkType/all?typeFlag=3'
-                        }).then(res => {
-                        if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.thingTypeOptions.push({label: item.typeName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                                                    
+        this.$http.get({
+            url: '/aimGroupInfo/all'
+        }).then(res => {
+            if (res.success) {
 
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.templateIdOptions.push({ label: item.groupName, value: String(item.id) });
+                    })
+                }
+            }
+        });
 
-                        this.$http.get({
-                        url:'/aimTemplate/all'
-                        }).then(res => {
-                        if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.templateIdOptions.push({label: item.templateName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                
 
+        this.$http.get({
+            url: '/cityInfo/all'
+        }).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.cityIdOptions.push({ label: item.cityName, value: String(item.id) });
+                    })
+                }
+            }
+        });
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.cityIdOptions.push({label: item.cityName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                    
 
 
-                        this.$http.get({
-                        url:'/areaInfo/all'
-                        }).then(res => {
-                        if (res.success) {
+        this.$http.get({
+            url: '/areaInfo/all'
+        }).then(res => {
+            if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.areaIdOptions.push({label: item.areaName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                            },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-                                                                                landmarkIdOptions:[],
-                                                    thingTypeOptions:[],
-                                                                                                            templateIdOptions:[],
-                                                    cityIdOptions:[],
-                                            areaIdOptions:[],
-                                                        subColumn: '',
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.areaIdOptions.push({ label: item.areaName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                keyword: [],
+            },
+            rules: {
+            },
+            landmarkIdOptions: [],
+            thingTypeOptions: [],
+            templateIdOptions: [],
+            cityIdOptions: [],
+            areaIdOptions: [],
+            subColumn: '',
             subValue: '',
+            subColumnList: [],
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/thingInfo/update' : '/thingInfo/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            data.keyword = data.keyword.join();
+            data.allowNavigate = this.formData.allowNavigate ? 'Y' : 'N';
+            this.$http.post({
+                url: this.formData.id ? '/thingInfo/update' : '/thingInfo/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/thingInfo/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('删除失败');
-                    }
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        checkSubColumn(value) {
+            if (this.$route.query.column) {
+                if (this.subColumnList.indexOf(value) >= 0) {
+                    return true;
+                }
+
+            }
+            return false;
+        },
+        onDeleteKeyword(index) {
+            console.log("111")
+            this.formData.keyword.splice(index, 1)
+        },
+        addKeyword() {
+            this.formData.keyword.push('')
+            console.log("222")
+        },
     }
+}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/ThingInfos.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/thingInfo',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/thingInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,164 +24,78 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('landmarkId')" prop="landmarkId" label="地标ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('thingName')" prop="thingName" label="事物名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('thingType')" prop="thingType" label="事物类型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rankLevel')" prop="rankLevel" label="优先级" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('allowNavigate')" prop="allowNavigate" label="允许导航" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('icon')" prop="icon" label="ICON" min-width="100">
+                <template slot-scope="{row}" v-if="row.icon">
+                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
             </el-table-column>
-                                                                                                                                                                                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('landmarkId')"
-                                prop="landmarkId"
-                                label="地标ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('thingName')"
-                                prop="thingName"
-                                label="事物名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('thingType')"
-                                prop="thingType"
-                                label="事物类型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('rankLevel')"
-                                prop="rankLevel"
-                                label="优先级"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('allowNavigate')"
-                                prop="allowNavigate"
-                                label="允许导航"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('icon')"
-                                prop="icon"
-                                label="ICON"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('keyword')"
-                                prop="keyword"
-                                label="关键字"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('image')"
-                                prop="image"
-                                label="图片"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.image" @click="showImg(row.image)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('textIntroduction')"
-                                prop="textIntroduction"
-                                label="文字描述"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('showDistance')"
-                                prop="showDistance"
-                                label="显示距离"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('templateId')"
-                                prop="templateId"
-                                label="点标模板"
-                                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('cityId')"
-                                prop="cityId"
-                                label="城市ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('areaId')"
-                                prop="areaId"
-                                label="区域ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapX')"
-                                prop="mapX"
-                                label="X"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapY')"
-                                prop="mapY"
-                                label="Y"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapIndex')"
-                                prop="mapIndex"
-                                label="index"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('keyword')" prop="keyword" label="关键字" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('image')" prop="image" label="图片" min-width="100">
+                <template slot-scope="{row}" v-if="row.image">
+                    <img :src="row.image" @click="showImg(row.image)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('textIntroduction')" prop="textIntroduction" label="文字描述" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('showDistance')" prop="showDistance" label="显示距离" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('templateId')" prop="templateId" label="点标模板" 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('cityId')" prop="cityId" label="城市ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('areaId')" prop="areaId" label="区域ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapX')" prop="mapX" label="X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapY')" prop="mapY" label="Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapIndex')" prop="mapIndex" label="index" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="$router.push({path:'/aimGroupInfos',query:{column:scope.row.areaId+',areaId'+';'+scope.row.cityId+',cityId'+';'+scope.row.landmarkId+',landmarkId'+';'+scope.row.id+',thingId'}})" type="primary" size="small" plain>点标组
+                    </el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -198,15 +109,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -227,16 +130,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -266,8 +167,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -301,387 +201,390 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '地标ID',
+                    value: 'landmarkId',
+                    show: true
+                },
+                {
+                    label: '事物名称',
+                    value: 'thingName',
+                    show: true
+                },
+                {
+                    label: '事物类型',
+                    value: 'thingType',
+                    show: true
+                },
+                {
+                    label: '优先级',
+                    value: 'rankLevel',
+                    show: true
+                },
+                {
+                    label: '允许导航',
+                    value: 'allowNavigate',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: 'ICON',
+                    value: 'icon',
+                    show: true
+                },
+                {
+                    label: '关键字',
+                    value: 'keyword',
+                    show: true
+                },
+                {
+                    label: '图片',
+                    value: 'image',
+                    show: true
+                },
+                {
+                    label: '文字描述',
+                    value: 'textIntroduction',
+                    show: true
+                },
+                {
+                    label: '显示距离',
+                    value: 'showDistance',
+                    show: true
+                },
+                {
+                    label: '点标模板',
+                    value: 'templateId',
+                    show: true
+                },
+                {
+                    label: '上级ID',
+                    value: 'frontLevelId',
+                    show: true
+                },
+                {
+                    label: '城市ID',
+                    value: 'cityId',
+                    show: true
+                },
+                {
+                    label: '区域ID',
+                    value: 'areaId',
+                    show: true
+                },
+                {
+                    label: 'X',
+                    value: 'mapX',
+                    show: true
+                },
+                {
+                    label: 'Y',
+                    value: 'mapY',
+                    show: true
+                },
+                {
+                    label: 'index',
+                    value: 'mapIndex',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '地标ID',
+                    value: 'landmark_id'
+                },
+                {
+                    label: '事物名称',
+                    value: 'thing_name'
+                },
+                {
+                    label: '事物类型',
+                    value: 'thing_type'
+                },
+                {
+                    label: '优先级',
+                    value: 'rank_level'
+                },
+                {
+                    label: '允许导航',
+                    value: 'allow_navigate'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: 'ICON',
+                    value: 'icon'
+                },
+                {
+                    label: '关键字',
+                    value: 'keyword'
+                },
+                {
+                    label: '图片',
+                    value: 'image'
+                },
+                {
+                    label: '文字描述',
+                    value: 'text_introduction'
+                },
+                {
+                    label: '显示距离',
+                    value: 'show_distance'
+                },
+                {
+                    label: '点标模板',
+                    value: 'template_id'
+                },
+                {
+                    label: '上级ID',
+                    value: 'front_level_id'
+                },
+                {
+                    label: '城市ID',
+                    value: 'city_id'
+                },
+                {
+                    label: '区域ID',
+                    value: 'area_id'
+                },
+                {
+                    label: 'X',
+                    value: 'map_x'
+                },
+                {
+                    label: 'Y',
+                    value: 'map_y'
+                },
+                {
+                    label: 'index',
+                    value: 'map_index'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                                                            {
-                                label: '地标ID',
-                                value: 'landmarkId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '事物名称',
-                                value: 'thingName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '事物类型',
-                                value: 'thingType',
-                                show: true
-                            },
-                                                                                                {
-                                label: '优先级',
-                                value: 'rankLevel',
-                                show: true
-                            },
-                                                                                                {
-                                label: '允许导航',
-                                value: 'allowNavigate',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'ICON',
-                                value: 'icon',
-                                show: true
-                            },
-                                                                                                {
-                                label: '关键字',
-                                value: 'keyword',
-                                show: true
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image',
-                                show: true
-                            },
-                                                                                                {
-                                label: '文字描述',
-                                value: 'textIntroduction',
-                                show: true
-                            },
-                                                                                                {
-                                label: '显示距离',
-                                value: 'showDistance',
-                                show: true
-                            },
-                                                                                                {
-                                label: '点标模板',
-                                value: 'templateId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '上级ID',
-                                value: 'frontLevelId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '城市ID',
-                                value: 'cityId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '区域ID',
-                                value: 'areaId',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'X',
-                                value: 'mapX',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'Y',
-                                value: 'mapY',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'index',
-                                value: 'mapIndex',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                                                            {
-                                label: '地标ID',
-                                value: 'landmark_id'
-                            },
-                                                                                                {
-                                label: '事物名称',
-                                value: 'thing_name'
-                            },
-                                                                                                {
-                                label: '事物类型',
-                                value: 'thing_type'
-                            },
-                                                                                                {
-                                label: '优先级',
-                                value: 'rank_level'
-                            },
-                                                                                                {
-                                label: '允许导航',
-                                value: 'allow_navigate'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: 'ICON',
-                                value: 'icon'
-                            },
-                                                                                                {
-                                label: '关键字',
-                                value: 'keyword'
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image'
-                            },
-                                                                                                {
-                                label: '文字描述',
-                                value: 'text_introduction'
-                            },
-                                                                                                {
-                                label: '显示距离',
-                                value: 'show_distance'
-                            },
-                                                                                                {
-                                label: '点标模板',
-                                value: 'template_id'
-                            },
-                                                                                                {
-                                label: '上级ID',
-                                value: 'front_level_id'
-                            },
-                                                                                                {
-                                label: '城市ID',
-                                value: 'city_id'
-                            },
-                                                                                                {
-                                label: '区域ID',
-                                value: 'area_id'
-                            },
-                                                                                                {
-                                label: 'X',
-                                value: 'map_x'
-                            },
-                                                                                                {
-                                label: 'Y',
-                                value: 'map_y'
-                            },
-                                                                                                {
-                                label: 'index',
-                                value: 'map_index'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
+            if (this.$route.query.column) {
+                var columnList = this.$route.query.column.split(';')
+                columnList.forEach(item => {
+                    var tempColumn = item;
                     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
-
-                this.$http.get({
-                    url: '/thingInfo/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
                 })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+
+            }
+
+            this.$http.get({
+                url: '/thingInfo/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/thingInfo',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/thingInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/thingInfo/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/thingInfo/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/thingInfo/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/thingInfo/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/router/index.js

@@ -513,6 +513,16 @@ const router = new Router({
                     path: '/areaShowPoints',
                     name: 'AreaShowPoints',
                     component: () => import('../pages/AreaShowPoints')
+                },
+                {
+                    path: '/aimPlaceInfo',
+                    name: 'AimPlaceInfo',
+                    component: () => import('../pages/AimPlaceInfo')
+                },
+                {
+                    path: '/aimPlaceInfos',
+                    name: 'AimPlaceInfos',
+                    component: () => import('../pages/AimPlaceInfos')
                 }
                 /**INSERT_LOCATION**/
             ]