Parcourir la source

fixed 数据修改

Elis il y a 1 mois
Parent
commit
defb6eff7c

+ 2 - 2
src/components/echarts/assisTance.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="name" style="margin: 0 auto">2023年最低生活保障数据</div>
+    <div class="name" style="margin: 0 auto">2024年最低生活保障数据</div>
     <div
       id="shjzEchars"
       style="height: 380px; width: 640px; margin: auto; padding-top: 40px"
@@ -28,7 +28,7 @@ export default {
           "农村居民最低生活保障人数(人)",
           "农村居民发放低保金(万元)",
         ],
-        ["2023年", 6912, 6320.76, 6328, 5789.33, 584, 531.42],
+        ["2024年", 7080, 6440.66, 6445, 5888.31, 635, 552.35],
       ];
       var chartDom = document.getElementById("shjzEchars");
       var myChart = echarts.init(chartDom);

+ 6 - 11
src/components/echarts/cultural.vue

@@ -101,6 +101,8 @@ export default {
               "2024年9月",
               "2024年10月",
               "2024年11月",
+              "2024年12月",
+              "2025年1月"
             ],
             axisPointer: {
               type: "shadow",
@@ -153,9 +155,7 @@ export default {
               },
             },
             data: [
-              0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539, 6571,
-              5639, 3153, 2802, 10793, 0, 11773, 10442, 6194, 5736, 12817,
-              19451, 22148,
+              0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539,6571,5639,3153,2802, 10793,1668,11773,10442,6194,5736,12817,19451,22148,20624,7506
             ],
           },
           {
@@ -168,9 +168,7 @@ export default {
             },
             data: [
               4741245, 4821452, 4524574, 4054582, 4484144, 3325145, 4047415,
-              3415412, 4851414, 4914414, 2175241, 2812211, 4892451, 5132351,
-              4812451, 4301241, 4789152, 3479836, 4314117, 3535124, 4912547,
-              5234589, 2294589,
+              3415412, 4851414, 4914414,2175241,2812211,4892451,5132351, 4812451,4301241,4789152,3479836,4314117,3535124,4912547,5234589,2294589,2856298,5212475
             ],
             itemStyle: {
               color: "#ed9121",
@@ -186,9 +184,7 @@ export default {
               },
             },
             data: [
-              33.46, 20.45, 26.2, 28.72, 18.09, 16.04, 10.66, 17.96, 13.98,
-              6.38, 99.34, 3.73, 3.19, 6.45, 6.36, 6.08, 6.8, 4.65, 6.59, 3.51,
-              1.26, 6.52, 5.49,
+              33.46, 20.45, 26.2, 28.72, 18.09, 16.04, 10.66, 17.96, 13.98, 6.38,99.34,3.73,3.19,6.45,6.36,6.08,6.80,4.65,6.59,3.51,1.26,6.52,5.49,1.57,6.54
             ],
           },
           {
@@ -201,8 +197,7 @@ export default {
               },
             },
             data: [
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255.58, 951.95, -4.14,
-              498.53, 374.64, 127.72, 108.73, 296.69, 251.16, 237.06,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,255.58, 951.95,-4.14,498.53,374.64,127.72,108.73,296.69,251.16,237.06,265.74,138.06
             ],
           },
         ],

+ 6 - 6
src/components/echarts/socialSecurity.vue

@@ -8,7 +8,7 @@
           <div class="right">
             <div>城镇新增就业人数</div>
             <div class="bottom">
-              <div class="number">3.75</div>
+              <div class="number">4.40</div>
               <div class="unit">万人</div>
             </div>
           </div>
@@ -18,7 +18,7 @@
           <div class="right">
             <div>城镇登记失业人员就业人数</div>
             <div class="bottom">
-              <div class="number">0.67</div>
+              <div class="number">0.76</div>
               <div class="unit">万人</div>
             </div>
           </div>
@@ -28,7 +28,7 @@
           <div class="right">
             <div>城镇调查失业率</div>
             <div class="bottom">
-              <div class="number">4.8</div>
+              <div class="number">5.3</div>
               <div class="unit">%</div>
             </div>
           </div>
@@ -38,7 +38,7 @@
           <div class="right">
             <div>创业贷款发放金额</div>
             <div class="bottom">
-              <div class="number">355</div>
+              <div class="number">425</div>
               <div class="unit">万元</div>
             </div>
           </div>
@@ -48,7 +48,7 @@
           <div class="right">
             <div>参加职业技能鉴定</div>
             <div class="bottom">
-              <div class="number">1501</div>
+              <div class="number">2288</div>
               <div class="unit">人</div>
             </div>
           </div>
@@ -58,7 +58,7 @@
           <div class="right">
             <div>补贴性职业培训人数</div>
             <div class="bottom">
-              <div class="number">0.57</div>
+              <div class="number">0.81</div>
               <div class="unit">万人</div>
             </div>
           </div>

