guoxiaohuan 4 years ago
parent
commit
7c82a17117

+ 1 - 0
src/lib/items/SFHFQZoneLegendItem.js

@@ -181,6 +181,7 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SFHFQZoneLegendItem.ts

@@ -217,6 +217,7 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SLineMarkerItem.js

@@ -114,6 +114,7 @@ export class SLineMarkerItem extends SLineItem {
             }
             painter.drawLine(this.line[0], this.line[1])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SLineMarkerItem.ts

@@ -125,6 +125,7 @@ export class SLineMarkerItem extends SLineItem {
             }
             painter.drawLine(this.line[0], this.line[1])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SSCPZZoneLegendItem.js

@@ -188,6 +188,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SSCPZZoneLegendItem.ts

@@ -225,6 +225,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SZoneLegendItem.js

@@ -182,6 +182,7 @@ export class SZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/SZoneLegendItem.ts

@@ -219,6 +219,7 @@ export class SZoneLegendItem extends SPolygonItem {
             // @ts-ignore
             painter.drawPolygon([...this.pointList])
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/TipelineItem.js

@@ -151,6 +151,7 @@ export class TipelineItem extends SPolylineItem {
             painter.pen.color = color
             painter.drawPolyline(this.pointList)
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 1 - 0
src/lib/items/TipelineItem.ts

@@ -162,6 +162,7 @@ export class TipelineItem extends SPolylineItem {
             painter.pen.color = color
             painter.drawPolyline(this.pointList)
         } else {
+            this.selected = true
             super.onDraw(painter)
         }
     }

+ 18 - 10
src/views/equipment/index.vue

@@ -37,12 +37,15 @@
                                 <img src='../../assets/imgs/bg.png' alt />
                             </div>
                             <el-collapse-transition>
-                                <div v-if='showView===3' class='add-img'>
-                                    <img :src='fqPic[0].url' alt />
+                                <div v-if='showView===3' class='add-img-container'>
+                                    <div class='add-img'>
+                                        <img :src='fqPic[0].url' alt />
+                                    </div>
                                 </div>
                             </el-collapse-transition>
                         </div>
                     </div>
+
                     <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' @emitFloor='emitFloor' id='system'></floor-list>
                 </div>
             </div>
@@ -307,10 +310,10 @@ export default {
                             background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
                             box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
                         }
-                        .add-img {
+                        .add-img-container {
                             width: 560px;
                             height: 360px;
-                            overflow: auto;
+                            overflow: hidden;
                             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);
@@ -320,13 +323,18 @@ export default {
                             right: 77px;
                             bottom: 381px;
                             z-index: 2;
-                            padding: 24px;
-                            img {
+                            padding: 20px;
+                            .add-img {
+                                // padding: 0;
                                 width: 100%;
-                                // max-height: 100%;
-                                // display: block;
-                                // margin: 0 auto;
-                                object-fit: cover;
+                                height: 100%;
+                                overflow: scroll;
+                                img {
+                                    width: 100%;
+                                    // max-height: 100%;
+                                    display: block;
+                                    margin: 0 auto;
+                                }
                             }
                         }
                     }

+ 13 - 5
src/views/other/index.vue

@@ -59,7 +59,8 @@ export default {
             picFloor: '',
             picFloorImg: [],
             dialogInfo: {},
-            floorData: []
+            floorData: [],
+            module: ''
         }
     },
     components: { floorListOther, OtherDialog, ZhsxOther, GcfzDialog },
@@ -155,6 +156,10 @@ export default {
         ...mapGetters(['floorsArr', 'plazaId'])
     },
     mounted() {
+        let module = window.location.href.split('=')[1]
+        if (module == 'comprehensive ') {
+            this.matterId = 1
+        }
         this.everySystem = this.matter[0].children
         this.tabSize()
     }
@@ -241,10 +246,13 @@ export default {
             margin: 0 auto;
             margin-top: 200px;
             img {
-                max-width: 100%;
-                max-height: 100%;
-                display: block;
-                margin: 0 auto;
+                width: 100%;
+                height: 100%;
+                object-fit: cover;
+                // max-width: 100%;
+                // max-height: 100%;
+                // display: block;
+                // margin: 0 auto;
             }
         }
         .fzyfwtp {