suochencheng 7 лет назад
Родитель
Сommit
bc4fbe9e15

+ 20 - 3
src/main/java/com/izouma/awesomeadmin/dao/AimPlacePositionMapper.xml

@@ -284,8 +284,14 @@
                 and remark3 = #{record.remark3}
             </if>
             <if test="record.frontLevelId != null and !&quot;&quot;.equals(record.frontLevelId)">
-                and front_level_id = #{record.frontLevelId}
+
+                and (front_level_id = #{record.frontLevelId}
+                <if test="'0'.toString()==record.frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
+
             <if test="record.ownedLandMarkId != null and !&quot;&quot;.equals(record.ownedLandMarkId)">
                 and owned_land_mark_id = #{record.ownedLandMarkId}
             </if>
@@ -409,7 +415,12 @@
                 and remark3 = #{remark3}
             </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
-                and front_level_id = #{frontLevelId}
+
+                and (front_level_id = #{frontLevelId}
+                <if test="'0'.toString()==frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
             <if test="ownedLandMarkId != null and !&quot;&quot;.equals(ownedLandMarkId)">
                 and owned_land_mark_id = #{ownedLandMarkId}
@@ -533,8 +544,14 @@
                 and remark3 = #{remark3}
             </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
-                and front_level_id = #{frontLevelId}
+
+                and (front_level_id = #{frontLevelId}
+                <if test="'0'.toString()==frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
+
             <if test="ownedLandMarkId != null and !&quot;&quot;.equals(ownedLandMarkId)">
                 and owned_land_mark_id = #{ownedLandMarkId}
             </if>

+ 18 - 3
src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.xml

@@ -451,7 +451,12 @@
                 and remark3 = #{record.remark3}
             </if>
             <if test="record.frontLevelId != null and !&quot;&quot;.equals(record.frontLevelId)">
-                and front_level_id = #{record.frontLevelId}
+
+                and (front_level_id = #{record.frontLevelId}
+                <if test="'0'.toString()==record.frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -637,7 +642,12 @@
                 and remark3 = #{remark3}
             </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
-                and front_level_id = #{frontLevelId}
+
+                and (front_level_id = #{frontLevelId}
+                <if test="'0'.toString()==frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -807,7 +817,12 @@
                 and remark3 = #{remark3}
             </if>
             <if test="frontLevelId != null and !&quot;&quot;.equals(frontLevelId)">
-                and front_level_id = #{frontLevelId}
+
+                and (front_level_id = #{frontLevelId}
+                <if test="'0'.toString()==frontLevelId">
+                    or (front_level_id is null or front_level_id = '')
+                </if>
+                )
             </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/web/UserInfoController.java

@@ -203,7 +203,7 @@ public class UserInfoController {
 
         data = userInfoService.getSingleUserInfo(data);
         if (data != null) {
-            return new Result(true, "用户名已存在");
+            return new Result(false, "用户名已存在");
         }
 
         UserInfo data2 = new UserInfo();
@@ -211,7 +211,7 @@ public class UserInfoController {
 
         data2 = userInfoService.getSingleUserInfo(data2);
         if (data2 != null) {
-            return new Result(true, "手机号已存在");
+            return new Result(false, "手机号已存在");
         }
 
 

+ 11 - 11
src/main/vue/src/components/AimPlaceContent.vue

@@ -130,18 +130,18 @@ export default {
 
 
 
-        this.$http.get({
-            url: '/landMark/all'
-        }).then(res => {
-            if (res.success) {
+        // this.$http.get({
+        //     url: '/landMark/all'
+        // }).then(res => {
+        //     if (res.success) {
 
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.ownedLandMarkIdOptions.push({ label: item.mapName, value: item.id });
-                    })
-                }
-            }
-        });
+        //         if (res.data.length > 0) {
+        //             res.data.forEach(item => {
+        //                 this.ownedLandMarkIdOptions.push({ label: item.mapName, value: item.id });
+        //             })
+        //         }
+        //     }
+        // });
     },
     data() {
         return {

+ 12 - 12
src/main/vue/src/components/AimPlacePosition.vue

@@ -103,7 +103,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.frontLevelIdOptions.push({ label: item.name, value: item.id });
+                        this.frontLevelIdOptions.push({ label: item.name, value: String(item.id) });
                     })
                 }
             }
@@ -111,18 +111,18 @@ export default {
 
 
 
-        this.$http.get({
-            url: '/landMark/all'
-        }).then(res => {
-            if (res.success) {
+        // this.$http.get({
+        //     url: '/landMark/all'
+        // }).then(res => {
+        //     if (res.success) {
 
-                if (res.data.length > 0) {
-                    res.data.forEach(item => {
-                        this.ownedLandMarkIdOptions.push({ label: item.mapName, value: item.id });
-                    })
-                }
-            }
-        });
+        //         if (res.data.length > 0) {
+        //             res.data.forEach(item => {
+        //                 this.ownedLandMarkIdOptions.push({ label: item.mapName, value: item.id });
+        //             })
+        //         }
+        //     }
+        // });
     },
     data() {
         return {

+ 3 - 3
src/main/vue/src/components/VuforiaImageInfo.vue

@@ -80,7 +80,7 @@ export default {
             type: Object,
             default: () => {
                 return {
-                    vuforiaImageGroupId:0
+                    vuforiaImageGroupId: 0
                 }
             }
         }
@@ -124,7 +124,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.vuforiaImageGroupIdOptions.push({ label: item.vuforiaName, value: item.id });
+                        this.vuforiaImageGroupIdOptions.push({ label: item.vuforiaName, value: String(item.id) });
                     })
                 }
             }
