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

Разница между файлами не показана из-за своего большого размера
+ 384 - 361
src/main/java/com/izouma/awesomeadmin/dao/AimPlaceContentMapper.xml


+ 21 - 0
src/main/java/com/izouma/awesomeadmin/dao/AimPlacePositionMapper.xml

@@ -18,6 +18,7 @@
         <result column="remark3" property="remark3" jdbcType="VARCHAR"/>
         <result column="front_level_id" property="frontLevelId" jdbcType="VARCHAR"/>
         <result column="owned_land_mark_id" property="ownedLandMarkId" jdbcType="VARCHAR"/>
+        <result column="map_index" property="mapIndex" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -53,6 +54,8 @@
 
             owned_land_mark_id,
 
+            map_index,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -117,6 +120,9 @@
             <if test="ownedLandMarkId!= null">
                 owned_land_mark_id,
             </if>
+            <if test="mapIndex!= null">
+                map_index,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -167,6 +173,9 @@
             <if test="ownedLandMarkId != null">
                 #{ownedLandMarkId,jdbcType=VARCHAR},
             </if>
+            <if test="mapIndex != null">
+                #{mapIndex},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.AimPlacePosition">
@@ -220,6 +229,9 @@
             <if test="ownedLandMarkId != null">
                 owned_land_mark_id= #{ownedLandMarkId,jdbcType=VARCHAR},
             </if>
+            <if test="mapIndex != null">
+                map_index= #{mapIndex},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -295,6 +307,9 @@
             <if test="record.ownedLandMarkId != null and !&quot;&quot;.equals(record.ownedLandMarkId)">
                 and owned_land_mark_id = #{record.ownedLandMarkId}
             </if>
