AR模板

src/main/vue/src/components/ArContent.vue

@@ -10,7 +10,10 @@
                     <el-input v-model="formData.name" :disabled="'name'==subColumn"></el-input>
                 </el-form-item>
                 <el-form-item prop="type" label="类别">
-                    <el-input v-model="formData.type" :disabled="'type'==subColumn"></el-input>
+                    <el-select placeholder="类别" size="small" v-model="formData.type" class="filter-item">
+                        <el-option label="普通虚拟讲解员" value="1001">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item prop="remark1" label="备注1">
                     <el-input v-model="formData.remark1" :disabled="'remark1'==subColumn"></el-input>
@@ -108,7 +111,9 @@ export default {
             },
             subColumn: '',
             subValue: '',
-            formData: {}
+            formData: {
+                type:'1001'
+            }
         }
     },
     computed: {

src/main/vue/src/components/ArContentTemplateStep3.vue

@@ -116,7 +116,7 @@ export default {
                         remark4: "",
                         remark5: "",
                         remark6: "",
-                        remark7: "",
+                        remark7: "0",
                         type: "2"
                     }
                     this.arContentChilds.push(jsonp)
@@ -229,7 +229,7 @@ export default {
                     remark4: "",
                     remark5: "",
                     remark6: "",
-                    remark7: "",
+                    remark7: "0",
                     type: "2"
                 });
                 setTimeout(() => {

src/main/vue/src/components/VuforiaImageInfo.vue

@@ -32,6 +32,13 @@
                         </el-select>
                     </template>
                 </el-form-item> -->
+                 <el-form-item prop="vuforiaImage" label="识别图">
+                    <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
+                </el-form-item>
+                <el-form-item prop="vuforiaImage" label="识别图URL">
+                    <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
+                </el-form-item>
+                
                 <el-form-item prop="arContentGroupId" label="AR内容组ID">
                     <el-input v-model="formData.arContentGroupId" :disabled="'arContentGroupId'==subColumn"></el-input>
                 </el-form-item>
@@ -56,12 +63,7 @@
                 <el-form-item prop="remark3" label="备注3">
                     <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
                 </el-form-item>
-                <el-form-item prop="vuforiaImage" label="识别图">
-                    <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
-                </el-form-item>
-                <el-form-item prop="vuforiaImage" label="识别图URL">
-                    <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
-                </el-form-item>
+               
             </div>
             <el-form-item style="margin-top:10px;">
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>

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

@@ -45,6 +45,13 @@
             <el-table-column v-if="isColumnShow('areaMarking')" prop="areaMarking" label="区域标记编号" min-width="100">
             </el-table-column>
 
+            <el-table-column v-if="isColumnShow('vuforiaImage')" prop="vuforiaImage" label="识别图" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.vuforiaImage" @click="showImg(row.vuforiaImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
             <el-table-column v-if="isColumnShow('landMarkId')" prop="landMarkId" label="所属地标ID" min-width="100">
             </el-table-column>
 
@@ -72,12 +79,6 @@
             <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('vuforiaImage')" prop="vuforiaImage" label="识别图" min-width="100">
-                <template slot-scope="{row}">
-                    <img :src="row.vuforiaImage" @click="showImg(row.vuforiaImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                </template>
-
-            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>

src/main/vue/src/pages/ArContentTemplates.vue

@@ -0,0 +1,541 @@
+<template>
+    <div>
+        <div class="filters-container">
+            <el-select placeholder="模板" size="small" v-model="filter2" @change="searchData" class="filter-item">
+                <el-option label="普通虚拟讲解员" value="1001">
+                </el-option>
+            </el-select>
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/arContentTemplate',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('groupId')" prop="groupId" label="内容组ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('name')" prop="name" label="名称/描述" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('type')" prop="type" label="类别" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="备注1" min-width="100">
+            </el-table-column>
+
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="scope">
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '1001',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '内容组ID',
+                    value: 'groupId',
+                    show: true
+                },
+                {
+                    label: '名称/描述',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '类别',
+                    value: 'type',
+                    show: true
+                },
+                {
+                    label: '文字',
+                    value: 'text',
+                    show: true
+                },
+                {
+                    label: '图片',
+                    value: 'image',
+                    show: true
+                },
+                {
+                    label: 'URL',
+                    value: 'url',
+                    show: true
+                },
+                {
+                    label: '音频',
+                    value: 'voice',
+                    show: true
+                },
+                {
+                    label: '视频',
+                    value: 'movie',
+                    show: true
+                },
+                {
+                    label: '模型',
+                    value: 'model',
+                    show: true
+                },
+                {
+                    label: '文本文件',
+                    value: 'cfile',
+                    show: true
+                },
+                {
+                    label: '资源大小（M）',
+                    value: 'resourceSize',
+                    show: true
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '备注4',
+                    value: 'remark4',
+                    show: true
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5',
+                    show: true
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '内容组ID',
+                    value: 'group_id'
+                },
+                {
+                    label: '名称/描述',
+                    value: 'name'
+                },
+                {
+                    label: '类别',
+                    value: 'type'
+                },
+                {
+                    label: '文字',
+                    value: 'text'
+                },
+                {
+                    label: '图片',
+                    value: 'image'
+                },
+                {
+                    label: 'URL',
+                    value: 'url'
+                },
+                {
+                    label: '音频',
+                    value: 'voice'
+                },
+                {
+                    label: '视频',
+                    value: 'movie'
+                },
+                {
+                    label: '模型',
+                    value: 'model'
+                },
+                {
+                    label: '文本文件',
+                    value: 'cfile'
+                },
+                {
+                    label: '资源大小（M）',
+                    value: 'resource_size'
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '备注4',
+                    value: 'remark4'
+                },
+                {
+                    label: '备注5',
+                    value: 'remark5'
+                },
+                {
+                    label: '备注6',
+                    value: 'remark6'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
+            this.getData();
+        },
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
+        },
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                type: this.filter2,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
+            }
+
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
+
+            this.$http.get({
+                url: '/arContent/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/arContentTemplate',
+                query: {
+                    arContentId: row.id,
+                }
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                var templist = [];
+
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.advancedQuerySearchKey = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
+
+            this.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/arContent/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/arContent/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+</style>

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

@@ -23,6 +23,14 @@
             <el-form-item prop="areaMarking" label="区域标记编号">
                 <el-input v-model="formData.areaMarking" :disabled="'areaMarking'==subColumn"></el-input>
             </el-form-item>
+
+            <el-form-item prop="vuforiaImage" label="识别图">
+                <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="vuforiaImage" label="识别图URL">
+                <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
+            </el-form-item>
+
             <el-form-item prop="landMarkId" label="所属地标ID">
                 <template>
                     <el-select v-model="formData.landMarkId" clearable placeholder="请选择" :disabled="'landMarkId'==subColumn">
@@ -55,12 +63,7 @@
             <el-form-item prop="remark3" label="备注3">
                 <el-input v-model="formData.remark3" :disabled="'remark3'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item prop="vuforiaImage" label="识别图">
-                <single-upload v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></single-upload>
-            </el-form-item>
-            <el-form-item prop="vuforiaImage" label="识别图URL">
-                <el-input v-model="formData.vuforiaImage" :disabled="'vuforiaImage'==subColumn"></el-input>
-            </el-form-item>
+
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>

src/main/vue/src/pages/VuforiaImageInfos.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:'/vuforiaImageInfo',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/vuforiaImageInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <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,139 +24,64 @@
                 </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('vuforiaImageGroupId')" prop="vuforiaImageGroupId" label="所属图集ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('name')" prop="name" label="识别图名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImageTypeId')" prop="vuforiaImageTypeId" label="识别图类型ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('areaMarking')" prop="areaMarking" label="区域标记编号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('vuforiaImage')" prop="vuforiaImage" label="识别图" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.vuforiaImage" @click="showImg(row.vuforiaImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('landMarkId')" prop="landMarkId" label="所属地标ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('arContentGroupId')" prop="arContentGroupId" label="AR内容组ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posX')" prop="posX" label="坐标X" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posY')" prop="posY" label="坐标Y" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('posZ')" prop="posZ" label="坐标Z" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('angle')" prop="angle" label="角度" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark1')" prop="remark1" label="备注1" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark2')" prop="remark2" label="备注2" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('remark3')" prop="remark3" label="备注3" 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('vuforiaImageGroupId')"