@@ -139,7 +139,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.vuforiaImageTypeIdOptions.push({ label: item.typeName, value: item.id });
+                        this.vuforiaImageTypeIdOptions.push({ label: item.typeName, value: String(item.id) });
                     })
                 }
             }

+ 1 - 1
src/main/vue/src/pages/AimPlaceContent.vue

@@ -131,7 +131,7 @@
 
                         if (res.data.length > 0) {
                         res.data.forEach(item => {
-                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:item.id});
+                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:String(item.id)});
                         })
                         }
                         }

+ 94 - 99
src/main/vue/src/pages/AimPlaceContentChild.vue

@@ -1,41 +1,36 @@
 <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="aimPlaceContentId" label="目标点内容ID">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="aimPlaceContentId" label="目标点内容ID">
                 <template>
-                    <el-select v-model="formData.aimPlaceContentId" clearable  placeholder="请选择" :disabled="'aimPlaceContentId'==subColumn">
-                        <el-option
-                                v-for="item in aimPlaceContentIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.aimPlaceContentId" clearable placeholder="请选择" :disabled="'aimPlaceContentId'==subColumn">
+                        <el-option v-for="item in aimPlaceContentIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="type" label="类别">
+            <el-form-item prop="type" label="类别">
                 <el-input v-model="formData.type" :disabled="'type'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="itemName" label="名称">
+            <el-form-item prop="itemName" label="名称">
                 <el-input v-model="formData.itemName" :disabled="'itemName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="itemMess" label="描述">
+            <el-form-item prop="itemMess" label="描述">
                 <el-input type="textarea" v-model="formData.itemMess" :disabled="'itemMess'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="itemDes" label="详细">
+            <el-form-item prop="itemDes" label="详细">
                 <el-input type="textarea" v-model="formData.itemDes" :disabled="'itemDes'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="remark1" label="备注1">
+            <el-form-item prop="remark1" label="备注1">
                 <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark2" label="备注2">
+            <el-form-item prop="remark2" label="备注2">
                 <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark3" label="备注3">
