From b29e8bc63ab18075e078826d662d02dbaf4c1544 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 5 Jul 2022 16:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  |  9 +++++----
 .../parameter/ParameterTemplate/index.vue     | 20 ++++++++++++-------
 .../views/parameter/parameterlist/index.vue   | 13 ++++++++----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index d4e712fbe..8304b2613 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -101,30 +101,31 @@
         <div class="text-field">
           <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
           <span class="text-field-right"
+                :title="configDetail.configName"
           >{{configDetail.configName}}</span>
         </div>
       </div>
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('Model')">{{$t('Model')}}:</span>
-          <span class="text-field-right"
+          <span class="text-field-right" :title="configDetail.carType"
           >{{configDetail.carType}}</span>
         </div>
         <div class="text-field">
           <span class="text-field-left" :title="$t('electricMachinery')">{{$t('electricMachinery')}}:</span>
-          <span class="text-field-right"
+          <span class="text-field-right" :title="configDetail.motor"
           >{{configDetail.motor}}</span>
         </div>
       </div>
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('Version')">{{$t('Version')}}:</span>
-          <span class="text-field-right"
+          <span class="text-field-right" :title="configDetail.version"
           >{{configDetail.version}}</span>
         </div>
         <div class="text-field">
           <span class="text-field-left" :title="$t('Battery')">{{$t('Battery')}}:</span>
-          <span class="text-field-right"
+          <span class="text-field-right" :title="configDetail.battery"
           >{{configDetail.battery}}</span>
         </div>
       </div>
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index fb8d13d60..dde4540c1 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -52,7 +52,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -60,7 +60,7 @@
       >
         <span slot="projectName" slot-scope="text,record" :title="text">
           <a @click="entryNameClick(record)">
-            {{ text && text.length > 30 ? text.slice(0, 29) + '...' : text }}
+            {{ text }}
           </a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
@@ -157,31 +157,37 @@ export default {
         {
           title: this.$t('zoneOfApplication'),
           align: 'center',
-          width: '10%',
+          width: 160,
+          ellipsis: true,
           dataIndex: 'region_dictText',
         },
         {
           title: this.$t('parameterTemplate'),
           align: 'center',
+          width: 180,
+          ellipsis: true,
           dataIndex: 'paramsTemplateName',
           scopedSlots: { customRender: 'projectName' }
         },
         {
           title: this.$t('contentDescription'),
           align: 'center',
+          ellipsis: true,
           dataIndex: 'description',
-          scopedSlots: { customRender: 'titleName' }
+          // scopedSlots: { customRender: 'titleName' }
         },
         {
           title: this.$t('createTime'),
           align: 'center',
-          width: '10%',
-          dataIndex: 'createTime'
+          dataIndex: 'createTime',
+          width: 160,
+          ellipsis: true,
         },
         {
           title: this.$t('updateTime'),
           align: 'center',
-          width: '10%',
+          width: 160,
+          ellipsis: true,
           dataIndex: 'updateTime'
         },
         {
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 0237cdaeb..de2d26b32 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -72,7 +72,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -155,20 +155,23 @@ export default {
         {
           title: this.$t('NiONumber'),
           align: 'center',
-          width: 100,
+          width: 130,
           dataIndex: 'nioNumber',
-          sorter: true
+          sorter: true,
+          ellipsis: true,
         },
         {
           title: this.$t('ParameterName'),
           align: 'center',
           dataIndex: 'paramsName',
           width: 160,
+          ellipsis: true,
         },
         {
           title: this.$t('ParameterDescription'),
           align: 'center',
           dataIndex: 'description',
+          ellipsis: true,
           // scopedSlots: { customRender: 'titleName' }
         },
         {
@@ -176,12 +179,14 @@ export default {
           align: 'center',
           dataIndex: 'dutyTerritory_dictText',
           width: 150,
+          ellipsis: true,
         },
         {
           title: this.$t('createTime'),
           align: 'center',
           dataIndex: 'createTime',
-          width: 110,
+          width: 180,
+          ellipsis: true,
         },
         {
           title: this.$t('operation'),