From 1650b67ece48d09df5acb6ad039166572ed18562 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Mon, 24 Feb 2025 21:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/datalink/Marines.vue        | 29 +++++++++++++++----------
 src/views/datalink/carrierBased.vue   | 31 ++++++++++++++++-----------
 src/views/datalink/waterDocuments.vue | 29 +++++++++++++++----------
 src/views/fileManage/recycling.vue    |  1 -
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue
index 25b9265..e0efcd5 100644
--- a/src/views/datalink/Marines.vue
+++ b/src/views/datalink/Marines.vue
@@ -109,11 +109,6 @@
             align:"fileName",
             dataIndex: 'fileName',
           },
-          {
-            title: '创建时间',
-            align:"createTime",
-            dataIndex: 'createTime'
-          },
           {
             title: '模式名称',
             align:"schemaName",
@@ -124,10 +119,16 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '创建时间',
+            align:"createTime",
+            dataIndex: 'createTime'
+          },
           {
             title: '状态',
-            align:"parseStatus",
+            align:"center",
             dataIndex: 'parseStatus',
+            scopedSlots: { customRender: 'parseStatus' },
           },
           {
             title: '解析进度',
@@ -197,12 +198,18 @@
       },
       processFile: function (record) {
         var that = this;
-        postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
-            if (res.success) {
-                this.$message.success(res.message);
-                that.loadData();
+        isDataLinkFileParsed({fileId:record.fileId}).then((res) => {
+            if (res) {
+              postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
+                  if (res.success) {
+                      this.$message.success(res.message);
+                      that.loadData();
+                  } else {
+                      this.$message.warning(res.message);
+                  }
+              });
             } else {
-                this.$message.warning(res.message);
+                this.$message.warning("解析中请勿重复点击");
             }
         });
       },
diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue
index e37fd32..0dd8261 100644
--- a/src/views/datalink/carrierBased.vue
+++ b/src/views/datalink/carrierBased.vue
@@ -70,7 +70,7 @@
 
 <script>
   import uploadModal from './modules/uploadModal'
-  import { getFileLinkInfo,processFile,fileDataLinkDelete } from '@/api/fileDataLink'
+  import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from "@/components/jeecg/JEllipsis";
   import {deleteAction, postAction} from '@/api/manage'
@@ -112,11 +112,6 @@
             align:"fileName",
             dataIndex: 'fileName',
           },
-          {
-            title: '创建时间',
-            align:"createTime",
-            dataIndex: 'createTime'
-          },
           {
             title: '模式名称',
             align:"schemaName",
@@ -127,10 +122,16 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '创建时间',
+            align:"createTime",
+            dataIndex: 'createTime'
+          },
           {
             title: '状态',
-            align:"parseStatus",
+            align:"center",
             dataIndex: 'parseStatus',
+            scopedSlots: { customRender: 'parseStatus' },
           },
           {
             title: '解析进度',
@@ -203,12 +204,18 @@
       },
       processFile: function (record) {
         var that = this;
-        postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
-            if (res.success) {
-                this.$message.success(res.message);
-                that.loadData();
+        isDataLinkFileParsed({fileId:record.fileId}).then((res) => {
+            if (res) {
+              postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
+                  if (res.success) {
+                      this.$message.success(res.message);
+                      that.loadData();
+                  } else {
+                      this.$message.warning(res.message);
+                  }
+              });
             } else {
-                this.$message.warning(res.message);
+                this.$message.warning("解析中请勿重复点击");
             }
         });
       },
diff --git a/src/views/datalink/waterDocuments.vue b/src/views/datalink/waterDocuments.vue
index 0333f53..8ca1645 100644
--- a/src/views/datalink/waterDocuments.vue
+++ b/src/views/datalink/waterDocuments.vue
@@ -42,7 +42,7 @@
 <!--        :locale="myLocale"-->
 
         <!-- 字符串超长截取省略号显示-->
-        <template slot="parseStatus" slot-scope="text,record">
+        <template slot="parseStatus" slot-scope="text">
             <span style="color:black;" v-if="text === 0" >未解析</span>
             <span style="color:darkorange;" v-if="text === 1">解析中</span>
             <span style="color:#87d068;" v-if="text === 2">解析完成</span>
@@ -109,11 +109,6 @@
             align:"fileName",
             dataIndex: 'fileName',
           },
-          {
-            title: '创建时间',
-            align:"createTime",
-            dataIndex: 'createTime'
-          },
           {
             title: '模式名称',
             align:"schemaName",
@@ -124,10 +119,16 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '创建时间',
+            align:"createTime",
+            dataIndex: 'createTime'
+          },
           {
             title: '状态',
             align:"center",
             dataIndex: 'parseStatus',
+            scopedSlots: { customRender: 'parseStatus' },
           },
           {
             title: '解析进度',
@@ -197,12 +198,18 @@
       },
       processFile: function (record) {
         var that = this;
-        postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
-            if (res.success) {
-                this.$message.success(res.message);
-                that.loadData();
+        isDataLinkFileParsed({fileId:record.fileId}).then((res) => {
+            if (res) {
+              postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
+                  if (res.success) {
+                      this.$message.success(res.message);
+                      that.loadData();
+                  } else {
+                      this.$message.warning(res.message);
+                  }
+              });
             } else {
-                this.$message.warning(res.message);
+                this.$message.warning("解析中请勿重复点击");
             }
         });
       },
diff --git a/src/views/fileManage/recycling.vue b/src/views/fileManage/recycling.vue
index 7583bbe..863eec3 100644
--- a/src/views/fileManage/recycling.vue
+++ b/src/views/fileManage/recycling.vue
@@ -19,7 +19,6 @@
             <a-col :md="6" :sm="24" >
                 <a-button type="primary"  style="left: 10px" @click="loadData" icon="search">查询</a-button>
                 <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
-                <a-button type="primary"  @click="handleAdd" icon="upload" style="margin-left: 8px;left: 10px">上传</a-button>
             </a-col>
           </span>