From dabd7e5cda12d4bfb50d9d37b1e5889f5cb66805 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Sat, 22 Feb 2025 16:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/datalink/Marines.vue             |  7 ++++++-
 src/views/datalink/carrierBased.vue        | 19 ++++++++++++-------
 src/views/datalink/modules/uploadModal.vue |  5 ++++-
 src/views/datalink/waterDocuments.vue      |  7 ++++++-
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue
index f28c36d..dfd4903 100644
--- a/src/views/datalink/Marines.vue
+++ b/src/views/datalink/Marines.vue
@@ -60,7 +60,7 @@
     <!-- table区域-end -->
 
     <!-- 表单区域 -->
-    <uploadModal ref="modalForm"></uploadModal>
+    <uploadModal ref="modalForm" @ok="loadData"></uploadModal>
   </a-card>
 </template>
 
@@ -123,6 +123,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '解析进度',
+            align:"center",
+            dataIndex: 'percent',
+          },
           {
             title: '解析时间开始',
             align:"analyzeStartTime",
diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue
index 827c845..5d26324 100644
--- a/src/views/datalink/carrierBased.vue
+++ b/src/views/datalink/carrierBased.vue
@@ -42,12 +42,9 @@
 <!--        :locale="myLocale"-->
 
         <!-- 字符串超长截取省略号显示-->
-        <span slot="name" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
-        <span slot="describe" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
+        <template slot="percent" slot-scope="text">
+            <span>{{ percent(text) }}</span>
+        </template>
         <span slot="action" slot-scope="text, record">
           <a @click="processFile(record)" v-has="'cont:btn'">解析</a>
           <a-divider type="vertical" v-has="'cont:btn'" />
@@ -60,7 +57,7 @@
     <!-- table区域-end -->
 
     <!-- 表单区域 -->
-    <uploadModal ref="modalForm"></uploadModal>
+    <uploadModal ref="modalForm" @ok="loadData"></uploadModal>
   </a-card>
 </template>
 
@@ -123,6 +120,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '解析进度',
+            align:"center",
+            dataIndex: 'percent',
+          },
           {
             title: '解析时间开始',
             align:"analyzeStartTime",
@@ -160,6 +162,9 @@
         this.ipagination = pagination;
         this.loadData();
       },
+      percent(val){
+        return (parseFloat(val)*100)+"%";
+      },
       loadData() {
         getFileLinkInfo(this.queryParam).then((res) => {
             if (res.success) {
diff --git a/src/views/datalink/modules/uploadModal.vue b/src/views/datalink/modules/uploadModal.vue
index e1d697e..c89d8ba 100644
--- a/src/views/datalink/modules/uploadModal.vue
+++ b/src/views/datalink/modules/uploadModal.vue
@@ -52,19 +52,22 @@ import SliceUpload from './SliceUpload'
     methods: {
       add () {
         this.visible =true;
+        this.$refs.technicalUpload.deleteFile();
       },
       onOk(value) {
         this.model.startDate = moment(value[0],dateFormat);
         this.model.endDate = moment(value[1],dateFormat);
       },
       close () {
-        this.$emit('close');
+        this.$emit('ok');
         this.visible = false;
       },
       handleOk () {
+        this.$emit('ok');
         this.close();
       },
       handleCancel () {
+        this.$emit('ok');
         this.close()
       },
     }
diff --git a/src/views/datalink/waterDocuments.vue b/src/views/datalink/waterDocuments.vue
index 6270e61..5069f79 100644
--- a/src/views/datalink/waterDocuments.vue
+++ b/src/views/datalink/waterDocuments.vue
@@ -60,7 +60,7 @@
     <!-- table区域-end -->
 
     <!-- 表单区域 -->
-    <uploadModal ref="modalForm"></uploadModal>
+    <uploadModal ref="modalForm" @ok="loadData"></uploadModal>
   </a-card>
 </template>
 
@@ -123,6 +123,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '解析进度',
+            align:"center",
+            dataIndex: 'percent',
+          },
           {
             title: '解析时间开始',
             align:"analyzeStartTime",