From 34f2e164e25e3bfe4b631ae9ed51122c818e9324 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Thu, 18 Jul 2024 15:54:45 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B2=B3=E5=8D=97=E6=9C=BA=E7=94=B5?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=AD=A6=E9=99=A2-=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/homepage/service/UserHomePageServiceImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
index f0f8c163..ace99a83 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
@@ -113,12 +113,12 @@ public class UserHomePageServiceImpl implements UserHomePageService {
         Annual annual = iAnnualService.getOne(new LambdaQueryWrapper<Annual>().eq(Annual::getAnnualName, currentYear + ""));
         List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompOrgan, departId));
         Set<String> compIds = Optional.ofNullable(compList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
-        List<AnnualComp> annualCompList = new ArrayList<>();
-        if (ObjectUtil.isNotNull(compIds)) {
-            annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>()
-                    .eq(AnnualComp::getAnnualid, annual.getId())
-                    .in(AnnualComp::getCompid, compIds));
+        if (ObjectUtils.isEmpty(compIds)) {
+            return resultMap;
         }
+        List<AnnualComp> annualCompList = iAnnualCompService.list(new LambdaQueryWrapper<AnnualComp>()
+                .eq(AnnualComp::getAnnualid, annual.getId())
+                .in(AnnualComp::getCompid, compIds));
         Set<String> annualCompIds = Optional.ofNullable(annualCompList).orElse(new LinkedList<>()).stream().map(obj -> obj.getId()).collect(Collectors.toSet());
         List<AnnualCompPoint> annualCompPointList = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
 

From e8c9ce5f1cea49f9101fe73f4698245573420c93 Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Thu, 18 Jul 2024 16:45:58 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E3=80=81=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3-master/src/api/demo/depart.ts  |  13 +
 .../components/chDepartment/index.vue         | 127 +++++----
 .../workbench/components/chSchool/index.vue   | 112 ++++++--
 .../workbench/components/chSchool/options.js  | 259 ++++++++++++++++++
 4 files changed, 424 insertions(+), 87 deletions(-)
 create mode 100644 jeecgboot-vue3-master/src/api/demo/depart.ts
 create mode 100644 jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js

diff --git a/jeecgboot-vue3-master/src/api/demo/depart.ts b/jeecgboot-vue3-master/src/api/demo/depart.ts
new file mode 100644
index 00000000..ec9e84b3
--- /dev/null
+++ b/jeecgboot-vue3-master/src/api/demo/depart.ts
@@ -0,0 +1,13 @@
+import { defHttp } from '/@/utils/http/axios';
+import { GetAccountInfoModel } from './model/accountModel';
+
+enum Api {
+  PAGE_SCHOOL = '/user/login/homepage/school',
+  PAGE_DEPARTMENT ='/user/login/homepage/depart'
+}
+
+// Get personal center-basic settings
+
+export const pageSchoolApi = () => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_SCHOOL });
+export const pageDepartmentApi = (orgCode:string) => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_DEPARTMENT ,params:{orgCode}});
+
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue
index fd1eb8a4..e87d73c1 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue
@@ -2,67 +2,31 @@
     <div class="department">
         <div class="header">
             <a-row :gutter="[16, 16]" type="flex" justify="space-between" style="width: 100%;">
-                <a-col :xs="12" :xl="6">
+                <a-col :lg="12" :xl="6" v-for="i in [
+                    { svg: 'mainHome-time|svg', title: '本年度已开展比赛项目数' },
+                    { svg: 'mainHome-time|svg', title: '本年度参加比赛队伍数' },
+                    { svg: 'mainHome-time|svg', title: '正在进行的比赛数' },
+                ]" :key="i">
                     <div class="card">
                         <div class="top">
                             <div class="text">
-                                本年度已开展比赛数
+                                {{ i.title }}
                             </div>
-                            <Icon icon="mainHome-time|svg" :size="20" />
+                            <Icon :icon="i.svg" :size="20" />
                         </div>
                         <div class="center">
                             <div class="text">
-                                67
+                                {{ match[i.title] || 0 }}
                             </div>
                         </div>
                         <div class="bottom">
