fix: 业务下的单据列表应该显示所有单据 #3970

TencentBlueKing · Apr 18, 2024 · 4a13f46 · 4a13f46
1 parent ce3066e
commit 4a13f46
Show file tree

Hide file tree

Showing 80 changed files with 156 additions and 172 deletions.
diff --git a/dbm-ui/frontend/src/components/cluster-common/OperationBtnStatusTips.vue b/dbm-ui/frontend/src/components/cluster-common/OperationBtnStatusTips.vue
@@ -23,7 +23,7 @@
         ref="popRef"
         style="font-size: 12px; line-height: 16px; color: #63656e">
         <I18nT
-          keypath="xx_跳转_我的服务单_查看进度"
+          keypath="xx_跳转_单据_查看进度"
           tag="span">
           <span>{{ data.operationStatusText }}</span>
           <AuthRouterLink
@@ -36,7 +36,7 @@
                 id: data.operationTicketId,
               },
             }">
-            {{ $t('我的服务单') }}
+            {{ $t('单据') }}
           </AuthRouterLink>
         </I18nT>
       </div>

diff --git a/dbm-ui/frontend/src/components/cluster-common/RenderOperationTag.vue b/dbm-ui/frontend/src/components/cluster-common/RenderOperationTag.vue
@@ -24,7 +24,7 @@
     </span>
     <I18nT
       ref="popRef"
-      keypath="xx_跳转_我的服务单_查看进度"
+      keypath="xx_跳转_单据_查看进度"
       style="font-size: 12px; line-height: 16px; color: #63656e"
       tag="div">
       <span>{{ data.tip }}</span>
@@ -39,7 +39,7 @@
             id: data.ticketId,
           },
         }">
-        {{ $t('我的服务单') }}
+        {{ $t('单据') }}
       </AuthRouterLink>
     </I18nT>
   </div>
@@ -91,11 +91,11 @@
             zIndex: 999999,
             hideOnClick: true,
             onShow() {
-              isShown.value = true
+              isShown.value = true;
+            },
+            onHide() {
+              isShown.value = false;
             },
-            onHide(){
-              isShown.value = false
-            }
           });
         });
       }

diff --git a/dbm-ui/frontend/src/components/cluster-common/RenderOperationTagNew.vue b/dbm-ui/frontend/src/components/cluster-common/RenderOperationTagNew.vue
@@ -23,7 +23,7 @@
     </span>
     <I18nT
       ref="popRef"
-      keypath="xx_跳转_我的服务单_查看进度"
+      keypath="xx_跳转_单据_查看进度"
       style="font-size: 12px; line-height: 16px; color: #63656e"
       tag="div">
       <span>{{ data.tip }}</span>
@@ -38,7 +38,7 @@
             id: data.ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </AuthRouterLink>
     </I18nT>
   </div>
@@ -100,11 +100,11 @@
             zIndex: 999999,
             hideOnClick: true,
             onShow() {
-              isShown.value = true
+              isShown.value = true;
+            },
+            onHide() {
+              isShown.value = false;
             },
-            onHide(){
-              isShown.value = false
-            }
           });
         });
       }

diff --git a/dbm-ui/frontend/src/components/mysql-toolbox/Success.vue b/dbm-ui/frontend/src/components/mysql-toolbox/Success.vue
@@ -27,7 +27,7 @@
           <a
             href="javascript:"
             @click="handleGoTicket">
-            {{ $t('我的服务单') }}
+            {{ $t('单据') }}
           </a>
         </I18nT>
       </slot>

diff --git a/dbm-ui/frontend/src/hooks/useTicketMessage.ts b/dbm-ui/frontend/src/hooks/useTicketMessage.ts
@@ -35,7 +35,7 @@ export const useTicketMessage = () => {
             href: route.href,
             target: '_blank',
           },
-          ` "${t('我的服务单')}" `,
+          ` "${t('单据')}" `,
         ),
         t('查看'),
       ]),

diff --git a/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue b/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue
@@ -22,7 +22,7 @@
         <span
           v-overflow-tips.right
           class="text-overflow">