+            <if test="record.mapIndex != null and !&quot;&quot;.equals(record.mapIndex)">
+                and map_index = #{record.mapIndex}
+            </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR name LIKE concat('%',#{record.searchKey},'%')
@@ -555,6 +570,9 @@
             <if test="ownedLandMarkId != null and !&quot;&quot;.equals(ownedLandMarkId)">
                 and owned_land_mark_id = #{ownedLandMarkId}
             </if>
+            <if test="mapIndex != null and !&quot;&quot;.equals(mapIndex)">
+                and map_index = #{mapIndex}
+            </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR name LIKE concat('%',#{searchKey},'%')
@@ -676,6 +694,9 @@
             <if test="ownedLandMarkId != null and !&quot;&quot;.equals(ownedLandMarkId)">
                 and owned_land_mark_id = #{ownedLandMarkId}
             </if>
+            <if test="mapIndex != null and !&quot;&quot;.equals(mapIndex)">
+                and map_index = #{mapIndex}
+            </if>
 
         </where>
         LIMIT 1

+ 9 - 1
src/main/java/com/izouma/awesomeadmin/model/AimPlaceContent.java

@@ -38,7 +38,7 @@ public class AimPlaceContent {
     private String remark4;
     private String remark5;
     private String remark6;
-
+    private Integer mapIndex;
     private List<AimPlaceContentChild> aimPlaceContentChildList;
 
     private String idStr;
@@ -326,5 +326,13 @@ public class AimPlaceContent {
     public void setAimPlaceContentChildList(List<AimPlaceContentChild> aimPlaceContentChildList) {
         this.aimPlaceContentChildList = aimPlaceContentChildList;
     }
+
+    public Integer getMapIndex() {
+        return mapIndex;
+    }
+
+    public void setMapIndex(Integer mapIndex) {
+        this.mapIndex = mapIndex;
+    }
 }
 

+ 10 - 0
src/main/java/com/izouma/awesomeadmin/model/AimPlacePosition.java

@@ -26,6 +26,8 @@ public class AimPlacePosition {
     private String frontLevelId;
     private String ownedLandMarkId;
 
+    private Integer mapIndex;
+
     private List<AimPlacePosition> aimPlacePositionChildList;
 
     private String idStr;
@@ -209,5 +211,13 @@ public class AimPlacePosition {
     public void setAimPlacePositionChildList(List<AimPlacePosition> aimPlacePositionChildList) {
         this.aimPlacePositionChildList = aimPlacePositionChildList;
     }
+
+    public Integer getMapIndex() {
+        return mapIndex;
+    }
+
+    public void setMapIndex(Integer mapIndex) {
+        this.mapIndex = mapIndex;
+    }
 }
 

+ 10 - 0
src/main/vue/src/components/AimPlaceContent.vue

@@ -96,6 +96,10 @@ export default {
             default: () => {
                 return {}
             }
+        },
+        MapWidth: {
+            type: String,
+            default: '1'
         }
     },
     created() {
@@ -168,6 +172,12 @@ export default {
         },
         submit() {
             var data = JSON.parse(JSON.stringify(this.formData));
+            if (this.MapWidth) {
+                if (data.arKitPosX && data.arKitPosY) {
+
+                    data.mapIndex = Number(data.arKitPosX) + Number(data.arKitPosY) * Number(this.MapWidth);
+                }
+            }
             this.$http.post({
                 url: this.formData.id ? '/aimPlaceContent/update' : '/aimPlaceContent/save',
                 data: data

+ 22 - 5
src/main/vue/src/components/AimPlaceContents.vue

@@ -250,13 +250,14 @@
 
         <el-dialog title="目标点内容编辑" :visible.sync="AimPlaceContentShow" width="450px">
             <div>
-                <AimPlaceContent :formData='editAimPlaceContent' @hide='AimPlaceContentShow=false' @update='getData'></AimPlaceContent>
+                <AimPlaceContent :MapWidth='MapWidth' :formData='editAimPlaceContent' @hide='AimPlaceContentShow=false' @update='getData'></AimPlaceContent>
             </div>
         </el-dialog>
 
         <el-dialog title="子集编辑" :visible.sync="AimPlaceContentChildShow" width="450px">
             <div>
-                <AimPlaceContentChild :formData='editAimPlaceContentChild' @hide='AimPlaceContentChildShow=false' @update='getData'></AimPlaceContentChild>
+                
+                <AimPlaceContentChild :formData='editAimPlaceContentChild'  @hide='AimPlaceContentChildShow=false' @update='getData'></AimPlaceContentChild>
             </div>
         </el-dialog>
 
@@ -271,8 +272,14 @@ import AimPlaceContentChild from '../components/AimPlaceContentChild';
 
 export default {
     name: 'AimPlaceContents',
+    props: {
+        MapWidth: {
+            type: String,
+            default: '1'
+        }
+    },
     created() {
-        this.getData();
+        this.getData(1);
     },
     data() {
         return {
@@ -539,7 +546,7 @@ export default {
             this.currentPage = page;
             this.getData();
         },
-        getData() {
+        getData(type) {
 
             var data = {
                 currentPage: this.currentPage,
@@ -564,6 +571,10 @@ export default {
                     this.tableData = res.data.pp;
                 }
             })
+
+             if(type!=1){
+   this.$emit('updatePoint')
+            }
         },
         isColumnShow(column) {
             var row = this.tableColumns.find(i => i.value === column);
@@ -575,10 +586,16 @@ export default {
                 this.$refs.table.clearSelection();
             }
         },
-        addEdit() {
+        addEdit(jsonp) {
+            
             this.editAimPlaceContent = {
                 ownedLandMarkId: this.$route.query.id
             }
+            if(jsonp){
+                this.editAimPlaceContent.arKitPosX=jsonp.X;
+                 this.editAimPlaceContent.arKitPosY=jsonp.Y;
+                  this.editAimPlaceContent.mapIndex=jsonp.index;
+            }
             this.AimPlaceContentShow = true
         },
         addChild(row) {

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

@@ -62,6 +62,10 @@ export default {
             default: () => {
                 return {}
             }
+        },
+        MapWidth: {
+            type: String,
+            default: '1'
         }
     },
     created() {
@@ -155,6 +159,14 @@ export default {
         },
         submit() {
             var data = JSON.parse(JSON.stringify(this.formData));
+
+            if (this.MapWidth) {
+                if (data.posX && data.posY) {
+
+                    data.mapIndex = Number(data.posX) + Number(data.posY) * Number(this.MapWidth);
+                }
+            }
+
             this.$http.post({
                 url: this.formData.id ? '/aimPlacePosition/update' : '/aimPlacePosition/save',
                 data: data

+ 27 - 10
src/main/vue/src/components/AimPlacePositions.vue

@@ -169,7 +169,7 @@
 
         <el-dialog title="子集编辑" :visible.sync="AimPlacePositionShow" width="450px">
             <div>
-                <AimPlacePosition :formData='AimPlacePositionEdit' @hide='AimPlacePositionShow=false' @update='getData'></AimPlacePosition>
+                <AimPlacePosition :MapWidth='MapWidth' :formData='AimPlacePositionEdit' @hide='AimPlacePositionShow=false' @update='getData'></AimPlacePosition>
             </div>
         </el-dialog>
 
@@ -183,8 +183,14 @@ import AimPlacePosition from '../components/AimPlacePosition';
 
 export default {
     name: 'AimPlacePositions',
+    props: {
+        MapWidth: {
+            type: String,
+            default: '1'
+        }
+    },
     created() {
-        this.getData();
+        this.getData(1);
     },
     data() {
         return {
@@ -328,7 +334,7 @@ export default {
             this.currentPage = page;
             this.getData();
         },
-        getData() {
+        getData(type) {
 
             var data = {
                 currentPage: this.currentPage,
@@ -353,6 +359,10 @@ export default {
                     this.tableData = res.data.pp;
                 }
             })
+            if (type != 1) {
+                this.$emit('updatePoint')
+            }
+
         },
         isColumnShow(column) {
             var row = this.tableColumns.find(i => i.value === column);
@@ -364,11 +374,18 @@ export default {
                 this.$refs.table.clearSelection();
             }
         },
-        addEdit(){
-          this.AimPlacePositionEdit={
-ownedLandMarkId:this.$route.query.id
-          }
-           this.AimPlacePositionShow=true
+        addEdit(jsonp) {
+            this.AimPlacePositionEdit = {
+                ownedLandMarkId: this.$route.query.id
+            }
+
+            if (jsonp) {
+                this.AimPlacePositionEdit.posX = jsonp.X;
+                this.AimPlacePositionEdit.posY = jsonp.Y;
+                this.AimPlacePositionEdit.mapIndex = jsonp.index;
+            }
+
+            this.AimPlacePositionShow = true
         },
         editRow(row) {
             // this.$router.push({
@@ -378,9 +395,9 @@ ownedLandMarkId:this.$route.query.id
             //         column: this.$route.query.column,
             //     }
             // })
-            this.AimPlacePositionEdit={...row}
+            this.AimPlacePositionEdit = { ...row }
 
-            this.AimPlacePositionShow=true
+            this.AimPlacePositionShow = true
 
         },
         operation1() {

+ 279 - 0
src/main/vue/src/components/MapInfo.vue

@@ -0,0 +1,279 @@
+<template>
+    <div class="content">
+        <div class="dragContent" :style="{top:bgPosition.top+'px',left:bgPosition.left+'px'}">
+            <img :src="mapImage" class="bgImg" :style="{height:totalHeight-180+'px'}" alt="">
+            <div class="gridInfo">
+                <div class="grid-item" @mousedown="addStart(index)" @mouseover="changeMap(index)" v-for="(item,index) in mapInfo" :style="{width:100/width/rate+'%',height:100/height/rate+'%',backgroundColor:color[item]}">
+
+                    <el-tooltip v-if="checkInMap(index)" class="item" effect="dark" :content="tooltipContent(index)" placement="right">
+                        <i class="el-icon-location-outline"></i>
+                    </el-tooltip>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+export default {
+    name: 'MapInfo',
+    props: {
+        Mapstyle: {
+            type: String,
+            default: 'Content'
+        }
+    },
+    created() {
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/landMark/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
+
+
+                    this.width = res.data.mapWidth || 20;
+                    this.height = res.data.mapHeight || 20;
+                    this.mapRate = res.data.mapRate || 1;
+                    if (res.data.mapInfo) {
+                        this.mapInfo = res.data.mapInfo.split('');
+                    }
+
+                    this.mapImage = res.data.mapSprite || require('../assets/demo_picture.jpg');
+
+
+                }
+            })
+
+            this.getPoint()
+
+
+
+
+        }
+
+
+
+    },
+    data() {
+        return {
+            isDown: false,
+            bgMove: true,
+            bgPosition: {
+                left: 0,
+                top: 0
+            },
+            width: 32,
+            height: 22,
+            rate: 1,
+            mapRate: 1,
+            mapInfo: [],
+            color: ['rgba(111, 189, 39,0.5)', 'rgba(227,98,100,0.4)', 'rgba(83,147,255,0.4)'],
+            nowAdd: 0,
+            startMoveIndex: 0,
+            nowMoveIndex: 0,
+            nowMapInfo: [],
+            mapImage: '',
+            aimPlaceContents: [],
+
+        }
+    },
+    mounted() {
+
+    },
+    computed: {
+        ...mapState(['totalHeight']),
+    },
+    methods: {
+        getPoint() {
+            if (this.Mapstyle == 'Content') {
+                this.$http.get({
+                    url: '/aimPlaceContent/all',
+                    data: {
+                        ownedLandMarkId: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+                        this.aimPlaceContents = res.data;
+                    }
+                })
+            }
+            else {
+                this.$http.get({
+                    url: '/aimPlacePosition/all',
+                    data: {
+                        ownedLandMarkId: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+                        this.aimPlaceContents = res.data;
+                    }
+                })
+            }
+
+        },
+        createMap() {
+            var sum = this.width * this.rate * this.height * this.rate
+            var list = []
+            for (var i = 0; i < sum; i++) {
+                list.push(0)
+            }
+            this.mapInfo = list
+            this.nowAdd = 0
+        },
+        addStart(index) {
+            // this.nowMapInfo = [...this.mapInfo]
+            // this.startMoveIndex = index
+            // this.mapInfo.splice(index, 1, this.nowAdd)
+            // this.addField(index);
+            var val = this.checkInMap(index)
+            if (val) {
+                delete val.aimPlaceContentChildList
+                this.$emit('editPoint', val)
+            }
+            else {
+                this.$emit('addPoint', {
+                    index: index,
+                    X: this.getX(index),
+                    Y: this.getY(index)
+                })
+            }
+
+        },
+        changeMap(index) {
+            if (this.isDown) {
+                this.nowMoveIndex = index
+                console.log(this.getChangeList(this.startMoveIndex, index))
+                this.mapInfo = [...this.nowMapInfo]
+                this.getChangeList(this.startMoveIndex, index).forEach(item => {
+                    this.mapInfo.splice(item, 1, this.nowAdd)
+                })
+            }
+
+        },
+        getX(index) {
+            return index % (this.width * this.rate)
+        },
+        getY(index) {
+            return parseInt(index / (this.width * this.rate))
+        },
+        getChangeList(index1, index2) {
+            var list = []
+            var list1 = [this.getX(index1), this.getX(index2)].sort((a, b) => { return a - b })
+            var list2 = [this.getY(index1), this.getY(index2)].sort((a, b) => { return a - b })
+            for (var i = list1[0]; i <= list1[1]; i++) {
+                for (var j = list2[0]; j <= list2[1]; j++) {
+                    if (list.indexOf(this.getIndex(i, j)) == -1) {
+                        list.push(this.getIndex(i, j))
+                    }
+                }
+            }
+            return list
+        },
+        getIndex(x, y) {
+            return y * (this.width * this.rate) + x
+        },
+        saveMapInfo() {
+
+            if (this.$route.query.id) {
+
+
+                var data = {
+                    id: this.$route.query.id,
+                    mapWidth: this.width,
+                    mapHeight: this.height,
+                    rate: this.rate,
+                    mapInfo: this.mapInfo.join(''),
+                };
+
+                this.$http.post({
+                    url: '/landMark/update',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+
+            }
+        },
+        checkInMap(index) {
+            var check = false;
+            this.aimPlaceContents.forEach(v => {
+                if (index == v.mapIndex) {
+                    check = v;
+                    return false;
+                }
+            });
+
+            return check;
+        },
+        addField(index) {
+            // this.aimPlaceContents.push({
+            //     mapIndex : index
+            // });
+
+            this.$emit('')
+        },
+        tooltipContent(index) {
+            var val = this.checkInMap(index);
+            if (val) {
+                if (this.Mapstyle == 'Content') {
+
+                    return '名称:' + val.name + ' X:' + val.arKitPosX + ' Y:' + val.arKitPosY
+                } else {
+
+                    return '名称:' + val.name + ' X:' + val.posX + ' Y:' + val.posY
+                }
+            }
+        },
+
+
+
+    }
+}
+
+
+
+</script>
+<style lang="less" scoped>
+.content {
+    position: relative;
+}
+.dragContent {
+    position: absolute;
+    top: 60px;
+    left: 0;
+    border: 2px dashed #ccc;
+    // cursor: move;
+    z-index: 1;
+    .gridInfo {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 3;
+        display: flex;
+        flex-wrap: wrap;
+
+        .grid-item {
+            background-color: rgba(0, 0, 0, 0.3);
+            box-sizing: border-box;
+            border: 1px solid rgba(255, 255, 255, 1);
+        }
+    }
+}
+.bgImg {
+    position: relative;
+    width: auto;
+    z-index: 2;
+}
+</style>

+ 4 - 3
src/main/vue/src/pages/DrugContent.vue

@@ -12,7 +12,7 @@
                     <el-input-number v-model="height" :min="1" label="描述文字"></el-input-number>
                 </el-form-item>
                 <el-form-item label="比率">
-                    <el-input-number v-model="rate" label="描述文字"></el-input-number>
+                    <el-input-number v-model="mapRate" label="描述文字"></el-input-number>
                 </el-form-item>
                 <el-form-item>
                     <el-button @click="createMap">生成网格</el-button>
@@ -59,7 +59,7 @@ export default {
 
                     this.width = res.data.mapWidth || 20;
                     this.height = res.data.mapHeight || 20;
-                    this.rate = res.data.mapRate || 1;
+                    this.mapRate = res.data.mapRate || 1;
                     if (res.data.mapInfo) {
                         this.mapInfo = res.data.mapInfo.split('');
                     }
@@ -84,8 +84,9 @@ export default {
             width: 32,
             height: 22,
             rate: 1,
+            mapRate: 1,
             mapInfo: [],
-            color: ['rgba(111, 189, 39,0.1)', 'rgba(227,98,100,0.2)', 'rgba(83,147,255,0.2)'],
+            color: ['rgba(111, 189, 39,0.5)', 'rgba(227,98,100,0.4)', 'rgba(83,147,255,0.4)'],
             nowAdd: 0,
             startMoveIndex: 0,
             nowMoveIndex: 0,

+ 39 - 3
src/main/vue/src/pages/LandMark.vue

@@ -103,10 +103,27 @@
 
             </el-tab-pane>
             <el-tab-pane label="目标点内容" name="2" v-if="this.$route.query.id">
-                <AimPlaceContents></AimPlaceContents>
+
+                <el-container>
+                    <el-aside width="50%">
+                        <AimPlaceContents :MapWidth="formData.mapWidth" ref="PlaceContents" @updatePoint='updatePoint'></AimPlaceContents>
+                    </el-aside>
+                    <el-main>
+                        <Map-info :Mapstyle="'Content'" ref='mapInfo' @addPoint='addContents' @editPoint='editContents'></Map-info>
+                    </el-main>
+                </el-container>
+
             </el-tab-pane>
             <el-tab-pane label="目标点位置" name="3" v-if="this.$route.query.id">
-                <AimPlacePositions></AimPlacePositions>
+
+                <el-container>
+                    <el-aside width="50%">
+                        <AimPlacePositions  :MapWidth="formData.mapWidth" ref="PlacePositions" @updatePoint='updatePoint2'></AimPlacePositions>
+                    </el-aside>
+                    <el-main>
+                        <Map-info :Mapstyle="'Position'" ref='mapInfo2' @addPoint='addPositions' @editPoint='editPositions'></Map-info>
+                    </el-main>
+                </el-container>
             </el-tab-pane>
             <el-tab-pane label="识别图" name="4" v-if="this.$route.query.id">
                 <VuforiaImageInfos></VuforiaImageInfos>
@@ -121,6 +138,7 @@ import CoordinateSelect from '../components/CoordinateSelect';
 import AimPlaceContents from '../components/AimPlaceContents';
 import AimPlacePositions from '../components/AimPlacePositions';
 import VuforiaImageInfos from '../components/VuforiaImageInfos';
+import MapInfo from '../components/MapInfo';
 import { mapState } from 'vuex'
 export default {
     created() {
@@ -211,6 +229,24 @@ export default {
         ...mapState(['totalHeight']),
     },
     methods: {
+        updatePoint2() {
+            this.$refs.mapInfo2.getPoint()
+        },
+        editPositions(jsonp) {
+            this.$refs.PlacePositions.editRow(jsonp)
+        },
+        addPositions(jsonp) {
+            this.$refs.PlacePositions.addEdit(jsonp)
+        },
+        updatePoint() {
+            this.$refs.mapInfo.getPoint()
+        },
+        editContents(jsonp) {
+            this.$refs.PlaceContents.editRow(jsonp)
+        },
+        addContents(jsonp) {
+            this.$refs.PlaceContents.addEdit(jsonp)
+        },
         onSave() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
@@ -266,7 +302,7 @@ export default {
         },
     },
     components: {
-        CoordinateSelect, AimPlaceContents, AimPlacePositions, VuforiaImageInfos
+        CoordinateSelect, AimPlaceContents, AimPlacePositions, VuforiaImageInfos, MapInfo
     }
 }
 </script>

+ 1 - 1
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.f89861d86b9595166f7ca0175db9c77b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a597396432a08e028440.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/admin.f5dc98b86a84993fc744.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.cf83588ef685e55e144589e0fc1488a9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1aeef9f600717138ec4a.js></script><script type=text/javascript src=/static/js/vendor.5100559a821335090ef4.js></script><script type=text/javascript src=/static/js/admin.566e246e750e2124b639.js></script></body></html>

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/css/admin.cf83588ef685e55e144589e0fc1488a9.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/10.34fdcedac488509f08a4.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/10.89ddfb77788b8e5adbe8.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/11.6bd1f0d4126b65c0a5c5.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/7.327181af8a3f0961300c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/7.56621ed84d1312086398.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/admin.566e246e750e2124b639.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/webapp/static/js/manifest.1aeef9f600717138ec4a.js


Некоторые файлы не были показаны из-за большого количества измененных файлов