+            <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <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>
@@ -44,108 +39,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: '/aimPlaceContentChild/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/aimPlaceContentChild/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:'/aimPlaceContent/all'
-                        }).then(res => {
-                        if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.aimPlaceContentIdOptions.push({label: item.name, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                                                                                                                                                                                            },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                        aimPlaceContentIdOptions:[],
-                                                                                        subColumn: '',
+        this.$http.get({
+            url: '/aimPlaceContent/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.aimPlaceContentIdOptions.push({ label: item.name, value: String(item.id) });
+                    })
+                }
+            }
+        });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            aimPlaceContentIdOptions: [],
+            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 ? '/aimPlaceContentChild/update' : '/aimPlaceContentChild/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 ? '/aimPlaceContentChild/update' : '/aimPlaceContentChild/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: '/aimPlaceContentChild/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>

+ 114 - 123
src/main/vue/src/pages/AimPlacePosition.vue

@@ -1,56 +1,47 @@
 <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="posX" label="坐标X">
+            <el-form-item prop="posX" label="坐标X">
                 <el-input v-model="formData.posX" :disabled="'posX'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posY" label="坐标Y">
+            <el-form-item prop="posY" label="坐标Y">
                 <el-input v-model="formData.posY" :disabled="'posY'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="posZ" label="坐标Z">
+            <el-form-item prop="posZ" label="坐标Z">
                 <el-input v-model="formData.posZ" :disabled="'posZ'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark1" label="备注1">
+            <el-form-item prop="remark1" label="备注1">
                 <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark2" label="备注2">
+            <el-form-item prop="remark2" label="备注2">
                 <el-input v-model="formData.remark2" :disabled="'remark2'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark3" label="备注3">
+            <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="frontLevelId" label="上级ID">
+            <el-form-item prop="frontLevelId" label="上级ID">
                 <template>
-                    <el-select v-model="formData.frontLevelId" clearable  placeholder="请选择" :disabled="'frontLevelId'==subColumn">
-                        <el-option
-                                v-for="item in frontLevelIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.frontLevelId" clearable placeholder="请选择" :disabled="'frontLevelId'==subColumn">
+                        <el-option v-for="item in frontLevelIdOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item 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>
+            <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>
@@ -59,128 +50,128 @@
     </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: '/aimPlacePosition/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/aimPlacePosition/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:'/aimPlacePosition/all'
-                        }).then(res => {
-                        if (res.success) {
+        this.$http.get({
+            url: '/aimPlacePosition/all'
+        }).then(res => {
+            if (res.success) {
+
+                if (res.data.length > 0) {
+                    res.data.forEach(item => {
+                        this.frontLevelIdOptions.push({ label: item.name, value: String(item.id) });
+                    })
+                }
+            }
+        });
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.frontLevelIdOptions.push({label: item.name, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                                                    
 
 
-                        this.$http.get({
-                        url:'/landMark/all'
-                        }).then(res => {
-                        if (res.success) {
+        this.$http.get({
+            url: '/landMark/all'
+        }).then(res => {
+            if (res.success) {
 
-                        if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                        this.ownedLandMarkIdOptions.push({label: item.mapName, value:item.id});
-                        })
-                        }
-                        }
-                        });
-                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                        name:
+                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: {
+                name:
                     [
-                                                {required: true, message: '请输入 名称', trigger: 'blur'},
-                                                                    ],
-                                                                                                                                                                                                                                                                                                },
-                                                                                                                                        frontLevelIdOptions:[],
-                                            ownedLandMarkIdOptions:[],
-                                subColumn: '',
+                        { required: true, message: '请输入 名称', trigger: 'blur' },
+                    ],
+            },
+            frontLevelIdOptions: [],
+            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 ? '/aimPlacePosition/update' : '/aimPlacePosition/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 ? '/aimPlacePosition/update' : '/aimPlacePosition/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: '/aimPlacePosition/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>

+ 1 - 1
src/main/vue/src/pages/ArContentChild.vue

@@ -108,7 +108,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.arContentIdOptions.push({ label: item.name, value: item.id });
+                        this.arContentIdOptions.push({ label: item.name, value: String(item.id)});
                     })
                 }
             }

