From 471eb1ecedf49fee2b584905bdb2790584e3649c Mon Sep 17 00:00:00 2001
From: duxp <dxp18195149767@163.com>
Date: Tue, 5 Sep 2023 17:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/base/affairs/year.html          |  2 +-
 .../src/main/resources/templates/main.html    | 42 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index e3df6e5..f43a1e2 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -336,7 +336,7 @@
         var options = {
             url: url,
             data:{
-                type:'年度考核指标'
+                type:'季度考核指标'
             },
             expandLevel: 2,
             onClick : zOnClick
diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html
index e980919..cd09c40 100644
--- a/cyx-admin/src/main/resources/templates/main.html
+++ b/cyx-admin/src/main/resources/templates/main.html
@@ -178,18 +178,7 @@
     loadPeopleData();
     loadDepData();
 
-    //先进成员滚动
-    if(_peopleData.length > 5){
-        setInterval(function () {
-            setTimeout(autoScroll("#center_footer_one"),0)
-        },1000)
-    }
-    //先进部门滚动
-    if(_deptData.length > 5){
-        setInterval(function () {
-            setTimeout(autoScroll("#center_footer_two"),0)
-        },1000)
-    }
+
 
 
 
@@ -518,6 +507,11 @@
                             itemStyle: {
                                 color: '#F9713C'
                             },
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value + ' 分';
+                                }
+                            },
                         }
                     ]
                 };
@@ -680,7 +674,7 @@
     function loadPeopleData(){
         _peopleData = [];
         $.ajax({
-            url:'/base/index/advanceParity',
+            url:'/base/affairs/importantWork',
             type:'post',
             dataType:'json',
             success(res){
@@ -689,11 +683,16 @@
                 _peopleData = res.data;
                 _data.forEach(item => {
                     _strHtml += '<div class="item_inline">' +
-                        '<p>党风廉政建设：'+item.name+'</p>' +
-                        '<p>目前完成度：'+item.events+'</p>' +
+                        '<p>'+item.type+'：'+item.shotName+'</p>' +
+                        '<p>目前完成度：'+item.percent+'%</p>' +
                         '</div>';
                 });
                 $('#center_footer_one').append(_strHtml);
+                if(_peopleData.length > 5){
+                    setInterval(function () {
+                        setTimeout(autoScroll("#center_footer_one"),0)
+                    },1000)
+                }
             }
         })
     }
@@ -702,22 +701,25 @@
     function loadDepData(){
         _deptData = [];
         $.ajax({
-            url:'/base/index/advanceDept',
+            url:'/base/affairs/labelTotal',
             type:'post',
             dataType:'json',
             success(res){
                 let _data = res.data;
                 let _strHtml = "";
-                
                 _deptData = res.data;
                 _data.forEach(item => {
-                    let _json = JSON.parse(item.json);
                     _strHtml += '<div class="item_inline">' +
-                        '<p>党建及意识形态：'+_json['日常考核指标']+'</p>' +
-                        '<p>目前完成度：'+_json['季度考核指标']+'</p>' +
+                        '<p>'+item.type+'：'+item.shotName+'</p>' +
+                        '<p>目前完成度：'+item.percent+'%</p>' +
                         '</div>';
                 });
                 $('#center_footer_two').append(_strHtml);
+                if(_deptData.length > 5){
+                    setInterval(function () {
+                        setTimeout(autoScroll("#center_footer_two"),0)
+                    },1000)
+                }
             }
         })
     }