浏览代码

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

zhulizhen1111 4 年之前
父节点
当前提交
eae3f5636c

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

@@ -8,12 +8,12 @@
         <div class='legend-container'>
             <div :class='showView===1?"legend2":"legend"' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage && legendTable.length>0'>图例</div>
             <!-- 图里展示状态组件 -->
-            <el-collapse-transition v-show='(type==1 || floors.length>0)&& isMessage && legendTable.length>0'>
-                <div class='legend-tab' v-show='showView===1'>
-                    <div class='legend-table2' v-show='systemName=="土建装饰"'>
+            <el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage && legendTable.length>0'>
+                <div class='legend-tab' v-if='showView===1'>
+                    <div class='legend-table2' v-if='systemName=="土建装饰"'>
                         <lengend-view @changeSwitch='handleSwich' ref='viewLengend' :systemName='systemName'></lengend-view>
                     </div>
-                    <div class='legend-table' v-show='systemName!="土建装饰"'>
+                    <div class='legend-table' v-else>
                         <div>
                             <lengend-view @changeSwitch='handleSwich' ref='viewLengend' :systemName='systemName'></lengend-view>
                         </div>
@@ -22,7 +22,7 @@
             </el-collapse-transition>
             <!-- 图例编辑状态组件 -->
             <el-collapse-transition>
-                <div v-show='showView===2'>
+                <div v-if='showView===2'>
                     <lengend-edit
                         @changeSwitch='handleSwich'
                         v-if='editTable.length>0'
@@ -204,11 +204,11 @@ export default {
                 }
             },
             deep: true
-        },
-        '$refs.viewLengend':{
-            handler(newV,oldV) {
-                this.$refs.viewLengend.setSelected()
-            }
+        }
+    },
+    '$refs.viewLengend': {
+        handler(newV, oldV) {
+            this.$refs.viewLengend.setSelected()
         }
     },
     methods: {

+ 14 - 3
src/components/floorMap/index.vue

@@ -164,9 +164,20 @@ export default {
                 }
                 //土建装饰的图例展示
                 if (this.$cookie.get('categoryId') == 'SCPZ') {
-                    let scpzTable = []
+                    let scpzTable = [],
+                        arr = []
                     scpzTable = data.Data[0].Elements.Nodes || []
-                    this.$store.commit('SETSCPZTABLE', scpzTable)
+                    console.log(scpzTable)
+                    if (scpzTable.length > 0) {
+                        scpzTable.forEach(e => {
+                            if (e.Properties.ItemExplain) {
+                                let obj = e
+                                arr.push(obj)
+                            }
+                        })
+                    }
+                    console.log(arr)
+                    this.$store.commit('SETSCPZTABLE', arr)
                 }
                 // 放到后边 $cookie graphId
                 this.$cookie.set('graphId', data.Data[0].ID, 3)
@@ -306,7 +317,7 @@ export default {
         // 保存为png
         savePng() {
             // this.view.saveImage(`${this.loadName}.png`, 'png')
-            this.view.saveImageSize(`${this.loadName}.png`, 'png', 1920*2, 1080*2)
+            this.view.saveImageSize(`${this.loadName}.png`, 'png', 1920 * 2, 1080 * 2)
             //console.log(`${this.loadName}.png`)
         },
         // 保存为svg

+ 15 - 3
src/components/viewLengend.vue

@@ -4,7 +4,7 @@
 *@info:图例展示状态
 */
 <template>
-    <div class='views'>
+    <div class='views view-lengend-current'>
         <div v-if='systemName=="土建装饰"'>
             <el-table
                 ref='dataTable'
@@ -15,7 +15,7 @@
             >
                 <el-table-column prop label='说明'>
                     <template slot-scope='{row}' v-if='row.Properties && row.Properties.ItemExplain'>
-                        <span>{{row.Properties.ItemExplain}}</span>
+                        <div>{{row.Properties.ItemExplain}}</div>
                     </template>
                 </el-table-column>
                 <el-table-column prop label='图例' width='60' align='center'>
@@ -116,7 +116,9 @@ export default {
         // }
         // }
     },
-    mounted() {},
+    mounted() {
+        console.log(this.remarksText)
+    },
     created() {}
 }
 </script>
@@ -149,6 +151,7 @@ export default {
         .remark-text {
             white-space: normal;
             word-break: break-all;
+
             p {
                 padding: 0;
             }
@@ -169,6 +172,15 @@ export default {
 }
 </style>
 <style lang="less">
+.view-lengend-current {
+    ol {
+        list-style: decimal !important;
+        padding-left: 1.5em;
+        li {
+            list-style: decimal !important;
+        }
+    }
+}
 .views {
     .el-input--mini .el-input__inner {
         width: 50px;

+ 13 - 10
src/views/overview/index.vue

@@ -308,17 +308,20 @@ export default {
         },
         picClick(type) {
             if (type === '1') {
-                if (this.pic1.length >= this.va) {
-                    this.$refs.picModal.showModal([this.pic1[this.va - 1]])
-                } else {
-                    this.$refs.picModal.showModal(this.pic1)
-                }
+                this.$refs.picModal.showModal(this.pic1)
+                //     if (this.pic1.length >= this.va) {
+                //         this.$refs.picModal.showModal([this.pic1[this.va - 1]])
+                //     } else {
+                //         this.$refs.picModal.showModal(this.pic1)
+                //     }
             } else {
-                if (this.pic2.length >= this.va) {
-                    this.$refs.picModal.showModal([this.pic2[this.va - 1]])
-                } else {
-                    this.$refs.picModal.showModal(this.pic2)
-                }
+                this.$refs.picModal.showModal(this.pic2)
+
+                //     if (this.pic2.length >= this.va) {
+                //         this.$refs.picModal.showModal([this.pic2[this.va - 1]])
+                //     } else {
+                //         this.$refs.picModal.showModal(this.pic2)
+                //     }
             }
         },
         findxmzl() {

+ 2 - 2
src/views/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='overview'>
         <!-- 顶部路由 -->
-        <div class='menu'>
+        <!-- <div class='menu'>
             <div class='home' @click='$emit("update:modelNum", 0)'>
                 <div class='downright'></div>
                 <div class='home-box'>
@@ -14,7 +14,7 @@
                     <span class='span3'>{{times}}</span>
                 </span>
             </div>
-        </div>
+        </div> -->
         <!-- 面包屑 -->
         <nav class='navigation'>
             <section class='crumbs'>