Parcourir la source

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

zhulizhen1111 il y a 4 ans
Parent
commit
c5d8265d4d

+ 76 - 19
package-lock.json

@@ -1102,40 +1102,84 @@
             "dev": true
         },
         "@saga-web/base": {
-            "version": "2.1.9",
-            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/base/-/base-2.1.9.tgz",
-            "integrity": "sha512-DE0rH2m25O3yCK1b1VXSX3tYUHBBEcQnrkjh72SctsFGK2jdS7XBE4+1x8szajvPIOkH05wMoUC2EsmJsZAhvQ=="
+            "version": "2.1.14",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/base/-/base-2.1.14.tgz",
+            "integrity": "sha512-mmoFJ6Bsg/ui2aqhwNdRPTj6meAEEVPAK+jjTmHWqDSsjVbAqNeSAKL04Cr0UtOqgi4+6P3Ys9klZgITHDpiFw=="
         },
         "@saga-web/big": {
-            "version": "1.0.6",
-            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.6.tgz",
-            "integrity": "sha512-YG3KlxfUGN1oBlbIUzC2WiGMia6lwlc+oOXubeMvUC1t5EUA+XwVGlOj26opoAacmDrEaGVzcaG3gclWY0uDaQ==",
+            "version": "1.0.16",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.16.tgz",
+            "integrity": "sha512-TA9F8KSG+Y0YxIOmxrMQ8s9fxCA88wU8JU7mBNYSvFwQrQ1Ur85rhIw3dn7uXBi3qPIUVvhee5hh1lXFPUSfJw==",
             "requires": {
-                "@saga-web/graphy": "2.1.52"
+                "@saga-web/graph": "2.1.65"
             }
         },
         "@saga-web/draw": {
-            "version": "2.1.80",
-            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.80.tgz",
-            "integrity": "sha512-sbVSq8xNuL60Yj0OJAEF96LkhDrQE5lClOiU6n7XAgyreUW03E1YdmM35a8J3rIJ4yOWh+5WK8Tnoc1NpaI4hw==",
+            "version": "2.1.84",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.84.tgz",
+            "integrity": "sha512-j7sM0NSB6+uq+83ZqvZfX+IasUBUE7C06Agtqn+yQu93bWChR9/aM7pYcwMaVrFk3UysjKSsiFmhFMkVzVJcyA==",
             "requires": {
-                "@saga-web/base": "^2.1.9"
+                "@saga-web/base": "^2.1.12"
             }
         },
         "@saga-web/feng-map": {
-            "version": "1.0.4",
-            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/feng-map/-/feng-map-1.0.4.tgz",
-            "integrity": "sha512-p3QbLTuDkXPSnPQNNp790Of3JbkdshOfEyguW3xj7Y+zzY9BgryR1elwY1zPU0JdayPCPcUvi9bvhRvsmrfd/A==",
+            "version": "1.0.6",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/feng-map/-/feng-map-1.0.6.tgz",
+            "integrity": "sha512-2/BRDFYsc1HdyThxL703NDI229e1+GjRCcUUYTvVpgGp8QkKy5tJQffCp+FSl4x7IgVYeD1ciFqoY89zzxXRIw==",
+            "requires": {
+                "@saga-web/big": "1.0.9"
+            },
+            "dependencies": {
+                "@saga-web/big": {
+                    "version": "1.0.9",
+                    "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.9.tgz",
+                    "integrity": "sha512-TjxNbh06eYoXCkkT1Uvo0rejjvrhzGqTSdkIQCBrsCHiX+EFY6/7x0DRq3yWSjmk1p92BJ3iDq1hHRl/xwZERQ==",
+                    "requires": {
+                        "@saga-web/graphy": "2.1.54"
+                    }
+                },
+                "@saga-web/draw": {
+                    "version": "2.1.82",
+                    "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.82.tgz",
+                    "integrity": "sha512-69guXPLfDZnAHC2sluakctR9ajDztbir5e3ilYjEpuBZnR5BepnlFp7sxvtui6v2SUBt7V2TmYOji99ix63MIw==",
+                    "requires": {
+                        "@saga-web/base": "^2.1.9"
+                    }
+                },
+                "@saga-web/graphy": {
+                    "version": "2.1.54",
+                    "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.54.tgz",
+                    "integrity": "sha512-rx7DNqaB2cZvpqRii0B/BZUrsNN2JGzFA05DyTV1epr+xBed0udLaa2x3mC0bxzZZZvdhNE/0mBIWboxiYxp0Q==",
+                    "requires": {
+                        "@saga-web/draw": "2.1.82"
+                    }
+                }
+            }
+        },
+        "@saga-web/graph": {
+            "version": "2.1.65",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.65.tgz",
+            "integrity": "sha512-IHSm612oEIZXqJReECMw46C9y0lyOJz8LxbHm8gWpo4BOT0PuhokyiRM2PyfFEVW1DMr/Rtgw2QOpf3UCud9mA==",
             "requires": {
-                "@saga-web/big": "1.0.6"
+                "@saga-web/draw": "2.1.84"
             }
         },
         "@saga-web/graphy": {
-            "version": "2.1.52",
-            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.52.tgz",
-            "integrity": "sha512-65lxavb4btJluSFnZ4KCqOZcsH2ksXfHy6XMWNZzTqxqgjP15ZJvT4uLxBdP+2G8SkStVRNkXIAstnroo9XLjA==",
+            "version": "2.1.58",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.58.tgz",
+            "integrity": "sha512-R2S0IgK3sVmhizgbLbjeuUuj/6GsqRGggV5KxoHa0R7G17h7xd4IuAhxRGcSyP4xpUF7Sus6wj8xg4jYyfsW7A==",
             "requires": {
-                "@saga-web/draw": "2.1.80"
+                "@saga-web/draw": "2.1.81"
+            },
+            "dependencies": {
+                "@saga-web/draw": {
+                    "version": "2.1.81",
+                    "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.81.tgz",
+                    "integrity": "sha512-fmMHl3lYyGcQFvGlHf/gSYq+hgwuat20Mf3znThG1ABuSM0HserlFmCkjr+mTdYViB6EnzqKspeM0L+90jbH8A==",
+                    "requires": {
+                        "@saga-web/base": "^2.1.9"
+                    }
+                }
             }
         },
         "@soda/friendly-errors-webpack-plugin": {
@@ -10799,6 +10843,11 @@
             "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
             "dev": true
         },
