fix

ruoyi-ui/src/router/index.js

@@ -56,18 +56,7 @@ export const constantRoutes = [{
         component: () =>
             import ('@/views/home'),
         hidden: false,
-        children: [{
-                path: "/plan",
-                name: "plan",
-                component: () =>
-                    import ("@/views/plan/index.vue")
-            },
-            {
-                path: "/addPlan",
-                name: "addPlan",
-                component: () =>
-                    import ("@/views/plan/add.vue")
-            },
+        children: [
             {
                 path: "/report",
                 name: "report",
@@ -80,6 +69,18 @@ export const constantRoutes = [{
                 component: () =>
                     import ("@/views/report/add.vue")
             },
+          {
+            path: "/plan",
+            name: "plan",
+            component: () =>
+              import ("@/views/plan/index.vue")
+          },
+          {
+            path: "/addPlan",
+            name: "addPlan",
+            component: () =>
+              import ("@/views/plan/add.vue")
+          },
         ]
     },
     // {
@@ -107,7 +108,7 @@ export const constantRoutes = [{
     {
         path: '',
         component: Layout,
-        redirect: 'plan',
+        redirect: 'report',
         children: [{
             path: 'index',
             component: () =>
@@ -209,4 +210,4 @@ export default new Router({
     mode: 'history', // 去掉url中的#
     scrollBehavior: () => ({ y: 0 }),
     routes: constantRoutes
-})
+})

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

@@ -31,14 +31,7 @@
               </div>
               <div style="display:inline-flex;width:100%;height:93vh;top:7vh;position:fixed">
                    <div class='left_menu'>
-                             <div style="text-align:center;margin-top:33rem" @click='handleMsg("/plan",1)'>
-                                <!-- <router-link key="collapse" class="sidebar-logo-link" to="/system/plan"> -->
-                                        <img src='@/assets/images/images/plan_entry.png' style="width:40rem;height:40rem"/>
-                                        <div :class='divSelect == 1?"icon_fontSelect":"icon_font"'>
-                                                计划录入
-                                        </div>
-                                <!-- </router-link> -->
-                             </div>
+
 
                               <div style="text-align:center;margin-top:30rem" @click='handleMsg("/report",2)'>
                                    <img src='@/assets/images/images/construction_report.png' style="width:40rem;height:40rem"/>
@@ -46,6 +39,14 @@
                                           施工报备
                                    </div>
                              </div>
+                     <div style="text-align:center;margin-top:33rem" @click='handleMsg("/plan",1)'>
+                       <!-- <router-link key="collapse" class="sidebar-logo-link" to="/system/plan"> -->
+                       <img src='@/assets/images/images/plan_entry.png' style="width:40rem;height:40rem"/>
+                       <div :class='divSelect == 1?"icon_fontSelect":"icon_font"'>
+                         计划录入
+                       </div>
+                       <!-- </router-link> -->
+                     </div>
 
                               <div style="text-align:center;margin-top:30rem">
                                    <img src='@/assets/images/images/statistical_analysis.png' style="width:40rem;height:40rem"/>

ruoyi-ui/src/views/login.vue

@@ -141,7 +141,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push("/plan").catch(()=>{});
+            this.$router.push("/report").catch(()=>{});
           }).catch(() => {
             this.loading = false;
             if (this.captchaOnOff) {

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

@@ -7,130 +7,160 @@
                         {{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">
-                        <el-input v-model="form.name" placeholder="请输入名称" style="width:300rem"/>
-                        </el-form-item>
-                        <el-form-item label="桥梁长度及净宽" prop="bridgeHeightWidth">
-                        <el-input v-model="form.bridgeHeightWidth" placeholder="请输入桥梁长度及净宽"  style="width:300rem"/>
-                        </el-form-item>
-                        <el-form-item label="公路技术等级" prop="level">
-                        <el-input v-model="form.level" placeholder="请输入公路等级"  style="width:300rem"/>
-                        </el-form-item>
-                        <el-row :gutter="20">
-                                      <el-col :span="7">
-                                    <el-form-item label="施工路段" prop="section">
-                                      <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">
-                                    <el-form-item label="方向" prop="direction">
-                                    <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-row>
-                         <el-row :gutter="20">
-                                        <el-col :span="7">
-                                    <el-form-item label="开始公里桩" prop="startKm">
-                                      <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>
-                        <el-row :gutter="20">
-                                      <el-col :span="7">
-                                    <el-form-item label="结束公里桩" prop="endKm">
-                                      <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-row :gutter="20">
-                                    <el-col :span="7">
-                                    <el-form-item label="施工内容一" prop="contentOne">
-                                    <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="6">
-                                    <el-form-item label="施工内容二" prop="contentTwo">
-                                    <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-row>
-
-                            <el-row :gutter="20">
-                                    <el-col :span="7">
-                                     <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"
-                                                    type="datetime"
-                                                    placeholder="选择日期时间">
-                                                  </el-date-picker>
-                                            </el-form-item>
-                                    </el-col>
-                                    <el-col :span="6">
-                                     <el-form-item label="预计结束时间" prop="endTime">
+            <el-form ref="form" :model="form" :rules="rules" label-width="200rem"  style="padding-left:100rem;padding-right:300rem;margin-top:50rem">
+                   <el-row>
+                     <el-col :span="12">
+                       <el-form-item label="公路（桥梁或汽渡）名称" prop="name" required>
+                         <el-input v-model="form.name" placeholder="请输入名称" style="width:300rem"/>
+                       </el-form-item>
+                     </el-col>
+                     <el-col :span="12">
+                       <el-form-item label="桥梁长度及净宽" prop="bridgeHeightWidth" required>
+                         <el-input v-model="form.bridgeHeightWidth" placeholder="请输入桥梁长度及净宽"  style="width:300rem"/>
+                       </el-form-item>
+                     </el-col>
+                     <el-col :span="12">
+                       <el-form-item label="施工路段" prop="section" required>
+                         <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="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-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-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" required>
+
+                                     <el-form-item label="预计结束时间" prop="endTime" required>
                                             <el-date-picker clearable
                                                 style="width:300rem"
                                                 v-model="form.endTime"
@@ -138,41 +168,49 @@
                                                 placeholder="请选择预计结束时间">
                                             </el-date-picker>
                                             </el-form-item>
-                                    </el-col>
-                        </el-row>
+
+                     </el-col>
+
+
+
+                     <el-col :span="24" >
+                       <el-form-item label="批准手续" prop="fileUrl">
+                         <div>
+                           <el-upload
+                             class="upload-demo"
+                             accept=".pdf"
+                             :action="uploadUrl"
+                             :headers="uploadHeaders"
+                             :on-preview="handlePreview"
+                             :on-change="handleFileChange"
+                             :on-remove="handleFileRemove"
+                             :before-remove="beforeRemove"
+                             :show-file-list="true"
+                             :file-list="fileList"
+                           >
+                             <div style="text-align:left;">
+                               <el-button size="small" type="primary" plain>+点击上传</el-button>
+                             </div>
+                           </el-upload>
+
+                         </div>
+
+
+                       </el-form-item>
 
 
+                     </el-col>
 
-                        <el-form-item label="施工单位" prop="dept">
-                        <el-input v-model="form.dept" placeholder="请输入施工单位" style="width:300rem"/>
-                        </el-form-item>
                         <!-- <el-form-item label="录入人" prop="creatUser">
                         <el-input v-model="form.creatUser" placeholder="请输入录入人" />
                         </el-form-item> -->
-                        <el-form-item label="批准手续" prop="fileUrl">
-                                      <el-upload
-                                          class="upload-demo"
-                                          accept=".pdf"
-                                          :action="uploadUrl"
-                                          :headers="uploadHeaders"
-                                          :on-preview="handlePreview"
-                                          :on-change="handleFileChange"
-                                          :on-remove="handleFileRemove"
-                                          :before-remove="beforeRemove"
-                                          :show-file-list="true"
-                                          :file-list="fileList"
-                                        >
-                                          <div style="text-align:left;">
-                                          <el-button size="small" type="primary" plain>+点击上传</el-button>
-                                        </div>
-                                      </el-upload>
-                        </el-form-item>
 
+                   </el-row>
                     </el-form>
 
 
                     <div style="text-align:center;margin-top:100rem">
-                               <el-button  size="mini" @click="submitForm">保存</el-button>
+                               <el-button  size="mini" type="primary" @click="submitForm">保存</el-button>
                                <el-button  size="mini" @click="cancle">取消</el-button>
                     </div>
   </div>

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

@@ -18,28 +18,31 @@
         :model="form"
         :rules="rules"
         label-width="200rem"
-        style="padding-left: 10%; margin-top: 50rem"
+        style="padding-left: 10%; padding-right: 100rem; margin-top: 50rem"
       >
-        <el-form-item label="选择计划" prop="planId">
-          <el-select
-            v-model="form.planId"
-            placeholder="请选择施工计划"
-            clearable
-            size="small"
-            style="width: 300rem"
-            :disabled="readonly"
-            @change="planChange()"
-          >
-            <el-option
-              v-for="obj in planList"
-              :key="obj.id"
-              :label="obj.name"
-              :value="obj.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-row :gutter="20">
-          <el-col :span="7">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="选择计划" prop="planId">
+              <el-select
+                v-model="form.planId"
+                placeholder="请选择施工计划"
+                clearable
+                size="small"
+                style="width: 300rem"
+                :disabled="readonly"
+                @change="planChange()"
+              >
+                <el-option
+                  v-for="obj in planList"
+                  :key="obj.id"
+                  :label="obj.name"
+                  :value="obj.id"
+                />
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="施工路段" prop="section" >
               <el-select
                 v-model="form.section"
@@ -57,8 +60,9 @@
                 />
               </el-select>
             </el-form-item>
+
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="方向" prop="direction">
               <el-select
                 v-model="form.direction"
@@ -75,69 +79,45 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="7">
-            <el-form-item label="开始公里桩" prop="startKm">
-              <el-input
-                v-model="form.startKm"
-                placeholder="请输入开始公里桩"
-                style="width: 300rem"
-                :readonly="readonly"
-              >
-                <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"
-                :readonly="readonly"
-              >
-                <template slot="prepend">+</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="7">
-            <el-form-item label="结束公里桩" prop="endKm">
-              <el-input
-                v-model="form.endKm"
-                :readonly="readonly"
-                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"
-                :readonly="readonly"
-                placeholder="请输入结束米桩"
-                style="width: 300rem"
-              >
-                <template slot="prepend">+</template>
-              </el-input>
 
-            </el-form-item>
-            <span v-if="showlengthover" style="color:red;position: absolute;bottom:0;left: 12vw;width:200px">{{showlenfthmsg}}</span>
           </el-col>
-        </el-row>
+          <el-col :span="12">
+            <el-row >
+              <el-col :span="7">
+                <el-form-item label="开始公里桩" prop="startKm">
+                  <el-input
+                    v-model="form.startKm"
+                    placeholder="请输入开始公里桩"
+                    style="width: 300rem"
+                    :readonly="readonly"
+                  >
+                    <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"
+                    :readonly="readonly"
+                  >
+                    <template slot="prepend">+</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
+          </el-col>
 
-        <el-row :gutter="20">
-          <el-col :span="7">
-            <el-form-item label="施工内容一" prop="contentOne">
+          <el-col :span="24">
+            <el-row>
+            <el-col :span="12">
+            <el-form-item label="占用车道" prop="lane">
               <el-select
-                v-model="form.contentOne"
+                multiple
+                v-model="roadlan"
                 placeholder="请选择方向"
                 clearable
                 :disabled="readonly"
@@ -145,19 +125,53 @@
                 style="width: 300rem"
               >
                 <el-option
-                  v-for="dict in dict.type.content_one"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+                  v-for="i in ['1','2','3', '4']"
+                  :key="i"
+                  :label="i"
+                  :value="i"
                 />
               </el-select>
+              <!-- <el-input v-model="form.lane" placeholder="请输入占用车道" style="width:300rem"/> -->
             </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="施工内容二" prop="contentTwo">
 
+            </el-col>
+              <el-col :span="12">
+                <el-row >
+                  <el-col :span="7">
+                    <el-form-item label="结束公里桩" prop="endKm">
+                      <el-input
+                        v-model="form.endKm"
+                        :readonly="readonly"
+                        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"
+                        :readonly="readonly"
+                        placeholder="请输入结束米桩"
+                        style="width: 300rem"
+                      >
+                        <template slot="prepend">+</template>
+                      </el-input>
+
+                    </el-form-item>
+                    <span v-if="showlengthover" style="color:red;position: absolute;bottom:0;left: 12vw;width:200px">{{showlenfthmsg}}</span>
+                  </el-col>
+                </el-row>
+
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="施工内容一" prop="contentOne">
               <el-select
-                v-model="form.contentTwo"
+                v-model="form.contentOne"
                 placeholder="请选择方向"
                 clearable
                 :disabled="readonly"
@@ -165,28 +179,16 @@
                 style="width: 300rem"
               >
                 <el-option
-                  v-for="dict in dict.type.content_two"
+                  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-row>
-
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="施工内容描述" prop="contentDes">
-              <el-input type="textarea" :readonly="readonly" v-model="form['contentDes']"></el-input>
-            </el-form-item>
 
           </el-col>
-
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="预计开始时间" prop="startTime">
               <!-- <el-date-picker clearable
                                                 v-model="form.startTime"
@@ -204,8 +206,30 @@
               >
               </el-date-picker>
             </el-form-item>
+
+          </el-col>
+          <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-form-item>
+
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="预计结束时间" prop="endTime">
               <el-date-picker
                 clearable
@@ -218,30 +242,9 @@
               >
               </el-date-picker>
             </el-form-item>
-          </el-col>
-        </el-row>
 
-        <el-form-item label="占用车道" prop="lane">
-          <el-select
-            multiple
-            v-model="roadlan"
-            placeholder="请选择方向"
-            clearable
-            :disabled="readonly"
-            size="small"
-            style="width: 300rem"
-          >
-            <el-option
-              v-for="i in ['1','2','3', '4']"
-              :key="i"
-              :label="i"
-              :value="i"
-            />
-          </el-select>
-          <!-- <el-input v-model="form.lane" placeholder="请输入占用车道" style="width:300rem"/> -->
-        </el-form-item>
-        <el-row :gutter="20">
-          <el-col :span="7">
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="现场负责人" prop="manageUser">
               <el-input
                 :readonly="readonly"
@@ -250,28 +253,26 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="现场负责人手机号" prop="managePhone">
+          <el-col :span="12">
+            <el-form-item label="现场安全员" prop="saveUser">
               <el-input
-                type="textarea"
                 :readonly="readonly"
-                v-model="form.managePhone"
-                placeholder="请输入现场负责人手机号"
+                v-model="form.saveUser"
+                placeholder="请输入现场安全员"
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="7">
-            <el-form-item label="现场安全员" prop="saveUser">
+          <el-col :span="12">
+            <el-form-item label="现场负责人手机号" prop="managePhone">
               <el-input
+                type="textarea"
                 :readonly="readonly"
-                v-model="form.saveUser"
-                placeholder="请输入现场安全员"
+                v-model="form.managePhone"
+                placeholder="请输入现场负责人手机号"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="安全员手机号" prop="savePhone">
               <el-input
                 type="textarea"
@@ -281,7 +282,16 @@
               />
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="施工内容描述" prop="contentDes">
+              <el-input type="textarea" :readonly="readonly" v-model="form['contentDes']"></el-input>
+            </el-form-item>
+
+          </el-col>
+
         </el-row>
+
       </el-form>
 
 
@@ -300,8 +310,8 @@
 
 
       <div style="text-align: center">
-        <el-button size="mini" v-if="!readonly" @click="save(1)">保存</el-button>
-        <el-button size="mini" v-if="!readonly" @click="dialogVisible = true">提交</el-button>
+        <el-button size="mini" type="primary" v-if="!readonly" @click="save(1)">保存</el-button>
+        <el-button size="mini" type="success" v-if="!readonly" @click="dialogVisible = true">提交</el-button>
         <el-button size="mini" v-if="!readonly" @click="cancle">取消</el-button>
       </div>
     </div>
@@ -317,7 +327,7 @@
         <el-row>
           <el-col
             :span="12"
-            v-for="item in deptlist" v-bind:key="item.deptId"
+            v-for="item in deptlist.filter(i=>i.deptId==105||i.deptId==106)" v-bind:key="item.deptId"
             style="margin-bottom: 10px"
           >
             <el-radio v-model="audioDept" :label="item.deptId">{{
@@ -448,6 +458,9 @@ export default {
     }else{
       this.readonly=false;
     }
+    if(this.name === '修改'&& queryd.status=="4"){
+      this.readonly=false;
+    }
 
 
 

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

@@ -18,7 +18,7 @@
           title="确定要合并所选报备？"
           @confirm="mergeReport"
         >
-          <el-button slot="reference"  icon="el-icon-notebook-2" v-hasPermi="['system:report:sp']"  size="mini" style="margin-left: 10px">合并</el-button>
+          <el-button slot="reference" type="primary" icon="el-icon-notebook-2" v-hasPermi="['system:report:sp']"  size="mini" style="margin-left: 10px">合并</el-button>
         </el-popconfirm>
 <!--        <el-button icon="el-icon-notebook-2" size="mini" @click="mergeReport">合并</el-button>-->
       </el-form-item>
@@ -88,7 +88,11 @@
       <!-- <el-table-column label="是否合并 0：否 1：是" align="center" prop="isMerge" /> -->
        <el-table-column label="状态" align="center" prop="status" width="120" fixed="right">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.report_status" :value="scope.row.status"/>
+          <div>
+            <div :class="scope.row.status=='1'?'status_wtj':scope.row.status=='2'?'status_dsh':scope.row.status=='3'?'status_ysh':scope.row.status=='4'?'status_yjj':'status_yhb'" style="display: inline-block;vertical-align: middle;margin-right: 5px;width:10px;height: 10px;border-radius: 5px" ></div>
+            <dict-tag style="display: inline-block" :options="dict.type.report_status" :value="scope.row.status"/>
+          </div>
+
           <!-- <div v-if="scope.row.report_status != 2">{{scope.row.contentTwo}}</div> -->
         </template>
       </el-table-column>
@@ -107,7 +111,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status==='1'"
+            v-if="scope.row.status==='1'||scope.row.status==='4'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:report:edit']"
           >修改</el-button>
@@ -115,7 +119,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              v-if="scope.row.status==='1'"
+              v-if="scope.row.status==='1'||scope.row.status==='4'"
               @click="handleDelete(scope.row)"
               v-hasPermi="['system:report:remove']"
             >删除</el-button>
@@ -601,6 +605,23 @@ export default {
 }
 
 
+.status_dsh{
+  background: #1c84c6;
+}
+.status_wtj{
+  background:#f8ac59;
+}
+.status_ysh{
+  background: #13ce66;
+}
+.status_yjj{
+  background: #C03639;
+}
+.status_yhb{
+  background: #99a9bf;
+}
+
+
 
 </style>