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

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

@@ -56,7 +56,21 @@
     </select>
 
     <select id="getShortMessage" resultType="java.util.Map">
-        SELECT id,n_dept,leaderperson,leaderphone,workphone,workperson FROM t_user where n_dept!=''
+        SELECT
+            td.deptid,
+            td.deptname,
+            tu.id,
+            tu.n_dept,
+            tu.leaderperson,
+            tu.leaderphone,
+            tu.workphone,
+            tu.workperson
+        FROM
+            t_dept td
+                LEFT JOIN t_user tu ON td.deptid = tu.deptid
+        WHERE
+            n_dept != ''
+        group by n_dept
             LIMIT 999999999
     </select>
 </mapper>

nngkxxdp/src/main/resources/static/natj/js/enterStatisMain.js

@@ -8,30 +8,30 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function() {
 		element = layui.element,
 		data1 = [
 			// {
-			// 	title: '地区生产总值',
-			// 	id: 1,
-			// 	children: [{
-			// 		title: '第一产业',
-			// 		id: 1000,
-			// 		type: 101,
-			// 		clickType: 1,
-			// 		color1: '#9BCE4A',
-			// 		color2: '#ffb43e'
-			// 	}, {
-			// 		title: '第二产业',
-			// 		id: 1001,
-			// 		type: 102,
-			// 		clickType: 1,
-			// 		color1: '#29B6F6',
-			// 		color2: '#5efff5'
-			// 	}, {
-			// 		title: '第三产业',
-			// 		id: 1002,
-			// 		type: 103,
-			// 		clickType: 1,
-			// 		color1: '#34D3EB',
-			// 		color2: '#9cdc7e'
-			// 	}]
+				// title: '地区生产总值',
+				// id: 1,
+				// children: [{
+				// 	title: '第一产业',
+				// 	id: 1000,
+				// 	type: 101,
+				// 	clickType: 1,
+				// 	color1: '#9BCE4A',
+				// 	color2: '#ffb43e'
+				// }, {
+				// 	title: '第二产业',
+				// 	id: 1001,
+				// 	type: 102,
+				// 	clickType: 1,
+				// 	color1: '#29B6F6',
+				// 	color2: '#5efff5'
+				// }, {
+				// 	title: '第三产业',
+				// 	id: 1002,
+				// 	type: 103,
+				// 	clickType: 1,
+				// 	color1: '#34D3EB',
+				// 	color2: '#9cdc7e'
+				// }]
 			// },
 			{
 				title: '规模以上工业增加值增速',
@@ -146,7 +146,6 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function() {
 		data: data1,
 		showLine: false, //是否开启连接线
 		click: function(obj) {
-			// console.log(obj);
 			myChart.innerHTML = "";
 			$('.tableMain').empty();
 
@@ -445,8 +444,7 @@ function getAllwholeScale(data1, myChart) {
 function getAllFinancial(data1, myChart) {
 	var str, listdataa;
 	getData('./json/financial.json').then(data => {
-		var children = data1[8].children;
-		// console.log(data1);
+		var children = data1[7].children;
 		var array = [];
 		for (var i = 0; i < children.length; i++) {
 			array.push(getScaleByTypeAll(data.financial, children[i]));
@@ -467,9 +465,13 @@ function getAllFinancial(data1, myChart) {
 		}
 
 		for (var j = 0; j < data.financial.length; j++) {
-			for (var k = 0; k < 4; k++) {
-				let a = NoToChinese(Number(k) + 1)
-				str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
+			if(data.financial[j].subData[0].data.firstSecondQuarter){
+				for (var k = 0; k < 4; k++) {
+					let a = NoToChinese(Number(k) + 1)
+					str += '<th>' + data.financial[j].date + '第一至' + a + '季度</th>'
+				}
+			}else{
+				str += '<th>' + data.financial[j].date + '第一至一季度</th>'
 			}
 
 		}
@@ -483,8 +485,7 @@ function getAllFinancial(data1, myChart) {
 function getAllFinan(data1, myChart) {
 	var str, listdataa;
 	getData('./json/bank.json').then(data => {
-		var children = data1[9].children;
-
+		var children = data1[8].children;
 		var array = [];
 		for (var i = 0; i < children.length; i++) {
 			array.push(getScaleByTypeAll(data.finance, children[i]));
@@ -645,11 +646,14 @@ function getFinancial(obj, myChart) {
 		}
 		listdataa += '</tr>'
 		for (var j = 0; j < list.length; j++) {
-			for (var k = 0; k < 4; k++) {
-				let a = NoToChinese(Number(k) + 1)
-				str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
+			if(list[j].subData[0].data.firstSecondQuarter){
+				for (var k = 0; k < 4; k++) {
+					let a = NoToChinese(Number(k) + 1)
+					str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
+				}
+			}else{
+				str += '<th>' + list[j].date + '第一至一季度</th>'
 			}
-
 		}
 
 		$('.tableTit').append(str);
@@ -718,9 +722,13 @@ function getBank(obj, myChart) {
 		}
 		listdataa += '</tr>'
 		for (var j = 0; j < list.length; j++) {
-			for (var k = 0; k < 4; k++) {
-				let a = NoToChinese(Number(k) + 1)
-				str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
+			if(list[j].subData[0].data.firstSecondQuarter){
+				for (var k = 0; k < 4; k++) {
+					let a = NoToChinese(Number(k) + 1)
+					str += '<th>' + list[j].date + '第一至' + a + '季度</th>'
+				}
+			}else{
+				str += '<th>' + list[j].date + '第一至一季度</th>'
 			}
 
 		}

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

@@ -417,7 +417,7 @@
 	  "alloneBasis": [
 	    18.5
 	  ],
-	  "growth":[3.9],
+	  "growth":[4.1],
 	  "subData": [
 	    {
 	      "type": 101,

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

@@ -2,7 +2,7 @@
   "scale": [
     {
       "date": "2018",
-      "name": "规模以上工业增加值增速",
+      "name": "规模以上工业",
       "totalNum": [
         "1698531",
         "3516015",
@@ -24,7 +24,7 @@
     },
     {
       "date": "2019",
-      "name": "规模以上工业增加值增速",
+      "name": "规模以上工业",
       "totalNum": [
         "1753752.8",
         "3749046.7",
@@ -46,7 +46,7 @@
     },
     {
       "date": "2020",
-      "name": "规模以上工业增加值增速",
+      "name": "规模以上工业",
       "totalNum": [
         "1442223",
         "3765347.5",
@@ -68,7 +68,7 @@
     },
     {
       "date": "2021",
-      "name": "规模以上工业增加值增速",
+      "name": "规模以上工业",
       "totalNum": [
         "2313252.8",
         "4453822.2",
@@ -90,7 +90,7 @@
     },
     {
       "date": "2022",
-      "name": "规模以上工业增加值增速",
+      "name": "规模以上工业",
       "totalNum": [
         "2313252.8"
       ],

nngkxxdp/src/main/resources/static/wzkp/css/wzkp.css

@@ -72,9 +72,9 @@ body {
 }
 
 .branch_street li.layui-this {
-    background: linear-gradient(90deg, #4381DC 0%, #195CAF 100%);
+    background: linear-gradient(90deg, #4381DC 0%, #195CAF 100%) !important;
     border-radius: 25px 25px 0px 25px;
-    color: #FFFFFF;
+    color: #FFFFFF !important;
 }
 
 .branch_street .layui-this:after {
@@ -438,7 +438,7 @@ body {
     background: #F8FAFE !important;
 }
 
-.table_css {
+.table_wrap {
     margin: 0 !important;
 }
 
@@ -446,40 +446,44 @@ body {
     border: 0px !important;
 }
 
-.table_css thead tr {
+.table_wrap thead tr {
     background: #4280DB !important;
 }
 
-.table_css thead tr th {
-    padding: 16px 15px !important;
+.table_wrap thead tr th {
+    padding: 16px 0px !important;
     font-size: 18px !important;
     font-family: PingFang SC !important;
     font-weight: bold !important;
     color: #FFFFFF !important;
 }
 
-.table_css thead tr th:first-child {
+.table_wrap thead tr th:first-child {
     border-collapse: separate !important;
     border-spacing: 0 !important;
     border-radius: 15px 0 0 0 !important;
 }
 
-.table_css thead tr th:last-child {
+.table_wrap thead tr th:last-child {
     border-collapse: separate;
     border-spacing: 0;
     border-radius: 0 15px 0 0;
 }
 
-.table_css tbody tr:nth-child(odd) {
+.table_wrap tbody tr:nth-child(odd) {
     background: #FFFFFF !important;
 }
 
-.table_css tbody tr:nth-child(even) {
+.table_wrap tbody tr:nth-child(even) {
     background: #F0F5FE !important;
 }
 
-.table_css tbody tr td {
-    padding: 16px 15px !important;
+.table_wrap .layui-table-view {
+    border: 0 !important;
+}
+
+.table_wrap tbody tr td {
+    padding: 16px 0px !important;
     font-size: 18px !important;
     font-family: PingFang SC !important;
     /* font-weight: bold !important; */
@@ -489,7 +493,7 @@ body {
     border-color: #EDEDED !important;
 }
 
-.table_css tbody tr td:last-child {
+.table_wrap tbody tr td:last-child {
     border-width: 0 !important;
 }
 
@@ -497,7 +501,7 @@ body {
     margin-right: 16px;
 }
 
-.table_css tbody tr:last-child td:first-child {
+.table_wrap tbody tr:last-child td:first-child {
     border-collapse: separate !important;
     border-spacing: 0 !important;
     border-radius: 0 0 0 15px !important;
@@ -684,3 +688,52 @@ body {
     border-radius: 0 0 15px 0 !important;
 }
 
+.content_hide thead tr th {
+    padding: 16px 0 !important;
+    font-size: 18px !important;
+    font-family: PingFang SC !important;
+    font-weight: bold !important;
+    color: #FFFFFF !important;
+}
+
+.content_hide tbody tr td {
+    padding: 16px 0 !important;
+    font-size: 18px !important;
+    font-family: PingFang SC !important;
+    /* font-weight: bold !important; */
+    color: #666666 !important;
+    border-width: 0 1px 0 0 !important;
+    border-style: solid !important;
+    border-color: #EDEDED !important;
+}
+
+.content_hide thead tr {
+    background: #4280DB !important;
+    border-collapse: separate !important;
+    border-spacing: 0 !important;
+    border-radius: 15px 15px 0 0 !important;
+}
+
+.content_hide .layui-table-body .layui-table tbody tr:nth-child(odd) {
+    background: #FFFFFF !important;
+}
+
+.content_hide .layui-table-body .layui-table tbody tr:nth-child(even) {
+    background: #F0F5FE !important;
+}
+
+.content_hide thead tr th:first-child {
+    border-collapse: separate !important;
+    border-spacing: 0 !important;
+    border-radius: 15px 0 0 0 !important;
+}
+
+.content_hide tbody tr:last-child td:first-child {
+    border-collapse: separate !important;
+    border-spacing: 0 !important;
+    border-radius: 0 0 0 15px !important;
+}
+
+.content_hide .layui-table-view {
+    border: 0 !important;
+}

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

@@ -2426,6 +2426,7 @@
 <script type="text/javascript" src="../page/js/echarts.min.js" charset="utf-8"></script>
 <script src="../zdjc/js/constans.js"></script>
 <script>
+    var dataList = [];
     var newDataList = [];
     var hasDept = 1;
     var type = 0;
@@ -2476,7 +2477,7 @@
             },
             type: "post",
             success: function (data) {
-                let dataList = [];
+                dataList = [];
                 let lastDataList = [];
                 for (let i = 0; i < data.data.deptids.length; i++) {
                     let dataD = {};
@@ -2503,25 +2504,29 @@
                 let dlLength = dataList.length;
                 newDataList = [];
                 for (let i = 0; i < dlLength; i++) {
-                    newDataList.push(dataList[dlLength - 1 - i]);
+                    newDataList.push(dataList[i]);
                     newDataList[i].totalScore = (newDataList[i].basicScore + newDataList[i].addScore) + '(' + newDataList[i].basicScore + '/' + newDataList[i].addScore + ')';
                     for (let j = 0; j < lastDataList.length; j++) {
                         if (newDataList[i].deptid == lastDataList[j].deptid) {
-                            newDataList[i].rankingLast = j - i;
+                            newDataList[i].rankingLast = i - j;
                         }
                     }
                 }
+                //对数据进步进行排序
+                // listSort(newDataList);
+
+                //生成此类型排名表格
+                rankingDetails(newDataList, hasDept, type);
 
                 //生成此类型排名最优3位
                 bestRanking(newDataList, hasDept, type);
                 let lowestRankingList = [];
-                lowestRankingList.push(dataList[0]);
-                lowestRankingList.push(dataList[1]);
-                lowestRankingList.push(dataList[2]);
+                lowestRankingList.push(newDataList[0]);
+                lowestRankingList.push(newDataList[1]);
+                lowestRankingList.push(newDataList[2]);
                 //生成此类型排名最末3位
                 lowestRanking(lowestRankingList, hasDept, type);
 
-                //对数据进步进行排序
                 progressSort(newDataList);
                 //此类型排名进步最大3位
                 let greatestProgressList = [];
@@ -2535,12 +2540,11 @@
                 regressiveMaximumList.push(newDataList[1]);
                 regressiveMaximumList.push(newDataList[2]);
                 regressiveMaximum(regressiveMaximumList, hasDept, type);
-                //生成此类型排名表格
-                rankingDetails(newDataList, hasDept, type);
+
                 //生成相应的部门
                 generationDepartment(data.data, hasDept, type);
                 //默认选中第一个部门
-                selectDepartment(data.data.deptids[0],hasDept,type);
+                selectDepartment(data.data.deptids[0], hasDept, type);
                 // lineChart(data.data['detail-data'], data.data['detail-x'], hasDept, type);
             }
         })
@@ -2693,23 +2697,23 @@
 
     //生成本月排名最优3位
     function bestRanking(obj, hasDept, type) {
-        $("#bestRanking1" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[0].department.substring(1, 3));
-        $("#bestRanking1" + hasDept + type).children("h1").text(obj[0].department);
-        $("#bestRanking1" + hasDept + type).children("p").children("span").text((obj[0].basicScore + obj[0].addScore).toFixed(2));
-        $("#bestRanking1" + hasDept + type).children("div").children("p").eq(0).text(obj[0].basicScore);
-        $("#bestRanking1" + hasDept + type).children("div").children("p").eq(1).text(obj[0].addScore);
-
-        $("#bestRanking2" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[1].department.substring(1, 3));
-        $("#bestRanking2" + hasDept + type).children("h1").text(obj[1].department);
-        $("#bestRanking2" + hasDept + type).children("p").children("span").text((obj[1].basicScore + obj[1].addScore).toFixed(2));
-        $("#bestRanking2" + hasDept + type).children("div").children("p").eq(0).text(obj[1].basicScore);
-        $("#bestRanking2" + hasDept + type).children("div").children("p").eq(1).text(obj[1].addScore);
-
-        $("#bestRanking3" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[2].department.substring(1, 3));
-        $("#bestRanking3" + hasDept + type).children("h1").text(obj[2].department);
-        $("#bestRanking3" + hasDept + type).children("p").children("span").text((obj[2].basicScore + obj[2].addScore).toFixed(2));
-        $("#bestRanking3" + hasDept + type).children("div").children("p").eq(0).text(obj[2].basicScore);
-        $("#bestRanking3" + hasDept + type).children("div").children("p").eq(1).text(obj[2].addScore);
+        $("#bestRanking1" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[obj.length - 1].department.substring(1, 3));
+        $("#bestRanking1" + hasDept + type).children("h1").text(obj[obj.length - 1].department);
+        $("#bestRanking1" + hasDept + type).children("p").children("span").text((obj[obj.length - 1].basicScore + obj[obj.length - 1].addScore).toFixed(2));
+        $("#bestRanking1" + hasDept + type).children("div").children("p").eq(0).text(obj[obj.length - 1].basicScore);
+        $("#bestRanking1" + hasDept + type).children("div").children("p").eq(1).text(obj[obj.length - 1].addScore);
+
+        $("#bestRanking2" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[obj.length - 2].department.substring(1, 3));
+        $("#bestRanking2" + hasDept + type).children("h1").text(obj[obj.length - 2].department);
+        $("#bestRanking2" + hasDept + type).children("p").children("span").text((obj[obj.length - 2].basicScore + obj[obj.length - 2].addScore).toFixed(2));
+        $("#bestRanking2" + hasDept + type).children("div").children("p").eq(0).text(obj[obj.length - 2].basicScore);
+        $("#bestRanking2" + hasDept + type).children("div").children("p").eq(1).text(obj[obj.length - 2].addScore);
+
+        $("#bestRanking3" + hasDept + type).parent().children("div").eq(0).children("p").text(obj[obj.length - 3].department.substring(1, 3));
+        $("#bestRanking3" + hasDept + type).children("h1").text(obj[obj.length - 3].department);
+        $("#bestRanking3" + hasDept + type).children("p").children("span").text((obj[obj.length - 3].basicScore + obj[obj.length - 3].addScore).toFixed(2));
+        $("#bestRanking3" + hasDept + type).children("div").children("p").eq(0).text(obj[obj.length - 3].basicScore);
+        $("#bestRanking3" + hasDept + type).children("div").children("p").eq(1).text(obj[obj.length - 3].addScore);
     }
 
     //生成本月排名最末3位
@@ -2802,8 +2806,9 @@
         if (type == 0) {
             layui.table.render({
                 elem: '#rankingDetails' + hasDept + type
-                , height: 450
-                , page: true //开启分页
+                // , height: 450
+                , limit: dataList1.length
+                , page: false //开启分页
                 , cols: [[ //表头
                     {field: 'department', title: '部门', width: 300}
                     , {field: 'totalScore', title: '总分(基础分/加分)', width: 200}
@@ -2824,8 +2829,9 @@
             }
             layui.table.render({
                 elem: '#rankingDetails' + hasDept + type
-                , height: 450
-                , page: true //开启分页
+                // , height: 450
+                , page: false //开启分页
+                , limit: dataList1.length
                 , cols: [[ //表头
                     {field: 'department', title: '部门', width: 300}
                     , {field: 'totalScore', title: '总分(基础分/加分)', width: 200}
@@ -2851,9 +2857,9 @@
             if (obj.deptids.length > 0) {
                 let selectHtml = '<option value=""></option>';
                 for (let i = 0; i < obj.deptids.length; i++) {
-                    if(i==0){
+                    if (i == 0) {
                         selectHtml += '<option value="' + obj.deptids[i] + '" selected="true">' + obj.yData[i] + '</option>';
-                    }else{
+                    } else {
                         selectHtml += '<option value="' + obj.deptids[i] + '">' + obj.yData[i] + '</option>';
                     }
                 }
@@ -2952,10 +2958,10 @@
     }
 
     function rankingScore(pid, hasDept, type) {
-        for (let i = 0; i < newDataList.length; i++) {
-            if (newDataList[i].deptid == pid) {
-                $("#rank_text" + hasDept + type).children("h1").eq(0).children("p").text(newDataList.length - i);
-                $("#rank_text" + hasDept + type).children("h1").eq(1).children("p").text(newDataList[i].basicScore + newDataList[i].addScore);
+        for (let i = 0; i < dataList.length; i++) {
+            if (dataList[i].deptid == pid) {
+                $("#rank_text" + hasDept + type).children("h1").eq(0).children("p").text(dataList.length - i);
+                $("#rank_text" + hasDept + type).children("h1").eq(1).children("p").text(dataList[i].basicScore + dataList[i].addScore);
             }
         }
     }
@@ -2968,9 +2974,9 @@
             success: function (data) {
                 layui.table.render({
                     elem: '#newMediaTable'
-                    , height: 800
-                    , page: true //开启分页
-                    , limit: 20
+                    // , height: 1600
+                    , page: false //开启分页
+                    , limit: data.data.length
                     , cols: [[ //表头
                         {field: 'official_account', title: '名称', width: 300}
                         , {field: 'type', title: '类型', width: 200}