-          {{ t('我的服务单') }}
+          {{ t('单据') }}
         </span>
       </BkMenuItem>
       <BkMenuItem key="MyTodos">

diff --git a/dbm-ui/frontend/src/locales/en.json b/dbm-ui/frontend/src/locales/en.json
@@ -240,7 +240,7 @@
   "快捷键": "Hot key",
   "跳过": "Ignore error",
   "总耗时": "Total time consuming",
-  "我的服务单": "My Services",
+  "单据": "My Services",
   "打包下载": "Download package",
   "执行人": "Executed by",
   "执行日志": "Execution log",
@@ -1030,7 +1030,7 @@
   "该操作需要以下权限": "Needs the following privileges",
   "需申请的权限": "Required privileges to apply",
   "中文": "Chinese",
-  "xx_跳转_我的服务单_查看进度": "{0}, jump to {1} to take a look",
+  "xx_跳转_单据_查看进度": "{0}, jump to {1} to take a look",
   "删除成功": "Delete successfully",
   "确认删除": "Confirm  to delete",
   "确认删除xx": "Confirm to delete {0}",

diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -231,7 +231,6 @@
     "确定重试吗": "确定重试吗?",
     "失败重试": "失败重试",
     "总耗时": "总耗时",
-    "我的服务单": "我的服务单",
     "删除Key_会将Key提取的对应内容进行删除_请谨慎操作": "删除 Key， 会将 Key 提取的对应内容进行删除，请谨慎操作",
     "确认从数据库中删除Key": "确认从数据库中删除 Key？",
     "批量操作中存在size为0的集群无法删除keys": "批量操作中存在 size 为 0 的集群无法删除 keys",
@@ -461,7 +460,7 @@
     "1_删除xx集群": "1. 删除 {name} 集群",
     "2_删除xx实例数据_停止相关进程": "2. 删除 {name} 实例数据，停止相关进程",
     "回收主机": "回收主机",
-    "xx_跳转_我的服务单_查看进度": "{0}，跳转 {1} 查看进度",
+    "xx_跳转_单据_查看进度": "{0}，跳转 {1} 查看进度",
     "已选n个集群": "已选 {0} 个集群",
     "批量备份集群": "批量备份集群",
     "备份集群": "备份集群",
@@ -2520,7 +2519,7 @@
     "删除节点": "删除节点",
     "禁用中": "禁用中",
     "已禁用": "已禁用",
-    "禁用任务正在进行中，跳转我的服务单查看进度": "禁用任务正在进行中，跳转 {0} 查看进度",
+    "禁用任务正在进行中，跳转单据查看进度": "禁用任务正在进行中，跳转 {0} 查看进度",
     "被禁用后将无法访问，如需恢复访问，可以再次「启用」": "被禁用后将无法访问，如需恢复访问，可以再次「启用」",
     "启用后将恢复访问": "启用后将恢复访问",
     "被删除后将进行以下操作": "被删除后将进行以下操作",

diff --git a/dbm-ui/frontend/src/views/es-manage/list/components/detail/components/node-list/Index.vue b/dbm-ui/frontend/src/views/es-manage/list/components/detail/components/node-list/Index.vue
@@ -103,7 +103,7 @@
               id: operationData?.operationTicketId,
             },
           }">
-          {{ t('我的服务单') }}
+          {{ t('单据') }}
         </AuthRouterLink>
       </I18nT>
     </BkAlert>

diff --git a/dbm-ui/frontend/src/views/hdfs-manage/list/components/detail/components/node-list/Index.vue b/dbm-ui/frontend/src/views/hdfs-manage/list/components/detail/components/node-list/Index.vue
@@ -99,7 +99,7 @@
               id: operationData?.operationTicketId,
             },
           }">
-          {{ t('我的服务单') }}
+          {{ t('单据') }}
         </AuthRouterLink>
       </I18nT>
     </BkAlert>

diff --git a/dbm-ui/frontend/src/views/kafka-manage/list/components/detail/components/node-list/Index.vue b/dbm-ui/frontend/src/views/kafka-manage/list/components/detail/components/node-list/Index.vue
@@ -102,7 +102,7 @@
               id: operationData?.operationTicketId,
             },
           }">