+ 18 - 3
src/json/jdp.json

@@ -529,17 +529,20 @@
       "totalNum": [
         "2464732",
         "5148055",
-        "7661611"
+        "7661611",
+        "11331605"
       ],
       "alloneBasis": [
         6.6,
         6.3,
-        6.5
+        6.5,
+        5.9
       ],
       "growth": [
         6.6,
         6.3,
-        6.5
+        6.5,
+        5.9
       ],
       "subData": [
         {
@@ -557,6 +560,10 @@
             "totalQuarter": 35772,
             "oneBasis": 3.7,
             "proportion": 0.5
+          },{
+            "totalQuarter": 49595,
+            "oneBasis": 3.5,
+            "proportion": 0.5
           }]
         },
         {
@@ -574,6 +581,10 @@
             "totalQuarter": 2925688,
             "oneBasis": 5.8,
             "proportion": 38.2
+          },{
+            "totalQuarter": 3937764,
+            "oneBasis": 3.4,
+            "proportion": 34.7
           }]
         },
         {
@@ -591,6 +602,10 @@
             "totalQuarter": 4700151,
             "oneBasis": 6.9,
             "proportion": 61.3
+          },{
+            "totalQuarter": 7344246,
+            "oneBasis": 7.3,
+            "proportion": 64.8
           }]
         }
       ]

+ 226 - 16
src/views/DataCenter.vue

@@ -74,10 +74,10 @@
               openDataStatus === 4
             "
           >
-            <img src="../assets/image/ty-left.png" alt="" />
+            <!-- <img src="../assets/image/ty-left.png" alt="" /> -->
           </div>
           <div class="ty-right" v-else>
-            <img src="../assets/image/ty-right.png" alt="" />
+            <!-- <img src="../assets/image/ty-right.png" alt="" /> -->
           </div>
           <div class="left-box">
             <div
@@ -400,8 +400,8 @@
             <div style="text-align: center" class="typing"></div>
           </vue-typed-js>
         </div>
-        <div class="open-data">开放数据</div>
-        <div class="count">
+        <a href="https://data.cq.gov.cn/opendata/open/county/countyTable?origin=8" target="_self" class="open-data" style="display: block;">点击进入</a>
+        <!-- <div class="count">
           共<span>{{ dataSetNum }}</span
           >个数据集,开放接口数<span>{{ apiNum }}</span
           >个
@@ -417,7 +417,7 @@
             {{ item.name }}
           </div>
         </div>
-        <router-view></router-view>
+        <router-view></router-view> -->
       </div>
     </section>
   </div>
@@ -479,8 +479,8 @@ export default {
     };
   },
   created() {
-    this.getInterList();
-    this.getDataSetList();
+    // this.getInterList();
+    // this.getDataSetList();
   },
   methods: {
     change(i, path) {
@@ -582,10 +582,219 @@ nav {
     }
   }
 }
