Browse Source

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

shaun-sheep 4 years ago
parent
commit
0953e00106

+ 8 - 1
src/assets/css/rotation.less

@@ -1,7 +1,8 @@
 .overview {
 .overview {
     background: #f2f5f7;
     background: #f2f5f7;
     padding: 16px 20px 20px 20px;
     padding: 16px 20px 20px 20px;
-    height: 100%;
+    // height: 100%;
+    height: calc(100% - 48px);
     width: 100%;
     width: 100%;
     .view-title {
     .view-title {
         display: flex;
         display: flex;
@@ -59,6 +60,10 @@
             flex-direction: column;
             flex-direction: column;
             .lb-left {
             .lb-left {
                 width: 100%;
                 width: 100%;
+                // TODO: lb-left
+                // max-height: 300px;
+                height: 66%;
+                // overflow: hidden;
                 flex: 1;
                 flex: 1;
                 margin-top: 12px;
                 margin-top: 12px;
                 margin-bottom: 10px;
                 margin-bottom: 10px;
@@ -188,6 +193,8 @@
                 flex-direction: column;
                 flex-direction: column;
                 .lb-right {
                 .lb-right {
                     flex: 1;
                     flex: 1;
+                    // TODO: lb-right
+                    height: 47%;
                     margin-top: 12px;
                     margin-top: 12px;
                     margin-bottom: 10px;
                     margin-bottom: 10px;
                     position: relative;
                     position: relative;

+ 6 - 1
src/components/Rotation/src/rotation.vue

@@ -5,7 +5,7 @@
 */
 */
 <template>
 <template>
     <div class='rotation'>
     <div class='rotation'>
-        <div v-if='rotationImg.length==1' height='100%'>
+        <div v-if='rotationImg.length==1' class='rotationCon'>
             <!-- <img
             <!-- <img
                 src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
                 src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
                 alt
                 alt
@@ -33,7 +33,12 @@ export default {
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 .rotation {
 .rotation {
+    width: 100%;
     height: 100%;
     height: 100%;
+    overflow: hidden;
+    .rotationCon {
+        height: 100%;
+    }
     img {
     img {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;

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

@@ -243,7 +243,7 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
-@import '../../assets/css/rotation.css';
+@import '../../assets/css/rotation.less';
 </style>
 </style>
 <style lang="less">
 <style lang="less">
 .view-right-bottom {
 .view-right-bottom {

+ 3 - 2
src/views/overview/picModal.vue

@@ -5,7 +5,7 @@
                 src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
                 src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
                 alt
                 alt
             />-->
             />-->
-            <rotation v-if='rotationImg.length>0' :rotationImg='rotationImg' style='height:700px;'></rotation>
+            <rotation v-if='rotationImg.length>0' :rotationImg='rotationImg' style='height:100%;'></rotation>
             <span class='close' @click='close'>X</span>
             <span class='close' @click='close'>X</span>
         </el-dialog>
         </el-dialog>
     </div>
     </div>
@@ -53,7 +53,7 @@ export default {
 <style lang='less'>
 <style lang='less'>
 .picDia {
 .picDia {
     .el-dialog {
     .el-dialog {
-        height: 90%;
+        height: 88%;
         margin-top: 5vh !important;
         margin-top: 5vh !important;
         position: relative;
         position: relative;
         .el-dialog__header {
         .el-dialog__header {
@@ -61,6 +61,7 @@ export default {
         }
         }
         .el-dialog__body {
         .el-dialog__body {
             padding: 0;
             padding: 0;
+            height: 100%;
         }
         }
     }
     }
 }
 }