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

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

@@ -467,6 +467,7 @@ body {
     font-family: PingFang SC !important;
     font-weight: bold !important;
     color: #FFFFFF !important;
+    border: 0 !important;
 }
 
 .table_wrap thead tr th:first-child {
@@ -475,7 +476,7 @@ body {
     border-radius: 15px 0 0 0 !important;
 }
 
-.table_wrap thead tr th:last-child {
+.table_wrap thead tr th:nth-last-child(2) {
     border-collapse: separate;
     border-spacing: 0;
     border-radius: 0 15px 0 0;
@@ -713,6 +714,7 @@ body {
     font-family: PingFang SC !important;
     font-weight: bold !important;
     color: #FFFFFF !important;
+    border: 0 !important;
 }
 
 .content_hide tbody tr td {
@@ -747,6 +749,12 @@ body {
     border-radius: 15px 0 0 0 !important;
 }
 
+.content_hide thead tr th:nth-last-child(2) {
+    border-collapse: separate !important;
+    border-spacing: 0 !important;
+    border-radius: 0 15px 0 0  !important;
+}
+
 .content_hide tbody tr:last-child td:first-child {
     border-collapse: separate !important;
     border-spacing: 0 !important;

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

@@ -2389,13 +2389,13 @@
                 }
             });
         } else {
-            let china = '季度';
+            let china = '季';
             if (type == 1) {
-                china = '季度';
+                china = '季';
             } else if (type == 2) {
                 china = '半年';
             } else if (type == 3) {
-                china = '年度';
+                china = '年';
             }
             layui.table.render({
                 elem: '#rankingDetails' + hasDept + type
@@ -2505,10 +2505,15 @@
         option = {
             tooltip: {
                 trigger: 'axis',
+                textStyle: {
+                    fontSize: 14,
+                    color: '#FEFEFF'
+                },
+                backgroundColor: '#1A5DB0',
                 formatter: function (params) {
                     let htmlStr = '<div>';
                     htmlStr += params[0].axisValue.substring(0, 4) + "年" + params[0].axisValue.substring(5, 6) + "月" + "<br>";
-                    htmlStr += "总分" + params[0].data + "</div>";
+                    htmlStr += '总分<span style="font-size:20px;">' + params[0].data + '</span></div>';
                     return htmlStr;
                 }
             },
@@ -2640,7 +2645,7 @@
             , page: false //开启分页
             , limit: obj.length
             , cols: [[ //表头
-                {field: 'target', title: '指标',width:120}
+                {field: 'target', title: '指标', width: 120}
                 , {field: 'targetScore', title: '分值', width: 70}
                 , {field: 'event', title: '指标要求', width: 420}
                 , {field: 'targetRequirement', title: '加扣分指标', width: 270}