From 5d633bd413c56c9222fbd00a3075897b8ae3476a Mon Sep 17 00:00:00 2001
From: JayChou <2064936853@qq.com>
Date: Mon, 8 Jul 2024 12:01:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Table/src/components/TableAction.vue      | 291 +++++++++---------
 .../committee/AnnualCompPointList.vue         |   2 +-
 .../superAdmin/AnnualCompPointListPass.vue    |   3 +
 3 files changed, 157 insertions(+), 139 deletions(-)

diff --git a/jeecgboot-vue3-master/src/components/Table/src/components/TableAction.vue b/jeecgboot-vue3-master/src/components/Table/src/components/TableAction.vue
index 4fe82a62..9b1b2cb0 100644
--- a/jeecgboot-vue3-master/src/components/Table/src/components/TableAction.vue
+++ b/jeecgboot-vue3-master/src/components/Table/src/components/TableAction.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="[prefixCls, getAlign]" @click="onCellClick">
+  <div :class="[prefixCls, getAlign]" @click="onCellClick" class="setting">
     <template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
       <template v-if="action.slot">
         <slot name="customButton"></slot>
@@ -19,183 +19,198 @@
 
       <Divider type="vertical" class="action-divider" v-if="divider && index < getActions.length - 1" />
     </template>
-    <Dropdown :trigger="['hover']" :dropMenuList="getDropdownList" popconfirm v-if="dropDownActions && getDropdownList.length > 0">
+    <Dropdown :trigger="['hover']" :dropMenuList="getDropdownList" popconfirm
+      v-if="dropDownActions && getDropdownList.length > 0">
       <slot name="more"></slot>
       <a-button type="link" size="small" v-if="!$slots.more"> 更多 <Icon icon="mdi-light:chevron-down"></Icon> </a-button>
     </Dropdown>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, PropType, computed, toRaw, unref } from 'vue';