+        "tiny-cookie": {
+            "version": "1.0.1",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/tiny-cookie/-/tiny-cookie-1.0.1.tgz",
+            "integrity": "sha1-dTeGB5xkKjw9CyrMrWAPjeEZrCo="
+        },
         "tinycolor2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
@@ -11280,6 +11329,14 @@
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
             "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
         },
+        "vue-cookie": {
+            "version": "1.1.4",
+            "resolved": "http://192.168.200.80:8081/repository/npm-saga/vue-cookie/-/vue-cookie-1.1.4.tgz",
+            "integrity": "sha1-uLRtESvan5Oi9HAXwu1SgtIGT9o=",
+            "requires": {
+                "tiny-cookie": "^1.0"
+            }
+        },
         "vue-eslint-parser": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz",

+ 5 - 5
package.json

@@ -8,11 +8,11 @@
         "lint": "vue-cli-service lint"
     },
     "dependencies": {
-        "@saga-web/base": "2.1.9",
-        "@saga-web/big": "1.0.6",
-        "@saga-web/draw": "2.1.80",
-        "@saga-web/feng-map": "1.0.4",
-        "@saga-web/graphy": "2.1.52",
+        "@saga-web/base": "^2.1.9",
+        "@saga-web/big": "^1.0.6",
+        "@saga-web/draw": "^2.1.80",
+        "@saga-web/feng-map": "^1.0.4",
+        "@saga-web/graphy": "^2.1.52",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 4 - 2
src/components/Legend/src/legend.vue

@@ -10,7 +10,7 @@
             <el-collapse-transition>
                 <div class='legend-tab' v-if='show'>
                     <div class='legend-table'>
-                        <lengend-view :tableData='tableData' :swich='value1'></lengend-view>
+                        <lengend-view :tableData='tableData' @changeSwitch='handleSwich'></lengend-view>
                     </div>
                 </div>
             </el-collapse-transition>
@@ -55,7 +55,6 @@ export default {
             text: '1.主要设备房包括:制冷机房、生活水泵房、消防泵房2.图例后    的数字,代表此位置的数量',
             show: false,
             show2: false,
-            value1: true,
             dataSelect2: [
                 { id: 'test1', name: '选择项' },
                 { id: 'test2', name: '单平米' },
@@ -182,6 +181,9 @@ export default {
         editTl() {
             this.show = false
             this.show2 = true
+        },
+        handleSwich(val) {
+            console.log(val)
         }
     },
     watch: {

+ 3 - 1
src/components/floorList.vue

@@ -36,7 +36,9 @@ export default {
             num: 0
         }
     },
-    mounted() {},
+    mounted() {
+        this.tabFloor('1F')
+    },
     computed: {
         ...mapGetters(['floorsArr'])
     },

+ 8 - 3
src/components/viewLengend.vue

@@ -22,7 +22,7 @@
             </el-table-column>
         </el-table>
         <div class='swich'>
-            <el-switch v-model='swich'></el-switch>
+            <el-switch v-model='swich' @change='handleSwich'></el-switch>
             <span>隐藏数量为0的项目</span>
         </div>
         <div class='remark'>
@@ -37,13 +37,18 @@
 </template>
 <script>
 export default {
-    props: ['tableData', 'swich'],
+    props: ['tableData'],
     data() {
-        return {}
+        return {
+            swich: true
+        }
     },
     methods: {
         handleSelectionChange(val) {
             this.multipleSelection = val
+        },
+        handleSwich() {
+            this.$emit('changeSwitch', this.swich)
         }
     },
     mounted() {}