From 5ee3b168fa33ea4c40c4a7d433dffcd5f9185884 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 28 Sep 2023 14:30:21 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=94=B9=E4=B8=AA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/software-history.vue           | 11 ++-
 .../configManage/softwareManage/index.vue     | 84 ++++++++++---------
 2 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/src/views/configManage/softwareManage/components/software-history.vue b/src/views/configManage/softwareManage/components/software-history.vue
index e8ac547f..8884b703 100644
--- a/src/views/configManage/softwareManage/components/software-history.vue
+++ b/src/views/configManage/softwareManage/components/software-history.vue
@@ -106,14 +106,16 @@ let tableColumns: ColumnsType = [
     title: '升级前版本',
     dataIndex: 'preVersion',
     align: 'center',
+    width: '60px',
   },
   {
     title: '回退前版本',
     dataIndex: 'newVersion',
     align: 'center',
+    width: '60px',
   },
   {
-    title: '用户状态',
+    title: '状态',
     dataIndex: 'status',
     key: 'status',
     align: 'center',
@@ -233,7 +235,12 @@ watch(
     @cancel="fnModalCancel"
   >
     <!-- 表格搜索栏 -->
-    <a-form :model="queryParams" name="queryParams" layout="horizontal">
+    <a-form
+      :model="queryParams"
+      name="queryParams"
+      layout="horizontal"
+      :label-col="{ span: 5 }"
+    >
       <a-row :gutter="16">
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item label="网元类型" name="neType">
diff --git a/src/views/configManage/softwareManage/index.vue b/src/views/configManage/softwareManage/index.vue
index dbf7ea9d..861cf6c1 100644
--- a/src/views/configManage/softwareManage/index.vue
+++ b/src/views/configManage/softwareManage/index.vue
@@ -461,15 +461,7 @@ onMounted(() => {
             <template #icon><UploadOutlined /></template>
             {{ t('views.configManage.softwareManage.uploadBtn') }}
           </a-button>
-          <a-button type="primary" @click.prevent="fnModalVisibleByEdit()">
-            <template #icon><DownloadOutlined /></template>
-            {{ t('views.configManage.softwareManage.downBtn') }}
-          </a-button>
-          <a-button type="primary" @click.prevent="fnModalVisibleByEdit()">
-            <template #icon><ThunderboltOutlined /></template>
-            {{ t('views.configManage.softwareManage.actBtn') }}
-          </a-button>
-          <a-button type="primary" @click.prevent="fnModalVisibleByHistory()">
+          <a-button type="dashed" @click.prevent="fnModalVisibleByHistory()">
             <template #icon><HistoryOutlined /></template>
             {{ t('views.configManage.softwareManage.historyBtn') }}
           </a-button>
@@ -535,6 +527,22 @@ onMounted(() => {
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
+              <a-tooltip>
+                <template #title>{{
+                  t('views.configManage.softwareManage.downBtn')
+                }}</template>
+                <a-button type="link" @click.prevent="fnDownloadFile(record)">
+                  <template #icon><SendOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip>
+                <template #title>{{
+                  t('views.configManage.softwareManage.actBtn')
+                }}</template>
+                <a-button type="link" @click.prevent="fnDownloadFile(record)">
+                  <template #icon><ThunderboltOutlined /></template>
+                </a-button>
+              </a-tooltip>
               <a-tooltip>
                 <template #title>{{ t('common.downloadText') }}</template>
                 <a-button type="link" @click.prevent="fnDownloadFile(record)">
@@ -564,36 +572,34 @@ onMounted(() => {
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFrom" layout="horizontal">
-        <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              label="网元类型"
-              name="neType"
-              v-bind="modalStateFrom.validateInfos.neType"
-            >
-              <a-select
-                v-model:value="modalState.from.neType"
-                placeholder="网元类型"
-                :options="useNeInfoStore().getNeSelectOtions"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              label="版本号"
-              name="version"
-              v-bind="modalStateFrom.validateInfos.version"
-            >
-              <a-input
-                v-model:value="modalState.from.version"
-                allow-clear
-                placeholder="请输入角色名称"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
+      <a-form
+        name="modalStateFrom"
+        layout="horizontal"
+        :label-col="{ span: 4 }"
+      >
+        <a-form-item
+          label="网元类型"
+          name="neType"
+          v-bind="modalStateFrom.validateInfos.neType"
+        >
+          <a-select
+            v-model:value="modalState.from.neType"
+            placeholder="网元类型"
+            :options="useNeInfoStore().getNeSelectOtions"
+          >
+          </a-select>
+        </a-form-item>
+        <a-form-item
+          label="版本号"
+          name="version"
+          v-bind="modalStateFrom.validateInfos.version"
+        >
+          <a-input
+            v-model:value="modalState.from.version"
+            allow-clear
+            placeholder="请输入版本号"
+          ></a-input>
+        </a-form-item>
         <a-form-item
           label="软件说明"
           name="comment"