``

pom.xml

@@ -121,7 +121,7 @@
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml-schemas</artifactId>
-                <version>${poi.version}</version>
+                <version>4.1.2</version>
             </dependency>
 
             <dependency>

ruoyi-admin/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
-            <version>${poi.version}</version>
+            <version>4.1.2</version>
         </dependency>
 
         <dependency>

ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysReportController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.util.PoitlIOUtils;
 import com.ruoyi.common.annotation.Log;
@@ -87,6 +88,7 @@ public class SysReportController extends BaseController
 
          String path = ClassUtils.getDefaultClassLoader().getResource("").getPath()+"static/template/";
         String templatePath =path+"report.docx";
+        logger.error(templatePath);
 
         List<SysReport> list = sysReportService.selectSysReportList(sysReport);
         if(list.size()<1)  AjaxResult.error("不存在！");;
@@ -106,6 +108,8 @@ public class SysReportController extends BaseController
         ) {
             twomap.put(d.getDictValue(),d.getDictLabel());
         }
+        logger.error(JSON.toJSONString(plan));
+        logger.error(JSON.toJSONString(list));
 
 //        ExcelUtil<SysReport> util = new ExcelUtil<SysReport>(SysReport.class);
 //        util.exportExcel(response, list, "数据");

ruoyi-ui/src/views/plan/add.vue

@@ -42,134 +42,116 @@
                      <el-col :span="12"> <el-form-item label="公路技术等级" required prop="level">
                        <el-input v-model="form.level" placeholder="请输入公路等级"  style="width:300rem"/>
                      </el-form-item></el-col>
-                     <el-col :span="12">
-                       <el-form-item label="路段方向" prop="direction" required>
-                         <el-select v-model="form.direction" placeholder="请选择方向" clearable size="small">
-                           <el-option
-                             v-for="dict in dict.type.sys_direction"
-                             :key="dict.value"
-                             :label="dict.label"
-                             :value="dict.value"
-                           />
-                         </el-select>
-                       </el-form-item>
-                     </el-col>
-
-
-
-                     <el-col :span="12">
-                       <div>
-                         <el-row >
-                           <el-col :span="7">
-                             <el-form-item label="开始公里桩" prop="startKm" required>
-                               <el-input v-model="form.startKm" placeholder="请输入开始公里桩"  style="width:300rem">
-                                 <template slot="prepend">K</template>
-                               </el-input>
-                             </el-form-item>
-                           </el-col>
-                           <el-col :span="6">
-                             <el-form-item label="" prop="startHectometer" >
-                               <el-input v-model="form.startHectometer" placeholder="请输入开始米桩"  style="width:300rem">
-                                 <template slot="prepend">+</template>
-                               </el-input>
-                             </el-form-item>
-                           </el-col>
-                         </el-row>
-                       </div>
-
 
-                     </el-col>
                      <el-col :span="24">
-                     <el-col :span="12">
-                       <el-form-item label="施工单位" prop="dept">
-                         <el-input v-model="form.dept" placeholder="请输入施工单位" style="width:300rem"/>
-                       </el-form-item>
-                     </el-col>
-                       <el-col :span="12">
-                         <el-row >
-                           <el-col :span="7">
-                             <el-form-item label="结束公里桩" prop="endKm" required>
-                               <el-input v-model="form.endKm" placeholder="请输入结束公里桩" style="width:300rem">
-                                 <template slot="prepend">K</template>
-                               </el-input>
-                             </el-form-item>
-                           </el-col>
-                           <el-col :span="6">
-                             <el-form-item label="" prop="endHectometer">
-                               <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" style="width:300rem">
-                                 <template slot="prepend">+</template>
-                               </el-input>
-                             </el-form-item>
-                           </el-col>
-                         </el-row>
-                       </el-col>
-                     </el-col>
-
-
-
+                      <el-row>
+                        <el-col :span="12">
+                          <el-form-item label="路段方向" prop="direction" required>
+                            <el-select v-model="form.direction" placeholder="请选择方向" clearable size="small">
+                              <el-option v-for="dict in dict.type.sys_direction" :key="dict.value" :label="dict.label" :value="dict.value" />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <div style="ovflow-x:auto">
+                            <el-row>
+                              <el-col :span="7">
+                                <el-form-item label="开始公里桩" prop="startKm" required>
+                                  <el-input v-model="form.startKm" placeholder="请输入开始公里桩" style="width:300rem">
+                                    <template slot="prepend">K</template>
+                                  </el-input>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="6">
+                                <el-form-item label="" prop="startHectometer">
+                                  <el-input v-model="form.startHectometer" placeholder="请输入开始米桩" style="width:300rem">
+                                    <template slot="prepend">+</template>
+                                  </el-input>
+                                </el-form-item>
+                              </el-col>
+                            </el-row>
+                          </div>
+                        </el-col>
+                      </el-row>
 
+                     </el-col>
 
 
 
-                     <el-col :span="12">
-                       <el-form-item label="施工内容一" prop="contentOne" required>
-                         <el-select v-model="form.contentOne" placeholder="请选择方向" clearable size="small" style="width:300rem">
-                           <el-option
-                             v-for="dict in dict.type.content_one"
-                             :key="dict.value"
-                             :label="dict.label"
-                             :value="dict.value"
-                           />
-                         </el-select>
-                       </el-form-item>
+                     <el-col :span="24">
+                      <el-row>
+                        <el-col :span="12">
+                          <el-form-item label="施工单位" prop="dept">
+                            <el-input v-model="form.dept" placeholder="请输入施工单位" style="width:300rem" />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-row>
+                            <el-col :span="7">
+                              <el-form-item label="结束公里桩" prop="endKm" required>
+                                <el-input v-model="form.endKm" placeholder="请输入结束公里桩" style="width:300rem">
+                                  <template slot="prepend">K</template>
+                                </el-input>
+                              </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                              <el-form-item label="" prop="endHectometer">
+                                <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" style="width:300rem">
+                                  <template slot="prepend">+</template>
+                                </el-input>
+                              </el-form-item>
+                            </el-col>
+                          </el-row>
+                        </el-col>
+
+                      </el-row>
 
                      </el-col>
 
