From 09398d5571320769dc7cdf81b69d325ebc1b8959 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Mon, 24 Feb 2025 15:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/datalink/Marines.vue             | 18 ++++++++++++------
 src/views/datalink/carrierBased.vue        | 12 ++++++++++++
 src/views/datalink/dblink.vue              |  2 +-
 src/views/datalink/modules/creatdblink.vue |  6 +++---
 src/views/datalink/waterDocuments.vue      | 12 ++++++++++++
 src/views/task/modules/taskModal.vue       | 16 +++++++++++-----
 6 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/views/datalink/Marines.vue b/src/views/datalink/Marines.vue
index dfd4903..25b9265 100644
--- a/src/views/datalink/Marines.vue
+++ b/src/views/datalink/Marines.vue
@@ -42,12 +42,13 @@
 <!--        :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="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>
+            <span style="color:red;" v-if="text === 3">解析失败</span>
+            <span style="color:royalblue;" v-if="text === 4">等待中</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'" />
@@ -123,6 +124,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '状态',
+            align:"parseStatus",
+            dataIndex: 'parseStatus',
+          },
           {
             title: '解析进度',
             align:"center",
diff --git a/src/views/datalink/carrierBased.vue b/src/views/datalink/carrierBased.vue
index 5d26324..e37fd32 100644
--- a/src/views/datalink/carrierBased.vue
+++ b/src/views/datalink/carrierBased.vue
@@ -45,6 +45,13 @@
         <template slot="percent" slot-scope="text">
             <span>{{ percent(text) }}</span>
         </template>
+        <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>
+            <span style="color:red;" v-if="text === 3">解析失败</span>
+            <span style="color:royalblue;" v-if="text === 4">等待中</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'" />
@@ -120,6 +127,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '状态',
+            align:"parseStatus",
+            dataIndex: 'parseStatus',
+          },
           {
             title: '解析进度',
             align:"center",
diff --git a/src/views/datalink/dblink.vue b/src/views/datalink/dblink.vue
index d1853ed..e01501e 100644
--- a/src/views/datalink/dblink.vue
+++ b/src/views/datalink/dblink.vue
@@ -65,7 +65,7 @@
 
         <!-- 字符串超长截取省略号显示-->
         <template slot="syncState" slot-scope="text">
-            <span style="color: #fff;" v-if="text === 0" >未同步</span>
+            <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>
         </template>
diff --git a/src/views/datalink/modules/creatdblink.vue b/src/views/datalink/modules/creatdblink.vue
index 80cfbee..0eaf610 100644
--- a/src/views/datalink/modules/creatdblink.vue
+++ b/src/views/datalink/modules/creatdblink.vue
@@ -286,10 +286,10 @@ import {  datasyncqueryPage,
             datasynccreateSchema({shipModelId:this.datamodel.shipModel,shipNumId:this.datamodel.shipNum,dataTypeId:this.datamodel.dataType}).then((res) => {
                 if (res.success) {
                   this.createSchemaboll =false;
-                  this.confirmLoading = false;
                 } else {
                   this.$message.warning(res.message);
                 }
+                this.confirmLoading = false;
             });
           }
         })
@@ -309,11 +309,11 @@ import {  datasyncqueryPage,
             that.confirmLoading = true;
             datasynctestConn({ip:values.ip,port:values.port,username:values.username,password:values.password}).then((res) => {
                 if (res.result) {
-                  this.confirmLoading = false;
                   this.getdatabaseList();
                 } else {
-                    this.$message.warning(res.message);
+                  this.$message.warning(res.message);
                 }
+                this.confirmLoading = false;
             });
             
           }
diff --git a/src/views/datalink/waterDocuments.vue b/src/views/datalink/waterDocuments.vue
index 6816c76..0333f53 100644
--- a/src/views/datalink/waterDocuments.vue
+++ b/src/views/datalink/waterDocuments.vue
@@ -42,6 +42,13 @@
 <!--        :locale="myLocale"-->
 
         <!-- 字符串超长截取省略号显示-->
+        <template slot="parseStatus" slot-scope="text,record">
+            <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>
+            <span style="color:red;" v-if="text === 3">解析失败</span>
+            <span style="color:royalblue;" v-if="text === 4">等待中</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'" />
@@ -117,6 +124,11 @@
             align:"tableName",
             dataIndex: 'tableName',
           },
+          {
+            title: '状态',
+            align:"center",
+            dataIndex: 'parseStatus',
+          },
           {
             title: '解析进度',
             align:"center",
diff --git a/src/views/task/modules/taskModal.vue b/src/views/task/modules/taskModal.vue
index 481edad..aee688d 100644
--- a/src/views/task/modules/taskModal.vue
+++ b/src/views/task/modules/taskModal.vue
@@ -43,6 +43,7 @@
             :placeholder="['任务开始时间', '任务结束时间']"
             @change="onChange"
             @ok="onOk"
+            
           />
         </a-form-item>
 
@@ -80,7 +81,7 @@ import { taskCreate,
         title:"操作",
         buttonStyle: 'solid',
         visible: false,
-        dateFormat:'YYYY-MM-DD HH:mm',
+        dateFormat:'YYYY-MM-DD HH:mm:ss',
         status:'',
         model: {},
         confirmLoading: false,
@@ -154,12 +155,14 @@ import { taskCreate,
         });
       },
       onChange(value, dateString) {
-        this.model.startDate = dateString[0];
-        this.model.endDate = dateString[1];
+        this.model.startTime = dateString[0];
+        this.model.endTime = dateString[1];
+        console.log(this.model);
       },
       onOk(value) {
-        this.model.startDate = moment(value[0],dateFormat);
-        this.model.endDate = moment(value[1],dateFormat);
+        this.model.startTime = value[0].format('YYYY-MM-DD HH:mm:ss');
+        this.model.endTime = value[1].format('YYYY-MM-DD HH:mm:ss');
+        console.log(this.model);
       },
       close () {
         this.$emit('close');
@@ -177,6 +180,9 @@ import { taskCreate,
               this.model.shipModelId = values.shipModelId;
               this.model.shipNumId = values.shipNumId;
               this.model.describe = values.describe;
+              this.model.startTime =  this.rangeTime[0].format('YYYY-MM-DD HH:mm:ss');
+              this.model.endTime = this.rangeTime[1].format('YYYY-MM-DD HH:mm:ss');
+              console.log(this.model);
               taskCreate(this.model).then((res)=>{
                 if(res.success){
                   that.$message.success(res.message);