zpf 1 год назад
Родитель
Сommit
1e4ed1dfca

+ 1 - 1
src/App.vue

@@ -11,7 +11,7 @@ export default {
 </script>
 <style lang="scss">
 #app {
-  background-color: rgba(1, 84, 120, 1);
+  background-image: url("/static/images/overview/驾驶背景遮罩.png");
 
 }
 </style>

+ 2 - 2
src/views/cockpitNew1/hysy.vue

@@ -235,8 +235,8 @@ export default {
     position: absolute;
     left: 9px;
     top: 68%;
-    /* width: 534px;
-    height: 316px; */
+    width: 416px;
+    height: 310px;
     display: flex;
 }
 

+ 81 - 19
src/views/cockpitNew1/jsyd.vue

@@ -1,22 +1,25 @@
 <template>
   <div class="jsyd">
-    <div class="title">建设用地规划指标</div>
+    <div class="title">
+      <div class="icon"></div>
+      <span>建设用地规划指标</span>
+    </div>
     <div class="content">
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_zxkg">
 
           </div>
         </div>
         <div class="text">
-          <p>在控规</p>
+          <p>在线控规</p>
           <span>64</span>个
 
         </div>
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_yrkkg">
 
           </div>
         </div>
@@ -28,7 +31,7 @@
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_jsydzzb">
 
           </div>
         </div>
@@ -40,7 +43,7 @@
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_xzjsyd">
 
           </div>
         </div>
@@ -52,7 +55,7 @@
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_ysyzb">
 
           </div>
         </div>
@@ -64,7 +67,7 @@
       </div>
       <div class="item">
         <div class="icon">
-          <div class="icon2">
+          <div class="icon_syzb">
 
           </div>
         </div>