+ 1 - 1
src/main/vue/src/pages/LandMark.vue

@@ -183,7 +183,7 @@ export default {
 
                 if (res.data.length > 0) {
                     res.data.forEach(item => {
-                        this.frontLevelIdOptions.push({ label: item.mapName, value: item.id });
+                        this.frontLevelIdOptions.push({ label: item.mapName, value: String(item.id) });
                     })
                 }
             }

+ 477 - 596
src/main/vue/src/pages/LandMarks.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:'/landMark',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/landMark',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,198 +24,94 @@
                 </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('mapName')" prop="mapName" label="地标名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('ownedCityId')" prop="ownedCityId" label="所属城市Id" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapSprite')" prop="mapSprite" label="缩略图" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.mapSprite" @click="showImg(row.mapSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('logeSprite')" prop="logeSprite" label="地点Loge图" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.logeSprite" @click="showImg(row.logeSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('openDescribe')" prop="openDescribe" label="营业/开放情况" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('markDescribe')" prop="markDescribe" label="地标简介" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('anchorImageGroupName')" prop="anchorImageGroupName" label="识别图组名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('defaultMode')" prop="defaultMode" label="模式" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImageGroupId')" prop="vuforiaImageGroupId" label="识别图集ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaDataName')" prop="vuforiaDataName" label="识别图集数据名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapInfo')" prop="mapInfo" label="地图信息" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapWidth')" prop="mapWidth" label="地图宽" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('mapHeight')" prop="mapHeight" label="地图高" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('mapRate')" prop="mapRate" label="比率" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('showInPanel')" prop="showInPanel" label="是否显示" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('longitude')" prop="longitude" label="经度" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('latitude')" prop="latitude" label="纬度" 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('mapName')"
