From d0a2e3d94bdb57c7e9d53542c532062f225e5596 Mon Sep 17 00:00:00 2001
From: RenCheng <RCMessage@outlook.com>
Date: Tue, 3 Jun 2025 00:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B62=EF=BC=9A1=E3=80=812=E3=80=8113=E6=96=87=E4=BB=B61?=
 =?UTF-8?q?=EF=BC=9A2=E3=80=813=E3=80=814?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/datalink/modules/creatdblink.vue    | 20 ++++++++++++++++
 src/views/datawashing/tempfour/rulesModel.vue |  7 ++++++
 src/views/fileManage/recycling.vue            |  3 ++-
 src/views/task/modules/taskModal.vue          |  3 ++-
 src/views/task/statistics.vue                 | 24 ++++++++++++++++---
 5 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/views/datalink/modules/creatdblink.vue b/src/views/datalink/modules/creatdblink.vue
index 3264f9f..6ee8cc0 100644
--- a/src/views/datalink/modules/creatdblink.vue
+++ b/src/views/datalink/modules/creatdblink.vue
@@ -285,6 +285,10 @@ import {  datasyncqueryPage,
         this.form.validateFields((err, values) => {
           console.log('values',values)
           this.datamodel = values;
+          if(this.datamodel.database==null){
+            this.$message.warning("源数据库未选择");
+            return false;
+          }
           var that = this;
           if (!err) {
             that.confirmLoading = true;
@@ -349,6 +353,22 @@ import {  datasyncqueryPage,
         this.form.validateFields((err, values) => {
           console.log('values',values)
           this.datamodel = values;
+          if(this.datamodel.shipModel==null){
+            this.$message.warning("型号必须选择");
+            return false;
+          }
+          if(this.datamodel.shipNum==null){
+            this.$message.warning("舷号必须选择");
+            return false;
+          }
+          if(this.datamodel.dataType==null){
+            this.$message.warning("数据类型必须选择");
+            return false;
+          }
+          if(this.datamodel.dbType==null){
+            this.$message.warning("数据类型必须选择");
+            return false;
+          }
           var that = this;
           if (!err) {
             that.confirmLoading = true;
diff --git a/src/views/datawashing/tempfour/rulesModel.vue b/src/views/datawashing/tempfour/rulesModel.vue
index 846423c..ec200b1 100644
--- a/src/views/datawashing/tempfour/rulesModel.vue
+++ b/src/views/datawashing/tempfour/rulesModel.vue
@@ -134,6 +134,13 @@ export default {
         handleOk() {
             this.$refs.ruleForm.validate(valid => {
                 if (valid) {
+                    if(this.form.maxVal < this.form.minVal){
+                        this.$notification.error({
+                            message: '系统提示',
+                            description: '最大值不可小于最小值'
+                        })
+                        return false;
+                    }
                     this.confirmLoading = true;
                     if (!this.form.id) {
                         createRules(this.form).then(res => {
diff --git a/src/views/fileManage/recycling.vue b/src/views/fileManage/recycling.vue
index 453c0ba..2a071f7 100644
--- a/src/views/fileManage/recycling.vue
+++ b/src/views/fileManage/recycling.vue
@@ -182,11 +182,12 @@
         deleteAllFile({}).then((res) => {
           if (res.success) {
             this.$message.success(res.result);
+            this.ipagination.total = 0;
+            this.ipagination.current = 1;
           } else {
             this.$message.warning(res.message);
           }
         });
-        this.loadData()
         this.$refs.modalForm.open();
       },
       initWebSocket: function () {
diff --git a/src/views/task/modules/taskModal.vue b/src/views/task/modules/taskModal.vue
index c1f9388..8319f78 100644
--- a/src/views/task/modules/taskModal.vue
+++ b/src/views/task/modules/taskModal.vue
@@ -15,7 +15,8 @@
           <a-input v-decorator="['name',{
              rules: [
               { required: true, message: '任务名称不能为空' },
-              { min: 0, max: 30, message: '长度0-30位' }
+              { min: 0, max: 30, message: '长度0-30位' },
+              { pattern:new RegExp('^[\u4e00-\u9fa5a-zA-Z0-9]+$','g'),message:'只允许包含数字、字母、中文'},
             ],
             validateTrigger: 'blur'
           }]" ></a-input>
diff --git a/src/views/task/statistics.vue b/src/views/task/statistics.vue
index 36a029c..9e35827 100644
--- a/src/views/task/statistics.vue
+++ b/src/views/task/statistics.vue
@@ -19,7 +19,9 @@
                         </a-row>
                     </a-form>
                 </div>
-                <a-table ref="table" size="middle" style="height:calc(100vh - 343px);background:#e6e9f1;padding: 10px;" bordered rowKey="id" :columns="columns" :dataSource="dataSource" @change="handleTableChange">
+                <a-table ref="table" size="middle" style="height:calc(100vh - 343px);background:#e6e9f1;padding: 10px;" bordered rowKey="id" 
+                :custom-row="handleCustomRow"
+                :columns="columns" :dataSource="dataSource" @change="handleTableChange">
                     <span slot="action" slot-scope="text, record">
                         <a @click="handleEdit(record)">选中</a>
                     </span>
@@ -164,7 +166,8 @@ export default {
                 fileLinkCount: 0
             },
             cleaningVariancesource: [],
-            totalNumberCataloguesData: []
+            totalNumberCataloguesData: [],
+            selectedRowId :null
         }
     },
     mounted() {
@@ -179,6 +182,17 @@ export default {
 
     },
     methods: {
+        handleCustomRow(record) {
+            return {
+                onClick: () => {
+                    console.log(record.id)
+                    this.selectedRowId = record.id;
+                },
+                class: {
+                'row-highlight': this.selectedRowId === record.id
+                }
+            };
+        },
         handleTableChange(pagination, filters, sorter) {
             if (Object.keys(sorter).length > 0) {
                 this.isorter.column = sorter.field;
@@ -189,6 +203,7 @@ export default {
         },
         handleEdit(value) {
             this.cleaningVariancesource = [];
+            this.selectedRowId = value.id;
             getDataAnalysis({ taskId: value.id, startDate: value.startTime, endDate: value.endTime }).then((res) => {
                 if (res.success) {
                     res.result.schemaNames.forEach(row => {
@@ -326,7 +341,10 @@ export default {
 .quarter-div .datanum {
     font-size: 26px;
 }
-
+/* 高亮样式 */
+/deep/.row-highlight {
+  background-color: #ffffff !important;
+}
 .quarter-div .ant-col-8,
 .quarter-div .ant-col-10 {
     text-align: center;