添加字段20181129

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

@@ -25,6 +25,10 @@
         <result column="remark4" property="remark4" jdbcType="VARCHAR"/>
         <result column="remark5" property="remark5" jdbcType="VARCHAR"/>
         <result column="remark6" property="remark6" jdbcType="VARCHAR"/>
+        <result column="remark7" property="remark7" jdbcType="VARCHAR"/>
+        <result column="remark8" property="remark8" jdbcType="VARCHAR"/>
+        <result column="remark9" property="remark9" jdbcType="VARCHAR"/>
+        <result column="remark10" property="remark10" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -73,6 +77,10 @@
             remark5,
 
             remark6,
+            remark7,
+            remark8,
+            remark9,
+            remark10,
 
         </trim>
     </sql>
@@ -159,6 +167,18 @@
             <if test="remark6!= null">
                 remark6,
             </if>
+            <if test="remark7!= null">
+                remark7,
+            </if>
+            <if test="remark8!= null">
+                remark8,
+            </if>
+            <if test="remark9!= null">
+                remark9,
+            </if>
+            <if test="remark10!= null">
+                remark10,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -230,6 +250,18 @@
             <if test="remark6 != null">
                 #{remark6,jdbcType=VARCHAR},
             </if>
+            <if test="remark7 != null">
+                #{remark7,jdbcType=VARCHAR},
+            </if>
+            <if test="remark8 != null">
+                #{remark8,jdbcType=VARCHAR},
+            </if>
+            <if test="remark9 != null">
+                #{remark9,jdbcType=VARCHAR},
+            </if>
+            <if test="remark10 != null">
+                #{remark10,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ArContent">
@@ -304,6 +336,18 @@
             <if test="remark6 != null">
                 remark6= #{remark6,jdbcType=VARCHAR},
             </if>
+            <if test="remark7 != null">
+                remark7= #{remark7,jdbcType=VARCHAR},
+            </if>
+            <if test="remark8 != null">
+                remark8= #{remark8,jdbcType=VARCHAR},
+            </if>
+            <if test="remark9 != null">
+                remark9= #{remark9,jdbcType=VARCHAR},
+            </if>
+            <if test="remark10 != null">
+                remark10= #{remark10,jdbcType=VARCHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">

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

@@ -32,6 +32,10 @@ public class ArContent {
     private String remark4;
     private String remark5;
     private String remark6;
+    private String remark7;
+    private String remark8;
+    private String remark9;
+    private String remark10;
 
     private List<ArContentChild> arContentChildList;
 
@@ -272,5 +276,37 @@ public class ArContent {
     public void setArContentChildList(List<ArContentChild> arContentChildList) {
         this.arContentChildList = arContentChildList;
     }
+
+    public String getRemark7() {
+        return remark7;
+    }
+
+    public void setRemark7(String remark7) {
+        this.remark7 = remark7;
+    }
+
+    public String getRemark8() {
+        return remark8;
+    }
+
+    public void setRemark8(String remark8) {
+        this.remark8 = remark8;
+    }
+
+    public String getRemark9() {
+        return remark9;
+    }
+
+    public void setRemark9(String remark9) {
+        this.remark9 = remark9;
+    }
+
+    public String getRemark10() {
+        return remark10;
+    }
+
+    public void setRemark10(String remark10) {
+        this.remark10 = remark10;
+    }
 }
 

src/main/vue/src/components/AimPlaceContent.vue

@@ -58,16 +58,16 @@
                 <el-form-item prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号">
                     <el-input v-model="formData.vuforiaImageInfoAreaMarking" :disabled="'vuforiaImageInfoAreaMarking'==subColumn"></el-input>
                 </el-form-item>
-                <el-form-item prop="remark1" label="备注1">
+                <el-form-item prop="remark1" label="模型X">
                     <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="模型Y">
                     <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="模型Z">
                     <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
                 </el-form-item>
-                <el-form-item prop="remark4" label="备注4">
+                <el-form-item prop="remark4" label="显示镜头前">
                     <el-input v-model="formData.remark4" :disabled="'remark4'==subColumn"></el-input>
                 </el-form-item>
                 <el-form-item prop="remark5" label="备注5">

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

@@ -125,16 +125,16 @@
             <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 v-if="isColumnShow('remark1')" prop="remark1" label="模型X" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="模型Y" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="模型Z" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('remark4')" prop="remark4" label="备注4" min-width="100">
+            <el-table-column v-if="isColumnShow('remark4')" prop="remark4" label="显示镜头前" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('remark5')" prop="remark5" label="备注5" min-width="100">
@@ -256,8 +256,8 @@
 
         <el-dialog title="子集编辑" :visible.sync="AimPlaceContentChildShow" width="450px">
             <div>
-                
-                <AimPlaceContentChild :formData='editAimPlaceContentChild'  @hide='AimPlaceContentChildShow=false' @update='getData'></AimPlaceContentChild>
+
+                <AimPlaceContentChild :formData='editAimPlaceContentChild' @hide='AimPlaceContentChildShow=false' @update='getData'></AimPlaceContentChild>
             </div>
         </el-dialog>
 
@@ -386,22 +386,22 @@ export default {
                     show: true
                 },
                 {
-                    label: '备注1',
+                    label: '模型X',
                     value: 'remark1',
                     show: true
                 },
                 {
-                    label: '备注2',
+                    label: '模型Y',
                     value: 'remark2',
                     show: true
                 },
                 {
-                    label: '备注3',
+                    label: '模型Z',
                     value: 'remark3',
                     show: true
                 },
                 {
-                    label: '备注4',
+                    label: '显示镜头前',
                     value: 'remark4',
                     show: true
                 },
@@ -496,20 +496,20 @@ export default {
                     value: 'vuforia_image_info_area_marking'
                 },
                 {
-                    label: '备注1',
-                    value: 'remark1'
+                    label: '模型X',
+                    value: 'remark1',
                 },
                 {
-                    label: '备注2',
-                    value: 'remark2'
+                    label: '模型Y',
+                    value: 'remark2',
                 },
                 {
-                    label: '备注3',
-                    value: 'remark3'
+                    label: '模型Z',
+                    value: 'remark3',
                 },
                 {
-                    label: '备注4',
-                    value: 'remark4'
+                    label: '显示镜头前',
+                    value: 'remark4',
                 },
                 {
                     label: '备注5',
@@ -572,8 +572,8 @@ export default {
                 }
             })
 
