From 0146c0ecf51e5e0b8a40cf8abfe446b53b496f3f Mon Sep 17 00:00:00 2001
From: duxp <dxp18195149767@163.com>
Date: Thu, 31 Aug 2023 17:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/css/main_center.css |  2 ++
 .../base/affairs/finishedstatic.html          |  6 ++--
 .../src/main/resources/templates/main.html    | 34 ++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cyx-admin/src/main/resources/static/css/main_center.css b/cyx-admin/src/main/resources/static/css/main_center.css
index 326f035..d3ab52b 100644
--- a/cyx-admin/src/main/resources/static/css/main_center.css
+++ b/cyx-admin/src/main/resources/static/css/main_center.css
@@ -49,6 +49,8 @@
     width: 16rem;
     height: 4rem;
     position: absolute;
+    cursor: pointer;
+    z-index: 999;
 }
 
 .main_wrap .main_center .main_center_item .data1 span,
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index 26108cb..c7eeaeb 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -10,7 +10,7 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <input type="hidden" name="type" value="党风廉政建设"/>
+                            <input id="type0831" type="hidden" name="type" value=""/>
 <!--                            <li>-->
 <!--                                <label>单位名称：</label>-->
 <!--                                <input type="text" name="unit"/>-->
@@ -80,7 +80,9 @@
         var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
         var prefix = ctx + "base/affairs";
-
+        if(window.parent.parent){
+            $("#type0831").val(window.parent.parent._tab_name)
+        }
         $(function() {
             var options = {
                 url: prefix + "/finishedstaticList",
diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html
index 7f336ca..e9db070 100644
--- a/cyx-admin/src/main/resources/templates/main.html
+++ b/cyx-admin/src/main/resources/templates/main.html
@@ -44,22 +44,22 @@
     </div>
     <div class="main_center">
         <div class="main_center_item">
-            <div class="data1">
+            <div class="data1" onclick="openTab(5,'年度考核完成情况')">
                 <span style="font-weight:900;font-size: 18px" >年度考核完成情况</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
-            <div class="data2">
+            <div class="data2" onclick="openTab(5,'党风廉政建设')">
                 <span style="font-weight:900;font-size: 18px" >党风廉政建设</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
-            <div class="data3">
+            <div class="data3" onclick="openTab(5,'党务及意识形态')">
                 <span style="font-weight:900;font-size: 18px" >党务及意识形态</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
-            <div class="data4">
+            <div class="data4" onclick="openTab(5,'日常考核完成情况')">
                 <span style="font-weight:900;font-size: 18px" >日常考核完成情况</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
@@ -140,37 +140,33 @@
 <script th:src="@{/js/echarts.min.js}"></script>
 <!--<script th:src="@{/js/index.js}"></script>-->
 <th:block th:include="include :: footer" />
-<script th:inline="javascript">
+<script type="text/javascript" th:inline="javascript">
+    let _peopleData = [];
+    let _deptData = [];
+
     var ctx = [[@{/}]];
     var prefix = ctx + "base/affairs";
-    function openTab(type){
+    function openTab(type,name){
         switch (type){
             case 1:
-                $.modal.openTab("党务及意识形态", prefix + '');
+                $.modal.openTab("党务及意识形态", prefix + '',true);
                 break;
             case 2:
-                $.modal.openTab("党风廉政建设", prefix + '/partystyle');
+                $.modal.openTab("党风廉政建设", prefix + '/partystyle',true);
                 break;
             case 3:
-                $.modal.openTab("日常考核指标", prefix + '/day');
+                $.modal.openTab("日常考核指标", prefix + '/day',true);
                 break;
             case 4:
-                $.modal.openTab("年度考核指标", prefix + '/year');
+                $.modal.openTab("年度考核指标", prefix + '/year',true);
                 break;
             case 5:
-                $.modal.openTab("指标完成情况汇总", prefix + '/finishedstaticList');
+                window.parent._tab_name = name;
+                $.modal.openTab("指标完成情况汇总", prefix + '/finishedstatic',true);
                 break;
         }
     }
 
-    $('.data1').click(function() {
-        $.modal.openTab("指标完成情况汇总", prefix + '/finishedstaticList');
-    })
-</script>
-<script type="text/javascript">
-    let _peopleData = [];
-    let _deptData = [];
-
     //echarts初始化
     loadEchartsOne();
     loadEchartsTwo();