-          {{ t('我的服务单') }}
+          {{ t('单据') }}
         </AuthRouterLink>
       </I18nT>
     </BkAlert>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/capacity-change/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/capacity-change/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>
@@ -47,10 +47,7 @@
 </template>
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
-  import {
-    useRoute,
-    useRouter,
-  } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
 
   import RenderSuccess from '@components/ticket-success/Index.vue';
 

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/db-backup/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/db-backup/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/db-clear/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/db-clear/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>
@@ -47,10 +47,7 @@
 </template>
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
-  import {
-    useRoute,
-    useRouter,
-  } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
 
   import RenderSuccess from '@components/ticket-success/Index.vue';
 

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/db-replace/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/db-replace/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/db-structure/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/db-structure/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>
@@ -47,10 +47,7 @@
 </template>
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
-  import {
-    useRoute,
-    useRouter,
-  } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
 
   import RenderSuccess from '@components/ticket-success/Index.vue';
 

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/db-table-backup/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/db-table-backup/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/proxy-scale-down/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/proxy-scale-down/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/proxy-scale-up/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/proxy-scale-up/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>
@@ -47,10 +47,7 @@
 </template>
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
-  import {
-    useRoute,
-    useRouter,
-  } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
 
   import RenderSuccess from '@components/ticket-success/Index.vue';
 

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/script-execute/steps/step2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/script-execute/steps/step2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/shard-scale-down/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/shard-scale-down/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/shard-scale-up/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/shard-scale-up/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ t('我的服务单') }}
+        {{ t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mongodb-manage/structure-instance/Index.vue b/dbm-ui/frontend/src/views/mongodb-manage/structure-instance/Index.vue
@@ -273,7 +273,7 @@
         <router-link
           target="_blank"
           to={{
-            name: 'SelfServiceMyTickets',
+            name: 'bizTicketManage',
             query: {
               id: data.ticket_id,
             },

diff --git a/dbm-ui/frontend/src/views/mysql/common/OperationStatusTips.vue b/dbm-ui/frontend/src/views/mysql/common/OperationStatusTips.vue
@@ -19,7 +19,7 @@
     <slot :disabled="disabled" />
     <I18nT
       ref="popRef"
-      keypath="xx_跳转_我的服务单_查看进度"
+      keypath="xx_跳转_单据_查看进度"
       style="font-size: 12px; line-height: 16px; color: #63656e"
       tag="div">
       <span>{{ text }}</span>
@@ -31,7 +31,7 @@
             id: data.ticket_id,
           },
         }">
-        {{ $t('我的服务单') }}
+        {{ $t('单据') }}
       </RouterLink>
     </I18nT>
   </span>

diff --git a/dbm-ui/frontend/src/views/mysql/db-backup/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mysql/db-backup/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ $t('我的服务单') }}
+        {{ $t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/dbm-ui/frontend/src/views/mysql/db-table-backup/pages/page2/Index.vue b/dbm-ui/frontend/src/views/mysql/db-table-backup/pages/page2/Index.vue
@@ -27,7 +27,7 @@
             id: ticketId,
           },
         }">
-        {{ $t('我的服务单') }}
+        {{ $t('单据') }}
       </RouterLink>
     </I18nT>
     <template #action>

diff --git a/...rc/views/mysql/dumper/components/render-list/components/instance-list/OperationBtnTip.vue b/...rc/views/mysql/dumper/components/render-list/components/instance-list/OperationBtnTip.vue
@@ -20,7 +20,7 @@
     <slot />
     <template #content>
       <I18nT
-        keypath="xx_跳转_我的服务单_查看进度"
+        keypath="xx_跳转_单据_查看进度"
         style="font-size: 12px; line-height: 16px; color: #63656e"
         tag="div">
         <span>{{ data.operationBtnTipStatusText }}</span>
@@ -32,7 +32,7 @@
               id: data.operationTicketId,
             },
           }">
-          {{ $t('我的服务单') }}
+          {{ $t('单据') }}
         </RouterLink>
       </I18nT>
     </template>