-             if(type!=1){
-   this.$emit('updatePoint')
+            if (type != 1) {
+                this.$emit('updatePoint')
             }
         },
         isColumnShow(column) {
@@ -587,14 +587,14 @@ export default {
             }
         },
         addEdit(jsonp) {
-            
+
             this.editAimPlaceContent = {
                 ownedLandMarkId: this.$route.query.id
             }
-            if(jsonp){
-                this.editAimPlaceContent.arKitPosX=jsonp.X;
-                 this.editAimPlaceContent.arKitPosY=jsonp.Y;
-                  this.editAimPlaceContent.mapIndex=jsonp.index;
+            if (jsonp) {
+                this.editAimPlaceContent.arKitPosX = jsonp.X;
+                this.editAimPlaceContent.arKitPosY = jsonp.Y;
+                this.editAimPlaceContent.mapIndex = jsonp.index;
             }
             this.AimPlaceContentShow = true
         },

src/main/vue/src/components/VuforiaImageInfos.vue

@@ -394,7 +394,7 @@ export default {
                 searchKey: this.filter1,
                 advancedQuery: this.advancedQuerySearchKey,
                 orderByStr: this.orderByStr,
-                ownedLandMarkId: this.$route.query.id
+                landMarkId: this.$route.query.id
             }
 
             // if (this.$route.query.column) {

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

@@ -1,86 +1,81 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="name" label="名称">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="name" label="名称">
                 <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
             </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="ownedLandMarkId" label="所属地标ID">
+            <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-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-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">
+            <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">
+            <el-form-item prop="arKitPosY" label="ArKit坐标Y">
                 <el-input v-model="formData.arKitPosY" :disabled="'arKitPosY'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitPosZ" label="ArKit坐标Z">
+            <el-form-item prop="arKitPosZ" label="ArKit坐标Z">
                 <el-input v-model="formData.arKitPosZ" :disabled="'arKitPosZ'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitScale" label="ArKit缩放">
+            <el-form-item prop="arKitScale" label="ArKit缩放">
                 <el-input v-model="formData.arKitScale" :disabled="'arKitScale'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitAngle" label="ArKit角度">
+            <el-form-item prop="arKitAngle" label="ArKit角度">
                 <el-input v-model="formData.arKitAngle" :disabled="'arKitAngle'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="arKitShowLenth" label="ArKit一定距离显示">
+            <el-form-item prop="arKitShowLenth" label="ArKit一定距离显示">
                 <el-input v-model="formData.arKitShowLenth" :disabled="'arKitShowLenth'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosX" label="Gyro坐标X">
+            <el-form-item prop="gyroPosX" label="Gyro坐标X">
                 <el-input v-model="formData.gyroPosX" :disabled="'gyroPosX'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosY" label="Gyro坐标Y">
+            <el-form-item prop="gyroPosY" label="Gyro坐标Y">
                 <el-input v-model="formData.gyroPosY" :disabled="'gyroPosY'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosZ" label="Gyro坐标Z">
+            <el-form-item prop="gyroPosZ" label="Gyro坐标Z">
                 <el-input v-model="formData.gyroPosZ" :disabled="'gyroPosZ'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosScale" label="Gyro缩放">
+            <el-form-item prop="gyroPosScale" label="Gyro缩放">
                 <el-input v-model="formData.gyroPosScale" :disabled="'gyroPosScale'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosAngle" label="Gyro角度">
+            <el-form-item prop="gyroPosAngle" label="Gyro角度">
                 <el-input v-model="formData.gyroPosAngle" :disabled="'gyroPosAngle'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gyroPosShowLenth" label="Gyro一定距离显示">
+            <el-form-item prop="gyroPosShowLenth" label="Gyro一定距离显示">
                 <el-input v-model="formData.gyroPosShowLenth" :disabled="'gyroPosShowLenth'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号">
+            <el-form-item prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号">
                 <el-input v-model="formData.vuforiaImageInfoAreaMarking" :disabled="'vuforiaImageInfoAreaMarking'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark1" label="备注1">
+            <el-form-item prop="remark1" label="模型X">
                 <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="模型Y">
                 <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="模型Z">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark4" label="备注4">
+            <el-form-item prop="remark4" label="显示镜头前">
                 <el-input v-model="formData.remark4" :disabled="'remark4'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark5" label="备注5">
+            <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-form-item prop="remark6" label="备注6">
                 <el-input v-model="formData.remark6" :disabled="'remark6'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -89,108 +84,108 @@
     </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: '/aimPlaceContent/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/aimPlaceContent/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:'/landMark/all'
-                        }).then(res => {
-                        if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:String(item.id)});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-                                                                                        ownedLandMarkIdOptions:[],
-                                                                                                                                                                                                subColumn: '',
+        this.$http.get({
+            url: '/landMark/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.ownedLandMarkIdOptions.push({ label: item.mapName, value: String(item.id) });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            ownedLandMarkIdOptions: [],
+            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 ? '/aimPlaceContent/update' : '/aimPlaceContent/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 ? '/aimPlaceContent/update' : '/aimPlaceContent/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: '/aimPlaceContent/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/pages/AimPlaceContents.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/aimPlaceContent',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <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>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,200 +24,88 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('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
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('gyroPosShowLenth')" prop="gyroPosShowLenth" label="Gyro一定距离显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImageInfoAreaMarking')" prop="vuforiaImageInfoAreaMarking" label="Gyro绑定识别图区域标记编号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="模型X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="模型Y" min-width="100">
             </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('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"
-            >
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="模型Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark4')" prop="remark4" label="显示镜头前" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark5')" prop="remark5" label="备注5" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark6')" prop="remark6" label="备注6" min-width="100">
+            </el-table-column>
+            <el-table-column 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>
+                    <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>
@@ -234,15 +119,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -263,16 +140,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -302,8 +177,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -337,441 +211,440 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '名称',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '类别',
+                    value: 'type',
+                    show: true
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'ownedLandMarkId',
+                    show: true
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'arContentGroupId',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标X',
+                    value: 'arKitPosX',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标Y',
+                    value: 'arKitPosY',
+                    show: true
+                },
+                {
+                    label: 'ArKit坐标Z',
+                    value: 'arKitPosZ',
+                    show: true
+                },
+                {
+                    label: 'ArKit缩放',
+                    value: 'arKitScale',
+                    show: true
+                },
+                {
+                    label: 'ArKit角度',
+                    value: 'arKitAngle',
+                    show: true
+                },
+                {
+                    label: 'ArKit一定距离显示',
+                    value: 'arKitShowLenth',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标X',
+                    value: 'gyroPosX',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标Y',
+                    value: 'gyroPosY',
+                    show: true
+                },
+                {
+                    label: 'Gyro坐标Z',
+                    value: 'gyroPosZ',
+                    show: true
+                },
+                {
+                    label: 'Gyro缩放',
+                    value: 'gyroPosScale',
+                    show: true
+                },
+                {
+                    label: 'Gyro角度',
+                    value: 'gyroPosAngle',
+                    show: true
+                },
+                {
+                    label: 'Gyro一定距离显示',
+                    value: 'gyroPosShowLenth',
+                    show: true
+                },
+                {
+                    label: 'Gyro绑定识别图区域标记编号',
+                    value: 'vuforiaImageInfoAreaMarking',
+                    show: true
+                },
+                {
+                    label: '模型X',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '模型Y',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '模型Z',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '显示镜头前',
+                    value: 'remark4',
+                    show: true
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5',
+                    show: true
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'name'
+                },
+                {
+                    label: '类别',
+                    value: 'type'
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'owned_land_mark_id'
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'ar_content_group_id'
+                },
+                {
+                    label: 'ArKit坐标X',
+                    value: 'ar_kit_pos_x'
+                },
+                {
+                    label: 'ArKit坐标Y',
+                    value: 'ar_kit_pos_y'
+                },
+                {
+                    label: 'ArKit坐标Z',
+                    value: 'ar_kit_pos_z'
+                },
+                {
+                    label: 'ArKit缩放',
+                    value: 'ar_kit_scale'
+                },
+                {
+                    label: 'ArKit角度',
+                    value: 'ar_kit_angle'
+                },
+                {
+                    label: 'ArKit一定距离显示',
+                    value: 'ar_kit_show_lenth'
+                },
+                {
+                    label: 'Gyro坐标X',
+                    value: 'gyro_pos_x'
+                },
+                {
+                    label: 'Gyro坐标Y',
+                    value: 'gyro_pos_y'
+                },
+                {
+                    label: 'Gyro坐标Z',
+                    value: 'gyro_pos_z'
+                },
+                {
+                    label: 'Gyro缩放',
+                    value: 'gyro_pos_scale'
+                },
+                {
+                    label: 'Gyro角度',
+                    value: 'gyro_pos_angle'
+                },
+                {
+                    label: 'Gyro一定距离显示',
+                    value: 'gyro_pos_show_lenth'
+                },
+                {
+                    label: 'Gyro绑定识别图区域标记编号',
+                    value: 'vuforia_image_info_area_marking'
+                },
+                {
+                    label: '模型X',
+                    value: 'remark1',
+                },
+                {
+                    label: '模型Y',
+                    value: 'remark2',
+                },
+                {
+                    label: '模型Z',
+                    value: 'remark3',
+                },
+                {
+                    label: '显示镜头前',
+                    value: 'remark4',
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5'
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: '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,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            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();
+            this.$http.get({
+                url: '/aimPlaceContent/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/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);
+            })
+        },
+        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,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/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('删除失败');
-                    }
+            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 }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/ArContent.vue

