1

nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/GzwController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 public class GzwController {
     @PostMapping("/emptyAreaList")
     public String getAllLeader( Integer page, Integer size){
-        String s = "http://219.152.50.209:81/api/app/asLeaseDispositionIndex/emptyAreaList?page="+page+"&size="+size;
+        String s = "https://219.152.50.209:81/api/app/asLeaseDispositionIndex/emptyAreaList?page="+page+"&size="+size;
         String post = HttpUtil.post(s, new HashMap<>());
         System.out.println(post);
         JSONObject entries = JSONUtil.parseObj(post);
@@ -47,7 +47,7 @@ public class GzwController {
     @PostMapping("/voPage")
     public String voPage(@RequestBody String json){
 
-        String s = "http://219.152.50.209:81/api/app/official/asLeaseDispositionInfo/voPage";
+        String s = "https://219.152.50.209:81/api/app/official/asLeaseDispositionInfo/voPage";
         System.out.println(json);
         String result2 = HttpRequest.post(s)
                 .header("Content-Type","application/json")
@@ -63,14 +63,14 @@ public class GzwController {
 
     @PostMapping("/info")
     public String info(@RequestBody String json){
-        String s = "http://219.152.50.209:81/api/app/official/asLeaseDispositionInfo/getVo";
-        System.out.println(json);
+        String s = "https://219.152.50.209:81/api/app/official/asLeaseDispositionInfo/getVo";
+//        System.out.println(json);
         String result2 = HttpRequest.post(s)
                 .header("Content-Type","application/json")
                 .body(json)
                 .execute().body();
 
-        System.out.println(result2);
+//        System.out.println(result2);
 //        JSONObject entries = JSONUtil.parseObj(post);
 
         return result2 ;
@@ -79,7 +79,7 @@ public class GzwController {
 
     @PostMapping("/contactList")
     public String contactList(Integer page, Integer size){
-        String s = "http://219.152.50.209:81/api/app/asLeaseDispositionIndex/contactList?page="+page+"&size="+size;
+        String s = "https://219.152.50.209:81/api/app/asLeaseDispositionIndex/contactList?page="+page+"&size="+size;
         String post = HttpUtil.post(s, new HashMap<>());
         System.out.println(post);
         JSONObject entries = JSONUtil.parseObj(post);

nngkxxdp/src/main/resources/static/natj/dataCenter/culturalTourism.html

@@ -8,6 +8,15 @@
     <title>数据中心</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_文化旅游">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_文化旅游">
     <style>
         #whlyEchar {
             width: 100%;

nngkxxdp/src/main/resources/static/natj/dataCenter/healthCare.html

@@ -8,6 +8,15 @@
     <title>数据中心</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_医疗卫生">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_医疗卫生">
     <style>
     </style>
 </head>

nngkxxdp/src/main/resources/static/natj/dataCenter/index.html

@@ -8,6 +8,15 @@
     <title>数据中心-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_教育领域">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_教育领域">
     <style>
         #whlyEchar {
             width: 1400px;

nngkxxdp/src/main/resources/static/natj/dataCenter/indexMobile.html

@@ -8,6 +8,15 @@
     <title>数据中心-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/indexMbile.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_社会保障">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_社会保障">
     <style>
         html {
             overflow-y: scroll;

nngkxxdp/src/main/resources/static/natj/dataCenter/js/employment.js

@@ -38,6 +38,7 @@ function employment() {
         "2023年三季度",
 		"2023年四季度",
 		"2024年一季度",
+		"2024年二季度",
       ],
     },
     yAxis: [

nngkxxdp/src/main/resources/static/natj/dataCenter/socialAssistance.html

@@ -8,6 +8,15 @@
     <title>数据中心</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_社会救助">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_社会救助">
     <style>
         #shjzEchar {
             width: 100%;

nngkxxdp/src/main/resources/static/natj/dataCenter/socialSecurity.html

@@ -8,6 +8,15 @@
     <title>数据中心</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/index.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="数据开放_社会救助">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="数据开放_社会救助">
     <style>
     </style>
 </head>

nngkxxdp/src/main/resources/static/natj/json/construction.json

@@ -100,10 +100,12 @@
       "date": "2024",
       "name": "建筑业",
       "totalNum": [
-        "726815.9"
+        "726815.9",
+        "1972499.3"
       ],
       "alloneBasis": [
-        1.4
+        1.4,
+        8.5
       ]
     }
 

nngkxxdp/src/main/resources/static/natj/json/financial.json

@@ -417,6 +417,9 @@
           "data":[{
             "totalQuarter": 236657,
             "oneBasis": 66
+          },{
+            "totalQuarter": 401901,
+            "oneBasis": 31.1
           }]
         },
         {
@@ -425,6 +428,9 @@
           "data":[{
             "totalQuarter": 111978,
             "oneBasis": 0.4
+          },{
+            "totalQuarter": 231070,
+            "oneBasis": 2.6
           }]
         },
         {
@@ -433,6 +439,9 @@
           "data":[{
             "totalQuarter": 392619,
             "oneBasis": 100.3
+          },{
+            "totalQuarter": 734621,
+            "oneBasis": 73.06
           }]
         }
       ]

nngkxxdp/src/main/resources/static/natj/json/fixedAssets.json

@@ -134,13 +134,16 @@
       "date": "2024",
       "name": "固定资产投资总额增速",
       "totalNum": [
-        "631356"
+        "631356",
+        ""
       ],
       "alloneBasis": [
+        12.3,
         12.3
       ],
       "growth": [
-        5.2
+        5.2,
+        6.2
       ]
     }
   ]

nngkxxdp/src/main/resources/static/natj/json/inlandTrade.json

@@ -640,10 +640,12 @@
       "date": "2024",
       "name": "社会消费品零售总额",
       "totalNum": [
-        "1794853.1"
+        "1794853.1",
+        "3637151.1"
       ],
       "alloneBasis": [
-        3.1
+        3.1,
+        4.3
       ],
       "subData": [
         {
@@ -653,6 +655,9 @@
             {
               "totalQuarter": 3107937.7,
               "oneBasis": 3.5
+            },{
+              "totalQuarter": 8044469.6,
+              "oneBasis": 3.0
             }
           ]
         },
@@ -663,6 +668,9 @@
             {
               "totalQuarter": 1096790.5,
               "oneBasis": 9.2
+            },{
+              "totalQuarter": 2497446.6,
+              "oneBasis": 8.3
             }
           ]
         },
@@ -673,6 +681,9 @@
             {
               "totalQuarter": 46306.7,
               "oneBasis": 11.5
+            },{
+              "totalQuarter": 129097.8,
+              "oneBasis": 5.4
             }
           ]
         },
