Explorar o código

图标、楼层弹框

guoxiaohuan %!s(int64=4) %!d(string=hai) anos
pai
achega
85414cdc26

BIN=BIN
src/assets/imgs/bg.png


BIN=BIN
src/assets/imgs/bjbg.png


BIN=BIN
src/assets/imgs/bjtl.png


+ 7 - 10
src/components/Legend/src/legend.vue

@@ -25,7 +25,6 @@
                     <lengend-edit v-if='editTable.length>=0' :loading='loading1' ref='editLen' @saveNum='saveNum' @cance='cance' :editText='editText'></lengend-edit>
                 </div>
             </el-collapse-transition>
-            <edit-list></edit-list>
         </div>
         <div class='edit_map'>
             <el-tooltip class='item' effect='dark' content='编辑平面图' placement='left'>
@@ -35,12 +34,12 @@
             </el-tooltip>
 
             <div class='hover-div'>
-                <span class='icon1' @click='legendClik'>
-                    <a-icon type='form' />
+                <span @click='legendClik'>
+                    <img src='@/assets/imgs/bjbg.png' alt />
                 </span>
                 <el-tooltip class='item' effect='dark' content='编辑图例' placement='left'>
-                    <span class='icon2' @click='editTl'>
-                        <a-icon type='form' />
+                    <span @click='editTl'>
+                        <img src='@/assets/imgs/bjtl.png' alt />
                     </span>
                 </el-tooltip>
             </div>
@@ -49,7 +48,6 @@
     </div>
 </template>
 <script>
-import editList from '@/components/edit.vue'
 import lengendView from '@/components/viewLengend'
 import Remarks from '@/components/legendremarks'
 import lengendEdit from '@/components/editLengend'
@@ -70,7 +68,7 @@ export default {
             loading: false,
             loading1: false,
             viewTable: [],
-            editTable: [],
+            editTable: [{}],
             tbData1: [],
             tbData2: [],
             tbData3: [],
@@ -78,12 +76,13 @@ export default {
             editText: ''
         }
     },
-    components: { editList, lengendView, Remarks, lengendEdit },
+    components: { lengendView, Remarks, lengendEdit },
     methods: {
         testClick(data) {},
         legendClik() {
             this.$refs.EditdMarks.showModal()
         },
+        dump() {},
         editChange(val) {
             this.editText = val
         },
@@ -176,7 +175,6 @@ export default {
 .edit_map {
     position: fixed;
     bottom: 28px;
-    right: 28px;
     z-index: 1;
     .edit-icon {
         width: 48px;
@@ -192,7 +190,6 @@ export default {
     .hover-div {
         position: absolute;
         bottom: 58px;
-        right: 28px;
         .icon1 {
             width: 40px;
             height: 40px;

+ 2 - 2
src/components/editLengend.vue

@@ -5,7 +5,7 @@
 */
 <template>
     <div class='view'>
-        <div class='legend-tab2' v-if='editTable.length>0'>
+        <div class='legend-tab2'>
             <div class='legend-table2-box'>
                 <div class='legend-table2' v-if='tbData1.length>=0'>
                     <el-table
@@ -146,7 +146,7 @@ export default {
         }
     },
     mounted() {
-        this.init()
+        // this.init()
     }
 }
 </script>

+ 14 - 3
src/views/floorFunc/index.vue

@@ -7,9 +7,11 @@
         <div class='legend-boxs'>
             <Legend></Legend>
         </div>
-        <floor-list></floor-list>
+        <floor-list @emitFloor='emitFloor'></floor-list>
         <div class='additional-box'>
-            <div class='additional' @click='additionalColl'></div>
+            <div class='additional' @click='additionalColl'>
+                <img src='../../assets/imgs/bg.png' alt />
+            </div>
             <el-collapse-transition>
                 <div v-if='show' class='add-img'>我是放附加数据图片哒。。。</div>
             </el-collapse-transition>
@@ -33,6 +35,7 @@ export default {
     },
     methods: {
         emitFloor(item) {
+            console.log(item)
             this.floorInfo.floorId = item
             this.$refs.floorMap.init(item)
         },
@@ -82,13 +85,21 @@ export default {
         .additional {
             width: 44px;
             height: 44px;
-            background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+            background: rgba(255, 255, 255, 1);
+            box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
             border-radius: 2px;
             position: fixed;
             right: 32px;
             top: 420px;
             z-index: 2;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             cursor: pointer;
+            img {
+                width: 20px;
+                height: 20px;
+            }
         }
         .add-img {
             width: 560px;