From 374b6feef3943a1797a0554dfefc065ac331c5f9 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Fri, 5 Jul 2024 17:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts         |  2 +-
 src/views/neUser/base5G/index.vue |  2 +-
 src/views/system/tenant/index.vue | 58 +++++++++++++++++++------------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index d5cba479..2305be45 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1844,7 +1844,7 @@ export default {
           requestMe:'Request Method',
           host:'Request Host',
           operStatus:'Status',
-          operDate:'Time',
+          operDate:'Time Stamp',
           useTime:'Time Lap',
           logInfo:'Operation Log Information',
           delSure:'Are you sure to delete the data item with access number [{ids}]?',
diff --git a/src/views/neUser/base5G/index.vue b/src/views/neUser/base5G/index.vue
index cae995ad..8fd10dff 100644
--- a/src/views/neUser/base5G/index.vue
+++ b/src/views/neUser/base5G/index.vue
@@ -310,7 +310,7 @@ onMounted(() => {
                 :options="[
                   { label: '4G', value: '4g' },
                   { label: '5G', value: '5g' },
-                  { label: '45G', value: '45g' },
+                  { label: '4/5G', value: '45g' },
                 ]"
                 :allow-clear="false"
                 :placeholder="t('common.selectPlease')"
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index d802e2dc..f2f3ea79 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -336,7 +336,8 @@ function fnModalVisibleByEdit(
         modalState.confirmLoading = false;
         hide();
       });
-    modalState.title = t('common.editText') + t('views.system.tenant.classInfo');
+    modalState.title =
+      t('common.editText') + t('views.system.tenant.classInfo');
     modalState.visibleByEdit = true;
     // 获取部门信息同时查询部门列表（排除节点）
   }
@@ -391,7 +392,7 @@ function fnModalOk() {
 function fnRecordDelete(tenantId: string | number) {
   Modal.confirm({
     title: t('common.tipTitle'),
-    content: t('views.system.tenant.delSure', { tenantId}),
+    content: t('views.system.tenant.delSure', { tenantId }),
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
       delTenant(tenantId).then(res => {
@@ -452,7 +453,8 @@ function fnModalVisibleByType(
         modalState.confirmLoading = false;
         hide();
       });
-    modalState.title = t('common.editText') + t('views.system.tenant.classInfo');
+    modalState.title =
+      t('common.editText') + t('views.system.tenant.classInfo');
     modalState.visibleByType = true;
     // 获取部门信息同时查询部门列表（排除节点）
   }
@@ -588,30 +590,37 @@ onMounted(() => {
               <a-tree :tree-data="state.tenantTreeData" @select="fnSelectNode">
                 <!-- treeKey is tenantId -->
 
-                <template #title="{ key: treeKey, title, status }">
-                  <div
-                    @mouseover="showButtons(treeKey)"
-                    @mouseleave="hideButtons"
-                    style="display: flex; align-items: center"
-                  >
+                <template
+                  #title="{ key: treeKey, title, status }"
+                  style="width: 170px"
+                >
+                  <div style="display: flex; align-items: center">
                     <span
                       :style="
                         status == 1 ? { color: 'green' } : { color: 'red' }
                       "
+                      class="treeNode"
                       >{{ title }}</span
                     >
-                    <div style="flex: 1"></div>
                     <!-- 占位符，推动后面的按钮到最右边 -->
-                    <EditOutlined
-                      class="iconMyStyle"
-                      @click.stop="fnModalVisibleByEdit(treeKey)"
-                      v-show="showButtonsKey === treeKey"
-                    />
-                    <DeleteOutlined
-                      class="iconMyStyle"
-                      @click.stop="fnRecordDelete(treeKey)"
-                      v-show="showButtonsKey === treeKey"
-                    />
+                    <div style="flex: 1"></div>
+
+                    <span>
+                      <EditOutlined
+                        :style="
+                          status == 1 ? { color: 'green' } : { color: 'red' }
+                        "
+                        class="iconMyStyle"
+                        @click.stop="fnModalVisibleByEdit(treeKey)"
+                      />
+                      <DeleteOutlined
+                        :style="
+                          status == 1 ? { color: 'green' } : { color: 'red' }
+                        "
+                        class="iconMyStyle"
+                        @click.stop="fnRecordDelete(treeKey)"
+                      />
+                    </span>
                   </div>
                 </template>
               </a-tree>
@@ -634,7 +643,7 @@ onMounted(() => {
               </template>
             </a-button>
             <a-typography-text v-if="state.selectedName">
-              {{  state.selectedName +'-Tenancy Asset	'}}
+              {{ state.selectedName + '-Tenancy Asset	' }}
             </a-typography-text>
             <a-typography-text type="danger" v-else>
               {{ t('views.system.tenant.treeSelectTip') }}
@@ -765,7 +774,7 @@ onMounted(() => {
           <a-input
             v-model:value="modalState.from.tenantName"
             allow-clear
-            :maxlength="30"
+            :maxlength="18"
           >
           </a-input>
         </a-form-item>
@@ -883,4 +892,9 @@ onMounted(() => {
 .iconMyStyle {
   margin-left: 14px;
 }
+
+.treeNode {
+  display: inline-block;
+  width: 130px; /* 设置你想要的宽度 */
+}
 </style>