@@ -683,6 +694,9 @@
             {
               "totalQuarter": 123918.2,
               "oneBasis": 6.5
+            },{
+              "totalQuarter": 309072.3,
+              "oneBasis": 4.9
             }
           ]
         }

nngkxxdp/src/main/resources/static/natj/json/jdp.json

@@ -527,13 +527,16 @@
       "date": "2024",
       "name": "地区生产总值",
       "totalNum": [
-        "2464732"
+        "2464732",
+        "5148055"
       ],
       "alloneBasis": [
-        6.6
+        6.6,
+        6.3
       ],
       "growth": [
-        6.6
+        6.6,
+        6.3
       ],
       "subData": [
         {
@@ -543,6 +546,10 @@
             "totalQuarter": 10099,
             "oneBasis": 3.4,
             "proportion": 0.4
+          },{
+            "totalQuarter": 24673,
+            "oneBasis": 3.5,
+            "proportion": 0.5
           }]
         },
         {
@@ -552,6 +559,10 @@
             "totalQuarter": 835807,
             "oneBasis": 2.9,
             "proportion": 33.9
+          },{
+            "totalQuarter": 1939417,
+            "oneBasis": 6.7,
+            "proportion": 37.7
           }]
         },
         {
@@ -561,6 +572,10 @@
             "totalQuarter": 1618826,
             "oneBasis": 8.7,
             "proportion": 65.7
+          },{
+            "totalQuarter": 3183965,
+            "oneBasis": 6.1,
+            "proportion": 61.8
           }]
         }
       ]

