Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/LandConsolidation/components/organize.vue

@@ -3,7 +3,7 @@
     <div class="tdTitle">试点目标</div>
     <div class="echars">
       <pie
-        unit="亩"
+        unit="公顷"
         class="pie_echart"
         ref="echartRef0"
         @echartClickTitle="(name) => echartClickTitle(name)"
@@ -25,11 +25,12 @@
       <div class="JSContent">
         <div class="jsitem">
           <p class="tvalue">
-            {{ (jxyddata.zzqjsydmj - jxyddata.zzhjsydmj).toFixed(2) }}
+            {{ computNum }}
+            <!-- {{ (jxyddata.zzhjsydmj - jxyddata.zzqjsydmj).toFixed(2) }} -->
           </p>
           <p>建设用地变化</p>
         </div>
-        <div class="itemCon" style="width: 55%">
+        <div class="itemCon" style="width: 60%">
           <span>
             <span class="font_color">整治前建设用地</span>
             <span style="padding: 0 3px">{{ jxyddata.zzqjsydmj }}</span>
@@ -51,7 +52,7 @@
         <span
           v-for="(item, i) in cjfkList"
           :key="i"
-          style="max-width: 50%; min-width: 40%"
+          :style="{ width: item.width + '%' }"
           ><span class="font_color">{{ item.name }}</span
           ><span style="padding: 0 3px; color: #ec808d; font-size: 14px">{{
             jxyddata[item.prop]
@@ -162,14 +163,14 @@ export default {
       sdata: {},
       jxyddata: {},
       cjfkList: [
-        { name: "拟拆旧面积", prop: "zzqjsydmj", unit: "公顷" },
-        { name: "复垦为耕地", prop: "zjfk_fkgd", unit: "公顷" },
-        { name: "拆迁房屋", prop: "zjfk_cqfw", unit: "幢" },
-        { name: "复垦为种植园地", prop: "zjfk_fkzzy", unit: "公顷" },
-        { name: "动迁居民", prop: "zjfk_dqjm", unit: "户" },
-        { name: "复垦为林草地", prop: "zjfk_fklcd", unit: "公顷" },
-        { name: "动迁人口", prop: "zjfk_dqrk", unit: "人" },
-        { name: "复垦为其他农用地", prop: "zjfk_fkqtnyd", unit: "公顷" },
+        { name: "拟拆旧面积", prop: "zjfk_nzjdkzmj", unit: "公顷" ,width:55},
+        { name: "复垦为耕地", prop: "zjfk_fkgd", unit: "公顷",width:45 },
+        { name: "拆迁房屋", prop: "zjfk_cqfw", unit: "幢" ,width:45},
+        { name: "复垦为种植园地", prop: "zjfk_fkzzy", unit: "公顷" ,width:55},
+        { name: "动迁居民", prop: "zjfk_dqjm", unit: "户",width:45 },
+        { name: "复垦为林草地", prop: "zjfk_fklcd", unit: "公顷",width:50 },
+        { name: "动迁人口", prop: "zjfk_dqrk", unit: "人",width:43 },
+        { name: "复垦为其他农用地", prop: "zjfk_fkqtnyd", unit: "公顷",width:57 },
       ],
       myChart: null,
     };
@@ -177,6 +178,16 @@ export default {
   components: {
     pie,
   },
+  computed:{
+    computNum() {
+      let num = (this.jxyddata.zzhjsydmj - this.jxyddata.zzqjsydmj).toFixed(2)
+      if ( num > 0) {
+        return `+${num}`;
+      } else {
+        return num;
+      }
+    }
+  },
   mounted() {
     // this.initEcharts();
   },
@@ -414,7 +425,7 @@ export default {
       width: 100%;
       margin-bottom: 4px;
       text-align: center;
-      margin-left: 0.3rem;
+      // margin-left: 0.3rem;
       .cvalue {
         font-family: "Arial Negreta", "Arial Normal", "Arial";
         font-weight: 700;
@@ -441,11 +452,12 @@ export default {
   }
   .pie_echart {
     height: 130px;
-    width: 400px;
+    // width: 400px;
+    width: 21vw;
   }
   #second_pie {
     height: 130px;
-    width: 300px;
+    width: 16vw;
   }
   .tzdiv {
     height: 20px;
@@ -458,7 +470,7 @@ export default {
     justify-content: space-between;
     margin-top: 10px;
     .jsitem {
-      width: 40%;
+      width: 38%;
       text-align: center;
       font-weight: 400;
       font-size: 13px;
@@ -491,6 +503,11 @@ export default {
       color: white;
     }
   }
+  .cjfkList{
+    span:nth-child(2n){
+      text-align: end;
+    }
+  }
   .divrow {
     height: 85px;
     // background-color: #0f7bc875;

src/views/LandConsolidation/components/qhdb.vue

@@ -198,13 +198,16 @@ export default {
     overflow-x: hidden;
     height: 280px;
     .echart {
-      width: 810px !important;
-      height: 280px !important;
+      // width: 810px !important;
+      // width: 43vw !important;
+      width: 51vw !important;
+      height: 275px !important;
     }
   }
 
   .echart2 {
-    width: 810px !important;
+    // width: 810px !important;
+    width: 43vw !important;
     height: 400px !important;
   }
 }

src/views/LandConsolidation/index.vue

@@ -313,18 +313,25 @@ export default {
   }
 
   .bottomPane {
-    width: 43%;
+    // width: 45vw;
+    width: 52vw;
     height: 330px;
     top: calc(100% - 360px);
-    left: 600px;
+    // left: 600px;
+    // left: 31.2vw;
+    left: 24vw;
   }
   .legendPane {
-    width: 130px;
-    height: 120px;
+    // position: relative;
+      // width: 130px;
+    // height: 120px;
+    width: 6.7vw;
+    height: 12.6vh;
     top: calc(100% - 500px);
     // top: calc(100% - 150px);
-    left: 460px;
-    // position: relative;
+    // left: 460px;
+    // left: 23.5vw;
+    left: 24vw;
     .eicon {
       width: 20px;
       height: 20px;
@@ -340,6 +347,7 @@ export default {
     // .close_eyes {
     //   background-image: url("/static/images/ghzc/close_eyes.png");
     // }
+  
     .lcolor {
       display: inline-block;
       width: 16px;
@@ -387,8 +395,8 @@ export default {
     height: 50px;
     // background: rgba(255, 192, 203, 0.379);
     position: absolute;
-    left: 38%;
-    top: 10px;
+    left:35vw;
+    top: 3vh;
     z-index: 99;
     pointer-events: none;
     ul {

src/views/complianceAnalysis/ghzc.scss

@@ -4,15 +4,16 @@
     position: absolute;
 
     .innerContainer {
-        width: 430px;
-        height: 800px; //calc(100% - 20px);
+        // width: 430px;
+        width: 22.5vw;
+        // height: 800px; //calc(100% - 20px);
+        height: calc(100% - 70px);
         position: absolute;
         top: 28px;
         z-index: 99;
         background-image: url("/static/images/ghzc/内容框.png");
         background-size: 100% 100%;
     }
-
     .leftPane {
         left: 20px;
     }

src/views/farmlandProtection/components/statistics.vue

@@ -67,12 +67,14 @@ export default {
       //   background: rgba(152, 251, 152, 0.685);
       margin: 5px 0px;
       .listArea {
-        width: 365px;
+        // width: 365px;
+        width: 20vw;
         display: flex;
         justify-content: space-between;
       }
       .listItem {
-        width: 365px;
+        // width: 365px;
+        width: 20vw;
         height: 10px;
         background: inherit;
         background-color: rgba(242, 242, 242, 0.43921568627451);

src/views/farmlandProtection/gdzl/index.vue

@@ -455,7 +455,8 @@ export default {
   }
 
   .pie_echart {
-    width: 400px;
+    // width: 400px;
+    width: 21vw;
     height: 140px;
   }
 }