合并分支 'feature_xiejiang_0.1' 到 'master'

src/views/customer/institution/edit.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-12-01 10:26:11
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 21:56:56
+ * @LastEditTime: 2024-12-11 23:10:28
  * @Description: 新增编辑角色
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -41,7 +41,7 @@
       <t-form-item label="机构服务结束时间" name="serviceTerminationTime" class="position-relative">
         <template #label>
           <div style="display: inline-flex">
-            <span>自定义标签</span>
+            <span>机构服务结束时间</span>
             <p class="text-[var(--td-warning-color-6)] m-[0] text-[12px] ml-[8px]">
               (机构服务的结束时间为该日期当日23:59:59)
             </p>

src/views/customer/institution/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-28 15:01:02
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 20:19:19
+ * @LastEditTime: 2024-12-11 23:13:39
  * @Description: 机构管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -84,6 +84,9 @@ onMounted(() => {
       title: '机构管理'
     }
   ])
+})
+
+onActivated(() => {
   getDictData()
   getData()
 })

src/views/sys-config/dictionary/dictionary-subset.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 11:31:32
+ * @LastEditTime: 2024-12-11 23:23:32
  * @Description: 系统字典-管理子集
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -17,6 +17,7 @@
         <DetailTable label="字典名称" :value="dataInfo.dictName" />
         <DetailTable label="字典编码" :value="dataInfo.dictCode" />
         <DetailTable label="字典属性">
+          <div class="flex flex-wrap">
             <span
               v-for="v in dictionarys"
               :key="v.value"
@@ -24,6 +25,7 @@
             >
               {{ dictionaryAttributeTxt(dataInfo[v.value] ? v.allow : v.noAllow)?.label }}
             </span>
+          </div>
         </DetailTable>
         <DetailTable label="字典说明" width="100%" :value="dataInfo.remark" />
       </div>

src/views/sys-config/dictionary/index.vue

@@ -89,6 +89,10 @@ onMounted(() => {
   getData()
 })
 
+onActivated(() => {
+  getData()
+})
+
 const dictionaryEditRef = ref()
 
 // 加载状态

src/views/sys-config/menu/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 21:51:44
+ * @LastEditTime: 2024-12-11 23:13:08
  * @Description: 菜单管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -117,6 +117,9 @@ onMounted(() => {
       title: '菜单管理'
     }
   ])
+})
+
+onActivated(() => {
   getData()
   GetAllMenuGroup()
 })

src/views/sys-config/version/index.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-11-11 09:38:40
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 21:51:06
+ * @LastEditTime: 2024-12-11 23:12:57
  * @Description: 版本管理
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -102,6 +102,9 @@ onMounted(() => {
       title: '版本管理'
     }
   ])
+})
+
+onActivated(() => {
   getData()
 })
 // 搜索参数类型

src/views/sys-permissions/authority/page/capabilities.vue

@@ -2,7 +2,7 @@
  * @Author: xiejiang
  * @Date: 2024-12-05 17:16:22
  * @LastEditors: xiejiang
- * @LastEditTime: 2024-12-11 22:31:51
+ * @LastEditTime: 2024-12-11 23:14:14
  * @Description: 功能权限
  * Copyright（c）2024 by 好老师教育科技有限公司 All right Reserved.
 -->
@@ -163,6 +163,7 @@ defineExpose({
     width: 230px;
     box-sizing: border-box;
     align-items: center;
+    min-height: 48px;
 
     :deep(.t-checkbox) {
       width: 100%;
@@ -192,6 +193,8 @@ defineExpose({
     .t-collapse-panel__header {
       padding: 8px;
       margin-top: -1px;
+      min-height: 48px;
+      box-sizing: border-box;
       background: var(--td-brand-color-12) !important;
       border: 1px solid var(--td-border) !important;
     }

src/views/sys-permissions/role/index.vue

@@ -81,6 +81,9 @@ onMounted(() => {
       name: 'role'
     }
   ])
+})
+
+onActivated(() => {
   getData()
 })
 

src/views/sys-permissions/user/index.vue

@@ -37,7 +37,7 @@
       </template>
 
       <template #operation="{ row }">
-        <template v-if="row.userType === 2">-</template>
+        <template v-if="row.userType === 2"><div class="min-h-[32px]">-</div></template>
         <template v-else
           ><operate-btn v-if="row.status != 2" content="启用" @click="handelStatus(row, 2)"> </operate-btn>
           <operate-btn v-if="row.status != 1" content="详情" @click="handelDetail(row)"> </operate-btn>
@@ -83,6 +83,9 @@ onMounted(() => {
       title: '用户管理'
     }
   ])
+})
+
+onActivated(() => {
   getData()
 })