From 7353c8a0e2dfa7396f803a40188b7ae422905da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 17 Aug 2023 19:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue | 2 ++
 ruoyi-ui/src/views/work/emergencyDrill/index.vue                | 1 +
 ruoyi-ui/src/views/work/workTrain/index.vue                     | 1 +
 ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue           | 2 ++
 yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml    | 2 +-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
index 8c763e88..cc1776c6 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
@@ -34,6 +34,7 @@
         v-loading="loading"
         :data="workTrainList"
         @selection-change="handleSelectionChange"
+        style="margin-left: 25px"
       >
         <el-table-column label="演练主图" align="center" prop="mainImage" width="75">
           <template slot-scope="scope">
@@ -184,6 +185,7 @@
           </el-form-item>
           <el-form-item label="演练日期" prop="beginDate">
             <el-date-picker
+              style="width: 100%"
               v-model="form.beginDate"
               type="datetime"
               placeholder="选择日期时间"
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index 4f0477a6..59d6e534 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -262,6 +262,7 @@
         </el-form-item>
         <el-form-item label="演练日期" prop="beginDate">
           <el-date-picker
+            style="width: 100%"
             v-model="form.beginDate"
             type="datetime"
             placeholder="选择日期时间"
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index d414e3ae..c5071707 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -262,6 +262,7 @@
         </el-form-item>
         <el-form-item label="培训日期" prop="beginDate">
           <el-date-picker
+            style="width: 100%"
             v-model="form.beginDate"
             type="datetime"
             placeholder="选择日期时间"
diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
index 4851f314..2dcb0e12 100644
--- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
+++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
@@ -34,6 +34,7 @@
         v-loading="loading"
         :data="workTrainList"
         @selection-change="handleSelectionChange"
+        style="margin-left: 25px"
       >
         <el-table-column label="培训主图" align="center" prop="mainImage" width="75">
           <template slot-scope="scope">
@@ -184,6 +185,7 @@
           </el-form-item>
           <el-form-item label="培训日期" prop="beginDate">
             <el-date-picker
+              style="width: 100%"
               v-model="form.beginDate"
               type="datetime"
               placeholder="选择日期时间"
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index 0026f589..35598cf0 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wt.create_by = #{nowUserName}
         OR #{nowRole} IN ('1', '2', '3', '4')
         )
-        AND end_date > NOW() THEN
+        AND begin_date > NOW() THEN
         0
         ELSE
         1