@@ -112,10 +115,10 @@ export default {
   position: relative;
   left: 9px;
   top: 20px;
-  width: 535px;
-  height: 260px;
+  width: 416px;
+  height: 310px;
   background: inherit;
-  background-color: rgba(3, 25, 67, 0.698039215686274);
+  // background-color: rgba(3, 25, 67, 0.698039215686274);
   border: none;
   border-radius: 0px;
   -moz-box-shadow: none;
@@ -127,11 +130,31 @@ export default {
   border-width: 0px;
   width: 100%;
   height: 40px;
-  font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
-  font-weight: 700;
-  font-style: normal;
-  color: #00FFFF;
-  padding: 2%;
+  // font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+  // font-weight: 700;
+  // font-style: normal;
+  // color: #fff;
+  // padding: 2%;
+  background: no-repeat;
+  background-image: url("/static/images/overview/标题框.png");
+
+  .icon {
+    background: no-repeat;
+
+    background-image: url("/static/images/overview/icon_标题框装饰.png");
+    display: inline-block;
+    width: 30px;
+    height: 30px;
+    background-position: 14px 7px;
+  }
+
+  span {
+    color: #fff;
+    font-size: 14px;
+    font-weight: bold;
+    position: relative;
+    bottom: 0.5rem;
+  }
 }
 
 .content {
@@ -155,21 +178,60 @@ export default {
   width: 50px;
   padding: 1.5%;
   border-radius: 8px;
-  background-color: rgba(104, 244, 251, 0.215686);
   display: inline-block;
   height: 50px
 }
 
-.icon2 {
+.icon_zxkg {
   background: no-repeat 50%;
-  background-image: url("/static/images/cockpitNew/u296.svg");
+  background-image: url("/static/images/overview/icon_zxkg.png");
   /* border: #00FFFF 1px solid; */
   width: 45px;
   height: 45px;
   display: inline-block;
 
 }
+.icon_yrkkg {
+  background: no-repeat 50%;
+  background-image: url("/static/images/overview/icon_yrkkg.png");
+  /* border: #00FFFF 1px solid; */
+  width: 45px;
+  height: 45px;
+  display: inline-block;
+
+}.icon_jsydzzb {
+  background: no-repeat 50%;
+  background-image: url("/static/images/overview/icon_jsydzzb.png");
+  /* border: #00FFFF 1px solid; */
+  width: 45px;
+  height: 45px;
+  display: inline-block;
 
+}.icon_xzjsyd {
+  background: no-repeat 50%;
+  background-image: url("/static/images/overview/icon_jsydzzb.png");
+  /* border: #00FFFF 1px solid; */
+  width: 45px;
+  height: 45px;
+  display: inline-block;
+
+}.icon_ysyzb {
+  background: no-repeat 50%;
+  background-image: url("/static/images/overview/icon_jsydzzb.png");
+  /* border: #00FFFF 1px solid; */
+  width: 45px;
+  height: 45px;
+  display: inline-block;
+
+}.icon_syzb {
+  background: no-repeat 50%;
+  background-image: url("/static/images/overview/icon_jsydzzb.png");
+  /* border: #00FFFF 1px solid; */
+  width: 45px;
+  height: 45px;
+  display: inline-block;
+
+}
 .text {
   display: inline-block;
   // border: #00FFFF 1px solid;

+ 3 - 3
src/views/cockpitNew1/stxf.vue

@@ -16,17 +16,17 @@
           KM2
         </p>
       </div>
-      <Bar3d id="stxf_echart" ref="echartRef"></Bar3d>
+      <!-- <Bar3d id="stxf_echart" ref="echartRef"></Bar3d> -->
     </div>
   </div>
 </template>
 
 <script>
 //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
-import Bar3d from "../../components/echartsTemplate/3dBar.vue";
+// import Bar3d from "../../components/echartsTemplate/3dBar.vue";
 
 export default {
-  components: { Bar3d },
+  // components: { Bar3d },
   data() {
     return {};
   },

+ 4 - 4
src/views/cockpitNew1/tdsc.vue

@@ -3,9 +3,9 @@
     <div class="title">土地收储</div>
     <div class="content">
     </div>
-    <!-- <div id="tdsc_echart">
+    <div id="tdsc_echart">
 
-    </div> -->
+    </div>
     <div id="tdsc_echart_xzqh">
 
     </div>
@@ -417,8 +417,8 @@ export default {
   position: absolute;
   left: 9px;
   top: 35%;
-  width: 534px;
-  height: 260px;
+  width: 416px;
+  height: 310px;
   border-width: 0px;
   background: inherit;
   background-color: rgba(3, 25, 67, 0.698039215686274);

+ 3 - 3
src/views/cockpitNew1/wpjg.vue

@@ -12,13 +12,13 @@
           <span class="dvalue">{{ sdata.value || 0 }}公顷</span>
         </div>
       </div>
-      <sankey id="wpjp_echart" ref="echartRef"></sankey>
+      <!-- <sankey id="wpjp_echart" ref="echartRef"></sankey> -->
     </div>
   </div>
 </template>
 
 <script>
-import sankey from "../../components/echartsTemplate/sankey.vue";
+// import sankey from "../../components/echartsTemplate/sankey.vue";
 //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
 let lcolors = ["#1677CA", "#5BB57A", "#B1651F"];
 let rcolors = [
@@ -33,7 +33,7 @@ let rcolors = [
   "#D4E0FF",
 ];
 export default {
-  components: { sankey },
+  // components: { sankey },
   data() {
     return {
       sdata: {},

BIN
static/images/overview/icon_jsydzzb.png


BIN
static/images/overview/icon_syzb.png


BIN
static/images/overview/icon_xzjsyd.png


BIN
static/images/overview/icon_yrkkg.png


BIN
static/images/overview/icon_ysyzb.png


BIN
static/images/overview/icon_zxkg.png


BIN
static/images/overview/icon_标题框装饰.png


BIN
static/images/overview/标题框.png


BIN
static/images/overview/驾驶背景遮罩.png