From 959f913927c069cde4458041088e95ef782e411c Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Wed, 25 Feb 2026 10:38:40 +0800
Subject: [PATCH 1/3] a

---
 src/assets/styles/page-cards.scss             |   1 -
 .../professionaltitlerelation/index.vue       | 259 ++++++++----------
 2 files changed, 117 insertions(+), 143 deletions(-)

diff --git a/src/assets/styles/page-cards.scss b/src/assets/styles/page-cards.scss
index 61e0884..07c334a 100644
--- a/src/assets/styles/page-cards.scss
+++ b/src/assets/styles/page-cards.scss
@@ -80,7 +80,6 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
-  gap: 10px;
 }
 
 .header-right {
diff --git a/src/views/professional/professionaltitlerelation/index.vue b/src/views/professional/professionaltitlerelation/index.vue
index 2ba74ec..2ca323e 100755
--- a/src/views/professional/professionaltitlerelation/index.vue
+++ b/src/views/professional/professionaltitlerelation/index.vue
@@ -1,120 +1,126 @@
 <template>
-  <div class="titlerelation-page">
+  <div class="page-cards">
     <div class="page-wrapper">
-      <!-- 内容区：最上搜索，其次标题+按钮，再下方表格 -->
-      <div class="content-block">
-        <!-- 最上：搜索区 -->
-        <div v-show="showSearch" class="content-block__filter">
-          <search-form
-            :model="search"
-            ref="searchFormRef"
-            @keyup-enter="handleFilter"
-          >
-            <template #default="{ visible }">
-              <template v-if="visible">
-                <el-form-item label="姓名" prop="realName">
-                  <el-input
-                    v-model="search.realName"
-                    clearable
-                    placeholder="请输入姓名"
-                    class="filter-input"
+      <!-- 筛选卡片 -->
+      <el-card v-show="showSearch" class="search-card" shadow="never">
+        <search-form
+          :model="search"
+          ref="searchFormRef"
+          :show-filter-title="false"
+          @keyup-enter="handleFilter"
+        >
+          <template #default="{ visible }">
+            <template v-if="visible">
+              <el-form-item label="姓名" prop="realName">
+                <el-input
+                  v-model="search.realName"
+                  clearable
+                  placeholder="请输入姓名"
+                  class="filter-input"
+                />
+              </el-form-item>
+              <el-form-item label="工号" prop="teacherNo">
+                <el-input
+                  v-model="search.teacherNo"
+                  clearable
+                  placeholder="请输入工号"
+                  class="filter-input"
+                />
+              </el-form-item>
+              <el-form-item label="审核状态" prop="state">
+                <el-select
+                  v-model="search.state"
+                  clearable
+                  placeholder="请选择审核状态"
+                  class="filter-select"
+                >
+                  <el-option
+                    v-for="item in professionalState"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   />
-                </el-form-item>
-                <el-form-item label="工号" prop="teacherNo">
-                  <el-input
-                    v-model="search.teacherNo"
-                    clearable
-                    placeholder="请输入工号"
-                    class="filter-input"
+                </el-select>
+              </el-form-item>
+              <el-form-item label="职称" prop="professionalTitleConfigId">
+                <el-select
+                  v-model="search.professionalTitleConfigId"
+                  clearable
+                  filterable
+                  placeholder="请选择职称"
+                  class="filter-select"
+                >
+                  <el-option
+                    v-for="item in professionalTitleList"
+                    :key="item.id"
+                    :label="item.professionalTitle"
+                    :value="item.id"
                   />
-                </el-form-item>
-                <el-form-item label="审核状态" prop="state">
-                  <el-select
-                    v-model="search.state"
-                    clearable
-                    placeholder="请选择审核状态"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalState"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="职称" prop="professionalTitleConfigId">
-                  <el-select
-                    v-model="search.professionalTitleConfigId"
-                    clearable
-                    filterable
-                    placeholder="请选择职称"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalTitleList"
-                      :key="item.id"
-                      :label="item.professionalTitle"
-                      :value="item.id"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="专业技术职务" prop="majorStation">
-                  <el-select
-                    v-model="search.majorStation"
-                    clearable
-                    filterable
-                    placeholder="请选择专业技术职务"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in majorStationList"
-                      :key="item.id"
-                      :label="item.majorStationName"
-                      :value="item.id"
-                    />
-                  </el-select>
-                </el-form-item>
-              </template>
-            </template>
-            <template #actions>
-              <el-form-item>
-                <el-button type="primary" @click="handleFilter" icon="Search">查询</el-button>
-                <el-button @click="resetQuery" icon="Refresh">重置</el-button>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="专业技术职务" prop="majorStation">
+                <el-select
+                  v-model="search.majorStation"
+                  clearable
+                  filterable
+                  placeholder="请选择专业技术职务"
+                  class="filter-select"
+                >
+                  <el-option
+                    v-for="item in majorStationList"
+                    :key="item.id"
+                    :label="item.majorStationName"
+                    :value="item.id"
+                  />
+                </el-select>
               </el-form-item>
             </template>
-          </search-form>
-        </div>
+          </template>
+          <template #actions>
+            <el-form-item>
+              <el-button type="primary" @click="handleFilter" icon="Search">查询</el-button>
+              <el-button @click="resetQuery" icon="Refresh">重置</el-button>
+            </el-form-item>
+          </template>
+        </search-form>
+      </el-card>
 
-        <!-- 其次：左侧按钮，右侧 RightToolbar -->
-        <div class="content-block__header">
-          <div class="header-actions">
-            <div class="action-group">
-              <el-button
-                v-if="hasAuth('professional_professionaltitlerelation_add')"
-                type="primary"
-                icon="FolderAdd"
-                @click="handleAdd"
-              >新增</el-button>
-              <el-button
-                v-if="hasAuth('professional_teacherbase_export')"
-                type="warning"
-                plain
-                icon="Download"
-                @click="handleDownLoadWord"
-                :loading="exportLoading"
-              >导出信息</el-button>
-            </div>
-            <div class="header-right">
-              <RightToolbar
-                v-model:showSearch="showSearch"
-                @queryTable="getDataList"
-              />
+      <!-- 列表内容卡片 -->
+      <el-card class="content-card" shadow="never">
+        <template #header>
+          <div class="card-header">
+            <span class="card-title">
+              <el-icon class="title-icon"><Medal /></el-icon>
+              职称关系
+            </span>
+            <div class="header-actions">
+              <div class="action-group">
+                <el-button
+                  v-if="hasAuth('professional_professionaltitlerelation_add')"
+                  type="primary"
+                  icon="FolderAdd"
+                  @click="handleAdd"
+                >新增</el-button>
+                <el-button
+                  v-if="hasAuth('professional_teacherbase_export')"
+                  type="warning"
+                  plain
+                  icon="Download"
+                  @click="handleDownLoadWord"
+                  :loading="exportLoading"
+                >导出信息</el-button>
+              </div>
+              <div class="header-right">
+                <RightToolbar
+                  v-model:showSearch="showSearch"
+                  @queryTable="getDataList"
+                />
+              </div>
             </div>
           </div>
-        </div>
+        </template>
 
-        <!-- 再下方：表格 -->
+        <!-- 表格 -->
         <el-table
           ref="tableRef"
           :data="state.dataList"
@@ -223,7 +229,7 @@
           @current-change="currentChangeHandle"
           @size-change="sizeChangeHandle"
         />
-      </div>
+      </el-card>
     </div>
 
     <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
@@ -258,6 +264,7 @@ import {
 import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
 import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
 import { defineAsyncComponent } from 'vue'
+import { Medal } from '@element-plus/icons-vue'
 // 子组件
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
@@ -469,17 +476,7 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
-.titlerelation-page {
-  padding: 12px;
-  min-height: 100%;
-  background: var(--el-bg-color-page, #f5f6f8);
-}
-
-.page-wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 0;
-}
+@import '/@/assets/styles/page-cards.scss';
 
 /* 筛选：内容区最上方，无上外边距；与下方标题栏间距用 margin-bottom */
 .content-block__filter {
@@ -527,29 +524,7 @@ onMounted(async () => {
   }
 }
 
-.header-actions {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  gap: 12px;
-  width: 100%;
-}
-
-/* 按钮间距按规范 10px；与 RightToolbar 区隔 */
-.action-group {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap; 
-}
-
-.header-right {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding-left: 12px;
-  // border-left: 1px solid var(--el-border-color-lighter);
-}
+/* header-actions / action-group / header-right 的基础布局来自 page-cards.scss */
 
 /* 表格 */
 .titlerelation-table {

From 2009497b80a14a75c53ad35c81393d6a6d982231 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Sat, 28 Feb 2026 10:56:15 +0800
Subject: [PATCH 2/3] 1

---
 src/views/admin/system/role/change-role.vue | 76 ++++++++++++---------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/views/admin/system/role/change-role.vue b/src/views/admin/system/role/change-role.vue
index e4eb5c3..6dcb686 100644
--- a/src/views/admin/system/role/change-role.vue
+++ b/src/views/admin/system/role/change-role.vue
@@ -13,16 +13,21 @@
       <el-form-item class="role-form-item">
         <el-radio-group v-model="radio" class="role-radio-group" @change="handleChangeRole">
           <template v-for="(roles, groupName) in allRoleGroups" :key="groupName">
-            <div class="role-group">
-              <el-divider>{{ groupName }}</el-divider>
-              <el-radio-button
-                v-for="item in roles"
-                :key="item.roleCode"
-                :label="item.roleCode"
-              >
-                {{ item.roleName }}
-              </el-radio-button>
-            </div>
+            <el-card class="role-group-card" shadow="hover">
+              <template #header>
+                <span class="group-name">{{ groupName }}</span>
+              </template>
+              <div class="role-group">
+                <el-radio-button
+                  v-for="item in roles"
+                  :key="item.roleCode"
+                  :label="item.roleCode"
+                  size="small"
+                >
+                  {{ item.roleName }}
+                </el-radio-button>
+              </div>
+            </el-card>
           </template>
         </el-radio-group>
       </el-form-item>
@@ -121,31 +126,12 @@ defineExpose({
     flex-wrap: wrap;
   }
 }
-.role-group {
-  width: 100%;
-  flex: 0 0 100%;
-  margin-bottom: 12px;
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 8px 12px;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-.group-name {
-  font-size: 13px;
-  color: var(--el-text-color-secondary);
-  margin-bottom: 6px;
-}
 .role-radio-group {
   display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  align-items: flex-start;
+  flex-direction: column;
+  gap: 6px;
+  width: 100%;
 
-  /* 每个分组内按钮可换行，分组之间不重叠 */
   :deep(.el-radio-button) {
     margin: 0;
   }
@@ -153,9 +139,35 @@ defineExpose({
     border-radius: 6px !important;
     border: 1px solid var(--el-border-color) !important;
     margin-left: 0 !important;
+    line-height: 1.3;
   }
   :deep(.el-radio-button.is-active .el-radio-button__inner) {
     border-color: var(--el-color-primary) !important;
   }
 }
+.role-group-card {
+  width: 100%;
+  flex: 0 0 auto;
+
+  :deep(.el-card__header) {
+    padding: 6px 12px;
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+  :deep(.el-card__body) {
+    padding: 6px 12px 8px;
+  }
+}
+.role-group {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 4px 8px;
+}
+.group-name {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
 </style>
\ No newline at end of file

From 4a9350211d87fe0c1062a2ab26a8e4372af746b6 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Sat, 28 Feb 2026 11:15:14 +0800
Subject: [PATCH 3/3] 1

---
 .../professionaltitlerelation/index.vue       | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/views/professional/professionaltitlerelation/index.vue b/src/views/professional/professionaltitlerelation/index.vue
index 2ca323e..9c3dbd5 100755
--- a/src/views/professional/professionaltitlerelation/index.vue
+++ b/src/views/professional/professionaltitlerelation/index.vue
@@ -258,13 +258,13 @@ import { useDict } from '/@/hooks/dict'
 import { 
   fetchList, 
   examObj, 
-  delObj, 
-  exportRelation
+  delObj
 } from '/@/api/professional/professionaluser/professionaltitlerelation'
 import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
 import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
 import { defineAsyncComponent } from 'vue'
 import { Medal } from '@element-plus/icons-vue'
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
 // 子组件
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
@@ -416,26 +416,14 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
-  try {
-    const response: any = await exportRelation(search)
-    
-    const blob = new Blob([response as BlobPart])
-    const fileName = '职称信息.xls'
-    const elink = document.createElement('a')
-    elink.download = fileName
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
+  exportLoading.value = true;
+  let params = Object.assign(search, { type: 'P20002' });
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+    message.success('后台下载进行中,请稍后查看任务列表');
+  });
+  setTimeout(() => {
+    exportLoading.value = false;
+  }, 3000); // 5分钟后自动关闭
 }
 
 // 获取职称名称