Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/TjController.java

@@ -2,6 +2,7 @@ package com.example.nngkxxdp.controller;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.example.nngkxxdp.util.*;
@@ -19,10 +20,8 @@ import com.example.nngkxxdp.util.Blank;
 import com.example.nngkxxdp.util.ConstStr;
 import com.example.nngkxxdp.util.SendUtil;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
 
 import javax.annotation.Resource;
 
@@ -85,7 +84,14 @@ public class TjController {
 	@PostMapping("websiteRating")
 	public Map<String, Object> websiteRating(Integer type, Integer childrenType, Integer deptId, Integer hasDept, String newMon) {
 		return SendUtil.send(true, null, tjService.websiteRating(type, childrenType, deptId, hasDept, null, newMon));
-		
+	}
+
+	/**
+	 * 政务新媒体
+	 */
+	@GetMapping("newMedia")
+	public Map<String, Object> newMedia() {
+		return SendUtil.send(true,null,tjService.newMedia());
 	}
 	
 	@GetMapping("task")

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/MailDao.java

@@ -167,6 +167,8 @@ public interface MailDao {
     String  findDeptName(@Param("name") String name);
 
 
+    List<Map<TypeCasting, Object>> findWebNew(Map<String, Object> param);
 
+    List<Map<String, Object>> findDeptNew(Map<String, Object> param);
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/TjDao.java

@@ -201,4 +201,8 @@ public interface TjDao {
 	 * @return
 	 */
 	List<Map<String, Object>> getPartitionGroup();
+
+	List<Map<String, Object>> findOfficialAccount();
+
+	List<Map<String, Object>> findHeadLines();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/TjService.java

@@ -1,5 +1,6 @@
 package com.example.nngkxxdp.service;
 
+import java.util.List;
 import java.util.Map;
 
 /** 
@@ -42,4 +43,6 @@ public interface TjService {
 	Map<String, Object> task(String strDate);
 	
 	Map<String, Object> sendSms();
+
+	List<Map<String, Object>> newMedia();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/MailServiceImpl.java

@@ -30,6 +30,7 @@ public class MailServiceImpl implements MailService {
     private MailDao mailDao;
     @Resource
     private ArticleDao articleDao;
+
     /**
      * 通过ID查询单条数据
      *
@@ -90,7 +91,7 @@ public class MailServiceImpl implements MailService {
 
     /**
      * 通过主键删除数据
-     *message: "
+     * message: "
      * ↵### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Expression #1 of ORDER BY clause is not in GROUP BY clause and contains nonaggregated column 'nazw.mail.emailTime' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by
      * ↵### The error may exist in class path resource [mapper/MailDao.xml]
      * ↵### The error may involve defaultParameterMap
@@ -98,24 +99,25 @@ public class MailServiceImpl implements MailService {
      * ↵### SQL: SELECT             COUNT(*) count,             DATE_FORMAT(emailTime,'%Y-%m') monthToNOwyear         FROM             mail         WHERE emailTime > ?         GROUP BY DATE_FORMAT(emailTime,'%Y-%m')         ORDER BY emailTime ASC
      * ↵### Cause: java.sql.SQLSyntaxErrorException: Expression #1 of ORDER BY clause is not in GROUP BY clause and contains nonaggregated column 'nazw.mail.emailTime' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by↵; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Expression #1 of ORDER BY clause is not in GROUP BY clause and contains nonaggregated column 'nazw.mail.emailTime' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by"
      * path: "/mail/queryMonthStatus"
+     *
      * @return 是否成功
      */
     @Override
     public Map<String, Object> queryMonthStatus() {
-        String today= DateUtil.today();
+        String today = DateUtil.today();
         String[] split = today.split("-");
         StringBuffer append = new StringBuffer().append(split[0]).append("-01-01 00:00:00");
         DateTime parse = DateUtil.parse(append);
 
         List<Mail> byYearDate = mailDao.findByYearDate(parse.toSqlDate());
         List<Map<String, Object>> quantityPerMonth = mailDao.findQuantityPerMonth(parse.toSqlDate());
-        if (ObjectUtil.hasEmpty(byYearDate,quantityPerMonth)){
+        if (ObjectUtil.hasEmpty(byYearDate, quantityPerMonth)) {
             return SendUtil.send();
         }
         int startSub = 0;
         List<List<Mail>> mails = new ArrayList<>();
-        for (Map<String, Object> month: quantityPerMonth) {
-            int nowstart = startSub+Convert.toInt(month.get("count"));
+        for (Map<String, Object> month : quantityPerMonth) {
+            int nowstart = startSub + Convert.toInt(month.get("count"));
             List<Mail> sub = ListUtil.sub(byYearDate, startSub, nowstart);
             mails.add(sub);
             startSub = nowstart;
@@ -123,28 +125,28 @@ public class MailServiceImpl implements MailService {
         Map<String, Object> requstData = new HashMap<>();
         List<Integer> numberOfTransactions = new ArrayList<>();
         List<Integer> numberOfAcceptances = new ArrayList<>();
-        for (List<Mail> mail: mails) {
+        for (List<Mail> mail : mails) {
             int thisFour = 0;
             for (int i = 0; i < mail.size(); i++) {
-                if (mail.get(i).getPrograma()==4){
+                if (mail.get(i).getPrograma() == 4) {
                     thisFour++;
                 }
             }
             numberOfTransactions.add(thisFour);
-            if (mail.size()>0){
+            if (mail.size() > 0) {
                 numberOfAcceptances.add(mail.size());
-            }else {
+            } else {
                 numberOfAcceptances.add(0);
             }
         }
         requstData.put("accept", numberOfAcceptances);
         requstData.put("handle", numberOfTransactions);
-        return SendUtil.send(true,"",requstData);
+        return SendUtil.send(true, "", requstData);
     }
 
     @Override
     public Map<String, Object> queryLeaveAMessage() {
-        String today= DateUtil.today();
+        String today = DateUtil.today();
         Date date = DateUtil.parse(today);
         DateTime dateStart = DateUtil.offsetDay(date, -30);
         java.sql.Date date1 = dateStart.toSqlDate();
@@ -152,8 +154,8 @@ public class MailServiceImpl implements MailService {
         List<Mail> dayData = mailDao.find30DayData(dateStart.toSqlDate());
         int thisFour = 0;
         int notFour = 0;
-        for (int i = 0; i <dayData.size(); i++) {
-            if (dayData.get(i).getPrograma()==4){
+        for (int i = 0; i < dayData.size(); i++) {
+            if (dayData.get(i).getPrograma() == 4) {
                 thisFour++;
                 continue;
             }
@@ -162,8 +164,8 @@ public class MailServiceImpl implements MailService {
         Map<String, Object> requstData = new HashMap<>();
         requstData.put("accepting", notFour);
         requstData.put("finished", thisFour);
-        requstData.put("handle",dayData.size());
-        return SendUtil.send(true,"",requstData);
+        requstData.put("handle", dayData.size());
+        return SendUtil.send(true, "", requstData);
     }
 
     @Override
@@ -196,7 +198,7 @@ public class MailServiceImpl implements MailService {
             map.put("finished", notFour);
             map.put("count", mails.get(j).size());
             map.put("month", allMonth.get(j).get("monthToNOwyear"));
-            if (ObjectUtil.isNull(map.get("其他"))){
+            if (ObjectUtil.isNull(map.get("其他"))) {
                 map.put("其他", 0);
             }
             requstData.add(map);
@@ -204,18 +206,18 @@ public class MailServiceImpl implements MailService {
         if (requstData.size() < 1) {
             return SendUtil.layuiTable(0, null);
         }
-        List<Map<String, Object>> sub = ListUtil.sub(requstData, start, start+limit);
+        List<Map<String, Object>> sub = ListUtil.sub(requstData, start, start + limit);
         return SendUtil.layuiTable(requstData.size(), sub);
     }
 
     @Override
     public Map<String, Object> queryToType(String type) {
-        String today= DateUtil.today();
+        String today = DateUtil.today();
         Date date = DateUtil.parse(today);
         DateTime dateStart = DateUtil.offsetDay(date, -90);
         List<Mail> dayData = mailDao.find90DayData(dateStart.toSqlDate());
         List<MapVo> mapVos = null;
-        switch (type){
+        switch (type) {
             case "1":
                 mapVos = getType1(dayData);
                 break;
@@ -233,11 +235,11 @@ public class MailServiceImpl implements MailService {
         Map<String, Object> result = new HashMap<>();
         List resultList = new ArrayList();
         List resultSize = new ArrayList();
-        List<String> publicNum = mailDao.findPublicNum(type,urlId);
+        List<String> publicNum = mailDao.findPublicNum(type, urlId);
         if (publicNum.size() != 0) {
             for (int i = 0; i < publicNum.size(); i++) {
                 resultList.add(publicNum.get(i));
-                System.err.println("====>"+publicNum.get(i));
+                System.err.println("====>" + publicNum.get(i));
                 resultSize.add(mailDao.findUpdateStatus(publicNum.get(i)));
             }
             result.put("field", resultList);
@@ -255,7 +257,7 @@ public class MailServiceImpl implements MailService {
         List listColumn = new ArrayList();
         for (int i = 0; i < typeName.size(); i++) {
             List<String> dept = mailDao.findDept(typeName.get(i));
-            if (dept!=null) {
+            if (dept != null) {
                 listDept.add(dept);
             }
             listColumn.add(articleDao.queryPublicStreetInfoByName(typeName.get(i)));
@@ -278,23 +280,43 @@ public class MailServiceImpl implements MailService {
         param.put("type", type);
         param.put("Id", Id);
         //查询网站
-        List<Map<TypeCasting, Object>> web = mailDao.findWeb(param);
-        if (web.size() != 0) {
+//        List<Map<TypeCasting, Object>> web = mailDao.findWeb(param);
+//        if (web.size() != 0) {
+//            for (int i = 0; i < web.size(); i++) {
+//                Object releaseDate = web.get(i).get("releaseDate");
+//                Object columnFirstName = web.get(i).get("columnFirstName");
+//
+//                int webUpdateCount = mailDao.findWebUpdateCount(columnFirstName, releaseDate);
+//                typeName.add(columnFirstName);
+//                listDate.add(releaseDate);
+//                listCount.add(webUpdateCount);
+//            }
+//            for (int i = 0; i <typeName.size() ; i++) {
+//                List<String> dept = mailDao.findDept(String.valueOf(typeName.get(i)));
+//                listDept.add(dept);
+//
+//            }
+//        }
+        List<Map<TypeCasting, Object>> web = mailDao.findWebNew(param);
+        List<Map<String, Object>> deptList = mailDao.findDeptNew(param);
+        if (web != null && web.size() > 0) {
             for (int i = 0; i < web.size(); i++) {
-                Object releaseDate = web.get(i).get("releaseDate");
-                Object columnFirstName = web.get(i).get("columnFirstName");
-
-                int webUpdateCount = mailDao.findWebUpdateCount(columnFirstName, releaseDate);
-                typeName.add(columnFirstName);
-                listDate.add(releaseDate);
-                listCount.add(webUpdateCount);
-            }
-            for (int i = 0; i <typeName.size() ; i++) {
-                List<String> dept = mailDao.findDept(String.valueOf(typeName.get(i)));
-                listDept.add(dept);
-
+                typeName.add(web.get(i).get("columnFirstName"));
+                listDate.add(web.get(i).get("releaseDate"));
+                listCount.add(web.get(i).get("count"));
+                if (deptList != null && deptList.size() > 0) {
+                    List<String> dept=new ArrayList<>();
+                    for (int j = 0; j < deptList.size(); j++) {
+                        if(web.get(i).get("columnFirstName").equals(deptList.get(j).get("columnFirstName"))){
+                            dept.add(deptList.get(j).get("deptname").toString());
+                        }
+                    }
+                    listDept.add(dept);
+                    dept=new ArrayList<>();
+                }
             }
         }
+
         result.put("ColumnName", typeName);
         result.put("count", listCount);
         result.put("releaseDate", listDate);
@@ -307,11 +329,11 @@ public class MailServiceImpl implements MailService {
 
     @Override
     public Map<String, Object> NanAnTop(String type) {
-      Map<String,Object> result=new HashMap<>();
+        Map<String, Object> result = new HashMap<>();
         List<Map<String, Object>> nanAnTop = mailDao.findNanAnTop(type);
-        if (!Blank.isEmpty(nanAnTop)){
-            result.put("listTop",nanAnTop);
-            result.put("length",nanAnTop.size());
+        if (!Blank.isEmpty(nanAnTop)) {
+            result.put("listTop", nanAnTop);
+            result.put("length", nanAnTop.size());
             return result;
         }
         return null;
@@ -340,7 +362,7 @@ public class MailServiceImpl implements MailService {
                 maps.add(mapVo);
             }
         }
-        return  maps;
+        return maps;
     }
 
     private List<MapVo> getType1(List<Mail> dayData) {
@@ -361,16 +383,16 @@ public class MailServiceImpl implements MailService {
                 maps.add(mapVo);
             }
         }
-        return  maps;
+        return maps;
     }
 
-//    private void hasAndAddMap2(MapVo vo, String text){
+    //    private void hasAndAddMap2(MapVo vo, String text){
 //
 //    }
     private void hasAndAddMap(Map<String, Object> map, String text) {
-        if (ObjectUtil.isNull(map.get(text))){
+        if (ObjectUtil.isNull(map.get(text))) {
             map.put(text, 1);
-        }else {
+        } else {
             int integer = Convert.toInt(map.get(text));
             integer++;
             map.put(text, integer);

nngkxxdp/src/main/resources/mapper/MailDao.xml

@@ -217,6 +217,22 @@
         ORDER BY releaseDate asc
     </select>
 
+    <select id="findWebNew" resultType="java.util.Map">
+        SELECT
+            a.columnFirstName,
+            count( * ) AS count,
+            MAX( a.releaseDate ) AS releaseDate
+        FROM
+            article AS a
+        WHERE
+            a.type = #{type}
+          AND a.urlId = #{Id}
+        GROUP BY
+            a.columnFirstName
+        ORDER BY
+            releaseDate ASC
+    </select>
+
     <select id="findWebUpdateCount" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM article as a
@@ -248,6 +264,30 @@
         WHERE d.`column`=#{name}
     </select>
 
+    <select id="findDeptNew" resultType="java.util.Map">
+        SELECT
+            b.columnFirstName,
+            d.deptname
+        FROM
+            (
+                SELECT
+                    a.columnFirstName,
+                    MAX( a.releaseDate ) AS releaseDate
+                FROM
+                    article AS a
+                WHERE
+                    a.type = #{type}
+                  AND a.urlId = #{Id}
+                GROUP BY
+                    a.columnFirstName
+                ORDER BY
+                    releaseDate ASC
+            ) b
+                RIGHT JOIN dept d ON d.`column` = b.columnFirstName
+        WHERE
+            b.columnFirstName IS NOT NULL;
+    </select>
+
 
 
     <select id="findDeptName" resultType="java.lang.String">

nngkxxdp/src/main/resources/mapper/TjDao.xml

@@ -352,5 +352,37 @@
 	<select id="getPartitionGroup" resultType="java.util.Map">
 		SELECT * FROM t_partition_group
 	</select>
+
+	<select id="findOfficialAccount" resultType="java.util.Map">
+		SELECT
+			id,
+			official_account,
+			title,
+			url,
+			sort,
+			create_time
+		FROM
+			sort_article
+		GROUP BY
+			official_account
+		ORDER BY
+			create_time
+	</select>
+
+	<select id="findHeadLines" resultType="java.util.Map">
+		SELECT
+			id,
+			official_account,
+			title,
+			url,
+			sort,
+			create_time
+		FROM
+			sort_article_headlines
+		GROUP BY
+			official_account
+		ORDER BY
+			create_time
+	</select>
 	
 </mapper>

nngkxxdp/src/main/resources/static/natj/enter_dataAll.html

@@ -59,20 +59,20 @@
 					<div class="topList">
 						<div class="layui-tab layui-tab-card" lay-filter="test1">
 							<ul class="layui-tab-title">
-								<!-- <li class="layui-this" lay-id="gdpmain">GDP</li> -->
-								<li class="layui-this" lay-id="scalemain" style="width: 100px;">规上工业总产值</li>
+								<li class="layui-this" lay-id="gdpmain">GDP增速</li>
+								<li lay-id="scalemain" style="width: 100px;">规模以上工业增加值增速</li>
 								<li lay-id="constructionmain">建筑业总产值</li>
-								<li lay-id="fixedAssetsmain">固定资产投资总额</li>
+								<li lay-id="fixedAssetsmain">固定资产投资总额增速</li>
 								<li lay-id="realtyMarketmain">商品房建设与销售</li>
 								<li lay-id="inlandTrademain">批发零售住宿餐饮业</li>
 								<li lay-id="publicIncomemain">地方财政收支</li>
 								<li lay-id="bankmain">金融机构存贷款</li>
 							</ul>
 							<div class="layui-tab-content" style="height: 500px;">
-								<!-- <div class="layui-tab-item layui-show" id="gdpmain"
+								<div class="layui-tab-item layui-show" id="gdpmain"
 									style="height: 480px;width: 1200px;">
-								</div> -->
-								<div class="layui-tab-item layui-show">
+								</div>
+								<div class="layui-tab-item">
 									<div id="scalemain" style="height: 480px;width: 1200px;"></div>
 								</div>
 								<div class="layui-tab-item">

nngkxxdp/src/main/resources/static/natj/enter_showStatis.html

@@ -1,225 +1,225 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <meta charset="utf-8"/>
-    <title>南岸区大屏</title>
-    <link rel="stylesheet" type="text/css" href="css/index.css"/>
-    <link rel="stylesheet" href="./layui/layui.css" media="all">
-    <style type="text/css">
-        html,
-        body {
-            width: 1150px;
-            padding: 0;
-            margin: 0;
-        }
-
-        @font-face {
-            font-family: RUIZIZHENYANTIMIANFEISHANGYONG;
-            src: url(./font/RUIZIZHENYANTIMIANFEISHANGYONG-2.TTF);
-        }
-
-        .all {
-            width: 1150px;
-            position: relative;
-            background-color: #EAF1F8;
-            min-width: 1150px;
-            height: 100%;
-        }
-
-        .logo {
-            background-image: none;
-            text-align: left;
-            padding-left: 20px;
-            font-family: RUIZIZHENYANTIMIANFEISHANGYONG;
-            color: #333;
-            background-color: #fff;
-            box-sizing: border-box;
-            width: 50%;
-            letter-spacing: 4px;
-        }
-
-        .topList {
-            display: flex;
-            /* margin: 0 10px; */
-            width: 100%;
-            justify-content: space-between;
-            height: 500px;
-            margin-bottom: 20px;
-        }
-
-        .topList > div {
-            width: 99%;
-        }
-
-        .topList .layui-tab-title li {
-            min-width: 115px;
-        }
-
-        .topList .layui-tab-title li:first-child {
-            min-width: 60px;
-        }
-
-        .topList .layui-tab-title li:nth-of-type(6) {
-            min-width: 133px;
-        }
-
-        .topList .layui-tab-card > .layui-tab-title {
-            background-color: #EAF1F8;
-        }
-
-        .layui-tab-content {
-
-            background: #fff;
-        }
-
-        .CenterList {
-            padding: 0px 40px 20px 20px;
-        }
-
-        .centerTit {
-            border-bottom: 2px solid #DAE4ED;
-            height: 40px;
-            line-height: 40px;
-        }
-
-        .centerTit span {
-            color: #2382FE;
-            font-weight: bold;
-            display: inline-block;
-            height: 80%;
-            width: 100px;
-            text-align: center;
-            margin-top: 8px;
-            border-bottom: 3px solid #2382FE;
-        }
-
-        .centerSelect {
-            margin-top: 10px;
-        }
-
-        .layui-form-label {
-            text-align: left;
-        }
-
-        .centerCon {
-            height: 410px;
-            display: flex;
-        }
-
-        .centerCon .centerTree {
-            border: 1px solid #DAE4ED;
-            width: 20%;
-            overflow: auto;
-        }
-
-        .centerCon .centerLine {
-            flex: 2;
-
-        }
-
-        .layui-tree-iconArrow:after {
-
-            border-color: transparent transparent transparent #1E9FFF;
-
-        }
-
-        .centerTable table {
-            width: 100%;
-            margin-top: 20px;
-            color: #333;
-            border: 1px solid #e3e9f0;
-            text-indent: 2em;
-        }
-
-        .centerTable table tr {
-            border: 1px solid #e3e9f0;
-        }
-
-        .centerTable table th {
-            background-color: #D7DEE6;
-            color: #333;
-            text-align: left;
-            font-weight: normal;
-            font-size: 16px;
-
-        }
-
-        .centerTable table th,
-        td {
-            height: 40px;
-            min-width: 165px;
-        }
-
-        .centerTable table th:first-child {
-            min-width: 200px;
-        }
-
-        .centerTable table tr:nth-of-type(2n) {
-            background-color: #f1f5f9;
-        }
-
-        .bottomListOne {
-            width: 46%;
-            border: 1px solid #E9E9E9;
-            height: 250px;
-        }
-
-        .bottomTit {
-            display: flex;
-            justify-content: space-between;
-            height: 40px;
-            border-bottom: 1px solid #E9E9E9;
-            margin-right: 5px;
-        }
-
-        .bottomTit span {
-            display: inline-block;
-            height: 100%;
-            width: 80px;
-            line-height: 40px;
-        }
-
-        .bottomTit span:first-child {
-            background-color: #007AFF;
-            color: #fff;
-            text-align: center;
-            position: relative;
-        }
-
-        .bottomTit span:first-child::after {
-            content: '';
-            position: absolute;
-            left: 50%;
-            border-width: 8px;
-            border-style: solid;
-            border-color: #007AFF transparent transparent transparent;
-            top: 100%;
-            margin-left: -4px;
-        }
-
-        .bottomTit span:last-child {
-            color: #999;
-
-        }
-
-        .bottomCon ul li {
-            list-style: inside;
-            height: 30px;
-            line-height: 30px;
-            padding: 5px 13px 5px 10px;
-        }
-
-        .bottomCon ul li span {
-            float: right;
-        }
-
-        .topList .layui-tab-card > .layui-tab-title .layui-this {
-            color: #007AFF;
-            font-weight: bold;
-            /* font-size: 16px; */
-        }
-
-        /* .layui-tab-card>.layui-tab-title .layui-this:after {
+	<head>
+		<meta charset="utf-8" />
+		<title>南岸区大屏</title>
+		<link rel="stylesheet" type="text/css" href="css/index.css" />
+		<link rel="stylesheet" href="./layui/layui.css" media="all">
+		<style type="text/css">
+			html,
+			body {
+				width: 1150px;
+				padding: 0;
+				margin: 0;
+			}
+
+			@font-face {
+				font-family: RUIZIZHENYANTIMIANFEISHANGYONG;
+				src: url(./font/RUIZIZHENYANTIMIANFEISHANGYONG-2.TTF);
+			}
+
+			.all {
+				width: 1150px;
+				position: relative;
+				background-color: #EAF1F8;
+				min-width: 1150px;
+				height: 100%;
+			}
+
+			.logo {
+				background-image: none;
+				text-align: left;
+				padding-left: 20px;
+				font-family: RUIZIZHENYANTIMIANFEISHANGYONG;
+				color: #333;
+				background-color: #fff;
+				box-sizing: border-box;
+				width: 50%;
+				letter-spacing: 4px;
+			}
+
+			.topList {
+				display: flex;
+				/* margin: 0 10px; */
+				width: 100%;
+				justify-content: space-between;
+				height: 500px;
+				margin-bottom: 20px;
+			}
+
+			.topList>div {
+				width: 99%;
+			}
+
+			/* .topList .layui-tab-title li {
+				min-width: 115px;
+			} */
+
+			.topList .layui-tab-title li:first-child {
+				min-width: 60px;
+			}
+
+			/* .topList .layui-tab-title li:nth-of-type(6) {
+				min-width: 133px;
+			} */
+
+			.topList .layui-tab-card>.layui-tab-title {
+				background-color: #EAF1F8;
+			}
+
+			.layui-tab-content {
+
+				background: #fff;
+			}
+
+			.CenterList {
+				padding: 0px 40px 20px 20px;
+			}
+
+			.centerTit {
+				border-bottom: 2px solid #DAE4ED;
+				height: 40px;
+				line-height: 40px;
+			}
+
+			.centerTit span {
+				color: #2382FE;
+				font-weight: bold;
+				display: inline-block;
+				height: 80%;
+				width: 100px;
+				text-align: center;
+				margin-top: 8px;
+				border-bottom: 3px solid #2382FE;
+			}
+
+			.centerSelect {
+				margin-top: 10px;
+			}
+
+			.layui-form-label {
+				text-align: left;
+			}
+
+			.centerCon {
+				height: 410px;
+				display: flex;
+			}
+
+			.centerCon .centerTree {
+				border: 1px solid #DAE4ED;
+				width: 20%;
+				overflow: auto;
+			}
+
+			.centerCon .centerLine {
+				flex: 2;
+
+			}
+
+			.layui-tree-iconArrow:after {
+
+				border-color: transparent transparent transparent #1E9FFF;
+
+			}
+
+			.centerTable table {
+				width: 100%;
+				margin-top: 20px;
+				color: #333;
+				border: 1px solid #e3e9f0;
+				text-indent: 2em;
+			}
+
+			.centerTable table tr {
+				border: 1px solid #e3e9f0;
+			}
+
+			.centerTable table th {
+				background-color: #D7DEE6;
+				color: #333;
+				text-align: left;
+				font-weight: normal;
+				font-size: 16px;
+
+			}
+
+			.centerTable table th,
+			td {
+				height: 40px;
+				min-width: 165px;
+			}
+
+			.centerTable table th:first-child {
+				min-width: 200px;
+			}
+
+			.centerTable table tr:nth-of-type(2n) {
+				background-color: #f1f5f9;
+			}
+
+			.bottomListOne {
+				width: 46%;
+				border: 1px solid #E9E9E9;
+				height: 250px;
+			}
+
+			.bottomTit {
+				display: flex;
+				justify-content: space-between;
+				height: 40px;
+				border-bottom: 1px solid #E9E9E9;
+				margin-right: 5px;
+			}
+
+			.bottomTit span {
+				display: inline-block;
+				height: 100%;
+				width: 80px;
+				line-height: 40px;
+			}
+
+			.bottomTit span:first-child {
+				background-color: #007AFF;
+				color: #fff;
+				text-align: center;
+				position: relative;
+			}
+
+			.bottomTit span:first-child::after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				border-width: 8px;
+				border-style: solid;
+				border-color: #007AFF transparent transparent transparent;
+				top: 100%;
+				margin-left: -4px;
+			}
+
+			.bottomTit span:last-child {
+				color: #999;
+
+			}
+
+			.bottomCon ul li {
+				list-style: inside;
+				height: 30px;
+				line-height: 30px;
+				padding: 5px 13px 5px 10px;
+			}
+
+			.bottomCon ul li span {
+				float: right;
+			}
+
+			.topList .layui-tab-card>.layui-tab-title .layui-this {
+				color: #007AFF;
+				font-weight: bold;
+				/* font-size: 16px; */
+			}
+
+			/* .layui-tab-card>.layui-tab-title .layui-this:after {
               content: '';
               width: 70%;
               height: 4px;
@@ -227,200 +227,201 @@
               left: 21px;
               top: 37px;
         } */
-        .topList .layui-tab-card > .layui-tab-title .layui-this::before {
-            content: '';
-            position: absolute;
-            width: 16px;
-            height: 16px;
-            background: #EAF1F8;
-            top: -7px;
-            left: -10px;
-            transform: rotate(45deg);
-
-        }
-
-        .topList .layui-tab-card > .layui-tab-title .layui-this::after {
-            content: '';
-            border: none;
-            position: absolute;
-            width: 16px;
-            height: 16px;
-            background: #EAF1F8;
-            top: -7px;
-            /* left: 130px; */
-            left: 93%;
-            transform: rotate(-45deg);
-
-        }
-
-        .bottomListOne .layui-tab {
-            margin: 0;
-        }
-
-        .bottomListOne .layui-tab-card > .layui-tab-title {
-            background-color: #fff;
-            position: relative;
-
-        }
-
-        .bottomListOne .layui-tab-card > .layui-tab-title .layui-this {
-            background-color: #007AFF;
-            font-weight: normal;
-            font-size: 14px;
-            color: #fff;
-            border: none;
-        }
-
-        .bottomListOne .layui-tab-card {
-            border-width: 1px;
-            border-style: none;
-            border-radius: none;
-            box-shadow: none;
-        }
-
-        .bottomListOne .layui-tab-card > .layui-tab-title .layui-this::before {
-            content: '';
-            position: absolute;
-            width: 15px;
-            height: 15px;
-            background: #007AFF;
-            top: 30px;
-            left: 39px;
-            transform: rotate(45deg);
-            z-index: 2;
-
-        }
-
-        .bottomListOne ul > span {
-            display: inline-block;
-            color: #999;
-            width: 100px;
-            height: 40px;
-            /* z-index: 1111111111111; */
-
-            line-height: 40px;
-            font-size: 14px;
-            position: absolute;
-            right: 0px;
-
-        }
-
-        .czbtn {
-            position: absolute;
-            bottom: 0;
-            left: 50%;
-            transform: translateX(-50%);
-            /* margin-left: 30px; */
-            z-index: 99999999;
-        }
-    </style>
-</head>
-<body>
-<div class="all all_enter_show">
-    <div style="display: flex;justify-content: space-between;background-color: #fff;border-bottom: 2px solid #C1C1C1;;">
-        <div class="logo">
-            南岸区经济发展数据
-        </div>
-        <div class="showTime" style="position: inherit;margin-top: 31px;color: #0990F8;">
-            <div class="timeDeatil" style="line-height: 42px;">10:12:23</div>
-            <div class="dateLine" style="line-height: 42px;margin-right: 10px;">|</div>
-            <div>
-                <p class="dateMon">星期四</p>
-                <p class="dateDeatil">2021-09-12</p>
-            </div>
-        </div>
-    </div>
-
-    <div class="main-container">
-        <div class="topList">
-            <div class="layui-tab layui-tab-card" lay-filter="test1">
-                <ul class="layui-tab-title">
-                    <!-- <li class="layui-this" lay-id="gdpmain">GDP</li> -->
-                    <li class="layui-this" lay-id="scalemain" style="width: 100px;">规上工业总产值</li>
-                    <li lay-id="constructionmain">建筑业总产值</li>
-                    <li lay-id="fixedAssetsmain">固定资产投资总额</li>
-                    <li lay-id="realtyMarketmain">商品房建设与销售</li>
-                    <li lay-id="inlandTrademain">批发零售住宿餐饮业</li>
-                    <li lay-id="publicIncomemain">地方财政收支</li>
-                    <li lay-id="bankmain">金融机构存贷款</li>
-                </ul>
-                <div class="layui-tab-content" style="height: 400px;">
-                    <!-- <div class="layui-tab-item layui-show" id="gdpmain" style="height: 100%;width: 100%;">
-                    </div> -->
-                    <div class="layui-tab-item layui-show">
-                        <div id="scalemain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item">
-                        <div id="constructionmain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item">
-                        <div id="fixedAssetsmain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item">
-                        <div id="realtyMarketmain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item">
-                        <div id="inlandTrademain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item" style="position: relative;">
-                        <div class="czbtn">
-                            <div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政支出</div>
-                            <div class="layui-btn layui-btn-xs layui-btn-normal togglePic">税收收入</div>
-                            <div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政收入</div>
-                        </div>
-                        <div id="publicIncomemain" style="height: 400px;width: 1146px;"></div>
-                    </div>
-                    <div class="layui-tab-item" style="position: relative;">
-                        <div class="czbtn">
-                            <div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币存款余额</div>
-                            <div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币贷款余额</div>
-                        </div>
-                        <div id="bankmain" style="height: 400px;width: 1146px;"></div>
-
-                    </div>
-                </div>
-            </div>
-
-
-        </div>
-        <div class="CenterList" style="height: auto;background-color: #fff;">
-            <div class="centerTit">
-                <span>详细数据</span>
-            </div>
-            <div class="centerSelect">
-                <div class="layui-form">
-
-                </div>
-            </div>
-            <div class="centerCon">
-                <div class="centerTree">
-                    <div id="test13" class="demo-tree-more"></div>
-                </div>
-                <div class="centerLine" id="mainCenter" style="height: 100%;width: 876px;"></div>
-            </div>
-            <div class="centerTable" style="overflow-x: scroll;">
-                <table border="0" cellspacing="" cellpadding="">
-                    <tr class="tableTit">
-                    </tr>
-                    <tbody class="tableMain">
-
-                    </tbody>
-
-                </table>
-            </div>
-        </div>
-
-    </div>
-
-
-</div>
-
-
-<script src="layui/layui.js"></script>
-<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/enterStatisMain.js" type="text/javascript" charset="utf-8"></script>
-
-
-</body>
+			.topList .layui-tab-card>.layui-tab-title .layui-this::before {
+				content: '';
+				position: absolute;
+				width: 16px;
+				height: 16px;
+				background: #EAF1F8;
+				top: -7px;
+				left: -10px;
+				transform: rotate(45deg);
+
+			}
+
+			.topList .layui-tab-card>.layui-tab-title .layui-this::after {
+				content: '';
+				border: none;
+				position: absolute;
+				width: 16px;
+				height: 16px;
+				background: #EAF1F8;
+				top: -7px;
+				/* left: 130px; */
+				left: 93%;
+				transform: rotate(-45deg);
+
+			}
+
+			.bottomListOne .layui-tab {
+				margin: 0;
+			}
+
+			.bottomListOne .layui-tab-card>.layui-tab-title {
+				background-color: #fff;
+				position: relative;
+
+			}
+
+			.bottomListOne .layui-tab-card>.layui-tab-title .layui-this {
+				background-color: #007AFF;
+				font-weight: normal;
+				font-size: 14px;
+				color: #fff;
+				border: none;
+			}
+
+			.bottomListOne .layui-tab-card {
+				border-width: 1px;
+				border-style: none;
+				border-radius: none;
+				box-shadow: none;
+			}
+
+			.bottomListOne .layui-tab-card>.layui-tab-title .layui-this::before {
+				content: '';
+				position: absolute;
+				width: 15px;
+				height: 15px;
+				background: #007AFF;
+				top: 30px;
+				left: 39px;
+				transform: rotate(45deg);
+				z-index: 2;
+
+			}
+
+			.bottomListOne ul>span {
+				display: inline-block;
+				color: #999;
+				width: 100px;
+				height: 40px;
+				/* z-index: 1111111111111; */
+
+				line-height: 40px;
+				font-size: 14px;
+				position: absolute;
+				right: 0px;
+
+			}
+
+			.czbtn {
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				/* margin-left: 30px; */
+				z-index: 99999999;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="all all_enter_show">
+			<div
+				style="display: flex;justify-content: space-between;background-color: #fff;border-bottom: 2px solid #C1C1C1;;">
+				<div class="logo">
+					南岸区经济发展数据
+				</div>
+				<div class="showTime" style="position: inherit;margin-top: 31px;color: #0990F8;">
+					<div class="timeDeatil" style="line-height: 42px;">10:12:23</div>
+					<div class="dateLine" style="line-height: 42px;margin-right: 10px;">|</div>
+					<div>
+						<p class="dateMon">星期四</p>
+						<p class="dateDeatil">2021-09-12</p>
+					</div>
+				</div>
+			</div>
+
+			<div class="main-container">
+				<div class="topList">
+					<div class="layui-tab layui-tab-card" lay-filter="test1">
+						<ul class="layui-tab-title">
+							<li class="layui-this" lay-id="gdpmain" style="width: 80px;">GDP增速</li>
+							<li lay-id="scalemain" style="width: 150px;">规模以上工业增加值增速</li>
+							<li lay-id="constructionmain" style="width: 100px;">建筑业总产值</li>
+							<li lay-id="fixedAssetsmain" style="width: 130px;">固定资产投资总额增速</li>
+							<li lay-id="realtyMarketmain" style="width: 120px;">商品房建设与销售</li>
+							<li lay-id="inlandTrademain" style="width: 120px;">批发零售住宿餐饮业</li>
+							<li lay-id="publicIncomemain" style="width: 100px;">地方财政收支</li>
+							<li lay-id="bankmain" style="width: 100px;">金融机构存贷款</li>
+						</ul>
+						<div class="layui-tab-content" style="height: 400px;">
+							<div class="layui-tab-item layui-show" id="gdpmain" style="height: 400px;width: 1146px;">
+							</div>
+							<div class="layui-tab-item">
+								<div id="scalemain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item">
+								<div id="constructionmain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item">
+								<div id="fixedAssetsmain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item">
+								<div id="realtyMarketmain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item">
+								<div id="inlandTrademain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item" style="position: relative;">
+								<div class="czbtn">
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政支出</div>
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">税收收入</div>
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic">＃公共财政收入</div>
+								</div>
+								<div id="publicIncomemain" style="height: 400px;width: 1146px;"></div>
+							</div>
+							<div class="layui-tab-item" style="position: relative;">
+								<div class="czbtn">
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币存款余额</div>
+									<div class="layui-btn layui-btn-xs layui-btn-normal togglePic2">金融机构人民币贷款余额</div>
+								</div>
+								<div id="bankmain" style="height: 400px;width: 1146px;"></div>
+
+							</div>
+						</div>
+					</div>
+
+
+				</div>
+				<div class="CenterList" style="height: auto;background-color: #fff;">
+					<div class="centerTit">
+						<span>详细数据</span>
+					</div>
+					<div class="centerSelect">
+						<div class="layui-form">
+
+						</div>
+					</div>
+					<div class="centerCon">
+						<div class="centerTree">
+							<div id="test13" class="demo-tree-more"></div>
+						</div>
+						<div class="centerLine" id="mainCenter" style="height: 100%;width: 876px;"></div>
+					</div>
+					<div class="centerTable" style="overflow-x: scroll;">
+						<table border="0" cellspacing="" cellpadding="">
+							<tr class="tableTit">
+							</tr>
+							<tbody class="tableMain">
+
+							</tbody>
+
+						</table>
+					</div>
+				</div>
+
+			</div>
+
+
+		</div>
+
+
+		<script src="layui/layui.js"></script>
+		<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="js/enterStatisMain.js" type="text/javascript" charset="utf-8"></script>
+
+
+	</body>
 </html>

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

@@ -14,7 +14,13 @@
         4.2,
         7.7,
         6.2
-      ]
+      ],
+	  "growth": [
+	    1.6,
+	    4.2,
+	    7.7,
+	    6.2
+	  ]
     },
     {
       "date": "2019",
@@ -30,6 +36,12 @@
         -15.9,
         -6.93,
         6.4
+      ],
+	  "growth": [
+        8.7,
+        -15.9,
+        -6.93,
+        6.4
       ]
     },
     {
@@ -46,7 +58,13 @@
         4.02,
         1.11,
         6.4
-      ]
+      ],
+	  "growth": [
+	    -14.06,
+	    4.02,
+	    1.11,
+	    6.4
+	  ]
     },
     {
       "date": "2021",
@@ -62,7 +80,24 @@
         11.1,
         13.4,
         0.1
-      ]
-    }
+      ],
+	  "growth": [
+	    12.3,
+	    11.1,
+	    13.4,
+	    0.1
+	  ]
+    },
+	{
+	  "date": "2022",
+	  "name": "固定资产投资总额增速",
+	  "totalNum": [
+	    "631356"
+	  ],
+	  "alloneBasis": [
+	    12.3
+	  ],
+	  "growth":[9.6]
+	}
   ]
 }

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

@@ -15,6 +15,12 @@
         2,
         2.9
       ],
+	  "growth": [
+	    -9.9,
+	    0.2,
+	    2,
+	    2.9
+	  ],
       "subData": [
         {
           "type": 101,
@@ -111,6 +117,12 @@
         5.7,
         6.1
       ],
+	  "growth": [
+	    7.5,
+	    5.6,
+	    5.7,
+	    6.1
+	  ],
       "subData": [
         {
           "type": 101,
@@ -207,6 +219,12 @@
         2.0,
         3.5
       ],
+	  "growth": [
+	    -7.8,
+	    0,
+	    2.0,
+	    3.5
+	  ],
       "subData": [
         {
           "type": 101,
@@ -303,6 +321,12 @@
         10,
         6.2
       ],
+	  "growth": [
+	    18.5,
+	    12.8,
+	    10,
+	    6.2
+	  ],
       "subData": [
         {
           "type": 101,
@@ -383,6 +407,52 @@
           }
         }
       ]
-    }
+    },
+	{
+	  "date": "2022",
+	  "name": "地区生产总值",
+	  "totalNum": [
+	    "2028507"
+	  ],
+	  "alloneBasis": [
+	    18.5
+	  ],
+	  "growth":[3.9],
+	  "subData": [
+	    {
+	      "type": 101,
+	      "subName": "第一产业",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 8646,
+	          "oneBasis": -0.4,
+	          "proportion": 0.4
+	        }
+	      }
+	    },
+	    {
+	      "type": 102,
+	      "subName": "第二产业",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 667514,
+	          "oneBasis": 3.9,
+	          "proportion": 32.4
+	        }
+	      }
+	    },
+	    {
+	      "type": 103,
+	      "subName": "第三产业",
+	      "data": {
+	        "firstQuarter": {
+	          "totalQuarter": 1387155,
+	          "oneBasis": 4.2,
+	          "proportion": 67.2
+	        }
+	      }
+	    }
+	  ]
+	}
   ]
 }

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

@@ -14,7 +14,13 @@
         -1.7,
         -2.53,
         -4.3
-      ]
+      ],
+	  "growth": [
+	    -20.3,
+	    -1.7,
+	    -2.53,
+	    -4.3
+	  ]
     },
     {
       "date": "2019",
@@ -30,7 +36,13 @@
         10.7,
         5.56,
         3.72
-      ]
+      ],
+	  "growth": [
+	    17.3,
+	    10.7,
+	    5.56,
+	    3.72
+	  ]
     },
     {
       "date": "2020",
@@ -46,7 +58,13 @@
         0.54,
         0.62,
         0.69
-      ]
+      ],
+	  "growth": [
+	    -17.5,
+	    0.54,
+	    0.62,
+	    0.69
+	  ]
     },
     {
       "date": "2021",
@@ -62,7 +80,24 @@
         17.4,
         15.35,
         9.49
-      ]
+      ],
+	  "growth": [
+	    59.7,
+	    17.4,
+	    15.35,
+	    9.49
+	  ]
+    },
+    {
+      "date": "2022",
+      "name": "规模以上工业增加值增速",
+      "totalNum": [
+        "2313252.8"
+      ],
+      "alloneBasis": [
+        59.7
+      ],
+	  "growth":[4.6]
     }
   ]
 }

nngkxxdp/src/main/resources/static/page/index.html

@@ -712,7 +712,6 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
                                         <div class="line"></div>
                                     </div>
                                     <div class="remindList">

nngkxxdp/src/main/resources/static/zdjc/decision.html

@@ -77,7 +77,8 @@
 				<div class="more " id="moreConntent" onclick="addMoreContent()">更多>></div>
 			</div>
 			<div class="ly-last">
-				<img alt="" src="img/zdgk-index-table-v2-1.jpg">
+				<img alt="" src="/zdjc_ml/zdgk-index-table-v2-1.jpg">
+<!--				<img alt="" src="img/zdgk-index-table-v2-1.jpg">-->
 <!--				<img alt="" src="img/zdgk-index-table-v2-2.png">-->
 			</div>
 			<div class="foot"></div>