-                                prop="vuforiaImageGroupId"
-                                label="所属图集ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('name')"
-                                prop="name"
-                                label="识别图名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('vuforiaImageTypeId')"
-                                prop="vuforiaImageTypeId"
-                                label="识别图类型ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('areaMarking')"
-                                prop="areaMarking"
-                                label="区域标记编号"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('landMarkId')"
-                                prop="landMarkId"
-                                label="所属地标ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('arContentGroupId')"
-                                prop="arContentGroupId"
-                                label="AR内容组ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('posX')"
-                                prop="posX"
-                                label="坐标X"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('posY')"
-                                prop="posY"
-                                label="坐标Y"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('posZ')"
-                                prop="posZ"
-                                label="坐标Z"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('angle')"
-                                prop="angle"
-                                label="角度"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark1')"
-                                prop="remark1"
-                                label="备注1"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark2')"
-                                prop="remark2"
-                                label="备注2"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark3')"
-                                prop="remark3"
-                                label="备注3"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('vuforiaImage')"
-                                prop="vuforiaImage"
-                                label="识别图"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.vuforiaImage" @click="showImg(row.vuforiaImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="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>
@@ -173,15 +95,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">
@@ -202,16 +116,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>
@@ -241,8 +153,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>
@@ -276,360 +187,359 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '所属图集ID',
+                    value: 'vuforiaImageGroupId',
+                    show: true
+                },
+                {
+                    label: '识别图名称',
+                    value: 'name',
+                    show: true
+                },
+                {
+                    label: '识别图类型ID',
+                    value: 'vuforiaImageTypeId',
+                    show: true
+                },
+                {
+                    label: '区域标记编号',
+                    value: 'areaMarking',
+                    show: true
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'landMarkId',
+                    show: true
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'arContentGroupId',
+                    show: true
+                },
+                {
+                    label: '坐标X',
+                    value: 'posX',
+                    show: true
+                },
+                {
+                    label: '坐标Y',
+                    value: 'posY',
+                    show: true
+                },
+                {
+                    label: '坐标Z',
+                    value: 'posZ',
+                    show: true
+                },
+                {
+                    label: '角度',
+                    value: 'angle',
+                    show: true
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1',
+                    show: true
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2',
+                    show: true
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3',
+                    show: true
+                },
+                {
+                    label: '识别图',
+                    value: 'vuforiaImage',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '所属图集ID',
+                    value: 'vuforia_image_group_id'
+                },
+                {
+                    label: '识别图名称',
+                    value: 'name'
+                },
+                {
+                    label: '识别图类型ID',
+                    value: 'vuforia_image_type_id'
+                },
+                {
+                    label: '区域标记编号',
+                    value: 'area_marking'
+                },
+                {
+                    label: '所属地标ID',
+                    value: 'land_mark_id'
+                },
+                {
+                    label: 'AR内容组ID',
+                    value: 'ar_content_group_id'
+                },
+                {
+                    label: '坐标X',
+                    value: 'pos_x'
+                },
+                {
+                    label: '坐标Y',
+                    value: 'pos_y'
+                },
+                {
+                    label: '坐标Z',
+                    value: 'pos_z'
+                },
+                {
+                    label: '角度',
+                    value: 'angle'
+                },
+                {
+                    label: '备注1',
+                    value: 'remark1'
+                },
+                {
+                    label: '备注2',
+                    value: 'remark2'
+                },
+                {
+                    label: '备注3',
+                    value: 'remark3'
+                },
+                {
+                    label: '识别图',
+                    value: 'vuforia_image'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '所属图集ID',
-                                value: 'vuforiaImageGroupId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图名称',
-                                value: 'name',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图类型ID',
-                                value: 'vuforiaImageTypeId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '区域标记编号',
-                                value: 'areaMarking',
-                                show: true
-                            },
-                                                                                                {
-                                label: '所属地标ID',
-                                value: 'landMarkId',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'AR内容组ID',
-                                value: 'arContentGroupId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '坐标X',
-                                value: 'posX',
-                                show: true
-                            },
-                                                                                                {
-                                label: '坐标Y',
-                                value: 'posY',
-                                show: true
-                            },
-                                                                                                {
-                                label: '坐标Z',
-                                value: 'posZ',
-                                show: true
-                            },
-                                                                                                {
-                                label: '角度',
-                                value: 'angle',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注1',
-                                value: 'remark1',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注2',
-                                value: 'remark2',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注3',
-                                value: 'remark3',
-                                show: true
-                            },
-                                                                                                {
-                                label: '识别图',
-                                value: 'vuforiaImage',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '所属图集ID',
-                                value: 'vuforia_image_group_id'
-                            },
-                                                                                                {
-                                label: '识别图名称',
-                                value: 'name'
-                            },
-                                                                                                {
-                                label: '识别图类型ID',
-                                value: 'vuforia_image_type_id'
-                            },
-                                                                                                {
-                                label: '区域标记编号',
-                                value: 'area_marking'
-                            },
-                                                                                                {
-                                label: '所属地标ID',
-                                value: 'land_mark_id'
-                            },
-                                                                                                {
-                                label: 'AR内容组ID',
-                                value: 'ar_content_group_id'
-                            },
-                                                                                                {
-                                label: '坐标X',
-                                value: 'pos_x'
-                            },
-                                                                                                {
-                                label: '坐标Y',
-                                value: 'pos_y'
-                            },
-                                                                                                {
-                                label: '坐标Z',
-                                value: 'pos_z'
-                            },
-                                                                                                {
-                                label: '角度',
-                                value: 'angle'
-                            },
-                                                                                                {
-                                label: '备注1',
-                                value: 'remark1'
-                            },
-                                                                                                {
-                                label: '备注2',
-                                value: 'remark2'
-                            },
-                                                                                                {
-                                label: '备注3',
-                                value: 'remark3'
-                            },
-                                                                                                {
-                                label: '识别图',
-                                value: 'vuforia_image'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        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: '/vuforiaImageInfo/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/vuforiaImageInfo/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: '/vuforiaImageInfo',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/vuforiaImageInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            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 + "/vuforiaImageInfo/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/vuforiaImageInfo/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/vuforiaImageInfo/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/vuforiaImageInfo/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

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

@@ -218,6 +218,12 @@ const router = new Router({
                     component: () =>
                         import ('../pages/ArContentTemplate')
                 },
+                {
+                    path: '/arContentTemplates',
+                    name: 'arContentTemplates',
+                    component: () =>
+                        import ('../pages/ArContentTemplates')
+                },
                 {
                     path: '/marketMap',
                     name: 'MarketMap',

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.54d9583e8d7b01d17c069994c453f14e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ee9655a2d9c044957f7.js></script><script type=text/javascript src=/static/js/vendor.e45891dc2e3759c91121.js></script><script type=text/javascript src=/static/js/admin.40932256d9566e11f5d4.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.c14e12d11a837e928825ffcf333bfd15.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0ca432bd7a3678a4eab.js></script><script type=text/javascript src=/static/js/vendor.87388ab3d5eb77ae8453.js></script><script type=text/javascript src=/static/js/admin.9f15d04a4f46e56ce472.js></script></body></html>

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ee9655a2d9c044957f7.js></script><script type=text/javascript src=/static/js/vendor.e45891dc2e3759c91121.js></script><script type=text/javascript src=/static/js/loginAdmin.503b7a5df8a33b3fe30a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0ca432bd7a3678a4eab.js></script><script type=text/javascript src=/static/js/vendor.87388ab3d5eb77ae8453.js></script><script type=text/javascript src=/static/js/loginAdmin.ff5a92fe0fb6a486056d.js></script></body></html>

src/main/webapp/static/js/57.c06efdf5e546168bb03e.js → src/main/webapp/static/js/59.a0783c67e57349c11484.js

@@ -1 +1 @@
-webpackJsonp([57],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
+webpackJsonp([59],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});

src/main/webapp/static/js/65.a7f9133528374df1b30a.js → src/main/webapp/static/js/68.4fd31c8d56549137d57b.js

@@ -1 +1 @@
-webpackJsonp([65],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});
+webpackJsonp([68],{izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("xnY9")},"data-v-04168182",null);e.default=c.exports},xnY9:function(t,e){}});