diff --git a/portal/Digitalgovernment/city/textHome.js b/portal/Digitalgovernment/city/textHome.js index 8ed2200..cfc7eb5 100644 --- a/portal/Digitalgovernment/city/textHome.js +++ b/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"aCode=' + 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() { diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/1.css b/portal/Digitalgovernment/town/h5/baozhangxing/1.css new file mode 100644 index 0000000..4daea6f --- /dev/null +++ b/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; +} diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/1.less b/portal/Digitalgovernment/town/h5/baozhangxing/1.less new file mode 100644 index 0000000..6dac9d6 --- /dev/null +++ b/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; + } + } + } + } + } + } + } + } +} diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/1.png b/portal/Digitalgovernment/town/h5/baozhangxing/1.png new file mode 100644 index 0000000..ae34be6 Binary files /dev/null and b/portal/Digitalgovernment/town/h5/baozhangxing/1.png differ diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/2.png b/portal/Digitalgovernment/town/h5/baozhangxing/2.png new file mode 100644 index 0000000..2408586 Binary files /dev/null and b/portal/Digitalgovernment/town/h5/baozhangxing/2.png differ diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/3.png b/portal/Digitalgovernment/town/h5/baozhangxing/3.png new file mode 100644 index 0000000..1ecd151 Binary files /dev/null and b/portal/Digitalgovernment/town/h5/baozhangxing/3.png differ diff --git a/portal/Digitalgovernment/town/h5/baozhangxing/house.svg b/portal/Digitalgovernment/town/h5/baozhangxing/house.svg new file mode 100644 index 0000000..bd9597a --- /dev/null +++ b/portal/Digitalgovernment/town/h5/baozhangxing/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/portal/h5/echartOfHome/1.js b/portal/h5/echartOfHome/1.js index 8ca49a7..9bb40d4 100644 --- a/portal/h5/echartOfHome/1.js +++ b/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') - var ershou = countTotal(d,'csHousing') - $("#yishou").html(yishou) - $("#ershou").html(ershou) + console.log("得到的价格指数的数据",data) + var yishou = countTotal(d,'ancHousing').toFixed(2) + var ershou = countTotal(d,'csHousing').toFixed(2) +/* $("#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,41 +427,49 @@ $.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)) + -let option02 = { - xAxis: { - type: "value", - // boundaryGap: [0, 0.05], - show: false, - max: 100, - }, - yAxis: { - type: "category", - show: false, - }, - series: [ - { - name: "2021", - type: "bar", - data: [nb_value2/mubiao2*100], - itemStyle: { - color: "#269BFF", - borderRadius: 20, - }, - barWidth: "10", - showBackground: true, - backgroundStyle: { - borderRadius: 100, - // color: "red", - }, - }, - ], -} -myChart02.setOption(option02) +}) + +/* 新建绿道修改 */ + +$.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", + // 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) + }) @@ -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 = [] diff --git a/portal/h5/fangdichan/1.js b/portal/h5/fangdichan/1.js index dadfecd..3efcfd1 100644 --- a/portal/h5/fangdichan/1.js +++ b/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('' + ningbo_allareas[p['areaCode']] + '完成备案已完成100%'); }) + let d = unique(data.infoList) + d.forEach(p => { $("#chart1_items").append('' + ningbo_allareas[p['areaCode']] + '完成备案已完成100%'); }) }) diff --git a/portal/h5/home.html b/portal/h5/home.html index a686dba..bbcc9d0 100644 --- a/portal/h5/home.html +++ b/portal/h5/home.html @@ -75,8 +75,8 @@ 二手住宅环比累计（1-7月）
- % - % + 3.90 % + 4.40 %
@@ -169,10 +169,8 @@

58

-

城镇老旧小区改造

-
开工项目数（1-7月） @@ -338,7 +336,7 @@

物业服务企业信用

-
物业服务企业信用:A级个 B级个 C级个 D级个
+
物业服务企业信用:A级个 B级个 C级个 D级个 E级个