-  import { MoreOutlined } from '@ant-design/icons-vue';
-  import { Divider, Tooltip, TooltipProps } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
-  import { ActionItem, TableActionType } from '/@/components/Table';
-  import { PopConfirmButton } from '/@/components/Button';
-  import { Dropdown } from '/@/components/Dropdown';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { useTableContext } from '../hooks/useTableContext';
-  import { usePermission } from '/@/hooks/web/usePermission';
-  import { isBoolean, isFunction, isString } from '/@/utils/is';
-  import { propTypes } from '/@/utils/propTypes';
-  import { ACTION_COLUMN_FLAG } from '../const';
-
-  export default defineComponent({
-    name: 'TableAction',
-    components: { Icon, PopConfirmButton, Divider, Dropdown, MoreOutlined, Tooltip },
-    props: {
-      actions: {
-        type: Array as PropType<ActionItem[]>,
-        default: null,
-      },
-      dropDownActions: {
-        type: Array as PropType<ActionItem[]>,
-        default: null,
-      },
-      divider: propTypes.bool.def(true),
-      outside: propTypes.bool,
-      stopButtonPropagation: propTypes.bool.def(false),
+import { defineComponent, PropType, computed, toRaw, unref } from 'vue';
+import { MoreOutlined } from '@ant-design/icons-vue';
+import { Divider, Tooltip, TooltipProps } from 'ant-design-vue';
+import Icon from '/@/components/Icon/index';
+import { ActionItem, TableActionType } from '/@/components/Table';
+import { PopConfirmButton } from '/@/components/Button';
+import { Dropdown } from '/@/components/Dropdown';
+import { useDesign } from '/@/hooks/web/useDesign';
+import { useTableContext } from '../hooks/useTableContext';
+import { usePermission } from '/@/hooks/web/usePermission';
+import { isBoolean, isFunction, isString } from '/@/utils/is';
+import { propTypes } from '/@/utils/propTypes';
+import { ACTION_COLUMN_FLAG } from '../const';
+
+export default defineComponent({
+  name: 'TableAction',
+  components: { Icon, PopConfirmButton, Divider, Dropdown, MoreOutlined, Tooltip },
+  props: {
+    actions: {
+      type: Array as PropType<ActionItem[]>,
+      default: null,
     },
-    setup(props) {
-      const { prefixCls } = useDesign('basic-table-action');
-      let table: Partial<TableActionType> = {};
-      if (!props.outside) {
-        table = useTableContext();
-      }
+    dropDownActions: {
+      type: Array as PropType<ActionItem[]>,
+      default: null,
+    },
+    divider: propTypes.bool.def(true),
+    outside: propTypes.bool,
+    stopButtonPropagation: propTypes.bool.def(false),
+  },
+  setup(props) {
+    const { prefixCls } = useDesign('basic-table-action');
+    let table: Partial<TableActionType> = {};
+    if (!props.outside) {
+      table = useTableContext();
+    }
 
-      const { hasPermission } = usePermission();
-      function isIfShow(action: ActionItem): boolean {
-        const ifShow = action.ifShow;
+    const { hasPermission } = usePermission();
+    function isIfShow(action: ActionItem): boolean {
+      const ifShow = action.ifShow;
 
-        let isIfShow = true;
+      let isIfShow = true;
 
-        if (isBoolean(ifShow)) {
-          isIfShow = ifShow;
-        }
-        if (isFunction(ifShow)) {
-          isIfShow = ifShow(action);
-        }
-        return isIfShow;
+      if (isBoolean(ifShow)) {
+        isIfShow = ifShow;
       }
+      if (isFunction(ifShow)) {
+        isIfShow = ifShow(action);
+      }
+      return isIfShow;
+    }
 
-      const getActions = computed(() => {
-        return (toRaw(props.actions) || [])
-          .filter((action) => {
-            return hasPermission(action.auth) && isIfShow(action);
-          })
-          .map((action) => {
-            const { popConfirm } = action;
-            return {
-              getPopupContainer: () => unref((table as any)?.wrapRef.value) ?? document.body,
-              type: 'link',
-              size: 'small',
-              ...action,
-              ...(popConfirm || {}),
-              onConfirm: popConfirm?.confirm,
-              onCancel: popConfirm?.cancel,
-              enable: !!popConfirm,
-            };
-          });
-      });
-
-      const getDropdownList = computed((): any[] => {
-        //过滤掉隐藏的dropdown,避免出现多余的分割线
-        const list = (toRaw(props.dropDownActions) || []).filter((action) => {
+    const getActions = computed(() => {
+      return (toRaw(props.actions) || [])
+        .filter((action) => {
           return hasPermission(action.auth) && isIfShow(action);
-        });
-        return list.map((action, index) => {
-          const { label, popConfirm } = action;
+        })
+        .map((action) => {
+          const { popConfirm } = action;
           return {
+            getPopupContainer: () => unref((table as any)?.wrapRef.value) ?? document.body,
+            type: 'link',
+            size: 'small',
             ...action,
-            ...popConfirm,
+            ...(popConfirm || {}),
             onConfirm: popConfirm?.confirm,
             onCancel: popConfirm?.cancel,
-            text: label,
-            divider: index < list.length - 1 ? props.divider : false,
+            enable: !!popConfirm,
           };
         });
-      });
+    });
 
-      const getAlign = computed(() => {
-        const columns = (table as TableActionType)?.getColumns?.() || [];
-        const actionColumn = columns.find((item) => item.flag === ACTION_COLUMN_FLAG);
-        return actionColumn?.align ?? 'left';
+    const getDropdownList = computed((): any[] => {
+      //过滤掉隐藏的dropdown,避免出现多余的分割线
+      const list = (toRaw(props.dropDownActions) || []).filter((action) => {
+        return hasPermission(action.auth) && isIfShow(action);
       });
-
-      function getTooltip(data: string | TooltipProps): TooltipProps {
+      return list.map((action, index) => {
+        const { label, popConfirm } = action;
         return {
-          getPopupContainer: () => unref((table as any)?.wrapRef.value) ?? document.body,
-          placement: 'bottom',
-          ...(isString(data) ? { title: data } : data),
+          ...action,
+          ...popConfirm,
+          onConfirm: popConfirm?.confirm,
+          onCancel: popConfirm?.cancel,
+          text: label,
+          divider: index < list.length - 1 ? props.divider : false,
         };
-      }
+      });
+    });
+
+    const getAlign = computed(() => {
+      const columns = (table as TableActionType)?.getColumns?.() || [];
+      const actionColumn = columns.find((item) => item.flag === ACTION_COLUMN_FLAG);
+      return actionColumn?.align ?? 'left';
+    });
+
+    function getTooltip(data: string | TooltipProps): TooltipProps {
+      return {
+        getPopupContainer: () => unref((table as any)?.wrapRef.value) ?? document.body,
+        placement: 'bottom',
+        ...(isString(data) ? { title: data } : data),
+      };
+    }
 
-      function onCellClick(e: MouseEvent) {
-        if (!props.stopButtonPropagation) return;
-        const path = e.composedPath() as HTMLElement[];
-        const isInButton = path.find((ele) => {
-          return ele.tagName?.toUpperCase() === 'BUTTON';
-        });
-        isInButton && e.stopPropagation();
-      }
+    function onCellClick(e: MouseEvent) {
+      if (!props.stopButtonPropagation) return;
+      const path = e.composedPath() as HTMLElement[];
+      const isInButton = path.find((ele) => {
+        return ele.tagName?.toUpperCase() === 'BUTTON';
+      });
+      isInButton && e.stopPropagation();
+    }
 
-      return { prefixCls, getActions, getDropdownList, getAlign, onCellClick, getTooltip };
-    },
-  });
+    return { prefixCls, getActions, getDropdownList, getAlign, onCellClick, getTooltip };
+  },
+});
 </script>
 <style lang="less">
-  @prefix-cls: ~'@{namespace}-basic-table-action';
+@prefix-cls: ~'@{namespace}-basic-table-action';
+
+.@{prefix-cls} {
+  display: flex;
+  align-items: center;
+  /* update-begin-author:taoyan date:2022-11-18 for: 表格默认行高比官方示例多出2px*/
+  height: 22px;
+  /* update-end-author:taoyan date:2022-11-18 for: 表格默认行高比官方示例多出2px*/
 
-  .@{prefix-cls} {
+  .action-divider {
+    display: table;
+  }
+
+  &.left {
+    justify-content: flex-start;
+  }
+
+  &.center {
+    justify-content: center;
+  }
+
+  &.right {
+    justify-content: flex-end;
+  }
+
+  button {
     display: flex;
     align-items: center;
-    /* update-begin-author:taoyan date:2022-11-18 for: 表格默认行高比官方示例多出2px*/
-    height: 22px;
-    /* update-end-author:taoyan date:2022-11-18 for: 表格默认行高比官方示例多出2px*/
-    
-    .action-divider {
-      display: table;
-    }
 
-    &.left {
-      justify-content: flex-start;
+    span {
+      margin-left: 0 !important;
     }
+  }
 
-    &.center {
-      justify-content: center;
+  button.ant-btn-circle {
+    span {
+      margin: auto !important;
     }
+  }
 
-    &.right {
-      justify-content: flex-end;
-    }
+  .ant-divider,
+  .ant-divider-vertical {
+    margin: 0 2px;
+  }
 
-    button {
-      display: flex;
-      align-items: center;
+  .icon-more {
+    transform: rotate(90deg);
 
-      span {
-        margin-left: 0 !important;
-      }
+    svg {
+      font-size: 1.1em;
+      font-weight: 700;
     }
+  }
+}
 
-    button.ant-btn-circle {
-      span {
-        margin: auto !important;
-      }
-    }
+.setting {
 
-    .ant-divider,
-    .ant-divider-vertical {
-      margin: 0 2px;
-    }
+  width: 100%;
 
-    .icon-more {
-      transform: rotate(90deg);
+  height: 100%;
 
-      svg {
-        font-size: 1.1em;
-        font-weight: 700;
-      }
-    }
-  }
+  display: flex;
+
+  flex-wrap: wrap;
+
+  align-items: center;
+
+}
 </style>
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
index a8711a36..a1ab7c67 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
@@ -105,7 +105,7 @@
       canResize: false,
       useSearchForm: false,
       actionColumn: {
-        width: 550,
+        width: 220,
         fixed: 'right',
       },
       beforeFetch: (params) => {
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue
index 2040b238..a982b84f 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue
@@ -336,4 +336,7 @@ function setFieldsValue(map) {
     text-align: center
   }
 }
+::v-deep(.ant-table-row) {
+    height: 120px !important;
+  }
 </style>

From ffdce67cfcd23d013533a6126e40c8e5f0043bbd Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:27:09 +0800
Subject: [PATCH 2/2] pul

---
 .../src/views/depart/workbench/index.vue      | 199 +-----------------
 1 file changed, 5 insertions(+), 194 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/index.vue
index 271345ed..3324e395 100644
--- a/jeecgboot-vue3-master/src/views/depart/workbench/index.vue
+++ b/jeecgboot-vue3-master/src/views/depart/workbench/index.vue
@@ -1,203 +1,14 @@
 <template>
     <div class="workbench">
-        <div class="header">
-            <div class="card">
-                <div class="top">
-                    <div class="text">
-                        本年度已开展比赛数
-                    </div>
-                    <Icon icon="mainHome-time|svg" :size="20" />
-                </div>
-                <div class="center">
-                    <div class="text">
-                        67
-                    </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>
-            <div class="card">
-                <div class="top">
-                    <div class="text">
-                        本年度已开展比赛数
-                    </div>
-                    <Icon icon="mainHome-time|svg" :size="20" />
-                </div>
-                <div class="center">
-                    <div class="text">
-                        67
-                    </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>
-            <div class="card">
-                <div class="top">
-                    <div class="text">
-                        本年度已开展比赛数
-                    </div>
-                    <Icon icon="mainHome-time|svg" :size="20" />
-                </div>
-                <div class="center">
-                    <div class="text">
-                        67
-                    </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>
-            <div class="card">
-                <div class="top">
-                    <div class="text">
-                        本年度已开展比赛数
-                    </div>
-                    <Icon icon="mainHome-time|svg" :size="20" />
-                </div>
-                <div class="center">
-                    <div class="text">
-                        67
-                    </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>
-        </div>
-
-        <div class="content">
-            <div class="con_left"></div>
-            <div class="con_right"></div>
-        </div>
-
-        <div class="footer">
-            <div class="foo_card"></div>
-            <div class="foo_card"></div>
-        </div>
+       <component :is="com()" />
     </div>
 </template>
 <script lang="ts" setup>
-
+import { ChDepartment } from './components/index'
+function com(){
+    return ChDepartment
+}
 </script>
 
 <style lang="less" scoped>
-.workbench {
-    padding: 16px 16px 0;
-
-    &>* {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .header {
-        .card {
-            width: 405px;
-            height: 182px;
-            background: #FFFFFF;
-            box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.02), 0px 1px 6px -1px rgba(0, 0, 0, 0.02), 0px 1px 2px 0px rgba(0, 0, 0, 0.03);
-            border-radius: 4px 4px 4px 4px;
-            padding: 20px 24px 0;
-
-            .top {
-                display: flex;
-                justify-content: space-between;
-
-                .text {
-                    height: 22px;
-                    font-family: Inter, Inter;
-                    font-weight: 400;
-                    font-size: 14px;
-                    color: rgba(0, 0, 0, 0.45);
-                    line-height: 22px;
-                    text-align: left;
-                    font-style: normal;
-                    text-transform: none;
-                }
-            }
-
-            .center {
-                margin-top: 4px;
-                width: 357px;
-                height: 78px;
-                border-radius: 0px 0px 0px 0px;
-                display: flex;
-                align-items: center;
-
-                .text {
-                    height: 38px;
-                    font-family: Inter, Inter;
-                    font-weight: 400;
-                    font-size: 48px;
-                    color: rgba(51, 51, 51, 0.88);
-                    line-height: 38px;
-                    text-align: left;
-                    font-style: normal;
-                    text-transform: none;
-                }
-            }
-
-            .bottom {
-                margin-top: 18px;
-                display: flex;
-                justify-content: space-between;
-
-                .bot_card {
-                    width: 91px;
-                    height: 22px;
-                    font-family: Inter, Inter;
-                    font-weight: 400;
-                    font-size: 14px;
-                    color: rgba(51, 51, 51, 0.88);
-                    line-height: 22px;
-                    text-align: left;
-                    font-style: normal;
-                    text-transform: none;
-                }
-            }
-        }
-    }
-
-    .content {
-        margin-top: 16px;
-
-        .con_left {
-            width: 489px;
-            height: 459px;
-            background: #FFFFFF;
-            border-radius: 2px 2px 2px 2px;
-            border: 1px solid #F0F0F0;
-        }
-
-        .con_right {
-            width: 1160px;
-            height: 458px;
-            background: #FFFFFF;
-            box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.1);
-            border-radius: 4px 4px 4px 4px;
-        }
-    }
-
-    .footer {
-        margin-top: 21px;
-
-        .foo_card {
-            width: 820px;
-            height: 502px;
-            background: #FFFFFF;
-            box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.1);
-            border-radius: 6px 6px 6px 6px;
-        }
-    }
-
-}
 </style>
\ No newline at end of file