界面修改

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

@@ -386,7 +386,7 @@
         </if>
 
     </update>
-    <select id="queryAimPlaceContentByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AimPlaceContent">
+    <select id="queryAimPlaceContentByPage" parameterType="java.util.Map" resultMap="ChildResultMap">
         select <include refid="Base_Column_List"/> from aim_place_content
         <where>
             and del_flag = 'N'

src/main/java/com/izouma/awesomeadmin/dao/ArContentChildMapper.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.ArContentChild;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.ArContentChildMapper")
+public interface ArContentChildMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(ArContentChild record);
+
+    ArContentChild selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ArContentChild record);
+
+    List<ArContentChild> queryAllArContentChild(ArContentChild record);
+
+    List<ArContentChild> queryArContentChildByPage(Map<String, Object> parameter);
+
+    int delete(ArContentChild record);
+
+    ArContentChild queryArContentChild(ArContentChild record);
+
+    List<ArContentChild> query(ArContentChild record);
+}
+

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

@@ -0,0 +1,244 @@
+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 ArContentChild{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String arContentId;
+    private String type;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+    private String remark4;
+    private String remark5;
+    private String remark6;
+    private String remark7;
+    private String remark8;
+    private String remark9;
+    private String remark10;
+    private String remark11;
+    private String remark12;
+    private String remark13;
+    private String remark14;
+    private String remark15;
+
+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 getArContentId(){
+        return this.arContentId;
+    }
+
+    public void setArContentId(String arContentId){
+        this.arContentId = arContentId;
+    }
+    public String getType(){
+        return this.type;
+    }
+
+    public void setType(String type){
+        this.type = type;
+    }
+    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 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 getRemark10(){
+        return this.remark10;
+    }
+
+    public void setRemark10(String remark10){
+        this.remark10 = remark10;
+    }
+    public String getRemark11(){
+        return this.remark11;
+    }
+
+    public void setRemark11(String remark11){
+        this.remark11 = remark11;
+    }
+    public String getRemark12(){
+        return this.remark12;
+    }
+
+    public void setRemark12(String remark12){
+        this.remark12 = remark12;
+    }
+    public String getRemark13(){
+        return this.remark13;
+    }
+
+    public void setRemark13(String remark13){
+        this.remark13 = remark13;
+    }
+    public String getRemark14(){
+        return this.remark14;
+    }
+
+    public void setRemark14(String remark14){
+        this.remark14 = remark14;
+    }
+    public String getRemark15(){
+        return this.remark15;
+    }
+
+    public void setRemark15(String remark15){
+        this.remark15 = remark15;
+    }
+
+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/ArContentChildService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.ArContentChild;
+
+
+/**
+*  service接口类
+*/
+public interface ArContentChildService{
+
+    List<ArContentChild> getArContentChildList(ArContentChild record);
+
+    List<ArContentChild> getArContentChildByPage(Page page, ArContentChild record);
+
+    ArContentChild getArContentChildById(String id);
+
+    ArContentChild getArContentChild(ArContentChild record);
+
+    boolean createArContentChild(ArContentChild record);
+
+    boolean deleteArContentChild(ArContentChild record);
+
+    boolean updateArContentChild(ArContentChild record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/ArContentChildServiceImpl.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.ArContentChild;
+import com.izouma.awesomeadmin.service.ArContentChildService;
+import com.izouma.awesomeadmin.dao.ArContentChildMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class ArContentChildServiceImpl implements ArContentChildService{
+
+    private static Logger logger = Logger.getLogger(ArContentChildServiceImpl.class);
+
+    @Autowired
+    private ArContentChildMapper arContentChildMapper;
+
+    @Override
+    public List<ArContentChild> getArContentChildList(ArContentChild record) {
+
+        logger.info("getArContentChildList");
+        try {
+
+        return arContentChildMapper.queryAllArContentChild(record);
+        } catch (Exception e) {
+        logger.error("getArContentChildList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<ArContentChild> getArContentChildByPage(Page page, ArContentChild record) {
+
+        logger.info("getArContentChildByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return arContentChildMapper.queryArContentChildByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getArContentChildByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ArContentChild getArContentChildById(String id) {
+
+        logger.info("getArContentChildyId");
+        try {
+
+            return arContentChildMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getArContentChildById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ArContentChild getArContentChild(ArContentChild record) {
+
+        logger.info("getArContentChild");
+        try {
+
+            return arContentChildMapper.queryArContentChild(record);
+        } catch (Exception e) {
+        logger.error("getArContentChild", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createArContentChild(ArContentChild record) {
+
+        logger.info("createArContentChild");
+        try {
+
+            int updates = arContentChildMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createArContentChild", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteArContentChild(ArContentChild record) {
+
+        logger.info("deleteArContentChild");
+        try {
+
+             int updates = arContentChildMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteArContentChild", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateArContentChild(ArContentChild record) {
+
+        logger.info("updateArContentChild");
+        try {
+
+            int updates = arContentChildMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateArContentChild", e);
+        }
+
+        return false;
+    }
+}
+

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

@@ -0,0 +1,174 @@
+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.ArContentChild;
+import com.izouma.awesomeadmin.service.ArContentChildService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/arContentChild")
+public class ArContentChildController {
+
+    @Autowired
+    private ArContentChildService arContentChildService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(ArContentChild record) {
+        List<ArContentChild> pp = arContentChildService.getArContentChildList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getArContentChild", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getArContentChild(@RequestParam(required = false, value = "id") String id) {
+        ArContentChild data = arContentChildService.getArContentChildById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(ArContentChild record) {
+        ArContentChild data = arContentChildService.getArContentChild(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, ArContentChild record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<ArContentChild> pp =arContentChildService.getArContentChildByPage(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(ArContentChild record) {
+        boolean num = arContentChildService.createArContentChild(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateArContentChild(ArContentChild record) {
+        boolean num = arContentChildService.updateArContentChild(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteArContentChild(ArContentChild record) {
+
+        boolean num = arContentChildService.deleteArContentChild(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, ArContentChild record) throws Exception {
+
+    List<ArContentChild> arContentChilds = arContentChildService.getArContentChildList(record);
+
+
+        String sheetName = "ar_content_child";
+        String titleName = "AR内容子集数据表";
+        String fileName = "AR内容子集表";
+        int columnNumber = 23;
+        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 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "AR内容ID" ,   "类型" ,   "字段1" ,   "字段2" ,   "字段3" ,   "字段4" ,   "字段5" ,   "字段6" ,   "字段7" ,   "字段8" ,   "字段9" ,   "字段10" ,   "字段11" ,   "字段12" ,   "字段13" ,   "字段14" ,   "字段15"  };
+        String[][] dataList = new String[arContentChilds.size()][23];
+
+        for (int i = 0; i < arContentChilds.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(arContentChilds.get(i).getId());
+                        dataList[i][1] = String.valueOf(arContentChilds.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(arContentChilds.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(arContentChilds.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(arContentChilds.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(arContentChilds.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(arContentChilds.get(i).getArContentId());
+                        dataList[i][7] = String.valueOf(arContentChilds.get(i).getType());
+                        dataList[i][8] = String.valueOf(arContentChilds.get(i).getRemark1());
+                        dataList[i][9] = String.valueOf(arContentChilds.get(i).getRemark2());
+                        dataList[i][10] = String.valueOf(arContentChilds.get(i).getRemark3());
+                        dataList[i][11] = String.valueOf(arContentChilds.get(i).getRemark4());
+                        dataList[i][12] = String.valueOf(arContentChilds.get(i).getRemark5());
+                        dataList[i][13] = String.valueOf(arContentChilds.get(i).getRemark6());
+                        dataList[i][14] = String.valueOf(arContentChilds.get(i).getRemark7());
+                        dataList[i][15] = String.valueOf(arContentChilds.get(i).getRemark8());
+                        dataList[i][16] = String.valueOf(arContentChilds.get(i).getRemark9());
+                        dataList[i][17] = String.valueOf(arContentChilds.get(i).getRemark10());
+                        dataList[i][18] = String.valueOf(arContentChilds.get(i).getRemark11());
+                        dataList[i][19] = String.valueOf(arContentChilds.get(i).getRemark12());
+                        dataList[i][20] = String.valueOf(arContentChilds.get(i).getRemark13());
+                        dataList[i][21] = String.valueOf(arContentChilds.get(i).getRemark14());
+                        dataList[i][22] = String.valueOf(arContentChilds.get(i).getRemark15());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/components/AimPlaceContents.vue

@@ -0,0 +1,698 @@
+<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:'/aimPlaceContent',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 type="expand">
+                <template scope="props">
+                    <el-table :data="props.row.aimPlaceContentChildList" border stripe v-if="props.row.aimPlaceContentChildList" size="mini">
+                        <el-table-column label="操作" align="center" min-width="80">
+                            <template slot-scope="scope">
+                                <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-column prop="id" label="ID" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="aimPlaceContentId" label="目标点内容ID" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="type" label="类别" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="itemName" label="名称" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="itemMess" label="描述" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="itemDes" label="详细" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="remark1" label="备注1" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="remark2" label="备注2" min-width="100">
+                        </el-table-column>
+
+                        <el-table-column prop="remark3" label="备注3" min-width="100">
+                        </el-table-column>
+
+                    </el-table>
+                </template>
+            </el-table-column>
+
+            <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="备注1" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark4')" prop="remark4" label="备注4" 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 label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/AimPlaceContentChilds',query:{column:scope.row.id+',aimPlaceContentId'}})" 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>
+        </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 {
+    name: 'AimPlaceContents',
+    // props:{
+    //     ownedLandMarkId(){
+    //         type:Number,
+
+    //     }
+    // },
+    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: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '备注4',
+                    value: 'remark4',
+                    show: true
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5',
+                    show: true
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6',
+                    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: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '备注4',
+                    value: 'remark4'
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5'
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6'
+                },
+            ],
+            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,
+                ownedLandMarkId: this.$route.query.id
+            }
+
+            // if (this.$route.query.column) {
+            //     var tempColumn = this.$route.query.column;
+            //     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            // }
+
+            this.$http.get({
+                url: '/aimPlaceContent/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: '/aimPlaceContent',
+                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 + "/aimPlaceContent/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: '/aimPlaceContent/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/components/AimPlacePositions.vue

@@ -0,0 +1,494 @@
+<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:'/aimPlacePosition',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('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('remark1')" prop="remark1" label="备注1" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('ownedLandMarkId')" prop="ownedLandMarkId" 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="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 {
+    name: 'AimPlacePositions',
+    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: '坐标X',
+                    value: 'posX',
+                    show: true
+                },
+                {
+                    label: '坐标Y',
+                    value: 'posY',
+                    show: true
+                },
+                {
+                    label: '坐标Z',
+                    value: 'posZ',
+                    show: true
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '上级ID',
+                    value: 'frontLevelId',
+                    show: true
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'ownedLandMarkId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'name'
+                },
+                {
+                    label: '类别',
+                    value: 'type'
+                },
+                {
+                    label: '坐标X',
+                    value: 'pos_x'
+                },
+                {
+                    label: '坐标Y',
+                    value: 'pos_y'
+                },
+                {
+                    label: '坐标Z',
+                    value: 'pos_z'
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '上级ID',
+                    value: 'front_level_id'
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'owned_land_mark_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,
+                ownedLandMarkId: this.$route.query.id
+            }
+
+            // if (this.$route.query.column) {
+            //     var tempColumn = this.$route.query.column;
+            //     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            // }
+
+            this.$http.get({
+                url: '/aimPlacePosition/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: '/aimPlacePosition',
+                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 + "/aimPlacePosition/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: '/aimPlacePosition/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/components/VuforiaImageInfos.vue

@@ -0,0 +1,546 @@
+<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:'/vuforiaImageInfo',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('vuforiaImageGroupId')" prop="vuforiaImageGroupId" 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('vuforiaImageTypeId')" prop="vuforiaImageTypeId" label="识别图类型ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('areaMarking')" prop="areaMarking" label="区域标记编号" min-width="100">
+            </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('arContentGroupId')" prop="arContentGroupId" label="AR内容组ID" 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('angle')" prop="angle" label="角度" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="备注1" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImage')" prop="vuforiaImage" label="识别图" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.vuforiaImage" @click="showImg(row.vuforiaImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </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="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 {
+     name: 'VuforiaImageInfos',
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '所属图集ID',
+                    value: 'vuforiaImageGroupId',
+                    show: true
+                },
+                {
+                    label: '识别图名称',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '识别图类型ID',
+                    value: 'vuforiaImageTypeId',
+                    show: true
+                },
+                {
+                    label: '区域标记编号',
+                    value: 'areaMarking',
+                    show: true
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'landMarkId',
+                    show: true
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'arContentGroupId',
+                    show: true
+                },
+                {
+                    label: '坐标X',
+                    value: 'posX',
+                    show: true
+                },
+                {
+                    label: '坐标Y',
+                    value: 'posY',
+                    show: true
+                },
+                {
+                    label: '坐标Z',
+                    value: 'posZ',
+                    show: true
+                },
+                {
+                    label: '角度',
+                    value: 'angle',
+                    show: true
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '识别图',
+                    value: 'vuforiaImage',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '所属图集ID',
+                    value: 'vuforia_image_group_id'
+                },
+                {
+                    label: '识别图名称',
+                    value: 'name'
+                },
+                {
+                    label: '识别图类型ID',
+                    value: 'vuforia_image_type_id'
+                },
+                {
+                    label: '区域标记编号',
+                    value: 'area_marking'
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'land_mark_id'
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'ar_content_group_id'
+                },
+                {
+                    label: '坐标X',
+                    value: 'pos_x'
+                },
+                {
+                    label: '坐标Y',
+                    value: 'pos_y'
+                },
+                {
+                    label: '坐标Z',
+                    value: 'pos_z'
+                },
+                {
+                    label: '角度',
+                    value: 'angle'
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '识别图',
+                    value: 'vuforia_image'
+                },
+            ],
+            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,
+                ownedLandMarkId: this.$route.query.id
+            }
+
+            // if (this.$route.query.column) {
+            //     var tempColumn = this.$route.query.column;
+            //     data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            // }
+
+            this.$http.get({
+                url: '/vuforiaImageInfo/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: '/vuforiaImageInfo',
+                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 + "/vuforiaImageInfo/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: '/vuforiaImageInfo/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/entries/admin.js

@@ -15,6 +15,7 @@ import '../main.less'
 import { format } from 'date-fns'
 import zh from 'date-fns/locale/zh_cn'
 
+Vue.use(VueAMap);
 VueAMap.initAMapApiLoader({
     key: 'bf91055058a47a7dc387e40ab6256a5f',
     plugin: ['Autocomplete', 'PlaceSearch', 'Scale', 'OverView', 'ToolBar', 'MapType', 'PolyEditor', 'AMap.CircleEditor', 'AMap.Geolocation'],
@@ -166,6 +167,7 @@ const updateTableHeight = () => {
         const filter = document.getElementsByClassName('filters-container')[0].clientHeight;
         const page = document.getElementsByClassName('pagination-wrapper')[0].clientHeight;
         store.commit('updateTableHeight', total - filter - page - 44);
+        store.commit('updateTotalHeight', total);
     } catch (e) {
         // console.error(e)
     }

src/main/vue/src/pages/ArContentChild.vue

@@ -0,0 +1,178 @@
+<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="arContentId" label="AR内容ID">
+                <template>
+                    <el-select v-model="formData.arContentId" clearable  placeholder="请选择" :disabled="'arContentId'==subColumn">
+                        <el-option
+                                v-for="item in arContentIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="type" label="类型">
+                <el-input v-model="formData.type" :disabled="'type'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark1" label="字段1">
+                <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark2" label="字段2">
+                <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark3" label="字段3">
+                <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark4" label="字段4">
+                <el-input v-model="formData.remark4" :disabled="'remark4'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark5" label="字段5">
+                <el-input v-model="formData.remark5" :disabled="'remark5'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark6" label="字段6">
+                <el-input v-model="formData.remark6" :disabled="'remark6'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark7" label="字段7">
+                <el-input v-model="formData.remark7" :disabled="'remark7'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark8" label="字段8">
+                <el-input v-model="formData.remark8" :disabled="'remark8'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark9" label="字段9">
+                <el-input v-model="formData.remark9" :disabled="'remark9'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark10" label="字段10">
+                <el-input v-model="formData.remark10" :disabled="'remark10'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark11" label="字段11">
+                <el-input v-model="formData.remark11" :disabled="'remark11'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark12" label="字段12">
+                <el-input v-model="formData.remark12" :disabled="'remark12'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark13" label="字段13">
+                <el-input v-model="formData.remark13" :disabled="'remark13'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark14" label="字段14">
+                <el-input v-model="formData.remark14" :disabled="'remark14'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark15" label="字段15">
+                <el-input v-model="formData.remark15" :disabled="'remark15'==subColumn"></el-input>
+            </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) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/arContentChild/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                        
+
+
+                        this.$http.get({
+                        url:'/arContent/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.arContentIdOptions.push({label: item.name, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                        arContentIdOptions:[],
+                                                                                                                                                                subColumn: '',
+            subValue: '',
+        }
+        },
+        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 ? '/arContentChild/update' : '/arContentChild/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: '/arContentChild/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('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/ArContentChilds.vue

@@ -0,0 +1,663 @@
+<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:'/arContentChild',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('arContentId')"
+                                prop="arContentId"
+                                label="AR内容ID"
+                                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('remark1')"
+                                prop="remark1"
+                                label="字段1"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark2')"
+                                prop="remark2"
+                                label="字段2"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark3')"
+                                prop="remark3"
+                                label="字段3"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark4')"
+                                prop="remark4"
+                                label="字段4"
+                                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('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('remark10')"
+                                prop="remark10"
+                                label="字段10"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark11')"
+                                prop="remark11"
+                                label="字段11"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark12')"
+                                prop="remark12"
+                                label="字段12"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark13')"
+                                prop="remark13"
+                                label="字段13"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark14')"
+                                prop="remark14"
+                                label="字段14"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark15')"
+                                prop="remark15"
+                                label="字段15"
+                                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="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: 'AR内容ID',
+                                value: 'arContentId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'type',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段1',
+                                value: 'remark1',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段2',
+                                value: 'remark2',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段3',
+                                value: 'remark3',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段4',
+                                value: 'remark4',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段5',
+                                value: 'remark5',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段6',
+                                value: 'remark6',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段7',
+                                value: 'remark7',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段8',
+                                value: 'remark8',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段9',
+                                value: 'remark9',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段10',
+                                value: 'remark10',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段11',
+                                value: 'remark11',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段12',
+                                value: 'remark12',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段13',
+                                value: 'remark13',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段14',
+                                value: 'remark14',
+                                show: true
+                            },
+                                                                                                {
+                                label: '字段15',
+                                value: 'remark15',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: 'AR内容ID',
+                                value: 'ar_content_id'
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'type'
+                            },
+                                                                                                {
+                                label: '字段1',
+                                value: 'remark1'
+                            },
+                                                                                                {
+                                label: '字段2',
+                                value: 'remark2'
+                            },
+                                                                                                {
+                                label: '字段3',
+                                value: 'remark3'
+                            },
+                                                                                                {
+                                label: '字段4',
+                                value: 'remark4'
+                            },
+                                                                                                {
+                                label: '字段5',
+                                value: 'remark5'
+                            },
+                                                                                                {
+                                label: '字段6',
+                                value: 'remark6'
+                            },
+                                                                                                {
+                                label: '字段7',
+                                value: 'remark7'
+                            },
+                                                                                                {
+                                label: '字段8',
+                                value: 'remark8'
+                            },
+                                                                                                {
+                                label: '字段9',
+                                value: 'remark9'
+                            },
+                                                                                                {
+                                label: '字段10',
+                                value: 'remark10'
+                            },
+                                                                                                {
+                                label: '字段11',
+                                value: 'remark11'
+                            },
+                                                                                                {
+                                label: '字段12',
+                                value: 'remark12'
+                            },
+                                                                                                {
+                                label: '字段13',
+                                value: 'remark13'
+                            },
+                                                                                                {
+                                label: '字段14',
+                                value: 'remark14'
+                            },
+                                                                                                {
+                                label: '字段15',
+                                value: 'remark15'
+                            },
+                                                            ],
+                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 tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/arContentChild/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: '/arContentChild',
+                    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 + "/arContentChild/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: '/arContentChild/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/ArContents.vue

@@ -176,6 +176,8 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/ArContentChilds',query:{column:scope.row.id+',arContentId'}})" 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/LandMark.vue

@@ -1,215 +1,262 @@
 <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="mapName" label="地标名称">
-                <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="ownedCityId" label="所属城市Id">
-                <template>
-                    <el-select v-model="formData.ownedCityId" clearable  placeholder="请选择" :disabled="'ownedCityId'==subColumn">
-                        <el-option
-                                v-for="item in ownedCityIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="mapSprite" label="缩略图">
-                 <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                                                                                                                                             <el-form-item prop="logeSprite" label="地点Loge图">
-                 <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                <el-form-item prop="openDescribe" label="营业/开放情况">
-                <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="markDescribe" label="地标简介">
-                <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="anchorImageGroupName" label="识别图组名称">
-                <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="defaultMode" label="模式">
-                <el-input v-model="formData.defaultMode" :disabled="'defaultMode'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="vuforiaImageGroupId" label="识别图集ID">
-                <el-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="vuforiaDataName" label="识别图集数据名称">
-                <el-input v-model="formData.vuforiaDataName" :disabled="'vuforiaDataName'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="mapInfo" label="地图信息">
-                <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="mapWidth" label="地图宽">
-                <el-input v-model="formData.mapWidth" :disabled="'mapWidth'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapHeight" label="地图高">
-                <el-input v-model="formData.mapHeight" :disabled="'mapHeight'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="mapRate" label="比率">
-                <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="showInPanel" label="是否显示">
-                <el-input v-model="formData.showInPanel" :disabled="'showInPanel'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="longitude" label="经度">
-                <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="latitude" label="纬度">
-                <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark1" label="备注1">
-                <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark2" label="备注2">
-                <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark3" label="备注3">
-                <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="frontLevelId" label="上级地标ID">
-                <template>
-                    <el-select v-model="formData.frontLevelId" clearable  placeholder="请选择" :disabled="'frontLevelId'==subColumn">
-                        <el-option
-                                v-for="item in frontLevelIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-                                                                                                                                                                                    <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
+    <div >
+
+        <el-tabs :value="tabVal" type="border-card" >
+            <el-tab-pane label="地标信息" name="1">
+                <el-form  :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+                    <el-form-item prop="mapName" label="地标名称">
+                        <el-input v-model="formData.mapName" :disabled="'mapName'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="ownedCityId" label="所属城市Id">
+                        <template>
+                            <el-select v-model="formData.ownedCityId" clearable placeholder="请选择" :disabled="'ownedCityId'==subColumn">
+                                <el-option v-for="item in ownedCityIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </template>
+                    </el-form-item>
+                    <el-form-item prop="mapSprite" label="缩略图">
+                        <single-upload v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="mapSprite" label="缩略图URL">
+                        <el-input v-model="formData.mapSprite" :disabled="'mapSprite'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="logeSprite" label="地点Loge图">
+                        <single-upload v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="logeSprite" label="地点Loge图URL">
+                        <el-input v-model="formData.logeSprite" :disabled="'logeSprite'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="openDescribe" label="营业/开放情况">
+                        <el-input v-model="formData.openDescribe" :disabled="'openDescribe'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="markDescribe" label="地标简介">
+                        <el-input type="textarea" v-model="formData.markDescribe" :disabled="'markDescribe'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="anchorImageGroupName" label="识别图组名称">
+                        <el-input v-model="formData.anchorImageGroupName" :disabled="'anchorImageGroupName'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="defaultMode" label="模式">
+                        <el-input v-model="formData.defaultMode" :disabled="'defaultMode'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="vuforiaImageGroupId" label="识别图集ID">
+                        <el-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="vuforiaDataName" label="识别图集数据名称">
+                        <el-input v-model="formData.vuforiaDataName" :disabled="'vuforiaDataName'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mapInfo" label="地图信息">
+                        <el-input type="textarea" v-model="formData.mapInfo" :disabled="'mapInfo'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mapWidth" label="地图宽">
+                        <el-input v-model="formData.mapWidth" :disabled="'mapWidth'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mapHeight" label="地图高">
+                        <el-input v-model="formData.mapHeight" :disabled="'mapHeight'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mapRate" label="比率">
+                        <el-input v-model="formData.mapRate" :disabled="'mapRate'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="showInPanel" label="是否显示">
+                        <el-input v-model="formData.showInPanel" :disabled="'showInPanel'==subColumn"></el-input>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="text" @click="mapDialogVisible = !mapDialogVisible">点击打开地图选择地址</el-button>
+
+                        <div class="amap-page-container" v-if="mapDialogVisible">
+                            <coordinate-select :value="[formData.longitude||118.79647,formData.latitude||32.05838]" @selected="coordinateSelected" v-if="mapDialogVisible"></coordinate-select>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item prop="longitude" label="经度">
+                        <el-input v-model="formData.longitude" :disabled="'longitude'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="latitude" label="纬度">
+                        <el-input v-model="formData.latitude" :disabled="'latitude'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark1" label="备注1">
+                        <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark2" label="备注2">
+                        <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark3" label="备注3">
+                        <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="frontLevelId" label="上级地标ID">
+                        <template>
+                            <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
+                                <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </template>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                        <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                        <el-button @click="$router.go(-1)">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
+                <AimPlaceContents></AimPlaceContents>
+            </el-tab-pane>
+            <el-tab-pane label="目标点位置" name="3" v-if="this.$route.query.id">
+                <AimPlacePositions></AimPlacePositions>
+            </el-tab-pane>
+            <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
+               <VuforiaImageInfos></VuforiaImageInfos>
+            </el-tab-pane>
+        </el-tabs>
+
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator';
+import CoordinateSelect from '../components/CoordinateSelect';
+import AimPlaceContents from '../components/AimPlaceContents';
+import AimPlacePositions from '../components/AimPlacePositions';
+import VuforiaImageInfos from '../components/VuforiaImageInfos';
+import { mapState } from 'vuex'
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/landMark/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/landMark/getOne',
-                    data: {
-                        id: this.$route.query.id
+                    if (!res.data.latitude) {
+                        res.data.latitude = this.formData.latitude;
+                    }
+                    if (!res.data.longitude) {
+                        res.data.longitude = this.formData.longitude;
                     }
-                }).then(res => {
-                    if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                        this.formData = res.data;
+                    this.formData = res.data;
 
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
+        }
+
+
+
+
+        this.$http.get({
+            url: '/cityInfo/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.ownedCityIdOptions.push({ label: item.cityName, value: item.id });
+                    })
+                }
+            }
+        });
+
 
-                                                                                                                                                                                                                                                    
-
-
-                        this.$http.get({
-                        url:'/cityInfo/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.ownedCityIdOptions.push({label: item.cityName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-
-
-                        this.$http.get({
-                        url:'/landMark/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.frontLevelIdOptions.push({label: item.mapName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-                                                                                ownedCityIdOptions:[],
-                                                                                                                                                                                            frontLevelIdOptions:[],
-                                subColumn: '',
+
+        this.$http.get({
+            url: '/landMark/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.frontLevelIdOptions.push({ label: item.mapName, value: item.id });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                latitude: 32.05838,
+                longitude: 118.79647,
+            },
+            rules: {
+            },
+            ownedCityIdOptions: [],
+            frontLevelIdOptions: [],
+            subColumn: '',
             subValue: '',
+            mapDialogVisible: false,
+            tabVal:"2",
         }
+    },
+    computed: {
+        ...mapState(['totalHeight']),
+    },
+    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 ? '/landMark/update' : '/landMark/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));
+            this.$http.post({
+                url: this.formData.id ? '/landMark/update' : '/landMark/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: '/landMark/del',
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        coordinateSelected(data) {
+            //this.formData.address = data.formattedAddress;
+            this.formData.latitude = data.lnglat.lat;
+            this.formData.longitude = data.lnglat.lng;
+        },
+    },
+    components: {
+        CoordinateSelect,AimPlaceContents,AimPlacePositions,VuforiaImageInfos
     }
+}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/VuforiaImageInfo.vue

@@ -1,77 +1,67 @@
 <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="vuforiaImageGroupId" 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="vuforiaImageGroupId" label="所属图集ID">
                 <template>
-                    <el-select v-model="formData.vuforiaImageGroupId" clearable  placeholder="请选择" :disabled="'vuforiaImageGroupId'==subColumn">
-                        <el-option
-                                v-for="item in vuforiaImageGroupIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.vuforiaImageGroupId" clearable placeholder="请选择" :disabled="'vuforiaImageGroupId'==subColumn">
+                        <el-option v-for="item in vuforiaImageGroupIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="name" label="识别图名称">
+            <el-form-item prop="name" label="识别图名称">
                 <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="vuforiaImageTypeId" label="识别图类型ID">
+            <el-form-item prop="vuforiaImageTypeId" label="识别图类型ID">
                 <template>
-                    <el-select v-model="formData.vuforiaImageTypeId" clearable  placeholder="请选择" :disabled="'vuforiaImageTypeId'==subColumn">
-                        <el-option
-                                v-for="item in vuforiaImageTypeIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.vuforiaImageTypeId" clearable placeholder="请选择" :disabled="'vuforiaImageTypeId'==subColumn">
+                        <el-option v-for="item in vuforiaImageTypeIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="areaMarking" label="区域标记编号">
+            <el-form-item prop="areaMarking" label="区域标记编号">
                 <el-input v-model="formData.areaMarking" :disabled="'areaMarking'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="landMarkId" label="所属地标ID">
+            <el-form-item prop="landMarkId" 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.landMarkId" clearable placeholder="请选择" :disabled="'landMarkId'==subColumn">
+                        <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="arContentGroupId" label="AR内容组ID">
+            <el-form-item prop="arContentGroupId" label="AR内容组ID">
                 <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posX" label="坐标X">
+            <el-form-item prop="posX" label="坐标X">
                 <el-input v-model="formData.posX" :disabled="'posX'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posY" label="坐标Y">
+            <el-form-item prop="posY" label="坐标Y">
                 <el-input v-model="formData.posY" :disabled="'posY'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posZ" label="坐标Z">
+            <el-form-item prop="posZ" label="坐标Z">
                 <el-input v-model="formData.posZ" :disabled="'posZ'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="angle" label="角度">
+            <el-form-item prop="angle" label="角度">
                 <el-input v-model="formData.angle" :disabled="'angle'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark1" label="备注1">
+            <el-form-item prop="remark1" label="备注1">
                 <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark2" label="备注2">
+            <el-form-item prop="remark2" label="备注2">
                 <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark3" label="备注3">
+            <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="vuforiaImage" label="识别图">
-                 <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                            <el-form-item>
+            <el-form-item prop="vuforiaImage" label="识别图">
+                <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="vuforiaImage" label="识别图URL">
+                <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
+            </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>
@@ -80,140 +70,140 @@
     </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) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/vuforiaImageInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/vuforiaImageInfo/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-                        this.formData = res.data;
+
+                    this.formData = res.data;
 
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
+        }
+
 
-                                                                                                                                                                                                                        
-
-
-                        this.$http.get({
-                        url:'/vuforiaImageGroup/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.vuforiaImageGroupIdOptions.push({label: item.vuforiaName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                
-
-
-                        this.$http.get({
-                        url:'/vuforiaImageType/all'
-                        }).then(res => {
-                        if (res.success) {
-
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.vuforiaImageTypeIdOptions.push({label: item.typeName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                
-
-
-                        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:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                                                    },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
-                                                                        vuforiaImageGroupIdOptions:[],
-                                                    vuforiaImageTypeIdOptions:[],
-                                                    landMarkIdOptions:[],
-                                                                                                        subColumn: '',
+
+
+        this.$http.get({
+            url: '/vuforiaImageGroup/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.vuforiaImageGroupIdOptions.push({ label: item.vuforiaName, value: item.id });
+                    })
+                }
+            }
+        });
+
+
+
+        this.$http.get({
+            url: '/vuforiaImageType/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.vuforiaImageTypeIdOptions.push({ label: item.typeName, value: item.id });
+                    })
+                }
+            }
+        });
+
+
+
+        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: item.id });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            vuforiaImageGroupIdOptions: [],
+            vuforiaImageTypeIdOptions: [],
+            landMarkIdOptions: [],
+            subColumn: '',
             subValue: '',
         }
+    },
+    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 ? '/vuforiaImageInfo/update' : '/vuforiaImageInfo/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));
+            this.$http.post({
+                url: this.formData.id ? '/vuforiaImageInfo/update' : '/vuforiaImageInfo/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: '/vuforiaImageInfo/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('删除失败');
+                }
+            })
+        },
     }
+}
 </script>
 <style lang="less" scoped>
 </style>

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

@@ -335,6 +335,16 @@ const router = new Router({
                     path: '/cityInfos',
                     name: 'CityInfos',
                     component: () => import('../pages/CityInfos')
+                },
+                {
+                    path: '/arContentChild',
+                    name: 'ArContentChild',
+                    component: () => import('../pages/ArContentChild')
+                },
+                {
+                    path: '/arContentChilds',
+                    name: 'ArContentChilds',
+                    component: () => import('../pages/ArContentChilds')
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/vuex/index.js

@@ -8,6 +8,7 @@ export default new Vuex.Store({
         tableHeight: 0,
         fetchingData: false,
         userInfo: null,
+        totalHeight:0
     },
     mutations: {
         updateTableHeight(state, height) {
@@ -18,7 +19,10 @@ export default new Vuex.Store({
         },
         updateUserInfo(state, userInfo) {
             state.userInfo = userInfo
-        }
+        },
+        updateTotalHeight(state, height) {
+            state.totalHeight = height;
+        },
     },
     actions: {