提交代码

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="选择日期时间"

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="选择日期时间"

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="选择日期时间"

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="选择日期时间"

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