`fix 导出`

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

@@ -120,7 +120,7 @@ public class SysReportController extends BaseController
                         put("name", plan.getName());
                         put("length", plan.getBridgeHeightWidth());
                         put("dengji", plan.getLevel());
-                        put("luduan", list.get(0).getSection()+("K"+ (list.get(0).getStartKm()==null?list.get(0).getStartKm():"0" )+"+"+(list.get(0).getStartHectometer()==null?list.get(0).getStartHectometer():"000" )+" ~ K"+ (list.get(0).getEndKm()==null?list.get(0).getEndKm():"0")+"+"+(list.get(0).getEndHectometer()==null?list.get(0).getEndHectometer():"000" )));
+                        put("luduan", list.get(0).getSection()+("K"+ (list.get(0).getStartKm()!=null?list.get(0).getStartKm():"0" )+"+"+(list.get(0).getStartHectometer()!=null?list.get(0).getStartHectometer():"000" )+" ~ K"+ (list.get(0).getEndKm()!=null?list.get(0).getEndKm():"0")+"+"+(list.get(0).getEndHectometer()!=null?list.get(0).getEndHectometer():"000" )));
                         put("content",(list.get(0).getContentOne()==null?"":onemap.get( list.get(0).getContentOne())) +(list.get(0).getContentTwo()==null?"":twomap.get( list.get(0).getContentTwo())) );
                         put("daterange", DateUtils.parseDateToStr("yyyy年MM月dd日hh:mm:ss",list.get(0).getStartTime())+" 至 "+DateUtils.parseDateToStr("yyyy年MM月dd日hh:mm:ss",list.get(0).getEndTime()));
                         put("danwei", list.get(0).getDept());

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DATABASE_HOST:127.0.0.1}:${DATABASE_PORT:3306}/ruoyisql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/ruoyisql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源

ruoyi-admin/src/main/resources/mapper/system/SysReportMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysReportList" parameterType="SysReport" resultMap="SysReportResult">
         <include refid="selectSysReportVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="planId != null "> and plan_id = #{planId}</if>
             <if test="lane != null  and lane != ''"> and lane = #{lane}</if>
             <if test="params.beginTime != null "> and date_format(start_time,'%y%m%d')  &gt;= date_format(#{params.beginTime},'%y%m%d')</if>

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

@@ -118,15 +118,13 @@
                           </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"  :readonly="readonly" v-model="form.startTime" type="datetime" placeholder="选择日期时间">
-                            </el-date-picker>
+                          <el-form-item label="施工内容二" prop="contentTwo" required>
+                            <el-input v-if='form.contentOne != 2' :readonly="readonly" v-model="form.contentTwo" placeholder="请输入施工内容二"
+                              style="width:300rem" />
+                            <el-select v-if='form.contentOne == 2' :disabled="readonly" 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-row>
@@ -134,13 +132,18 @@
 
                      <el-col :span="24">
                       <el-row>
+
                         <el-col :span="12">
-                          <el-form-item label="施工内容二" prop="contentTwo" required>
-                            <el-input v-if='form.contentOne != 2' :readonly="readonly" v-model="form.contentTwo" placeholder="请输入施工内容二" style="width:300rem" />
-                            <el-select v-if='form.contentOne == 2'  :disabled="readonly" 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 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" :readonly="readonly" v-model="form.startTime" type="datetime"
+                              placeholder="选择日期时间">
+                            </el-date-picker>
                           </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -277,10 +280,10 @@ export default {
           var queryd = localStorage.getItem("currentplan");
           if(queryd){
             queryd = JSON.parse(queryd);
-          }else{
-            this.$modal.msgError("发生错误");
-            this.$router.back();
-            return;
+          } else {
+            // this.$modal.msgError("发生错误");
+            // this.$router.back();
+            // return;
           }
           console.log(queryd);
           // console.log(this.$route.query);

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

@@ -246,7 +246,7 @@ export default {
         var jsonObj = JSON.parse(obj.fileUrl);
         window.open(process.env.VUE_APP_BASE_API+jsonObj[0].url);
       },
-    goAdd(){
+    goAdd() {
           this.$router.push({path: '/addPlan'})
     },
     /** 查询【请填写功能名称】列表 */

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

@@ -189,45 +189,30 @@
 
           </el-col>
           <el-col :span="12">
-            <el-form-item label="预计开始时间" prop="startTime">
-              <!-- <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"
-                value-format="yyyy-MM-dd HH:mm:dd"
-                type="datetime"
-                :readonly="readonly"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
+            <el-form-item label="施工内容二" prop="contentTwo">
+
+              <el-select v-model="form.contentTwo" placeholder="请选择方向" clearable :disabled="readonly" 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="24">
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="施工内容二" prop="contentTwo">
 
-                <el-select
-                  v-model="form.contentTwo"
-                  placeholder="请选择方向"
-                  clearable
-                  :disabled="readonly"
-                  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-col :span="12">
+              <el-form-item label="预计开始时间" prop="startTime">
+                <!-- <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" value-format="yyyy-MM-dd HH:mm:dd" type="datetime"
+                  :readonly="readonly" placeholder="选择日期时间">
+                </el-date-picker>
               </el-form-item>
 
             </el-col>

ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                // target: `http://192.168.100.3:8080/api`,
-                target: 'http://nhxm.xt.wenhq.top:8083/api',
+                target: `http://localhost:8080/api`,
+                // target: 'http://nhxm.xt.wenhq.top:8083/api',
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''