From b255e2f447897f1c3403715040183004ca1728fe Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 31 Aug 2023 17:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/main.html    | 47 +++++++++++++++----
 .../com/cyx/framework/config/ShiroConfig.java |  2 +-
 2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html
index fcbdd02..7f336ca 100644
--- a/cyx-admin/src/main/resources/templates/main.html
+++ b/cyx-admin/src/main/resources/templates/main.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
+    <th:block th:include="include :: header('驾驶舱')" />
     <meta charset="utf-8">
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <!--360浏览器优先以webkit内核解析-->
@@ -22,14 +23,14 @@
             </div>
             <div class="echarts_title">
                 <span></span>
-                <span>党务及意识形态</span>
+                <span onclick="openTab(1)">党务及意识形态</span>
             </div>
             <div class="btn_echarts_wrap" id="top_left_echarts"></div>
         </div>
         <div class="main_left_item">
             <div class="echarts_title">
                 <span></span>
-                <span>党风廉政建设</span>
+                <span onclick="openTab(2)">党风廉政建设</span>
             </div>
             <div class="echarts_wrap" id="center_left_echarts"></div>
         </div>
@@ -44,22 +45,22 @@
     <div class="main_center">
         <div class="main_center_item">
             <div class="data1">
-                <span>年度考核完成情况</span>
+                <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">
-                <span>党风廉政建设</span>
+                <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">
-                <span>党务及意识形态</span>
+                <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">
-                <span>日常考核完成情况</span>
+                <span style="font-weight:900;font-size: 18px" >日常考核完成情况</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
@@ -120,14 +121,14 @@
             </div>
             <div class="echarts_title">
                 <span></span>
-                <span>日常考核指标</span>
+                <span onclick="openTab(3)">日常考核指标</span>
             </div>
             <div class="echarts_right_top_wrap" id="top_right_echarts"></div>
         </div>
         <div class="main_footer">
             <div class="echarts_title">
                 <span></span>
-                <span>年度考核指标</span>
+                <span onclick="openTab(4)">年度考核指标</span>
             </div>
             <div class="echarts_footer_wrap" id="bottom_right_echarts"></div>
         </div>
@@ -138,6 +139,34 @@
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <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">
+    var ctx = [[@{/}]];
+    var prefix = ctx + "base/affairs";
+    function openTab(type){
+        switch (type){
+            case 1:
+                $.modal.openTab("党务及意识形态", prefix + '');
+                break;
+            case 2:
+                $.modal.openTab("党风廉政建设", prefix + '/partystyle');
+                break;
+            case 3:
+                $.modal.openTab("日常考核指标", prefix + '/day');
+                break;
+            case 4:
+                $.modal.openTab("年度考核指标", prefix + '/year');
+                break;
+            case 5:
+                $.modal.openTab("指标完成情况汇总", prefix + '/finishedstaticList');
+                break;
+        }
+    }
+
+    $('.data1').click(function() {
+        $.modal.openTab("指标完成情况汇总", prefix + '/finishedstaticList');
+    })
+</script>
 <script type="text/javascript">
     let _peopleData = [];
     let _deptData = [];
diff --git a/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java b/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java
index 68428b8..23c927e 100644
--- a/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java
+++ b/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java
@@ -290,7 +290,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/wx/**", "anon");
         filterChainDefinitionMap.put("/profile/**", "anon");
-        filterChainDefinitionMap.put("/common/uploads", "anon");
+        filterChainDefinitionMap.put("/common/**", "anon");
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");