@@ -52,6 +52,18 @@
             <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="remark6" label="备注7">
+                <el-input v-model="formData.remark7" :disabled="'remark7'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark6" label="备注8">
+                <el-input v-model="formData.remark8" :disabled="'remark8'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark6" label="备注9">
+                <el-input v-model="formData.remark9" :disabled="'remark9'==subColumn"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark6" label="备注10">
+                <el-input v-model="formData.remark10" :disabled="'remark10'==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>

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

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/arContent',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/arContent',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,158 +24,78 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('groupId')" prop="groupId" 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('text')" prop="text" label="文字" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('image')" prop="image" label="图片" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('url')" prop="url" label="URL" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('voice')" prop="voice" label="音频" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('movie')" prop="movie" label="视频" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('model')" prop="model" label="模型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('cfile')" prop="cfile" label="文本文件" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('resourceSize')" prop="resourceSize" label="资源大小（M）" 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
-                    type="index"
-                    min-width="50"
-                    align="center">
+            <el-table-column v-if="isColumnShow('remark7')" prop="remark7" label="备注7" min-width="100">
             </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"
-                                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('text')"
-                                prop="text"
-                                label="文字"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('image')"
-                                prop="image"
-                                label="图片"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('url')"
-                                prop="url"
-                                label="URL"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('voice')"
-                                prop="voice"
-                                label="音频"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('movie')"
-                                prop="movie"
-                                label="视频"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('model')"
-                                prop="model"
-                                label="模型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('cfile')"
-                                prop="cfile"
-                                label="文本文件"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('resourceSize')"
-                                prop="resourceSize"
-                                label="资源大小（M）"
-                                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"
-            >
+            <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 label="操作" align="center" fixed="right" 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>
+                    <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>
@@ -192,15 +109,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -221,16 +130,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -260,8 +167,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -295,387 +201,422 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '内容组ID',
+                    value: 'groupId',
+                    show: true
+                },
+                {
+                    label: '名称/描述',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '类别',
+                    value: 'type',
+                    show: true
+                },
+                {
+                    label: '文字',
+                    value: 'text',
+                    show: true
+                },
+                {
+                    label: '图片',
+                    value: 'image',
+                    show: true
+                },
+                {
+                    label: 'URL',
+                    value: 'url',
+                    show: true
+                },
+                {
+                    label: '音频',
+                    value: 'voice',
+                    show: true
+                },
+                {
+                    label: '视频',
+                    value: 'movie',
+                    show: true
+                },
+                {
+                    label: '模型',
+                    value: 'model',
+                    show: true
+                },
+                {
+                    label: '文本文件',
+                    value: 'cfile',
+                    show: true
+                },
+                {
+                    label: '资源大小（M）',
+                    value: 'resourceSize',
+                    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
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '内容组ID',
+                    value: 'group_id'
+                },
+                {
+                    label: '名称/描述',
+                    value: 'name'
+                },
+                {
+                    label: '类别',
+                    value: 'type'
+                },
+                {
+                    label: '文字',
+                    value: 'text'
+                },
+                {
+                    label: '图片',
+                    value: 'image'
+                },
+                {
+                    label: 'URL',
+                    value: 'url'
+                },
+                {
+                    label: '音频',
+                    value: 'voice'
+                },
+                {
+                    label: '视频',
+                    value: 'movie'
+                },
+                {
+                    label: '模型',
+                    value: 'model'
+                },
+                {
+                    label: '文本文件',
+                    value: 'cfile'
+                },
+                {
+                    label: '资源大小（M）',
+                    value: 'resource_size'
+                },
+                {
+                    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',
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '内容组ID',
-                                value: 'groupId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '名称/描述',
-                                value: 'name',
-                                show: true
-                            },
-                                                                                                {
-                                label: '类别',
-                                value: 'type',
-                                show: true
-                            },
-                                                                                                {
-                                label: '文字',
-                                value: 'text',
-                                show: true
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'URL',
-                                value: 'url',
-                                show: true
-                            },
-                                                                                                {
-                                label: '音频',
-                                value: 'voice',
-                                show: true
-                            },
-                                                                                                {
-                                label: '视频',
-                                value: 'movie',
-                                show: true
-                            },
-                                                                                                {
-                                label: '模型',
-                                value: 'model',
-                                show: true
-                            },
-                                                                                                {
-                                label: '文本文件',
-                                value: 'cfile',
-                                show: true
-                            },
-                                                                                                {
-                                label: '资源大小（M）',
-                                value: 'resourceSize',
-                                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: '内容组ID',
-                                value: 'group_id'
-                            },
-                                                                                                {
-                                label: '名称/描述',
-                                value: 'name'
-                            },
-                                                                                                {
-                                label: '类别',
-                                value: 'type'
-                            },
-                                                                                                {
-                                label: '文字',
-                                value: 'text'
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image'
-                            },
-                                                                                                {
-                                label: 'URL',
-                                value: 'url'
-                            },
-                                                                                                {
-                                label: '音频',
-                                value: 'voice'
-                            },
-                                                                                                {
-                                label: '视频',
-                                value: 'movie'
-                            },
-                                                                                                {
-                                label: '模型',
-                                value: 'model'
-                            },
-                                                                                                {
-                                label: '文本文件',
-                                value: 'cfile'
-                            },
-                                                                                                {
-                                label: '资源大小（M）',
-                                value: 'resource_size'
-                            },
-                                                                                                {
-                                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,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/arContent/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/arContent/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/arContent',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/arContent',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/arContent/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: '/arContent/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/arContent/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: '/arContent/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/Login.vue

@@ -46,8 +46,8 @@ export default {
                     }).then(res => {
                         this.loading = false;
                         if (res.success) {
-                            // this.$router.replace('/');
-                            window.location = this.$baseUrl + '/admin'
+                             this.$router.replace('/');
+                            //window.location = this.$baseUrl + '/admin'
                         } else {
                             this.$message.error('登录失败');
                         }

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.cf83588ef685e55e144589e0fc1488a9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1aeef9f600717138ec4a.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/admin.566e246e750e2124b639.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.9c5808f0ffa58e5184aa72e509260764.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5ede984582bd1b28163f.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/admin.35d5819a5018b34c359a.js></script></body></html>

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1aeef9f600717138ec4a.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/loginAdmin.2af66e4cf673b4ccb2e2.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.a1de29a9f9c1d5b671b1965892c17dd1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5ede984582bd1b28163f.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/loginAdmin.c1b11c00864212d9def2.js></script></body></html>