-                                prop="mapName"
-                                label="地标名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('ownedCityId')"
-                                prop="ownedCityId"
-                                label="所属城市Id"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapSprite')"
-                                prop="mapSprite"
-                                label="缩略图"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.mapSprite" @click="showImg(row.mapSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('logeSprite')"
-                                prop="logeSprite"
-                                label="地点Loge图"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.logeSprite" @click="showImg(row.logeSprite)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('openDescribe')"
-                                prop="openDescribe"
-                                label="营业/开放情况"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('markDescribe')"
-                                prop="markDescribe"
-                                label="地标简介"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('anchorImageGroupName')"
-                                prop="anchorImageGroupName"
-                                label="识别图组名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('defaultMode')"
-                                prop="defaultMode"
-                                label="模式"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('vuforiaImageGroupId')"
-                                prop="vuforiaImageGroupId"
-                                label="识别图集ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('vuforiaDataName')"
-                                prop="vuforiaDataName"
-                                label="识别图集数据名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapInfo')"
-                                prop="mapInfo"
-                                label="地图信息"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapWidth')"
-                                prop="mapWidth"
-                                label="地图宽"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapHeight')"
-                                prop="mapHeight"
-                                label="地图高"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('mapRate')"
-                                prop="mapRate"
-                                label="比率"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('showInPanel')"
-                                prop="showInPanel"
-                                label="是否显示"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('longitude')"
-                                prop="longitude"
-                                label="经度"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('latitude')"
-                                prop="latitude"
-                                label="纬度"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark1')"
-                                prop="remark1"
-                                label="备注1"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark2')"
-                                prop="remark2"
-                                label="备注2"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark3')"
-                                prop="remark3"
-                                label="备注3"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('frontLevelId')"
-                                prop="frontLevelId"
-                                label="上级地标ID"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="备注1" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('frontLevelId')" prop="frontLevelId" label="上级地标ID" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                    <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
+                    <!-- <el-button @click="$router.push({path:'/VuforiaImageInfos',query:{column:scope.row.id+',landMarkId'}})" type="primary" size="small" plain>识别图
             </el-button>
                     <el-button @click="$router.push({path:'/AimPlaceContents',query:{column:scope.row.id+',ownedLandMarkId'}})" type="primary" size="small" plain>目标点内容
             </el-button>
                     <el-button @click="$router.push({path:'/AimPlacePositions',query:{column:scope.row.id+',ownedLandMarkId'}})" type="primary" size="small" plain>目标点位置
-            </el-button>
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+            </el-button> -->
+                    <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>
@@ -232,15 +125,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">
@@ -261,16 +146,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>
@@ -300,8 +183,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>
@@ -335,423 +217,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: '地标名称',
+                    value: 'mapName',
+                    show: true
+                },
+                {
+                    label: '所属城市Id',
+                    value: 'ownedCityId',
+                    show: true
+                },
+                {
+                    label: '缩略图',
+                    value: 'mapSprite',
+                    show: true
+                },
+                {
+                    label: '地点Loge图',
+                    value: 'logeSprite',
+                    show: true
+                },
+                {
+                    label: '营业/开放情况',
+                    value: 'openDescribe',
+                    show: true
+                },
+                {
+                    label: '地标简介',
+                    value: 'markDescribe',
+                    show: true
+                },
+                {
+                    label: '识别图组名称',
+                    value: 'anchorImageGroupName',
+                    show: true
+                },
+                {
+                    label: '模式',
+                    value: 'defaultMode',
+                    show: true
+                },
+                {
+                    label: '识别图集ID',
+                    value: 'vuforiaImageGroupId',
+                    show: true
+                },
+                {
+                    label: '识别图集数据名称',
+                    value: 'vuforiaDataName',
+                    show: true
+                },
+                {
+                    label: '地图信息',
+                    value: 'mapInfo',
+                    show: true
+                },
+                {
+                    label: '地图宽',
+                    value: 'mapWidth',
+                    show: true
+                },
+                {
+                    label: '地图高',
+                    value: 'mapHeight',
+                    show: true
+                },
+                {
+                    label: '比率',
+                    value: 'mapRate',
+                    show: true
+                },
+                {
+                    label: '是否显示',
+                    value: 'showInPanel',
+                    show: true
+                },
+                {
+                    label: '经度',
+                    value: 'longitude',
+                    show: true
+                },
+                {
+                    label: '纬度',
+                    value: 'latitude',
+                    show: true
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '上级地标ID',
+                    value: 'frontLevelId',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '地标名称',
+                    value: 'map_name'
+                },
+                {
+                    label: '所属城市Id',
+                    value: 'owned_city_id'
+                },
+                {
+                    label: '缩略图',
+                    value: 'map_sprite'
+                },
+                {
+                    label: '地点Loge图',
+                    value: 'loge_sprite'
+                },
+                {
+                    label: '营业/开放情况',
+                    value: 'open_describe'
+                },
+                {
+                    label: '地标简介',
+                    value: 'mark_describe'
+                },
+                {
+                    label: '识别图组名称',
+                    value: 'anchor_image_group_name'
+                },
+                {
+                    label: '模式',
+                    value: 'default_mode'
+                },
+                {
+                    label: '识别图集ID',
+                    value: 'vuforia_image_group_id'
+                },
+                {
+                    label: '识别图集数据名称',
+                    value: 'vuforia_data_name'
+                },
+                {
+                    label: '地图信息',
+                    value: 'map_info'
+                },
+                {
+                    label: '地图宽',
+                    value: 'map_width'
+                },
+                {
+                    label: '地图高',
+                    value: 'map_height'
+                },
+                {
+                    label: '比率',
+                    value: 'map_rate'
+                },
+                {
+                    label: '是否显示',
+                    value: 'show_in_panel'
+                },
+                {
+                    label: '经度',
+                    value: 'longitude'
+                },
+                {
+                    label: '纬度',
+                    value: 'latitude'
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '上级地标ID',
+                    value: 'front_level_id'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '地标名称',
-                                value: 'mapName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '所属城市Id',
-                                value: 'ownedCityId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '缩略图',
-                                value: 'mapSprite',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地点Loge图',
-                                value: 'logeSprite',
-                                show: true
-                            },
-                                                                                                {
-                                label: '营业/开放情况',
-                                value: 'openDescribe',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地标简介',
-                                value: 'markDescribe',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图组名称',
-                                value: 'anchorImageGroupName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '模式',
-                                value: 'defaultMode',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图集ID',
-                                value: 'vuforiaImageGroupId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图集数据名称',
-                                value: 'vuforiaDataName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地图信息',
-                                value: 'mapInfo',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地图宽',
-                                value: 'mapWidth',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地图高',
-                                value: 'mapHeight',
-                                show: true
-                            },
-                                                                                                {
-                                label: '比率',
-                                value: 'mapRate',
-                                show: true
-                            },
-                                                                                                {
-                                label: '是否显示',
-                                value: 'showInPanel',
-                                show: true
-                            },
-                                                                                                {
-                                label: '经度',
-                                value: 'longitude',
-                                show: true
-                            },
-                                                                                                {
-                                label: '纬度',
-                                value: 'latitude',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注1',
-                                value: 'remark1',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注2',
-                                value: 'remark2',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注3',
-                                value: 'remark3',
-                                show: true
-                            },
-                                                                                                {
-                                label: '上级地标ID',
-                                value: 'frontLevelId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '地标名称',
-                                value: 'map_name'
-                            },
-                                                                                                {
-                                label: '所属城市Id',
-                                value: 'owned_city_id'
-                            },
-                                                                                                {
-                                label: '缩略图',
-                                value: 'map_sprite'
-                            },
-                                                                                                {
-                                label: '地点Loge图',
-                                value: 'loge_sprite'
-                            },
-                                                                                                {
-                                label: '营业/开放情况',
-                                value: 'open_describe'
-                            },
-                                                                                                {
-                                label: '地标简介',
-                                value: 'mark_describe'
-                            },
-                                                                                                {
-                                label: '识别图组名称',
-                                value: 'anchor_image_group_name'
-                            },
-                                                                                                {
-                                label: '模式',
-                                value: 'default_mode'
-                            },
-                                                                                                {
-                                label: '识别图集ID',
-                                value: 'vuforia_image_group_id'
-                            },
-                                                                                                {
-                                label: '识别图集数据名称',
-                                value: 'vuforia_data_name'
-                            },
-                                                                                                {
-                                label: '地图信息',
-                                value: 'map_info'
-                            },
-                                                                                                {
-                                label: '地图宽',
-                                value: 'map_width'
-                            },
-                                                                                                {
-                                label: '地图高',
-                                value: 'map_height'
-                            },
-                                                                                                {
-                                label: '比率',
-                                value: 'map_rate'
-                            },
-                                                                                                {
-                                label: '是否显示',
-                                value: 'show_in_panel'
-                            },
-                                                                                                {
-                                label: '经度',
-                                value: 'longitude'
-                            },
-                                                                                                {
-                                label: '纬度',
-                                value: 'latitude'
-                            },
-                                                                                                {
-                                label: '备注1',
-                                value: 'remark1'
-                            },
-                                                                                                {
-                                label: '备注2',
-                                value: 'remark2'
-                            },
-                                                                                                {
-                                label: '备注3',
-                                value: 'remark3'
-                            },
-                                                                                                {
-                                label: '上级地标ID',
-                                value: 'front_level_id'
-                            },
-                                                            ],
-                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: '/landMark/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: '/landMark/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: '/landMark',
-                    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: '/landMark',
+                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 + "/landMark/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: '/landMark/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 + "/landMark/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: '/landMark/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>