-                            <div class="bot_card">国赛：12</div>
-                            <div class="bot_card">省赛：12</div>
-                            <div class="bot_card">校赛：24</div>
+                            <div class="bot_card">国赛：{{ match['国赛'] || 0 }}</div>
+                            <div class="bot_card">省赛：{{ match['省赛'] || 0 }}</div>
+                            <div class="bot_card">校赛：{{ match['校赛'] || 0 }}</div>
                         </div>
                     </div>
                 </a-col>
-                <a-col :xs="12" :xl="6">
 
-                    <div class="card">
-                        <div class="top">
-                            <div class="text">
-                                本年度参加比赛队伍数
-                            </div>
-                            <Icon icon="mainHome-mp|svg" :size="20" />
-                        </div>
-                        <div class="center">
-                            <div class="text">
-                                1262
-                            </div>
-                        </div>
-                        <div class="bottom">
-                            <div class="bot_card">国赛：120</div>
-                            <div class="bot_card">省赛：1230</div>
-                            <div class="bot_card">校赛：24</div>
-                        </div>
-                    </div>
-                </a-col>
-                <a-col :xs="12" :xl="6">
-                    <div class="card">
-                        <div class="top">
-                            <div class="text">
-                                正在进行的比赛数
-                            </div>
-                            <Icon icon="mainHome-down|svg" :size="20" />
-                        </div>
-                        <div class="center">
-                            <div class="text" style="color: #74D472;">
-                                45
-                            </div>
-                        </div>
-                        <div class="bottom">
-                            <div class="bot_card">国赛：9</div>
-                            <div class="bot_card">省赛：13</div>
-                            <div class="bot_card">校赛：26</div>
-                        </div>
-                    </div>
-                </a-col>
                 <a-col :xs="12" :xl="6">
                     <div class="card2">
                         <div class="top">
@@ -73,18 +37,19 @@
                         </div>
                         <div class="center">
                             <div class="percent">
-                                78%
+                                {{ (match['已完成比赛比率'] || 0) * 100 + '%' }}
                             </div>
                             <div>
-                                <a-progress stroke-linecap="square" :percent="78" :show-info="false" />
+                                <a-progress stroke-linecap="square" :percent="(match['已完成比赛比率'] || 0) * 100"
+                                    :show-info="false" />
                             </div>
                         </div>
                         <div class="bottom">
                             <div class="text">
-                                已完成的比赛11
+                                已完成的比赛{{ match['已完成的比赛'] || 0 }}
                             </div>
                             <div class="text">
-                                未完成的比赛11
+                                未完成的比赛{{ match['未完成的比赛'] || 0 }}
                             </div>
                         </div>
                     </div>
@@ -115,9 +80,9 @@
                             <div id="ec_bar" ref="ec_bar"></div>
                             <div class="infor">
                                 <ul class="card-box">
-                                    <li v-for="i in 12" :key="i">
-                                        <div class="ol">{{ i }}</div>
-                                        <div class="text">奠定基础</div>
+                                    <li v-for="item, i in names" :key="item">
+                                        <div class="ol">{{ i + 1 }}</div>
+                                        <div class="text" :title="item">{{ item }}</div>
                                     </li>
                                 </ul>
                             </div>
@@ -184,18 +149,63 @@
     </div>
 </template>
 <script lang="ts" setup>
+function traYears(arr: any[], attr = 'value', option: any = { attrs: [], values: [] }): any[] {
+    if (!Array.isArray(arr)) return []
+
+    if (option.attrs.length && option.values.length) {
+        return arr.map(item => {
+            let o = {}
+            option.attrs.map((at, i) => {
+                if (typeof option.values[i] === 'object') o[at] = option.values[i].value
+                else o[at] = item[option.values[i]]
+            })
+            return o
+        })
+    }
+
+    return arr.map(item => item[attr])
+}
 import { Progress as AProgress } from 'ant-design-vue';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, reactive } from 'vue';
 import * as echarts from 'echarts';
 import { optionRing, optionBar } from './options'
