zpf 11 달 전
부모
커밋
cfdc85d4f6
3개의 변경된 파일33개의 추가작업 그리고 27개의 파일을 삭제
  1. 12 7
      src/views/cockpit/gdbh.vue
  2. 1 1
      src/views/cockpit/stxf.vue
  3. 20 19
      src/views/cockpit/tdsy.vue

+ 12 - 7
src/views/cockpit/gdbh.vue

@@ -644,7 +644,8 @@ export default {
 }
 
 .gdbh {
-  top: 2rem  !important;
+  top: 2rem !important;
+
   .content {
     // border: #00FFFF 1px solid;
     // position: absolute;
@@ -865,6 +866,7 @@ export default {
   display: inline-block;
   height: 50px
 }
+
 .icon_st {
   background: no-repeat 50%;
   background-image: url("/static/images/overview/st.png");
@@ -874,6 +876,7 @@ export default {
   display: inline-block;
 
 }
+
 .icon_sjd {
   background: no-repeat 50%;
   background-image: url("/static/images/overview/sjd.png");
@@ -882,7 +885,9 @@ export default {
   height: 45px;
   display: inline-block;
 
-}.icon_ht {
+}
+
+.icon_ht {
   background: no-repeat 50%;
   background-image: url("/static/images/overview/ht.png");
   /* border: #00FFFF 1px solid; */
@@ -891,6 +896,7 @@ export default {
   display: inline-block;
 
 }
+
 .icon_jsyd {
   background: no-repeat 50%;
   background-image: url("/static/images/overview/gdxz_jsyd.png");
@@ -969,9 +975,9 @@ export default {
 .info {
   width: 21rem;
   height: 7rem;
-  position: fixed;
-  top: 14rem;
-  right: 2rem;
+  position: relative;
+  top: 8rem;
+  right: -4rem;
 
   ul {
     list-style: none;
@@ -1026,5 +1032,4 @@ export default {
     height: 100%;
     float: right;
   }
-}
-</style>
+}</style>

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

@@ -211,7 +211,7 @@ export default {
 }
 
 .item {
-  width: 112px; //112px;
+  width: 130px; //112px;
   height: 44px;
   position: relative;
   text-align: center;

+ 20 - 19
src/views/cockpit/tdsy.vue

@@ -20,7 +20,8 @@
           </el-select>
         </div>
       </div>
-      <div v-show="left_value == left_options[1].value && right_value == right_options[0].value">
+      <div style="position: absolute;"
+        v-show="left_value == left_options[1].value && right_value == right_options[0].value">
         <div class="dial_watch_legend">
           <div class="item_tdgy">
             <div class="icon_tdgy">
@@ -74,17 +75,18 @@
         <div id="gy_jg_echart"></div>
 
       </div>
-      <div v-show="left_value == left_options[1].value && right_value == right_options[1].value">
+      <div style="position: absolute;"
+        v-show="left_value == left_options[1].value && right_value == right_options[1].value">
         <div class="legend_jtgy">
           <div class="legend_jtgy_left">
             商业商服
             <br>
-            完成率 <span class="legend_jtgy_unit">24%</span>
+            完成率 <span class="legend_jtgy_unit">{{ accomplish_sfyd }}%</span>
           </div>
           <div class="legend_jtgy_right">
             工业用地
             <br>
-            完成率 <span class="legend_jtgy_unit">24%</span>
+            完成率 <span class="legend_jtgy_unit">{{ accomplish_gyyd }}%</span>
           </div>
         </div>
         <pie3d id="tdgy_echart_sfyd" unit="公顷" :legendFlag=true ref="tdgy_echart_sfyd">
@@ -110,6 +112,8 @@ export default {
   components: { pie3d, DialWatch },
   data() {
     return {
+      accomplish_sfyd: 0,
+      accomplish_gyyd: 0,
       dial_watch_info: {
         lt: {
           key: '计划供应',
@@ -234,11 +238,14 @@ export default {
 
         if (obj_echart.type == "商服用地") {
           store.state.cockpit_tdgy.jt_jg.商服用地 = obj_echart
+          that.accomplish_sfyd = (res.sj_crmj / (res.ce_crmj + res.sj_crmj)).toFixed(2);
+
           this.$refs.tdgy_echart_sfyd.setOptions(store.state.cockpit_tdgy.jt_jg.商服用地.data);
 
         }
         if (obj_echart.type == "工业用地") {
           store.state.cockpit_tdgy.jt_jg.工业用地 = obj_echart
+          that.accomplish_gyyd = (res.sj_crmj / (res.ce_crmj + res.sj_crmj)).toFixed(2);
 
           this.$refs.tdgy_echart_gyyd.setOptions(store.state.cockpit_tdgy.jt_jg.工业用地.data);
 
@@ -829,10 +836,9 @@ export default {
 #dial_watch {
   width: 26rem;
   height: 8.5rem;
-  // border: 1px solid red;
-  position: fixed;
-  left: -5rem;
-  top: 39.5rem;
+  position: relative;
+  left: -6rem;
+  top: -2rem;
   z-index: -1;
 }
 
@@ -840,7 +846,7 @@ export default {
   // border: 1px solid red;
   height: 8.5rem;
   position: relative;
-  top: 6.9rem;
+  top: -0.1rem;
 }
 
 .infoLIst {
@@ -939,8 +945,6 @@ export default {
       border: 1px solid rgba(100, 218, 255, 0.5);
       opacity: 0.6;
       display: inline-block;
-      position: relative;
-      top: 1.5rem;
     }
 
     .text {
@@ -977,12 +981,11 @@ export default {
 }
 
 #tdgy_echart_sfyd {
-
   width: 20rem;
   height: 10rem;
   margin-bottom: 0rem;
-  position: fixed;
-  top: 40rem;
+  position: relative;
+  top: -15rem;
   left: 9rem;
   z-index: -1;
 }
@@ -990,12 +993,11 @@ export default {
 
 #tdgy_echart_gyyd {
   z-index: -1;
-
   width: 20rem;
   height: 10rem;
   margin-bottom: 0rem;
-  position: fixed;
-  top: 47rem;
+  position: relative;
+  top: -18rem;
   left: 9rem;
 }
 
@@ -1008,7 +1010,7 @@ export default {
 }
 
 .legend_jtgy {
-  width: 30%;
+  width: 90%;
   margin-top: 4rem;
   margin-left: 2rem;
 
@@ -1027,5 +1029,4 @@ export default {
     color: #64DAFF;
   }
 }
-
 </style>