瀏覽代碼

样式调整

zpf 11 月之前
父節點
當前提交
9cfdc3a51c
共有 4 個文件被更改,包括 90 次插入27 次删除
  1. 15 14
      src/views/cockpit/bjxm.vue
  2. 37 10
      src/views/cockpit/hysy.vue
  3. 1 1
      src/views/cockpit/wpjg.vue
  4. 37 2
      src/views/viewer.vue

+ 15 - 14
src/views/cockpit/bjxm.vue

@@ -165,7 +165,7 @@ export default {
         //你的代码
         backgroundColor: 'rgba(17, 42, 62, 0)',//"#012366",
         tooltip: {
-          show:false,
+          show: false,
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
@@ -393,12 +393,12 @@ export default {
 </script>
 <style lang="scss" scoped>
 .bjxm {
-  position: absolute;
-  width: 22vw;
-  border: 1px solid red;
-  height: 17rem;
-  top: 38.5rem;
-  left: 27.5vw;
+  position: relative;
+  // width: 22vw;
+  // border: 1px solid red;
+  // height: 17rem;
+  // top: 41.5rem;
+  // left: 27%;
   border-radius: 0px;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -409,7 +409,7 @@ export default {
 .selectTab {
   position: absolute;
   top: 3px;
-  right: 22px;
+  right: -6px;
   z-index: 100;
 
   /deep/ .el-input__inner {
@@ -478,16 +478,17 @@ export default {
 
 .content {
   position: absolute;
-  left: 5%;
-  width: 400px;
+  left: 1%;
+  width: 100%;
   height: 220px;
-  top: 13%;
+  top: 1.5rem;
 }
 
 .item {
-  width: 45%;
+  width: 49%;
   height: 30%;
   display: inline-block;
+  margin-top: 0.5rem;
 }
 
 .icon {
@@ -538,8 +539,8 @@ export default {
 
 #bjxm_echart {
   position: relative;
-  top: 0.4rem;
-  width: 20.5rem;
+  top: 1rem;
+  width: 21.5vw;
   height: 10rem;
 }
 

+ 37 - 10
src/views/cockpit/hysy.vue

@@ -11,7 +11,22 @@
                 </el-option>
             </el-select>
         </div>
-        <DiscountedAColumnar />
+
+        <div class="hy_tabs">
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane label="期限监测" name="first">
+                    <DiscountedAColumnar class="discounteda_columnar_hy" />
+
+                </el-tab-pane>
+                <el-tab-pane label="复垦监测" name="second">
+                    <DiscountedAColumnar class="discounteda_columnar_hy" />
+
+                </el-tab-pane>
+                <el-tab-pane label="用途监测" name="third">
+                    用途监测
+                </el-tab-pane>
+            </el-tabs>
+        </div>
     </div>
 </template>
 
@@ -24,6 +39,7 @@ export default {
     components: { DiscountedAColumnar },
     data() {
         return {
+            activeName: 'first',
             radio: 'cut',
             left_value: 'nzyd',
             options: [
@@ -65,14 +81,14 @@ export default {
 
 <style lang="scss"  scoped>
 .hysy {
-    position: absolute;
-    top: 38.4rem;
-    left: 49.5vw;
-    width: 24vw;
+    // position: absolute;
+    // top: 38.4rem;
+    // left: 50%;
+    // width: 24vw;
 
-    height: 17rem;
+    // height: 17rem;
     z-index: 100;
-    border: 1px solid red;
+    // border: 1px solid red;
 }
 
 
@@ -94,9 +110,9 @@ export default {
         color: #fff;
         font-size: 14px;
         font-weight: bold;
-        position: relative;
+        position: absolute;
         top: 0.3rem;
-        left: -15rem;
+        left: 2.5rem;
     }
 }
 
@@ -130,7 +146,7 @@ export default {
 .selectTab {
     position: absolute;
     top: 3px;
-    right: 22px;
+    right: 12px;
     z-index: 100;
 
     /deep/ .el-input__inner {
@@ -208,4 +224,15 @@ export default {
     right: 8px;
     bottom: 9px;
 }
+
+.discounteda_columnar_hy {
+    width: 21.5vw !important;
+}
+.hy_tabs{
+    // width: 90%;
+}
+/deep/ .el-tabs__item {
+    color: white !important;
+    font-size: 12px !important;
+}
 </style>

+ 1 - 1
src/views/cockpit/wpjg.vue

@@ -587,7 +587,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .wpjg {
-  top: 38.5rem !important;
+  top: 38rem !important;
 
 
   .stacontent {

+ 37 - 2
src/views/viewer.vue

@@ -13,13 +13,23 @@
             <!-- <ser-center></ser-center> -->
             <KJZB ref="gkzb_ref" />
             <JCBD />
-            <BJXM ref="bjxm_ref" />
+
             <TDSC ref="tdsc_ref" />
-            <HYSY ref="hysy_ref" />
             <TDSY ref="tdgy_ref" />
             <GDBH ref="gdbh_ref" />
             <STXF ref="stxf_ref" />
             <WPJG ref="wpjg_ref" />
+
+            <div class="bottom_model">
+                <div class="bjxm_box">
+                    <BJXM ref="bjxm_ref" />
+
+                </div>
+                <div class="hysy_box">
+                    <HYSY ref="hysy_ref" />
+                </div>
+            </div>
+
         </div>
     </div>
 </template>
@@ -500,4 +510,29 @@ export default {
         background: linear-gradient(to top, rgba(6, 37, 66, 0.5), rgba(26, 28, 53, 0));
     }
 }
+
+.bottom_model {
+    // border: 1px solid red;
+    position: absolute;
+    left: 28.5vw;
+    width: 44vw;
+    height: 29vh;
+    z-index: 100;
+    top: 38rem;
+
+    .bjxm_box {
+        // border: 1px solid red;
+        width: 48%;
+        height: 100%;
+        display: inline-block;
+    }
+
+    .hysy_box {
+        // border: 1px solid red;
+        width: 48%;
+        height: 100%;
+        display: inline-block;
+        float: right;
+    }
+}
 </style>