From 27c3271cd63177bcb050dc4b4fd072887fc01925 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 3 Jun 2024 19:33:53 +0800
Subject: [PATCH] 1

---
 src/views/projectFront/laborManage/dataValidation.vue | 10 +++++++---
 src/views/projectFront/specialWork/blindPlugWork.vue  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue
index 8c624597..fefa5a13 100644
--- a/src/views/projectFront/laborManage/dataValidation.vue
+++ b/src/views/projectFront/laborManage/dataValidation.vue
@@ -151,7 +151,7 @@ export default {
                     this.$message.success(res.message);
                     this.getHikvisionPage();
                 }else {
-                    this.$message.error(res.message);
+                    this.$message.error(res.result.msg);
                 }
             })
         },
@@ -165,9 +165,10 @@ export default {
                 projectSn: this.projectSn,
                 type: type,
             }).then((res) => {
-                console.log(res);
                 if (res.code == 200) {
-                    
+                    this.$message.success(res.message);
+                }else {
+                    this.$message.error(res.message);
                 }
             })
         },
@@ -192,6 +193,7 @@ export default {
                 projectSn: this.projectSn,
                 pageNo: this.pagInfo.pageNo,
                 pageSize: this.pagInfo.pageSize,
+                type: Number(this.activeName),
             }).then((res) => {
                 if (res.code == 200) {
                     this.tableList = res.result.records;
@@ -224,10 +226,12 @@ export default {
         //切换条数
         sizeChange(val) {
             this.pagInfo.pageSize = val;
+            this.getHikvisionPage();
         },
         //切换页数
         currentChange(val) {
             this.pagInfo.pageNo = val;
+            this.getHikvisionPage();
         },
     },
 };
diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue
index defedcfe..3c7f01d5 100644
--- a/src/views/projectFront/specialWork/blindPlugWork.vue
+++ b/src/views/projectFront/specialWork/blindPlugWork.vue
@@ -248,7 +248,7 @@
                                 {{ workDetail.safetyWorkTicketCode }}
                             </el-form-item> -->
                             <el-form-item label="实际作业开始时间：" :label-width="formLabelWidthDetail">
-                                <el-date-picker v-model="workDetail.actualJobBeginTime" type="datetimerange"
+                                <el-date-picker v-model="workDetail.workExecutionBeginTime" type="datetime"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail">
                                 </el-date-picker>
                             </el-form-item>