fix

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

@@ -3,8 +3,9 @@
             <div style="font-size: 16rem;
                         font-weight: 1000;
                         text-align: left;
-                        color: #333333;">
+                        color: #333333;position: relative">
                         {{name}}
+              <el-button size="small" type="primary" plain style="position: absolute;top:0;right: 10px"  @click="cancle">返回</el-button>
             </div>
             <el-form ref="form" :model="form" :rules="rules" label-width="200rem" style="padding-left:300rem;margin-top:50rem">
                         <el-form-item label="公路（桥梁或汽渡）名称" prop="name">
@@ -19,7 +20,22 @@
                         <el-row :gutter="20">
                                       <el-col :span="7">
                                     <el-form-item label="施工路段" prop="section">
-                                    <el-input v-model="form.section" placeholder="请输入施工路段"  style="width:300rem"/>
+                                      <el-select
+
+                                        v-model="form.section"
+                                        placeholder="请选择路段"
+                                        clearable
+                                        size="small"
+                                        style="width: 300rem"
+                                      >
+                                        <el-option
+                                          v-for="dict in dict.type.road"
+                                          :key="dict.value"
+                                          :label="dict.value"
+                                          :value="dict.value"
+                                        />
+                                      </el-select>
+<!--                                    <el-input v-model="form.section" placeholder="请输入施工路段"  style="width:300rem"/>-->
                                     </el-form-item>
                                       </el-col>
                                     <el-col :span="6">
@@ -44,7 +60,7 @@
                                       </el-form-item>
                                         </el-col>
                                       <el-col :span="6">
-                                    <el-form-item label="开始米桩" prop="startHectometer">
+                                    <el-form-item label="" prop="startHectometer">
                                       <el-input v-model="form.startHectometer" placeholder="请输入开始米桩"  style="width:300rem">
                                         <template slot="prepend">+</template>
                                       </el-input>
@@ -60,7 +76,7 @@
                                     </el-form-item>
                                       </el-col>
                                     <el-col :span="6">
-                                    <el-form-item label="结束米桩" prop="endHectometer">
+                                    <el-form-item label="" prop="endHectometer">
                                       <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" style="width:300rem">
                                         <template slot="prepend">+</template>
                                       </el-input>
@@ -168,7 +184,7 @@ import { getToken } from '@/utils/auth'
 // import { AppMain } from '@/layout/components'
 export default {
   name: "Index",
-  dicts: ['sys_direction','content_one','content_two'],
+  dicts: ['sys_direction','content_one','content_two','road'],
   // components: {
   //   AppMain,
   // },

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

@@ -116,13 +116,13 @@
         <el-form-item label="开始公里桩" prop="startKm">
           <el-input v-model="form.startKm" placeholder="请输入开始公里桩" />
         </el-form-item>
-        <el-form-item label="开始米桩" prop="startHectometer">
+        <el-form-item label="" prop="startHectometer">
           <el-input v-model="form.startHectometer" placeholder="请输入开始米桩" />
         </el-form-item>
         <el-form-item label="结束公里桩" prop="endKm">
           <el-input v-model="form.endKm" placeholder="请输入结束公里桩" />
         </el-form-item>
-        <el-form-item label="结束米桩" prop="endHectometer">
+        <el-form-item label="" prop="endHectometer">
           <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" />
         </el-form-item>
         <el-form-item label="预计开始时间" prop="startTime">

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

@@ -6,10 +6,11 @@
           font-size: 16rem;
           font-weight: 1000;
           text-align: left;
-          color: #333333;
+          color: #333333;position: relative;
         "
       >
         {{ name }}
+        <el-button size="small" type="primary" plain style="position: absolute;top:0;right: 10px"  @click="cancle">返回</el-button>
       </div>
       <el-form
         ref="form"
@@ -37,12 +38,21 @@
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item label="施工路段" prop="section">
-              <el-input
+            <el-form-item label="施工路段" prop="section" >
+              <el-select
                 v-model="form.section"
-                placeholder="请输入施工路段"
+                placeholder="请选择路段"
+                clearable
+                size="small"
                 style="width: 300rem"
-              />
+              >
+                <el-option
+                  v-for="dict in dict.type.road"
+                  :key="dict.value"
+                  :label="dict.value"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -76,7 +86,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="开始米桩" prop="startHectometer">
+            <el-form-item label="" prop="startHectometer">
               <el-input
                 v-model="form.startHectometer"
                 placeholder="请输入开始米桩"
@@ -100,7 +110,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结束米桩" prop="endHectometer">
+            <el-form-item label="" prop="endHectometer">
               <el-input
                 v-model="form.endHectometer"
                 placeholder="请输入结束米桩"
@@ -192,14 +202,15 @@
 
         <el-form-item label="占用车道" prop="lane">
           <el-select
-            v-model="form.lane"
+            multiple
+            v-model="roadlan"
             placeholder="请选择方向"
             clearable
             size="small"
             style="width: 300rem"
           >
             <el-option
-              v-for="i in [1, 2, 3, 4]"
+              v-for="i in ['1','2','3', '4']"
               :key="i"
               :label="i"
               :value="i"
@@ -306,7 +317,7 @@ import {
 // import { AppMain } from '@/layout/components'
 export default {
   name: "Index",
-  dicts: ["sys_direction", "content_one", "content_two"],
+  dicts: ["sys_direction", "content_one", "content_two","road"],
   // components: {
   //   AppMain,
   // },
@@ -323,8 +334,14 @@ export default {
       dialogVisible: false,
       audioDept: "103",
       deptlist: [],
+      roadlan:[],
     };
   },
+  watch: {
+    'roadlan': function(val) {
+      this.form["lane"] = val.join(",");
+    }
+  },
   mounted: function () {
     this.getList();
     console.log(this.$route.query);
@@ -332,10 +349,18 @@ export default {
     this.form = this.$route.query;
     this.name = this.$route.query.routerName;
 
+
+
+    this.form.lane = this.$route.query.lane;
+    this.roadlan = (this.form.lane ?? "").split(",")
+
     listDept({ parentId: 101 }).then((res) => {
       //  console.log(res)
       this.deptlist = res.data;
     });
+
+
+
     // console.log(this.$route.query.status);
   },
   methods: {
@@ -351,6 +376,7 @@ export default {
           this.form.endHectometer = this.planList[index].endHectometer;
           this.form.contentOne = this.planList[index].contentOne;
           this.form.contentTwo = this.planList[index].contentTwo;
+
         }
       }
     },

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

@@ -130,13 +130,13 @@
         <el-form-item label="开始公里桩" prop="startKm">
           <el-input v-model="form.startKm" placeholder="请输入开始公里桩" />
         </el-form-item>
-        <el-form-item label="开始米桩" prop="startHectometer">
+        <el-form-item label="" prop="startHectometer">
           <el-input v-model="form.startHectometer" placeholder="请输入开始米桩" />
         </el-form-item>
         <el-form-item label="结束公里桩" prop="endKm">
           <el-input v-model="form.endKm" placeholder="请输入结束公里桩" />
         </el-form-item>
-        <el-form-item label="结束米桩" prop="endHectometer">
+        <el-form-item label="" prop="endHectometer">
           <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" />
         </el-form-item>
         <el-form-item label="预计开始时间" prop="startTime">