nngkxxdp/src/main/resources/static/natj/json/realtyMarket.json

@@ -100,10 +100,12 @@
       "date": "2024",
       "name": "商品房销售面积",
       "totalNum": [
-        "30.4082"
+        "30.4082",
+        "78.1128"
       ],
       "alloneBasis": [
-        -21.35
+        -21.35,
+        3.01
       ]
     }
   ]

nngkxxdp/src/main/resources/static/natj/json/scale.json

@@ -124,12 +124,14 @@
       "date": "2024",
       "name": "规模以上工业",
       "totalNum": [
+        "2313252.8",
         "2313252.8"
       ],
       "alloneBasis": [
+        59.7,
         59.7
       ],
-      "growth":[4.0]
+      "growth":[4.0,6.5]
     }
   ]
 }

nngkxxdp/src/main/resources/static/school/school.html

@@ -8,6 +8,15 @@
     <title>学校-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/school.css">
     <link rel="stylesheet" href="css/conmon.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="书香南岸_学校">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="书香南岸_学校">
     <style>
         .btn {
             width: 105px;

nngkxxdp/src/main/resources/static/school/schoolDetail.html

@@ -8,6 +8,15 @@
     <title>学校详情-重庆市南岸区人民政府网</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" type="text/css" href="./layui/layui.css" media="all">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="书香南岸_学校">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="书香南岸_学校">
     <style>
         .content {
             width: 70%;

nngkxxdp/src/main/resources/static/school/schoolDetailMobile.html

@@ -8,6 +8,15 @@
     <title>学校详情</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" type="text/css" href="./layui/layui.css" media="all">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="书香南岸_学校">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="书香南岸_学校">
     <style>
         .content {
             width: 100%;

nngkxxdp/src/main/resources/static/school/schoolDetailMoblies.html

@@ -6,6 +6,15 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width" />
   <title>学校-重庆市南岸区人民政府网</title>
+  <meta name="SiteName" content="重庆市南岸区人民政府">
+  <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+  <meta name="SiteIDCode" content="5001080014">
+
+  <!--栏目类-->
+  <meta name="ColumnName" content="书香南岸_学校">
+  <meta name="ColumnDescription" content="">
+  <meta name="ColumnKeywords" content="">
+  <meta name="ColumnType" content="书香南岸_学校">
 </head>
 <style>
   body{

nngkxxdp/src/main/resources/static/school/schoolMobile.html

@@ -8,6 +8,15 @@
     <title>学校</title>
     <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/schoolMobile.css">
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="书香南岸_学校">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="书香南岸_学校">
     <style>
         .btn {
             width: 6.5rem;

nngkxxdp/src/main/resources/static/school/schoolMobiles.html

@@ -6,6 +6,15 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width" />
   <title>学校-重庆市南岸区人民政府网</title>
+    <meta name="SiteName" content="重庆市南岸区人民政府">
+    <meta name="SiteDomain" content="http://www.cqna.gov.cn">
+    <meta name="SiteIDCode" content="5001080014">
+
+    <!--栏目类-->
+    <meta name="ColumnName" content="书香南岸_学校">
+    <meta name="ColumnDescription" content="">
+    <meta name="ColumnKeywords" content="">
+    <meta name="ColumnType" content="书香南岸_学校">
 </head>
 <style>
   body{

nnzwminiapp/pages/index/index.wxml

@@ -226,11 +226,11 @@
 			<image src="{{imgUrl}}index-video-recommend.png" style="height:180rpx;width:720rpx" bindtap="gotoSZRBB"></image> 
 			
 		</view>
-		<view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5; margin-top: 30rpx;">
+		<!-- <view class="three" style="height:163rpx;width:100%;padding-left:15rpx;background-color: #F5F5F5; margin-top: 30rpx;">
 			
 			<image src="{{imgUrl}}zhgz.png" style="height:180rpx;width:720rpx" bindtap="gotozhgz"></image> 
 			
-		</view>
+		</view> -->
     <!-- <view class="content-service" style="margin-left: 20rpx;margin-right: 20rpx;">
 					<view bindtap="clickService1" data-item="{{index}}" wx:for="{{ serviceItems3 }}" wx:for-item="item" wx:for-index="index" wx:key="index" class="content-service-item2">
 						<view data-item="{{index}}">
@@ -355,19 +355,19 @@
 				<!-- 内容 -->
 				<view>
 					<!-- header -->
-					<view style="position:relative;height: 164rpx" bindtap="toZMHD">
+					<!-- <view style="position:relative;height: 164rpx" bindtap="toZMHD">
 						<view style="margin-top:15rpx;height: 164rpx;width:100%;display:flex;align-items:center;justify-content:center;">
 							<image src="{{ imgUrl }}index-communicate-header.png" style="height: 164rpx;width:650rpx;border-radius: 10rpx;"></image>
-						</view>
+						</view> -->
 						<!-- 入口 -->
-						<view style="height: 129rpx;width:100%;position: absolute;bottom:0rpx;">
+						<!-- <view style="height: 129rpx;width:100%;position: absolute;bottom:0rpx;">
 							<view class="zmhd-title-font">与南岸政府对话</view>
 							<view style="padding-left: 38rpx;padding-top: 10rpx;">
 								<view style="background: linear-gradient(90deg, #FF9B3B 0%, #FAB982 100%);" class="center-analysis-enter-button-item">
 									进入 ></view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 					<!-- 列表 -->
 					<view style="height: 800rpx;margin-top: 18rpx;">
 						<view style="display:flex">

nnzwminiapp/pages/myCenter/myCenter.wxml

@@ -48,10 +48,14 @@
 			<image class="icon" src="{{imgUrl}}/mytopwd.png"/>
 			<view  class="text">智能问答</view>
 		</view>
-		<button open-type="contact" class="box-item butsy">
+		<view class="box-item" bindtap="toznwd">
+			<image class="icon" src="{{imgUrl}}/mygjj.png"/>
+			<view  class="text">公积金</view>
+		</view>
+		<!-- <button open-type="contact" class="box-item butsy">
 			<image class="icon" src="{{imgUrl}}/mytopkf.png" />
 			<view  class="text">掌上客服</view>
-		</button>
+		</button> -->
 		<view class="box-item">
     <!-- bindtap="tohdy" -->
 			<image class="icon" src="{{imgUrl}}/mytopmore.png"  />
@@ -72,20 +76,21 @@
 				<image class="icon" src="{{imgUrl}}/mysbfw.png" />
 				<view  class="text">社保服务</view>
 			</view>
-			<view class="box-item" bindtap="togjj">
+			<!-- <view class="box-item" bindtap="togjj">
 				<image class="icon" src="{{imgUrl}}/mygjj.png" />
 				<view  class="text">公积金</view>
-			</view>
+			</view> -->
 			<view class="box-item" bindtap="todzzz">
 				<image class="icon" src="{{imgUrl}}/myddzz.png" />
 				<view  class="text">电子证照</view>
 			</view>
-		</view>
-		<view class="lifeitem">
 			<view class="box-item" bindtap="toswfw">
 				<image class="icon" src="{{imgUrl}}/myswfw.png" />
 				<view  class="text">税务服务</view>
 			</view>
+		</view>
+		<view class="lifeitem">
+			
 			<view class="box-item">
 				<image class="icon" src="{{imgUrl}}/mymore.png" />
 				<view  class="text">更多</view>