-section {
+@media screen and (min-width:1921px){
+  section {
   background-image: url("../assets/image/bg-bottom1.png");
-  background-size: 100% 100%;
-  height: 2551px;
+  background-size: 100% 220%;
+  height: 110vh;
+  nav {
+    background-image: url("../assets/image/btt.png");
+    background-size: 100% 100%;
+    height: 80px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .content {
+    width: 1400px;
+    margin: auto;
+    .bt {
+      img {
+        height: 51px;
+      }
+      .open-data {
+        background-image: url("../assets/image/openbg.png");
+        background-size: 100% 100%;
+        width: 213px;
+        line-height: 70px;
+        text-align: center;
+        font-size: 36px;
+        font-family: Source Han Sans SC;
+        font-weight: 400;
+        color: #ffffff;
+        text-shadow: 0px 4px 4px rgba(1, 50, 59, 0.5);
+        margin: 7px auto;
+        margin-bottom: 0;
+      }
+    }
+    .openDataBox {
+      width: 770px;
+      height: 540px;
+      position: relative;
+      margin: auto;
+      .ty-left {
+        position: absolute;
+        left: 17px;
+        top: 55px;
+        transform: rotate(3deg);
+      }
+      .ty-right {
+        position: absolute;
+        left: 17px;
+        top: 55px;
+        transform: rotate(3deg);
+      }
+      .left-box {
+        position: absolute;
+        left: -372px;
+        top: -5px;
+        width: 400px;
+        .left-item > img:nth-of-type(1) {
+          width: 132px;
+          height: 32px;
+        }
+        .left-item > img:nth-of-type(2) {
+          width: 47px;
+          height: 42px;
+        }
+        .left-item {
+          text-align: center;
+          margin-bottom: 44px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          height: 98px;
+          cursor: pointer;
+          .jt-left {
+            position: absolute;
+          }
+        }
+        .gmjj {
+          background-size: 100% 100%;
+          width: 334px;
+          text-align: center;
+          transform: translateX(56px);
+        }
+        .zwfw {
+          background-size: 100% 100%;
+          width: 334px;
+          line-height: 104px;
+          text-align: center;
+        }
+        .shbz {
+          background-size: 100% 100%;
+          width: 334px;
+          text-align: center;
+        }
+        .gkxx {
+          background-size: 100% 100%;
+          width: 334px;
+          text-align: center;
+          transform: translateX(56px);
+        }
+      }
+      .right-box {
+        position: absolute;
+        right: -372px;
+        top: -5px;
+        .right-item {
+          text-align: center;
+          margin-bottom: 44px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          height: 98px;
+          cursor: pointer;
+          .jt-right {
+            position: absolute;
+          }
+        }
+        // .right-item > img:nth-of-type(1) {
+        //   width: 132px;
+        //   height: 32px;
+        // }
+        // .right-item > img:nth-of-type(2) {
+        //   width: 47px;
+        //   height: 42px;
+        // }
+        .whly {
+          background-size: 100% 100%;
+          width: 334px;
+          line-height: 104px;
+          text-align: center;
+          transform: translateX(-60px);
+        }
+        .wsyl {
+          background-size: 100% 100%;
+          width: 334px;
+          line-height: 104px;
+          text-align: center;
+        }
+        .shjz {
+          background-size: 100% 100%;
+          width: 334px;
+          line-height: 104px;
+          text-align: center;
+        }
+        .jyly {
+          background-size: 100% 100%;
+          width: 334px;
+          line-height: 104px;
+          text-align: center;
+          transform: translateX(-60px);
+        }
+      }
+    }
+    .wel {
+    }
+    .open-data {
+      background-image: url("../assets/image/openbg.png");
+      background-size: 100% 100%;
+      width: 213px;
+      line-height: 70px;
+      text-align: center;
+      font-size: 36px;
+      font-family: Source Han Sans SC;
+      font-weight: 400;
+      color: #ffffff;
+      text-shadow: 0px 4px 4px rgba(1, 50, 59, 0.5);
+      margin: 31px auto;
+      margin-bottom: 50px;
+    }
+    .count {
+      line-height: 61px;
+      background: rgba(4, 65, 112, 0.78);
+      font-size: 32px;
+      font-family: Source Han Sans SC;
+      font-weight: 400;
+      color: #ffffff;
+      text-align: center;
+      span {
+        color: #efa430;
+      }
+    }
+    .tabs {
+      line-height: 81px;
+      background: rgba(5, 85, 146, 0.42);
+      border: 1px solid #00e2ff;
+      display: flex;
+      justify-content: space-around;
+      margin: 16px auto;
+      margin-bottom: 30px;
+      .tabs-item {
+        width: 226px;
+        line-height: 80px;
+        cursor: pointer;
+        text-align: center;
+        font-size: 30px;
+        font-family: Source Han Sans SC;
+        font-weight: 400;
+        color: #a3cedf;
+      }
+      .active {
+        background: rgba(27, 154, 230, 0.67);
+        color: #ffffff;
+      }
+    }
+  }
+}
+}
+@media screen and (min-width:1366px) and (max-width:1920px){
+  section {
+  background-image: url("../assets/image/bg-bottom1.png");
+  background-size: 100% 290%;
+  height: 110vh;
   nav {
     background-image: url("../assets/image/btt.png");
     background-size: 100% 100%;
@@ -624,15 +833,15 @@ section {
       margin: auto;
       .ty-left {
         position: absolute;
-        left: -11px;
-        top: 0;
-        transform: rotate(5deg);
+        left: 17px;
+        top: 55px;
+        transform: rotate(3deg);
       }
       .ty-right {
         position: absolute;
-        right: -12px;
-        top: 0;
-        transform: rotate(-5deg);
+        left: 17px;
+        top: 55px;
+        transform: rotate(3deg);
       }
       .left-box {
         position: absolute;
@@ -788,4 +997,5 @@ section {
     }
   }
 }
+}
 </style>

+ 5 - 5
src/views/mobile/index.vue

@@ -150,8 +150,8 @@
           </div>
         </div>
         <div class="wel"></div>
-        <div class="open-data">数据公开</div>
-        <div class="count">
+        <a href="https://data.cq.gov.cn/opendata/open/county/countyTable?origin=8" class="open-data" style="display: block;" >点击进入</a>
+        <!-- <div class="count">
           共<span>{{ dataSetNum }}</span
           >个数据集,开放接口数<span>{{ apiNum }}</span
           >个
@@ -169,7 +169,7 @@
         </div>
         <div class="container">
           <router-view></router-view>
-        </div>
+        </div> -->
       </div>
     </section>
   </div>
@@ -209,8 +209,8 @@ export default {
     };
   },
   created() {
-    this.getInterList();
-    this.getDataSetList();
+    // this.getInterList();
+    // this.getDataSetList();
   },
   methods: {
     change(i, path) {