数据修改

portal/Digitalgovernment/city/textHome.js

@@ -254,49 +254,7 @@ $.post(url43, function (data) {
   })
   var mubiao2 = countTotal(d, 'targetValue');
   var nb_value2 = countTotal(d, 'currentValue');
-  $("#leijimub").html(parseFloat(nb_value2).toFixed(2));
+
-  $(".dandu").html(parseFloat(nb_value2/mubiao2*100).toFixed(2))
-/* 新建绿道长条部分 */
-  let option02 = {
-    grid: {
-      right: 00,
-      top: 5,
-      bottom: 5,
-      left: 00,
-    },
-    xAxis: {
-      show: false,
-    },
-    yAxis: {
-      type: "category",
-      show: false,
-    },
-    series: [
-      {
-        name: "2021",
-        type: "bar",
-        data: [nb_value2/mubiao2*100],
-        itemStyle: {
-          color: "#83BBFF",
-          borderRadius: 5,
-        },
-        barWidth: "10",
-        zlevel: 2,
-      },
-      {
-        name: "2021",
-        type: "bar",
-        data: 100,
-        itemStyle: {
-          color: "#E6F1FF",
-          borderRadius: 5,
-        },
-        barWidth: "10",
-        barGap: "-100%",
-      },
-    ],
-  }
-  myChart02.setOption(option02)
   $.post('https://sznbs.ningbo.gov.cn:89/nbszhjkzz/tojcms/targetProgress.do?taskId=' + taskId43 + '&taskSystem=government&quotaCode=' + quotaCode43, function (data3) {
     var nb_value = (data3.infoList.filter(function (item) {
       return item['areaName'] == '宁波市'
@@ -388,6 +346,91 @@ $.post(url43, function (data) {
   })
 })
 
+
+/* 绿道建设修改 */
+$.get("http://118.178.224.202:8024/api/new7",function(data){
+
+  $("#leijimub").html(data.data[0].total5);
+  $(".dandu").html(data.data[0].finish)
+/* 新建绿道长条部分 */
+ /*  let option02 = {
+    grid: {
+      right: 00,
+      top: 5,
+      bottom: 5,
+      left: 00,
+    },
+    xAxis: {
+      show: false,
+    },
+    yAxis: {
+      type: "category",
+      show: false,
+    },
+    series: [
+      {
+        name: "2021",
+        type: "bar",
+        data: [nb_value2/mubiao2*100],
+        itemStyle: {
+          color: "#83BBFF",
+          borderRadius: 5,
+        },
+        barWidth: "10",
+        zlevel: 2,
+      },
+      {
+        name: "2021",
+        type: "bar",
+        data: 100,
+        itemStyle: {
+          color: "#E6F1FF",
+          borderRadius: 5,
+        },
+        barWidth: "10",
+        barGap: "-100%",
+      },
+    ],
+  } */
+  let option02 = {
+    grid: {
+      right: 00,
+      top: 5,
+      bottom: 5,
+      left: 00,
+    },
+    xAxis: {
+      type: "value",
+      // boundaryGap: [0, 0.05],
+      show: false,
+      max: 100,
+    },
+    yAxis: {
+      type: "category",
+      show: false,
+    },
+    series: [
+      {
+        name: "2021",
+        type: "bar",
+        data:  [data.data[0].finish],
+        itemStyle: {
+          color: "#269BFF",
+          borderRadius: 20,
+        },
+        barWidth: "10",
+        showBackground: true,
+        backgroundStyle: {
+          borderRadius: 100,
+          // color: "red",
+        },
+      },
+    ],
+  } 
+  myChart02.setOption(option02)
+
+})
+
 /*  城市建设*/
 
 function jianshe() {

portal/Digitalgovernment/town/h5/baozhangxing/1.css

@@ -0,0 +1,150 @@
+.baozhang {
+  position: absolute;
+  top: 73px;
+  height: 720px;
+  left: 20px;
+  right: 240px;
+  visibility: hidden;
+  background: #ffffff;
+  padding: 10px 20px;
+}
+.baozhang h3 {
+  text-align: left;
+  padding: 10px;
+  padding-left: 20px;
+  border-bottom: 1px solid #e1e1e1;
+}
+.baozhang b {
+  font-size: 26px;
+  margin-right: 10px;
+  color: black;
+}
+.baozhang .top {
+  display: flex;
+  justify-content: space-between;
+}
+.baozhang .top > div {
+  width: 49%;
+  box-shadow: 0 0 1px 1px #e1e1e1;
+}
+.baozhang .top .flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.baozhang .top .flex span {
+  padding: 10px 20px;
+  color: #797979;
+}
+.baozhang .bottom {
+  box-shadow: 0 0 1px 1px #e1e1e1;
+  margin-top: 10px;
+}
+.baozhang .bottom > .flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px 20px 10px;
+}
+.baozhang .bottom > .flex .left {
+  width: 30%;
+  color: #797979;
+}
+.baozhang .bottom > .flex .left > div {
+  height: 150px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  margin: 10px 0;
+  width: 100%;
+  background: #ffffff;
+  box-shadow: 0 0 1px 1px #e1e1e1;
+  padding-bottom: 10px;
+}
+.baozhang .bottom > .flex .left > div img {
+  width: 40px;
+  margin: 10px 0;
+}
+.baozhang .bottom > .flex .right {
+  width: 68%;
+  height: 480px;
+  box-shadow: 0 0 1px 1px #e1e1e1;
+  padding-bottom: 20px;
+}
+.baozhang .bottom > .flex .right > :nth-child(1) {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 40px 0px 20px;
+}
+.baozhang .bottom > .flex .right > :nth-child(1) > :nth-child(1) {
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  font-size: 18px;
+}
+.baozhang .bottom > .flex .right > :nth-child(1) > :nth-child(1) img {
+  height: 25px;
+}
+.baozhang .bottom > .flex .right > :nth-child(1) > :nth-child(2) span {
+  padding: 5px 10px;
+  border: 1px solid #b1afaf;
+  border-radius: 3px;
+  margin-left: -4px;
+}
+.baozhang .bottom > .flex .right > :nth-child(1) .mapButtonColor {
+  color: #198eff;
+  border: 1px solid #198eff !important;
+  box-shadow: 0 0 1px 1px #c2e3ff;
+}
+.baozhang .bottom > .flex .right p {
+  margin-left: 70%;
+  margin-top: 20px;
+  margin-bottom: 5px;
+}
+.baozhang .bottom > .flex .right .peizu {
+  display: flex;
+  justify-content: left;
+  position: relative;
+}
+.baozhang .bottom > .flex .right .peizu .echart2 {
+  width: 37%;
+  height: 400px;
+  margin-left: 20%;
+}
+.baozhang .bottom > .flex .right .peizu table {
+  position: absolute;
+  left: 70%;
+  text-align: left;
+}
+.baozhang .bottom > .flex .right .peizu table tbody td {
+  padding: 7px 0;
+  padding-right: 20px;
+}
+.baozhang .bottom > .flex .right .peizu table tbody tr > :nth-child(2) {
+  color: #198eff;
+}
+.baozhang .bottom > .flex .right .zulin {
+  display: flex;
+  justify-content: left;
+  display: none;
+  position: relative;
+}
+.baozhang .bottom > .flex .right .zulin .echart3 {
+  width: 37%;
+  height: 400px;
+  margin-left: 20%;
+}
+.baozhang .bottom > .flex .right .zulin table {
+  position: absolute;
+  left: 70%;
+  text-align: left;
+}
+.baozhang .bottom > .flex .right .zulin table tbody td {
+  padding: 7px 0;
+  padding-right: 20px;
+}
+.baozhang .bottom > .flex .right .zulin table tbody tr > :nth-child(2) {
+  color: #198eff;
+}

portal/Digitalgovernment/town/h5/baozhangxing/1.less

@@ -0,0 +1,192 @@
+.baozhang {
+  position: absolute;
+  top: 73px;
+  height: 720px;
+  left: 20px;
+  right: 240px;
+  visibility: hidden;
+  // display: none;
+
+  background: #ffffff;
+
+  padding: 10px 20px;
+  h3 {
+    text-align: left;
+
+    padding: 10px;
+    padding-left: 20px;
+    // padding-left: 20px;
+    border-bottom: 1px solid #e1e1e1;
+  }
+  b {
+    font-size: 26px;
+    margin-right: 10px;
+    color: black;
+  }
+  .top {
+    display: flex;
+    justify-content: space-between;
+
+    > div {
+      width: 49%;
+      box-shadow: 0 0 1px 1px #e1e1e1;
+    }
+    .flex {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      span {
+        padding: 10px 20px;
+        color: #797979;
+      }
+    }
+  }
+
+  .bottom {
+    box-shadow: 0 0 1px 1px #e1e1e1;
+    margin-top: 10px;
+
+    > .flex {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 5px 20px 10px;
+      .left {
+        // height: 500px;
+        width: 30%;
+        color: #797979;
+        > div {
+          height: 150px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          margin: 10px 0;
+          width: 100%;
+          background: #ffffff;
+          box-shadow: 0 0 1px 1px #e1e1e1;
+          padding-bottom: 10px;
+          span {
+            // margin-top: 10px;
+          }
+
+          img {
+            width: 40px;
+            margin: 10px 0;
+          }
+          // img:nth-child(2) {
+          //   width: 18px;
+          // }
+        }
+      }
+
+      .right {
+        width: 68%;
+        height: 480px;
+        box-shadow: 0 0 1px 1px #e1e1e1;
+        padding-bottom: 20px;
+        > :nth-child(1) {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 20px 40px 0px 20px;
+
+          > :nth-child(1) {
+            display: flex;
+            align-items: center;
+            font-weight: bold;
+            font-size: 18px;
+
+            img {
+              height: 25px;
+            }
+          }
+
+          > :nth-child(2) {
+            span {
+              padding: 5px 10px;
+              border: 1px solid rgb(177, 175, 175);
+              border-radius: 3px;
+              margin-left: -4px;
+            }
+          }
+          .mapButtonColor {
+            color: #198eff;
+            border: 1px solid #198eff !important;
+            box-shadow: 0 0 1px 1px #c2e3ff;
+          }
+        }
+        p {
+          // text-align: right;
+          margin-left: 70%;
+          margin-top: 20px;
+          margin-bottom: 5px;
+        }
+        .peizu {
+          display: flex;
+          justify-content: left;
+          position: relative;
+          .echart2 {
+            width: 37%;
+            height: 400px;
+            margin-left: 20%;
+            // max-width: 200px;
+            // margin: 0 auto;
+          }
+          table {
+            // width: 40%;
+            position: absolute;
+            left: 70%;
+            text-align: left;
+            // td {
+            //   width: 100px;
+            // }
+            tbody {
+              td {
+                padding: 7px 0;
+                padding-right: 20px;
+              }
+              tr {
+                // line-height: 20px;
+                > :nth-child(2) {
+                  color: #198eff;
+                }
+              }
+            }
+          }
+        }
+
+        .zulin {
+          display: flex;
+          justify-content: left;
+          display: none;
+          position: relative;
+          .echart3 {
+            width: 37%;
+            height: 400px;
+            // max-width: 200px;
+            // margin: 0 auto;
+            margin-left: 20%;
+          }
+          table {
+            position: absolute;
+            left: 70%;
+            text-align: left;
+            tbody {
+              td {
+                padding: 7px 0;
+                padding-right: 20px;
+              }
+              tr {
+                // line-height: 20px;
+                > :nth-child(2) {
+                  color: #198eff;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

portal/Digitalgovernment/town/h5/baozhangxing/house.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635144801845" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3535" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1000.7 903.4h-46.5V350.8c0-50.6-41.9-92.1-93.1-92.1H674.9v644.7h-46.6V120.5c0-50.6-41.9-92.1-93.1-92.1H162.9c-51.2 0-93.1 41.5-93.1 92.1v782.9H23.3c-14 0-23.3 9.2-23.3 23.1v46.1c0 13.8 9.2 23.1 23.3 23.1h977.4c14 0 23.3-9.2 23.3-23.1v-46.1c0-13.8-9.3-23.1-23.3-23.1zM302.6 696.2c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1h93.1c14 0 23.3 9.2 23.3 23.1v46.1z m0-184.2c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1h93.1c14 0 23.3 9.2 23.3 23.1V512z m0-184.3c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1h93.1c14 0 23.3 9.2 23.3 23.1v46.1z m232.7 368.5c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1H512c14 0 23.3 9.2 23.3 23.1v46.1z m0-184.2c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1H512c14 0 23.3 9.2 23.3 23.1V512z m0-184.3c0 13.8-9.3 23.1-23.3 23.1h-93.1c-14 0-23.3-9.2-23.3-23.1v-46.1c0-13.8 9.3-23.1 23.3-23.1H512c14 0 23.3 9.2 23.3 23.1v46.1zM864 465.9V512c0 13.8-6.6 23.1-16.5 23.1h-65.9c-9.9 0-16.5-9.2-16.5-23.1v-46.1c0-13.8 6.6-23.1 16.5-23.1h65.9c9.9 0 16.5 9.2 16.5 23.1z m-98.9 184.2c0-13.8 6.6-23.1 16.5-23.1h65.9c9.9 0 16.5 9.2 16.5 23.1v46.1c0 13.8-6.6 23.1-16.5 23.1h-65.9c-9.9 0-16.5-9.2-16.5-23.1v-46.1z" p-id="3536" fill="#269BFF"></path></svg>

portal/h5/echartOfHome/1.js

@@ -1,14 +1,14 @@
 // home页面所有echart图表
 
 //住房价格指数
-var url = "http://118.178.224.202:8024/api/h-pindex"
 let city_myChart1 = echarts.init(document.querySelector(".cityEchart1"))
-$.get(url,function(data){
+$.get("http://118.178.224.202:8024/api/h-pindex",function(data){
  var d = data.data
- var yishou = countTotal(d,'ancHousing')
+ console.log("得到的价格指数的数据",data)
- var ershou = countTotal(d,'csHousing')
+ var yishou = countTotal(d,'ancHousing').toFixed(2)
- $("#yishou").html(yishou)
+ var ershou = countTotal(d,'csHousing').toFixed(2)
- $("#ershou").html(ershou)
+/*  $("#yishou").html(yishou)
+ $("#ershou").html(ershou) */
   let cityOption1 = {
     title: {
       text: "",
@@ -26,7 +26,9 @@ $.get(url,function(data){
     xAxis: {
       type: "category",
       boundaryGap: false,
-      data: ["2021.1", "2", "3", "4", "5", "6", "7"],
+      data:d.map(function (item) {
+        return item['month']
+      }),
       axisLabel: {
         rotate: 45,
       },
@@ -425,10 +427,18 @@ $.post(url7, function (data) {
   })
   var mubiao2 = countTotal(d, 'targetValue');
   var nb_value2 = countTotal(d, 'currentValue');
-  $("#lejiwc").html(parseFloat(nb_value2).toFixed(2));
-  $("#wclv").html(parseFloat(nb_value2/mubiao2*100).toFixed(2))
  
   
+  
+
+})
+
+/* 新建绿道修改 */
+
+$.get("http://118.178.224.202:8024/api/new7",function(data){
+  console.log("得到的新建绿道数据",data)
+  $("#lejiwc").html(data.data[0].total5);
+  $("#wclv").html(data.data[0].finish)
   let option02 = {
     xAxis: {
       type: "value",
@@ -444,7 +454,7 @@ let option02 = {
       {
         name: "2021",
         type: "bar",
-      data:  [nb_value2/mubiao2*100],
+        data:  [data.data[0].finish],
         itemStyle: {
           color: "#269BFF",
           borderRadius: 20,
@@ -470,9 +480,7 @@ let myChart03 = echarts.init(document.querySelector(".echart03"))
 $.get(url6,function(data){
   var d = data.data
   var kaigongshu = countTotal(d,"aim")
-  var gaizaoshu = countTotal(d,"started")
   $("#kaigongshu").html(kaigongshu)
-  $("#gaizaoshu").html(gaizaoshu)
 
   
 let option03 = {
@@ -571,15 +579,17 @@ let option03 = {
 }
 myChart03.setOption(option03)
 
-
-
 })
 
-
 var url8 = "http://118.178.224.202:8024/api/old-urban2"
 let myChart04 = echarts.init(document.querySelector(".echart04"))
 
 $.get(url8,function(data){
+  var d = data.data
+
+  var gaizaoshu = countTotal(d,"aim").toFixed(1)
+  $("#gaizaoshu").html(gaizaoshu)
+
   let option04 = {
     dataZoom: [
       {
@@ -1020,7 +1030,7 @@ $.get(url11,function(data){
 let myChart09 = echarts.init(document.querySelector(".echart09"))
 let url13 = "http://118.178.224.202:8024/api/real-estate"
 $.get(url13,function(data){
-   $("#touzi").html(countTotal(data.data,"investment"))
+   $("#touzi").html(countTotal(data.data,"investment").toFixed(2))
    let option09 = {
     dataZoom: [
       {
@@ -1219,6 +1229,7 @@ $.get(url15,function(data){
   $(".bj").html(data.data[1].number);
   $(".cj").html(data.data[2].number);
   $(".dj").html(data.data[3].number);
+  $(".ej").html(data.data[4].number);
 
   let list = []
 

portal/h5/fangdichan/1.js

@@ -127,7 +127,8 @@ $.post(url1, function (data) {
   
    $.get("https://sznbs.ningbo.gov.cn:89/nbszhjkzz/tojcms/getQuotaByTaksIdOrQuotaCode.do?parentQuotaCode=" + quotaCode1 + "&systemName=government", function (data) {
     console.log("得到的table数据",data) 
-   data.infoList.forEach(p => { $("#chart1_items").append('<tr><td>' + ningbo_allareas[p['areaCode']] + '</td><td>完成备案</td><td>已完成</td><td>100%</td></tr>'); })
+    let d = unique(data.infoList)
+   d.forEach(p => { $("#chart1_items").append('<tr><td>' + ningbo_allareas[p['areaCode']] + '</td><td>完成备案</td><td>已完成</td><td>100%</td></tr>'); })
     })
 
 

portal/h5/home.html

@@ -75,8 +75,8 @@
                     <span>二手住宅环比累计（1-7月）</span>
                   </div>
                   <div class="flex">
-                    <span><b id="yishou"></b><i> %</i></span>
+                    <span><b id="yishou">3.90</b><i> %</i></span>
-                    <span><b id="ershou"></b><i> %</i></span>
+                    <span><b id="ershou">4.40</b><i> %</i></span>
                   </div>
                   <div class="cityEchart1"></div>
                 </div>
@@ -169,10 +169,8 @@
                 <p><b id="wclv">58</b></p>
                 <div class="echart02"></div>
               </div>
-
               <div class="right">
                 <h3>城镇老旧小区改造</h3>
-
                 <div class="flex">
                   <div class="left">
                     <span>开工项目数（1-7月）</span>
@@ -338,7 +336,7 @@
                     <h4>物业服务企业信用</h4>
                     <div class="echart011"></div>
 
-                    <div>物业服务企业信用:A级<b class="aj"></b>个 B级<b class="bj"></b>个 C级<b class="cj"></b>个 D级<b class="dj"></b>个</div>
+                    <div>物业服务企业信用:A级<b class="aj"></b>个 B级<b class="bj"></b>个 C级<b class="cj"></b>个 D级<b class="dj"></b>个 E级<b class="ej"></b>个</div>
                   </div>
 
                   <div class="middle">