-                     <el-col :span="12">
-                       <el-form-item label="预计开始时间" prop="startTime" required>
-                         <!-- <el-date-picker clearable
-                             v-model="form.startTime"
-                             type="date"
-                             value-format="yyyy-MM-dd"
-                             placeholder="请选择预计开始时间">
-                         </el-date-picker> -->
-                         <el-date-picker
-                           style="width:300rem"
-                           v-model="form.startTime"
-                           type="datetime"
-                           placeholder="选择日期时间">
-                         </el-date-picker>
-                       </el-form-item>
-
+                     <el-col :span="24">
+                      <el-row>
+                        <el-col :span="12">
+                          <el-form-item label="施工内容一" prop="contentOne" required>
+                            <el-select v-model="form.contentOne" placeholder="请选择" clearable size="small" style="width:300rem">
+                              <el-option v-for="dict in dict.type.content_one" :key="dict.value" :label="dict.label" :value="dict.value" />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item label="预计开始时间" prop="startTime" required>
+                            <!-- <el-date-picker clearable
+                                                       v-model="form.startTime"
+                                                       type="date"
+                                                       value-format="yyyy-MM-dd"
+                                                       placeholder="请选择预计开始时间">
+                                                   </el-date-picker> -->
+                            <el-date-picker style="width:300rem" v-model="form.startTime" type="datetime" placeholder="选择日期时间">
+                            </el-date-picker>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                      </el-col>
 
-                     <el-col :span="12">
-                       <el-form-item label="施工内容二" prop="contentTwo" required>
-                         <el-input v-if='form.contentOne != 2' v-model="form.contentTwo" placeholder="请输入施工内容二" style="width:300rem"/>
-                         <el-select v-if='form.contentOne == 2' v-model="form.contentTwo" placeholder="请选择方向" clearable size="small" style="width:300rem">
-                           <el-option
-                             v-for="dict in dict.type.content_two"
-                             :key="dict.value"
-                             :label="dict.label"
-                             :value="dict.value"
-                           />
-                         </el-select>
-                       </el-form-item>
-
+                     <el-col :span="24">
+                      <el-row>
+                        <el-col :span="12">
+                          <el-form-item label="施工内容二" prop="contentTwo" required>
+                            <el-input v-if='form.contentOne != 2' v-model="form.contentTwo" placeholder="请输入施工内容二" style="width:300rem" />
+                            <el-select v-if='form.contentOne == 2' v-model="form.contentTwo" placeholder="请选择方向" clearable size="small"
+                              style="width:300rem">
+                              <el-option v-for="dict in dict.type.content_two" :key="dict.value" :label="dict.label" :value="dict.value" />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item label="预计结束时间" prop="endTime" required>
+                            <el-date-picker clearable style="width:300rem" v-model="form.endTime" type="datetime" placeholder="请选择预计结束时间">
+                            </el-date-picker>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                      </el-col>
 
-                     <el-col :span="12" required>
-
-                                     <el-form-item label="预计结束时间" prop="endTime" required>
-                                            <el-date-picker clearable
-                                                style="width:300rem"
-                                                v-model="form.endTime"
-                                                type="datetime"
-                                                placeholder="请选择预计结束时间">
-                                            </el-date-picker>
-                                            </el-form-item>
-
-                     </el-col>
 
 
 
@@ -235,6 +217,47 @@ export default {
       form: {},
       name:'新增',
       rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        bridgeHeightWidth: [
+          { required: true, message: '请输入桥梁长度及净宽', trigger: 'blur' }
+        ],
+        section: [
+          { required: true, message: '请选择路段', trigger: 'blur' }
+        ],
+        level: [
+          { required: true, message: '请输入公路等级', trigger: 'blur' }
+        ],
+        direction: [
+          { required: true, message: '请选择方向', trigger: 'blur' }
+        ],
+        startKm: [
+          { required: true, message: '请输入开始公里桩', trigger: 'blur' }
+        ],
+        startHectometer: [
+          { required: true, message: '请输入开始米桩', trigger: 'blur' }
+        ],
+        endKm: [
+          { required: true, message: '请输入结束公里桩', trigger: 'blur' }
+        ],
+        endHectometer: [
+          { required: true, message: '请输入结束米桩', trigger: 'blur' }
+        ],
+        contentOne: [
+          { required: true, message: '请选择施工内容', trigger: 'blur' }
+        ],
+        startTime: [
+          { required: true, type: 'date', message: '请选择预计开始时间', trigger: 'blur' }
+        ],
+        contentTwo: [
+          { required: true, message: '请选择施工内容', trigger: 'blur' }
+        ],
+        endTime: [
+          { required: true, type: 'date', message: '请选择预计结束时间', trigger: 'blur' }
+        ],
+
+
       },
        uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       fileList:[],
@@ -327,8 +350,8 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-     .addPlan{
+<style  lang="scss">
+.addPlan{
           background-color: #ffffff
      }
 
@@ -338,6 +361,8 @@ export default {
         position: relative;
         display: inline-block;
       }
-
+      .el-form-item__error{
+        min-width:150px !important;
+      }
 </style>