+import { pageDepartmentApi } from '/@/api/demo/depart';
+import { useUserStore } from '/@/store/modules/user';
+const userStore = useUserStore()
+
+const match = reactive<any>({})
+const names = reactive<any[]>([])
+if (userStore.userInfo) {
+    pageDepartmentApi(userStore.userInfo.orgCode as string).then(res => {
+    // pageDepartmentApi('A03').then(res => {
+        Object.assign(match, res)
+
+        optionBar.series[0].data = traYears(res['部门近2年能力分析']?.[0][2023])
+        optionBar.series[1].data = traYears(res['部门近2年能力分析']?.[1][2024])
+        setBar.value()
+
+        names.push(...traYears(res['部门近2年能力分析']?.[0][2023], 'capacityName'))
+        optionRing.series[0].data = [
+            { name: '已完成',value: res['已完成的比赛'] || 0,  },
+            { name: '比赛中',value: res['正在进行的比赛数']|| 0 },
+            { name: '未开始',value: res['未完成的比赛'] || 0 },
+        ]
+        setRing.value()
+
+    })
+}
 
 const ec = ref()
 const ec_bar = ref()
+const setBar = ref(() => { })
+const setRing = ref(() => { })
 onMounted(() => {
     const myChart = echarts.init(ec.value);
-    myChart.setOption(optionRing);
+    setRing.value = ()=> myChart.setOption(optionRing);
+    
     const bar = echarts.init(ec_bar.value);
-    bar.setOption(optionBar);
+    setBar.value = () => bar.setOption(optionBar);
+
     window.addEventListener('resize', function () {
         myChart.resize()
         bar.resize()
@@ -515,6 +525,9 @@ onMounted(() => {
                             }
 
                             .text {
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
                                 width: 67px;
                                 font-size: 14px;
                                 color: rgba(51, 51, 51, 0.88);
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue
index cf5ddba7..e0c3ce6b 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue
@@ -1,26 +1,28 @@
 <template>
     <div class="school">
         <a-row :gutter="[16, 16]" type="flex" justify="space-between">
-            <a-col :lg="12" :xl="6" v-for="i in 4" :key="i">
-                <div class="card">
-                    <div class="top">
-                        <div class="text">
-                            本年度已开展比赛数
+            <a-row :gutter="[16, 16]" type="flex" justify="space-between">
+                <a-col :lg="12" :xl="6" v-for="i in ['本年度已开展比赛项目数', '本年度参加比赛队伍数', '正在进行的比赛数', '已完成的比赛']" :key="i">
+                    <div class="card">
+                        <div class="top">
+                            <div class="text">
+                                {{ i }}
+                            </div>
+                            <Icon icon="mainHome-time|svg" :size="20" />
                         </div>
-                        <Icon icon="mainHome-time|svg" :size="20" />
-                    </div>
-                    <div class="center">
-                        <div class="text">
-                            67
+                        <div class="center">
+                            <div class="text">
+                                {{ match[i] }}
+                            </div>
+                        </div>
+                        <div class="bottom">
+                            <div class="bot_card">国赛：{{ match['国赛'] || 0 }}</div>
+                            <div class="bot_card">省赛：{{ match['省赛'] || 0 }}</div>
+                            <div class="bot_card">校赛：{{ match['校赛'] || 0 }}</div>
                         </div>
                     </div>
-                    <div class="bottom">
-                        <div class="bot_card">国赛：12</div>
-                        <div class="bot_card">省赛：12</div>
-                        <div class="bot_card">校赛：24</div>
-                    </div>
-                </div>
-            </a-col>
+                </a-col>
+            </a-row>
         </a-row>
         <a-row :gutter="[16, 16]" type="flex" justify="space-between">
             <a-col :xs="24" :xl="8">
@@ -36,7 +38,7 @@
             <a-col :xs="24" :xl="16">
                 <div class="con_right">
                     <div class="title-box">
-                        <div class="tit">部门近两年维度积分</div>
+                        <div class="tit">学校近两年能力分析</div>
                         <div class="bas"></div>
                     </div>
                     <div class="ec-box">
@@ -44,9 +46,9 @@
                         <div id="ec_bar" ref="ec_bar"></div>
                         <div class="infor">
                             <ul class="card-box">
-                                <li v-for="i in 12" :key="i">
-                                    <div class="ol">{{ i }}</div>
-                                    <div class="text">奠定基础</div>
+                                <li v-for="item, i in names" :key="item">
+                                    <div class="ol">{{ i + 1 }}</div>
+                                    <div class="text" :title="item">{{ item }}</div>
                                 </li>
                             </ul>
                         </div>
@@ -59,13 +61,14 @@
             <a-col :xs="24" :xl="12">
                 <div class="foo_card">
                     <div class="title">
-                        部门比赛积分排名
+                        本年度全校部门积分排名
                     </div>
 
                     <div class="table">
                         <div class="t_item t_head">
                             <div class="ranking">排名</div>
-                            <div class="name">比赛名称</div>
+                            <div class="name2">比赛名称</div>
+                            <div class="name2">项目名称</div>
                             <div class="total">比赛积分</div>
                             <div class="operate">操作</div>
                         </div>
@@ -73,7 +76,8 @@
                             <div class="ranking">
                                 <div class="ol" :class="{ ac: i <= 3 }">{{ i }}</div>
                             </div>
-                            <div class="name">国家电网竞赛</div>
+                            <div class="name2">国家电网竞赛</div>
+                            <div class="name2">国家电网竞赛</div>
                             <div class="total">7059</div>
                             <div class="operate">详情</div>
                         </div>
@@ -83,13 +87,13 @@
             <a-col :xs="24" :xl="12">
                 <div class="foo_card">
                     <div class="title">
-                        部门学生积分排名
+                        本年度项目积分排名
                     </div>
 
                     <div class="table">
                         <div class="t_item t_head">
                             <div class="ranking">排名</div>
-                            <div class="name">参赛选手名</div>
+                            <div class="name">院系名称</div>
                             <div class="total">比赛积分</div>
                             <div class="operate">操作</div>
                         </div>
@@ -110,17 +114,58 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue';
+import { onMounted, reactive, ref } from 'vue';
 import * as echarts from 'echarts';
-import { optionRadar, optionBar } from '../chDepartment/options'
+import { optionRadar, optionBar } from './options'
+import { pageSchoolApi } from '/@/api/demo/depart';
+
+function traYears(arr: any[], attr = 'value',option:any={attrs:[],values: []}): any[] {
+    if (!Array.isArray(arr)) return []
+
+    if(option.attrs.length&&option.values.length){
+        return arr.map(item => {
+            let o = {} 
+            option.attrs.map((at,i)=>{
+                if(typeof option.values[i] === 'object')o[at] = option.values[i].value
+                else o[at]=item[option.values[i]]
+            })
+            return o
+        })
+    }
+    
+    return arr.map(item => item[attr])
+}
+
+const match = reactive({})
+const names = reactive<any[]>([])
+pageSchoolApi().then(res => {
+    Object.assign(match, res)
+
+    optionBar.series[0].data = traYears(res['近2年能力分析']?.[0][2023])
+    optionBar.series[1].data = traYears(res['近2年能力分析']?.[1][2024])
+    setBar.value()
+
+    names.push(...traYears(res['近2年能力分析']?.[0][2023], 'capacityName'))
+
+    optionRadar.radar.indicator = traYears(res['近2年能力分析']?.[0][2023],undefined,{attrs:['text','max'],values:['capacityName',{value:100}]})
+    optionRadar.series[0].data[0].value = traYears(res['近2年能力分析']?.[0][2023])
+    setRadar.value()
+})
+
+
 
 const ec_radar = ref()
 const ec_bar = ref()
+const setRadar = ref(() => { })
+const setBar = ref(() => { })
+
 onMounted(() => {
     const myChart = echarts.init(ec_radar.value);
-    myChart.setOption(optionRadar);
+    setRadar.value = () => myChart.setOption(optionRadar)
+    
     const bar = echarts.init(ec_bar.value);
-    bar.setOption(optionBar);
+    setBar.value = () => bar.setOption(optionBar)
+
     window.addEventListener('resize', function () {
         myChart.resize()
         bar.resize()
@@ -339,6 +384,9 @@ onMounted(() => {
                         }
 
                         .text {
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
                             width: 67px;
                             font-size: 14px;
                             color: rgba(51, 51, 51, 0.88);
@@ -398,6 +446,10 @@ onMounted(() => {
                     width: calc((542 / 756) * 100%);
                 }
 
+                .name2 {
+                    width: calc((271 / 756) * 100%);
+                }
+
                 .total {
                     width: calc((74 / 756) * 100%);
                 }
diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js
new file mode 100644
index 00000000..271d83b0
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js
@@ -0,0 +1,259 @@
+// 部门比赛情况分布 圆环
+export const optionRing = {
+    color: [
+        '#0052D9',
+        '#699EF5',
+        '#B5C7FF',
+    ],
+    legend: {
+        x: 'center',
+        orient: 'horizontal',
+        bottom: '48px',
+        data: ['已完成', '比赛中', '未开始']
+    },
+    series: [
+        {
+            type: 'pie',
+            center: ['50%', '41%'],
+            radius: ['35%', '45%'],
+            avoidLabelOverlap: false,
+            label: {
+                show: false,
+                position: 'center'
+            },
+            labelLine: {
+                show: false
+            },
+            emphasis: {
+                label: {
+                    show: true,
+                    fontSize: '25',
+                    fontWeight: 'bold'
+                }
+            },
+            data: [
+                { value: 335, name: '已完成' },
+                { value: 50, name: '比赛中' },
+                { value: 23, name: '未开始' },
+            ]
+        }
+    ]
+};
+
+
+export const optionBar = {
+    tooltip: {
+        trigger: 'axis', // 触发类型为坐标轴触发  
+        axisPointer: {
+            type: 'line',
+            label: {
+                backgroundColor: '#6a7985' // 自定义交叉线标签的背景色  
+            }
+        },
+        formatter: function (params) {
+            let result = '<div class="bar_card">';
+            result += `<div class="title">维度名称</div>`
+            params.forEach(param => {
+                result += `<div class="item" style="color: ${param.color};">
+                    ${param.seriesName}年 ${param.value}    
+                </div>`;
+            });
+            result += '</div>';
+            return result;
+        }
+    },
+    grid: {
+        left: '0%',
+        right: '0%',
+        top: '5%',
+        bottom: '86px',
+        // 如果需要，还可以设置containLabel来控制坐标轴标签是否完全包含在grid区域内  
+        containLabel: true
+    },
+    legend: {
+        data: ['2023', '2024'],
+        bottom: '39px',
+    },
+    xAxis: {
+        data: ['维度一', '维度一', '维度一', '维度一', '维度一', '维度一', '维度一']
+    },
+    yAxis: {
+        type: 'value',
+        min: 0,
+        max: 100,
+    },
+    series: [
+        {
+            name: '2023',
+            type: 'bar',
+            data: [33, 44, 58, 85, 47, 38, 45],
+            barWidth: '20px',
+            itemStyle: {
+                color: '#0052D9',
+            }
+        },
+        {
+            name: '2024',
+            type: 'bar',
+            data: [36, 34, 48, 62, 43, 30, 37],
+            barWidth: '20px',
+            itemStyle: {
+                color: '#699EF5',
+            }
+        },
+    ]
+};
+
+
+var colorArr = ['#fff', '#fff']; //颜色
+var dataArr = [
+   {
+    value: [4000, 700, 3600, 3900, 1800, 4200, 700, 3600, 4200, 700, 3600, 4200, 700, 3600],
+    name: '1',
+    itemStyle: {
+     normal: {
+      lineStyle: {
+       color: '#55d7f2',
+      },
+      shadowColor: '#4A99FF',
+      shadowBlur: 10,
+     },
+    },
+    areaStyle: {
+     normal: {
+      // 单项区域填充样式
+      color: {
+       type: 'linear',
+       x: 1, //右
+       y: 0, //下
+       x2: 1, //左
+       y2: 1, //上
+       colorStops: [
+        {
+         offset: 0,
+         color: '#f0a223',
+        },
+        {
+         offset: 1,
+         color: '#093138',
+        },
+       ],
+       globalCoord: false,
+      },
+      opacity: 1, // 区域透明度
+     },
+    },
+   },
+  ];
+ var indicator = [
+  {
+   text: '前言探索',
+   max: 6000,
+  },
+  {
+   text: '奠定基础',
+   max: 5000,
+  },
+  {
+   text: '知识分析',
+   max: 5000,
+  },
+  {
+   text: '社会责任',
+   max: 5000,
+  },
+  {
+   text: '独立思考',
+   max: 5500,
+  },
+  {
+   text: '拓宽视野',
+   max: 5000,
+  },
+  {
+   text: '激发兴趣',
+   max: 5000,
+  },
+  {
+   text: '沟通协调',
+   max: 5000,
+  },
+  {
+   text: '设计开发',
+   max: 5000,
+  },
+  {
+   text: '研判分析',
+   max: 5000,
+  },
+  {
+   text: '创新能力',
+   max: 5000,
+  },
+  {
+   text: '团队协作',
+   max: 5000,
+  },
+ ];
+
+
+export const optionRadar = {
+    backgroundColor: "transparent",
+    color: colorArr,
+    // legend: {
+    //  orient: "vertical",
+    //  // icon: 'circle', //图例形状
+    //  // data: legendData,
+    //  top: 0,
+    //  left: 20,
+    //  itemWidth: 8, // 图例标记的图形宽度。[ default: 25 ]
+    //  itemHeight: 8, // 图例标记的图形高度。[ default: 14 ]
+    //  itemGap: 22, // 图例每项之间的间隔。[ default: 10 ]横向布局时为水平间隔，纵向布局时为纵向间隔。
+    //  textStyle: {
+    //   fontSize: 12,
+    //   fontWeight: "bold",
+    //   color: "#00E4FF",
+    //  },
+    // },
+    tooltip: {
+        trigger: 'item'
+    },
+    radar: {
+        // shape: 'circle',
+        name: {
+            textStyle: {
+                color: "#9ca4a6",
+                fontSize: 12,
+            },
+        },
+        indicator: indicator,
+        splitArea: {
+            // 坐标轴在 grid 区域中的分隔区域，默认不显示。
+            show: true,
+            areaStyle: {
+                // 分隔区域的样式设置。
+                color: ["rgba(255,255,255,0)", "rgba(255,255,255,0)"], // 分隔区域颜色。分隔区域会按数组中颜色的顺序依次循环设置颜色。默认是一个深浅的间隔色。
+            },
+        },
+        axisLine: {
+            //指向外圈文本的分隔线样式
+            lineStyle: {
+                color: "#2a5f61",
+            },
+        },
+        splitLine: {
+            lineStyle: {
+                color: "#2a5f61", // 分隔线颜色
+                width: 1, // 分隔线线宽
+            },
+        },
+    },
+    series: [
+        {
+            type: "radar",
+            symbolSize: 6,
+            symbol: "circle",
+            data: dataArr,
+        },
+    ],
+};
\ No newline at end of file

From b7242f67d390b030c36d54a8473412a49a33ab28 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Thu, 18 Jul 2024 17:22:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?18-=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layouts/default/header/index.vue        |  9 +--------
 .../src/settings/projectSetting.ts              |  2 +-
 .../views/cms/admin/subweside/SubwesideList.vue | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/jeecgboot-vue3-master/src/layouts/default/header/index.vue b/jeecgboot-vue3-master/src/layouts/default/header/index.vue
index 7b1db92b..da501030 100644
--- a/jeecgboot-vue3-master/src/layouts/default/header/index.vue
+++ b/jeecgboot-vue3-master/src/layouts/default/header/index.vue
@@ -24,19 +24,12 @@
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
       <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" />
-
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
-
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
-
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
-
       <LockScreen v-if="getUseLockPage" />
-
-      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />
-
+<!--      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />-->
       <UserDropDown :theme="getHeaderTheme" />
-
       <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
     </div>
   </Header>
diff --git a/jeecgboot-vue3-master/src/settings/projectSetting.ts b/jeecgboot-vue3-master/src/settings/projectSetting.ts
index 1c3c942a..8e5b9c83 100644
--- a/jeecgboot-vue3-master/src/settings/projectSetting.ts
+++ b/jeecgboot-vue3-master/src/settings/projectSetting.ts
@@ -73,7 +73,7 @@ const setting: ProjectConfig = {
     // 主题
     theme: ThemeEnum.LIGHT,
     // 开启锁屏功能
-    useLockPage: true,
+    useLockPage: false,
     // 显示全屏按钮
     showFullScreen: true,
     // 显示文档按钮
diff --git a/jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue b/jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue
index 5b7ec42c..fdb53004 100644
--- a/jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue
+++ b/jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue
@@ -30,7 +30,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
@@ -155,13 +155,24 @@
         label: '编辑',
         onClick: handleEdit.bind(null, record),
       },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }
     ];
   }
    
   /**
    * 下拉操作栏
    */
-  function getDropDownAction(record) {
+/*  function getDropDownAction(record) {
     return [
       {
         label: '详情',
@@ -174,7 +185,7 @@
         }
       }
     ]
-  }
+  }*/
 
   /**
    * 查询

From 0d29d3255ba93a930153eb0cef2cab39b885f2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Fri, 19 Jul 2024 15:52:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?CMS=E6=89=8B=E7=8A=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=89=8D=E5=90=8E=E5=8F=B0=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E8=BD=AC=E8=B7=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main-home/components/homePage/index.vue   |  7 +-
 .../matchEvaluation/components/MCh.vue        |  7 +-
 .../src/views/demo/main-home/index.vue        | 10 +--
 .../src/views/system/loginmini/MiniLogin.vue  | 68 +++++++++++++++++++
 4 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/demo/main-home/components/homePage/index.vue b/jeecgboot-vue3-master/src/views/demo/main-home/components/homePage/index.vue
index 8c6b76a3..f831fa93 100644
--- a/jeecgboot-vue3-master/src/views/demo/main-home/components/homePage/index.vue
+++ b/jeecgboot-vue3-master/src/views/demo/main-home/components/homePage/index.vue
@@ -24,7 +24,7 @@
                         <ul class="right_">
                             <li class=""  v-for="o in data" :key="o.columnId"
                                 @click="$router.push(`/main-home/MatchEvaluation/LesserCh/${o.id}`)">
-                                <span class="le_">{{ o.title}}</span>
+                                <span  style="cursor: pointer"  class="le_">{{ o.title}}</span>
                                 <span class="re_">{{o.publishTime}}</span>
                             </li>
                         </ul>
@@ -60,7 +60,7 @@
                     <div class="re_card">
                         <div class="re_card_img_box"  v-for="o in data3" :key="o.columnId"
                              @click="$router.push(`/main-home/MatchEvaluation/LesserCh/${o.id}`)">
-                            <img :src="setImageUrl(o.comimg)" alt="">
+                            <img style="cursor: pointer"  :src="setImageUrl(o.comimg)" alt="">
                           <div class="text">
                             {{ o.title}}
                           </div>
@@ -185,7 +185,7 @@ function lookMore(i){
                     cursor: pointer;
 
                     .img-box {
-                        width: 20px;
+                      width: 20px;
                         height: 20px;
 
                         img {
@@ -294,6 +294,7 @@ function lookMore(i){
                     height: 189px;
 
                     .img-box {
+                      cursor: pointer;
                         width: 100%;
                         height: 158px;
                         margin-bottom: 10px;
diff --git a/jeecgboot-vue3-master/src/views/demo/main-home/components/matchEvaluation/components/MCh.vue b/jeecgboot-vue3-master/src/views/demo/main-home/components/matchEvaluation/components/MCh.vue
index af53c2f3..df8e9c5d 100644
--- a/jeecgboot-vue3-master/src/views/demo/main-home/components/matchEvaluation/components/MCh.vue
+++ b/jeecgboot-vue3-master/src/views/demo/main-home/components/matchEvaluation/components/MCh.vue
@@ -18,9 +18,10 @@
                     <div class="card_left">
                         <div class="big">{{ parseTime(o.createTime,'b') }}</div>
                         <div class="small">{{parseTime(o.createTime,'a')}}</div>
-                        <!-- <img :src="o.comimg" /> -->
+
                     </div>
-                    <div class="card_right">
+                    <div style="cursor: pointer"  class="card_right">
+<!--                      <img :src="setImageUrl(o.comimg)" />-->
                         <p class="tit">{{ o.title }}</p>
                         <p class="text" v-if="o.info">
                             <span>{{ o.info }}</span>
@@ -49,7 +50,7 @@
                 </div>
             </div>
             <div class="message-box">
-                <div class="msg-item" v-for="o in data" :key="o.columnId"
+                <div  style="cursor: pointer"  class="msg-item" v-for="o in data" :key="o.columnId"
                     @click="$router.push(`/main-home/MatchEvaluation/LesserCh/${o.id}`)">
                     <div class="msg-date">{{ o.publishTime }}</div>
                     <div class="msg-date_"></div>
diff --git a/jeecgboot-vue3-master/src/views/demo/main-home/index.vue b/jeecgboot-vue3-master/src/views/demo/main-home/index.vue
index 3c161a5a..67c5b24c 100644
--- a/jeecgboot-vue3-master/src/views/demo/main-home/index.vue
+++ b/jeecgboot-vue3-master/src/views/demo/main-home/index.vue
@@ -21,13 +21,13 @@
         </div>
 
         <div class="fixed">
-            <div style="width: 100px;height: 100px;cursor: pointer;">
+<!--            <div style="width: 100px;height: 100px;cursor: pointer;">
                 <img style="width: 100%;height: 100%;" src="../../../assets/images/mainHome/div(1).png" alt="">
-            </div>
-            <div class="bas"></div>
+            </div>-->
+<!--            <div class="bas"></div>-->
             <div class="card bot">
-                <div class="img-box"><img src="../../../assets/images/mainHome/Frame.png" alt=""></div>
-                <div class="text">选手查询</div>
+                <div class="img-box"  onclick="window.location.href='http://10.20.15.171:3200/'"><img src="../../../assets/images/mainHome/Frame.png" alt=""></div>
+                <div class="text">后台管理</div>
             </div>
         </div>
 
diff --git a/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue b/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue
index 37f9b681..16e647ba 100644
--- a/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue
+++ b/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue
@@ -1,5 +1,17 @@
 <template>
   <div :class="prefixCls" class="login-background-img">
+
+    <div class="fixed">
+      <!--            <div style="width: 100px;height: 100px;cursor: pointer;">
+                      <img style="width: 100%;height: 100%;" src="../../../assets/images/mainHome/div(1).png" alt="">
+                  </div>-->
+      <!--            <div class="bas"></div>-->
+      <div class="card bot">
+        <div class="img-box"  onclick="window.location.href='http://10.20.15.171:3200/main-home'"><img src="../../../assets/images/mainHome/Frame.png" alt=""></div>
+        <div class="text">新闻首页</div>
+      </div>
+    </div>
+
     <AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false"/>
     <AppDarkModeToggle class="absolute top-3 right-7 enter-x" />
     <div class="aui-logo" v-if="!getIsMobile">
@@ -425,6 +437,62 @@
   @import '/@/assets/loginmini/style/home.less';
   @import '/@/assets/loginmini/style/base.less';
 
+  .fixed {
+    position: fixed;
+    width: 100px;
+    height: 202px;
+    top: calc(80px + 20px);
+    right: 0px;
+    z-index: 9;
+
+
+    .card {
+      width: 100px;
+      height: 100px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+
+      .img-box {
+        width: 40px;
+        height: 40px;
+        margin-bottom: 4px;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+
+      .text {
+        height: 18px;
+        font-family: Microsoft YaHei, Microsoft YaHei;
+        font-weight: 400;
+        font-size: 13px;
+        color: #FFFFFF;
+        line-height: 17px;
+        text-align: center;
+        font-style: normal;
+        text-transform: none;
+      }
+
+    }
+
+    .bas {
+      height: 2px;
+      width: 100%;
+      background-color: #fff;
+    }
+
+    .bot {
+      background: #A7B2C6;
+      border-bottom-left-radius: 20px;
+    }
+  }
+
+
   :deep(.ant-input:focus) {
     box-shadow: none;
   }

From 7419244080cd6a6e4e82e7e0b803bce11f5e41f6 Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Fri, 19 Jul 2024 16:45:27 +0800
Subject: [PATCH 5/6] 19

---
 .../src/views/annualcompgroup/AnnualCompGroupList.vue           | 2 +-
 jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue         | 2 +-
 jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
index 895f29ce..2ed331e8 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
@@ -97,7 +97,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {
diff --git a/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue b/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
index 788690b4..3f159758 100644
--- a/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
+++ b/jeecgboot-vue3-master/src/views/receipt/ReceiptList.vue
@@ -72,7 +72,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {
diff --git a/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue b/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
index ab0640bf..2d79abf0 100644
--- a/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
+++ b/jeecgboot-vue3-master/src/views/scpayment/ScPaymentList.vue
@@ -72,7 +72,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 160,
         fixed: 'right',
       },
       beforeFetch: (params) => {

From 0cd515071878342e8e0b291616c8cfcaf44dfe4e Mon Sep 17 00:00:00 2001
From: admin <417727563@qq.com>
Date: Fri, 19 Jul 2024 16:56:31 +0800
Subject: [PATCH 6/6] 13

---
 .../src/views/annualcompgroup/AnnualCompGroupList.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
index 2ed331e8..2109cc25 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
@@ -34,8 +34,8 @@
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>