瀏覽代碼

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

YaolongHan 4 年之前
父節點
當前提交
e81175c92d
共有 3 個文件被更改,包括 12 次插入8 次删除
  1. 5 5
      package.json
  2. 2 3
      src/components/Rotation/src/rotation.vue
  3. 5 0
      src/views/overview/picViewRotation.vue

+ 5 - 5
package.json

@@ -11,11 +11,11 @@
     },
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
-        "@saga-web/base": "2.1.24",
-        "@saga-web/big": "1.0.97",
-        "@saga-web/draw": "2.1.105",
-        "@saga-web/feng-map": "1.0.31",
-        "@saga-web/graph": "2.1.118",
+        "@saga-web/base": "2.1.25",
+        "@saga-web/big": "1.0.100",
+        "@saga-web/draw": "2.1.106",
+        "@saga-web/feng-map": "1.0.35",
+        "@saga-web/graph": "2.1.119",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 2 - 3
src/components/Rotation/src/rotation.vue

@@ -180,6 +180,8 @@ export default {
     }
     img {
         height: 100%;
+        height: 100%;
+        object-fit: contain;
     }
     .rotationCon {
         height: 100%;
@@ -190,8 +192,5 @@ export default {
         text-align: center;
         background: #fff;
     }
-    img {
-        width: 100%;
-    }
 }
 </style>

+ 5 - 0
src/views/overview/picViewRotation.vue

@@ -81,16 +81,21 @@ export default {
         }
         img {
             height: 100%;
+            object-fit: contain;
         }
     }
 
     .rotationCon {
+        width: 100%;
+        height: 100%;
         /deep/ .el-carousel__item {
             text-align: center;
             background: #fff;
         }
         img {
             width: 100%;
+            height: 100%;
+            object-fit: contain;
         }
     }
 }