guoxiaohuan před 4 roky
rodič
revize
9c253bd5d5

+ 1 - 1
src/components/Legend/src/legend.vue

@@ -535,7 +535,7 @@ export default {
 @red: rgb(255, 0, 0); //红色
 .legend-container {
     position: relative;
-    top: -15px;
+    top: -23px;
     .legend {
         text-align: center;
         line-height: 44px;

+ 1 - 1
src/components/Rotation/src/rotation.vue

@@ -13,7 +13,7 @@
             <img :src='rotationImg[0].url' alt />
             <!-- <img src='./3440.jpg' alt /> -->
         </div>
-        <el-carousel v-else trigger='click' style='height:100%;width:100%' :interval='5000' arrow='always' @change='changePic'>
+        <el-carousel v-else trigger='click' style='height:100%;width:100%' :interval='5000' arrow='always' @change='changePic' :loop='false'>
             <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
                 <img :src='item.url' alt />
             </el-carousel-item>

+ 6 - 1
src/components/floorList.vue

@@ -230,7 +230,7 @@ export default {
 .floor-box {
     position: fixed;
     right: 32px;
-    top: 196px;
+    top: 172px;
     z-index: 2;
     .floor-list {
         width: 44px;
@@ -242,8 +242,13 @@ export default {
         padding: 6px 4px;
         text-align: center;
         .floor-out {
+            max-height: 300px;
             overflow: hidden;
             position: relative;
+            overflow-y: auto;
+            &::-webkit-scrollbar {
+                display: none;
+            }
 
             .floor-center {
                 transition: all linear 0.8s;

+ 1 - 1
src/components/floorListOther.vue

@@ -205,7 +205,7 @@ export default {
 .floor-box {
     position: fixed;
     right: 32px;
-    top: 196px;
+    top: 172px;
     z-index: 2;
     .floor-list {
         width: 44px;

+ 10 - 2
src/shims-vue.d.ts

@@ -1,4 +1,12 @@
 declare module '*.vue' {
-  import Vue from 'vue'
-  export default Vue
+    import Vue from 'vue'
+    export default Vue
 }
+
+declare module 'vue-quill-editor'
+declare module '@/components/Editor'
+declare module '@/components/Rotation'
+declare module '@/components/PicLarge'
+declare module '@/components/Legend'
+declare module 'vue-cookie'
+declare module 'meri-design'

+ 1 - 1
src/views/equipment/fenbuPic.vue

@@ -111,7 +111,7 @@ export default {
         position: fixed;
         z-index: 9;
         right: 32px;
-        top: 155px;
+        top: 142px;
     }
     .canvas-box {
         width: 100%;

+ 20 - 11
src/views/equipment/index.vue

@@ -132,12 +132,14 @@ export default {
         },
         dialogVisible(eve) {
             // console.log('dialogVisible')
-            // console.log(eve)
+            console.log(eve)
             // 点击后显示弹窗组件
-            this.ShowDialog = true
-            this.$nextTick(() => {
-                this.$refs.dialog.showModal(eve)
-            })
+            if (eve.label != '查看图纸') {
+                this.ShowDialog = true
+                this.$nextTick(() => {
+                    this.$refs.dialog.showModal(eve)
+                })
+            }
         },
         /**
          * 关闭弹窗,子组件传回父组件,
@@ -158,7 +160,7 @@ export default {
         // 查询附加数据图片
         queryTable(system) {
             this.fqPic = []
-            let picFloor = this.$cookie.get('floorNow')
+            let picFloor = this.$cookie.get('floorMapId')
             let getParams = {
                 module: '1003',
                 floor: picFloor,
@@ -228,7 +230,12 @@ export default {
         this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {
-        ...mapGetters(['floorsArr', 'plazaId', 'showView', 'legendTable'])
+        ...mapGetters(['floorsArr', 'plazaId', 'showView', 'legendTable']),
+        Height() {
+            console.log(document.body.clientHeight)
+            // return document.body.clientHeight
+            return 300
+        }
     }
 }
 </script>
@@ -344,7 +351,7 @@ export default {
                         position: fixed;
                         z-index: 9;
                         right: 32px;
-                        top: 160px;
+                        top: 142px;
                     }
                     .additional-box {
                         position: relative;
@@ -355,7 +362,7 @@ export default {
                             border-radius: 2px;
                             position: fixed;
                             right: 32px;
-                            top: 510px;
+                            top: 528px;
                             z-index: 2;
                             display: flex;
                             justify-content: center;
@@ -377,7 +384,9 @@ export default {
                         .add-img-container {
                             width: 560px;
                             height: 360px;
-                            overflow: hidden;
+                            // max-height: calc(100% - 60px);
+                            // height: calc(100% - 60px);
+                            overflow: auto;
                             background: #ffffff;
                             -webkit-box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
                             box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
@@ -385,7 +394,7 @@ export default {
                             border: 1px solid #e4e5e7;
                             position: absolute;
                             right: 77px;
-                            bottom: 381px;
+                            bottom: 325px;
                             z-index: 2;
                             padding: 20px;
                             .add-img {

+ 1 - 1
src/views/floorFunc/index.vue

@@ -86,7 +86,7 @@ export default {
         position: fixed;
         z-index: 9;
         right: 32px;
-        top: 155px;
+        top: 142px;
     }
 }
 </style>

+ 1 - 1
src/views/other/index.vue

@@ -236,7 +236,7 @@ export default {
         .legend-boxs {
             position: fixed;
             right: 32px;
-            top: 155px;
+            top: 142px;
         }
     }
     .qtfugl {