zhulizhen1111 4 年 前
コミット
33bde32570

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

@@ -122,7 +122,22 @@ export default {
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'floorSelect'])
     },
-    props: ['systemName', 'floors', 'type'],
+    props: {
+        floors: {
+            default: () => {
+                ;[]
+            },
+            type: Array
+        },
+        type: {
+            default: '1',
+            type: String
+        },
+        systemName: {
+            default: '',
+            type: String
+        }
+    },
     components: { lengendView, legendRemarks, lengendEdit },
     methods: {
         testClick(data) {},
@@ -330,6 +345,7 @@ export default {
     position: fixed;
     bottom: 28px;
     z-index: 1;
+     right: 28px;
     .edit-icon,
     .edit-icon2 {
         width: 48px;

+ 1 - 1
src/components/floorList.vue

@@ -244,7 +244,7 @@ export default {
         padding: 28px 4px;
         text-align: center;
         .floor-out {
-            height: 260px;
+            max-height: 260px;
             overflow: hidden;
             // overflow-y: auto;
             position: relative;

+ 7 - 4
src/views/equipment/eqDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <!-- 设备设施的三级路由的tabs -->
+    <!-- 设备设施的三级路由的tabs ,八大系统和7个二级菜单共用了一个全屏弹框-->
     <div class='dialog-container'>
         <el-dialog :visible.sync='visible' :fullscreen='true'>
             <!-- 除了清单和原理页面,别的都有记录事项detailDialog页面 -->
@@ -53,6 +53,7 @@
                     <template v-for='(value,index) in dialogInfo.children'>
                         <template v-for='(eve,index1) in tabCount'>
                             <template v-if='eve.typecode == value.param.type_code'>
+                                <!-- 原理图分出来写,因为要判断没有图片的时候不显示tab,如果都没有则都不显示系统原理图 -->
                                 <el-tab-pane
                                     :key='index1+index'
                                     :label='`${value.label}`'
@@ -64,13 +65,14 @@
                                         <rotation :rotationImg='rotationImg'></rotation>
                                     </div>
                                 </el-tab-pane>
+                                <!-- 发布之后的编辑器的分支图 -->
                                 <el-tab-pane
                                     :key='index1+index'
                                     :label='`${value.label}`'
                                     :name='`${value.param.type_code}`'
                                     v-if='value.id.slice(2,4)=="YL" && value.param.type_code=="FBT"'
                                 >
-                                    <fenbuPic></fenbuPic>
+                                    <fenbuPic ref='fenbutu'></fenbuPic>
                                 </el-tab-pane>
                             </template>
                         </template>
@@ -151,10 +153,11 @@ export default {
             if (this.dialogInfo.children.length > 0) {
                 this.typecode = this.dialogInfo.children[`${tab.index}`].param.type_code
                 this.diff = this.dialogInfo.children[`${tab.index}`].param.diff
-            }     
-            if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL' && this.typecode!="FBT") {
+            }
+            if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL' && this.typecode != 'FBT') {
                 this.initImage(this.typecode)
             }
+           
             this.tabLabel = tab.label
         },
         visibalBox() {

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

@@ -55,7 +55,7 @@ export default {
         getFloorData() {
             let postParams = {
                 Distinct: true,
-                Filters: "projectId ='1000423';categoryId='LCGN' or categoryId='XFBFYCFL';isPub=true",
+                Filters: `projectId =${this.$store.state.plazaId};categoryId='LCGN' or categoryId='XFBFYCFL';isPub=true`,
                 PageNumber: 1,
                 PageSize: 500,
                 Projection: ['floorId']
@@ -69,7 +69,7 @@ export default {
                     floor = res.Content
                     this.floorsArr.forEach(el => {
                         floor.forEach(ele => {
-                            if (ele.floorId == el.gname) {
+                            if (ele.FloorId == el.gname) {
                                 this.floors.push({
                                     gname: el.gname,
                                     code: el.code
@@ -83,7 +83,7 @@ export default {
         }
     },
     mounted() {
-        // this.getFloorData()
+        this.getFloorData()
         // this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }

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

@@ -25,7 +25,7 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend :systemName='systemName' :floor='floorsArr' type='1'></Legend>
+                            <Legend :systemName='systemName' :floors='floorsArr' type='1'></Legend>
                         </div>
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>

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

@@ -5,7 +5,7 @@
         </div>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :floor='floorsArr' type='1'></Legend>
+            <Legend :floors='floorsArr' type='1'></Legend>
         </div>
         <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' :type='1' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <!-- <div class='additional-box'>