基础操作

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

@@ -23,6 +23,7 @@ public class AimPlacePosition{
     private String remark2;
     private String remark3;
     private String frontLevelId;
+    private String ownedLandMarkId;
 
 private String idStr;
 
@@ -143,6 +144,13 @@ private String orderByStr;
     public void setFrontLevelId(String frontLevelId){
         this.frontLevelId = frontLevelId;
     }
+    public String getOwnedLandMarkId(){
+        return this.ownedLandMarkId;
+    }
+
+    public void setOwnedLandMarkId(String ownedLandMarkId){
+        this.ownedLandMarkId = ownedLandMarkId;
+    }
 
 public String getSearchKey() {
     return searchKey;

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

@@ -132,10 +132,10 @@ public class AimPlacePositionController {
         String sheetName = "aim_place_position";
         String titleName = "目标点-位置数据表";
         String fileName = "目标点-位置表";
-        int columnNumber = 15;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "类别" ,   "坐标X" ,   "坐标Y" ,   "坐标Z" ,   "备注1" ,   "备注2" ,   "备注3" ,   "上级ID"  };
-        String[][] dataList = new String[aimPlacePositions.size()][15];
+        int columnNumber = 16;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "名称" ,   "类别" ,   "坐标X" ,   "坐标Y" ,   "坐标Z" ,   "备注1" ,   "备注2" ,   "备注3" ,   "上级ID" ,   "所属地标ID"  };
+        String[][] dataList = new String[aimPlacePositions.size()][16];
 
         for (int i = 0; i < aimPlacePositions.size(); i++) {
 
@@ -154,6 +154,7 @@ public class AimPlacePositionController {
                         dataList[i][12] = String.valueOf(aimPlacePositions.get(i).getRemark2());
                         dataList[i][13] = String.valueOf(aimPlacePositions.get(i).getRemark3());
                         dataList[i][14] = String.valueOf(aimPlacePositions.get(i).getFrontLevelId());
+                        dataList[i][15] = String.valueOf(aimPlacePositions.get(i).getOwnedLandMarkId());
                     }
 
 

src/main/vue/src/pages/AimPlaceContent.vue

@@ -8,13 +8,31 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="type" label="类别">
                 <el-input v-model="formData.type" :disabled="'type'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="ownedLandMarkId" label="所属地标ID">
-                <el-input v-model="formData.ownedLandMarkId" :disabled="'ownedLandMarkId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="ownedLandMarkId" label="所属地标ID">
+                <template>
+                    <el-select v-model="formData.ownedLandMarkId" clearable  placeholder="请选择" :disabled="'ownedLandMarkId'==subColumn">
+                        <el-option
+                                v-for="item in ownedLandMarkIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="arContentGroupId" label="AR内容组ID">
-                <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitPosX" label="ArKit坐标X">
+                <template>
+                    <el-select v-model="formData.arContentGroupId" clearable  placeholder="请选择" :disabled="'arContentGroupId'==subColumn">
+                        <el-option
+                                v-for="item in arContentGroupIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="arKitPosX" label="ArKit坐标X">
                 <el-input v-model="formData.arKitPosX" :disabled="'arKitPosX'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="arKitPosY" label="ArKit坐标Y">
@@ -112,14 +130,46 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                                                                                
+
+
+                        this.$http.get({
+                        url:'/landMark/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/arContent/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.arContentGroupIdOptions.push({label: item.name, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 },
-                                                                                                                                                                                                                                                    subColumn: '',
+                                                                                        ownedLandMarkIdOptions:[],
+                                            arContentGroupIdOptions:[],
+                                                                                                                                                                                        subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/AimPlaceContentChild.vue

@@ -2,22 +2,31 @@
     <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="aimPlaceContentId" label="目标点内容ID">
-                <el-input v-model="formData.aimPlaceContentId" :disabled="'aimPlaceContentId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="aimPlaceContentId" label="目标点内容ID">
+                <template>
+                    <el-select v-model="formData.aimPlaceContentId" clearable  placeholder="请选择" :disabled="'aimPlaceContentId'==subColumn">
+                        <el-option
+                                v-for="item in aimPlaceContentIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="type" label="类别">
+                                                                                                                                                                                                                        <el-form-item prop="type" label="类别">
                 <el-input v-model="formData.type" :disabled="'type'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="itemName" label="名称">
                 <el-input v-model="formData.itemName" :disabled="'itemName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="itemMess" label="描述">
-                <el-input v-model="formData.itemMess" :disabled="'itemMess'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="itemMess" label="描述">
+                <el-input type="textarea" v-model="formData.itemMess" :disabled="'itemMess'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="itemDes" label="详细">
-                <el-input v-model="formData.itemDes" :disabled="'itemDes'==subColumn"></el-input>
+                <el-input type="textarea" v-model="formData.itemDes" :disabled="'itemDes'==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">
@@ -67,14 +76,30 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                        
+
+
+                        this.$http.get({
+                        url:'/aimPlaceContent/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.aimPlaceContentIdOptions.push({label: item.name, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                            },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                             },
-                                                                                                                            subColumn: '',
+                                                                        aimPlaceContentIdOptions:[],
+                                                                                        subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/AimPlaceContentChilds.vue

@@ -43,7 +43,14 @@
                     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('aimPlaceContentId')"
                                 prop="aimPlaceContentId"
@@ -241,7 +248,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '目标点内容ID',
                                 value: 'aimPlaceContentId',
                                 show: true
@@ -289,7 +301,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '目标点内容ID',
                                 value: 'aim_place_content_id'
                             },

src/main/vue/src/pages/AimPlaceContents.vue

@@ -43,7 +43,14 @@
                     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"
@@ -211,6 +218,8 @@
                     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>
@@ -346,7 +355,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '名称',
                                 value: 'name',
                                 show: true
@@ -469,7 +483,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '名称',
                                 value: 'name'
                             },

src/main/vue/src/pages/AimPlacePosition.vue

@@ -26,10 +26,31 @@
                                                                                                                                                                                                                                                                                                                             <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">
-                <el-input v-model="formData.frontLevelId" :disabled="'frontLevelId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <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-form-item prop="ownedLandMarkId" label="所属地标ID">
+                <template>
+                    <el-select v-model="formData.ownedLandMarkId" clearable  placeholder="请选择" :disabled="'ownedLandMarkId'==subColumn">
+                        <el-option
+                                v-for="item in ownedLandMarkIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                    <el-form-item>
                 <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>
@@ -56,7 +77,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -70,14 +91,50 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+
+
+                        this.$http.get({
+                        url:'/aimPlacePosition/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.frontLevelIdOptions.push({label: item.name, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/landMark/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                    subColumn: '',
+                                                                                                                                                                                                                        name:
+                    [
+                                                {required: true, message: '请输入 名称', trigger: 'blur'},
+                                                                    ],
+                                                                                                                                                                                                                                                                                                },
+                                                                                                                                        frontLevelIdOptions:[],
+                                            ownedLandMarkIdOptions:[],
+                                subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/AimPlacePositions.vue

@@ -43,7 +43,14 @@
                     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"
@@ -106,6 +113,13 @@
                                 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"
@@ -248,7 +262,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '名称',
                                 value: 'name',
                                 show: true
@@ -292,6 +311,11 @@
                                 label: '上级ID',
                                 value: 'frontLevelId',
                                 show: true
+                            },
+                                                                                                {
+                                label: '所属地标ID',
+                                value: 'ownedLandMarkId',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -301,7 +325,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '名称',
                                 value: 'name'
                             },
@@ -336,6 +364,10 @@
                                                                                                 {
                                 label: '上级ID',
                                 value: 'front_level_id'
+                            },
+                                                                                                {
+                                label: '所属地标ID',
+                                value: 'owned_land_mark_id'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

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

@@ -43,7 +43,14 @@
                     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('groupId')"
                                 prop="groupId"
@@ -304,7 +311,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '内容组ID',
                                 value: 'groupId',
                                 show: true
@@ -397,7 +409,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '内容组ID',
                                 value: 'group_id'
                             },

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

@@ -212,6 +212,12 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
+            </el-button>
+                    <el-button @click="$router.push({path:'/AimPlaceContents',query:{column:scope.row.id+',ownedLandMarkId'}})" type="primary" size="small" plain>目标点内容
+            </el-button>
+                    <el-button @click="$router.push({path:'/AimPlacePositions',query:{column:scope.row.id+',ownedLandMarkId'}})" type="primary" size="small" plain>目标点位置
+            </el-button>
                             <el-button @click="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/VuforiaImageGroups.vue

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

@@ -2,25 +2,61 @@
     <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-input v-model="formData.vuforiaImageGroupId" :disabled="'vuforiaImageGroupId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                        <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-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-input v-model="formData.vuforiaImageTypeId" :disabled="'vuforiaImageTypeId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <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-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-input v-model="formData.landMarkId" :disabled="'landMarkId'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                <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-option>
+                    </el-select>
+                </template>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="arContentGroupId" label="AR内容组ID">
-                <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
+                <template>
+                    <el-select v-model="formData.arContentGroupId" clearable  placeholder="请选择" :disabled="'arContentGroupId'==subColumn">
+                        <el-option
+                                v-for="item in arContentGroupIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </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">
@@ -41,10 +77,10 @@
                                                                                                                                                                                                                                                                                                                             <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="识别图">
-                <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
-            </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>
                 <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>
@@ -85,14 +121,78 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                                                                        
+
+
+                        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});
+                        })
+                        }
+                        }
+                        });
+                                                                                    
+
+
+                        this.$http.get({
+                        url:'/arContent/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.arContentGroupIdOptions.push({label: item.name, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                                                                                                                                                                                                                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     },
-                                                                                                                                                                            subColumn: '',
+                                                                        vuforiaImageGroupIdOptions:[],
+                                                    vuforiaImageTypeIdOptions:[],
+                                                    landMarkIdOptions:[],
+                                            arContentGroupIdOptions:[],
+                                                                                                subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/VuforiaImageInfos.vue

@@ -43,7 +43,14 @@
                     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"
@@ -140,8 +147,12 @@
                                 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
+                                                                <el-table-column
                     label="操作"
                     align="center"
                     fixed="right"
@@ -283,7 +294,12 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '所属图集ID',
                                 value: 'vuforiaImageGroupId',
                                 show: true
@@ -361,7 +377,11 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'ID',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                                                                                                            {
                                 label: '所属图集ID',
                                 value: 'vuforia_image_group_id'
                             },

src/main/vue/src/pages/VuforiaImageTypes.vue

@@ -47,7 +47,7 @@
                                             <el-table-column
                                 v-if="isColumnShow('id')"
                                 prop="id"
-                                label=""
+                                label="类型ID"
                                 min-width="100">
                         </el-table-column>
                                                                                                                                                                                                             
@@ -228,7 +228,7 @@
                 filter2: '',
                 tableColumns: [
                                                                         {
-                                label: '',
+                                label: '类型ID',
                                 value: 'id',
                                 show: true
                             },
@@ -266,7 +266,7 @@
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
                                                                         {
-                                label: '',
+                                label: '类型ID',
                                 value: 'id'
                             },
                                                                                                                                                                                                                                                                                                                             {