``

ruoyi-admin/pom.xml

@@ -61,6 +61,8 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="./home/ruoyi/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -38,24 +38,32 @@
                          <el-row :gutter="20">
                                         <el-col :span="7">
                                     <el-form-item label="开始公里桩" prop="startKm">
-                                      <el-input v-model="form.startKm" placeholder="请输入开始公里桩"  style="width:300rem"/>
+                                      <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"/>
+                                    <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"/>
+                                      <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"/>
+                                    <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>
@@ -90,7 +98,7 @@
 
                             <el-row :gutter="20">
                                     <el-col :span="7">
-                                     <el-form-item label="预计开始时间" prop="startTime" > 
+                                     <el-form-item label="预计开始时间" prop="startTime" >
                                             <!-- <el-date-picker clearable
                                                 v-model="form.startTime"
                                                 type="date"
@@ -118,7 +126,7 @@
                         </el-row>
 
 
-     
+
                         <el-form-item label="施工单位" prop="dept">
                         <el-input v-model="form.dept" placeholder="请输入施工单位" style="width:300rem"/>
                         </el-form-item>
@@ -143,7 +151,7 @@
                                         </div>
                                       </el-upload>
                         </el-form-item>
-                     
+
                     </el-form>
 
 

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container plan">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80rem">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80rem" style="position: relative;">
       <el-form-item label="时间" prop="timeRanage">
         <el-date-picker
             v-model="queryParams.timeRanage"
@@ -15,11 +15,12 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-plus" size="mini" @click="goAdd">新增</el-button>
       </el-form-item>
+
     </el-form>
 
     <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center"/> -->
-      <el-table-column label="公路(桥梁或汽渡)名称" align="center" prop="name" width='200'/>
+      <el-table-column label="公路(桥梁或汽渡)名称" align="center" prop="name" width='200' fixed="left"/>
       <el-table-column label="桥梁长度及净宽" align="center" prop="bridgeHeightWidth" width='200'/>
       <el-table-column label="施工路段" align="center" prop="section" width='200'/>
       <el-table-column label="方向" align="center" prop="direction" width='100'>
@@ -27,10 +28,16 @@
           <dict-tag :options="dict.type.sys_direction" :value="scope.row.direction"/>
         </template>
       </el-table-column>
-      <el-table-column label="开始公里桩" align="center" prop="startKm" width='100'/>
-      <el-table-column label="开始百米桩" align="center" prop="startHectometer" width='100'/>
-      <el-table-column label="结束公里桩" align="center" prop="endKm" width='100'/>
-      <el-table-column label="结束百米桩" align="center" prop="endHectometer" width='100'/>
+      <el-table-column label="起止桩号" align="center"  width='300'>
+        <template v-slot="scope">
+          <div>K{{scope.row.startKm?scope.row.startKm:'0' }}+{{scope.row.startHectometer?scope.row.startHectometer:'0' }} ~ K{{scope.row.endKm?scope.row.endKm:'0' }}+{{scope.row.endHectometer?scope.row.endHectometer:'0' }}</div>
+        </template>
+
+      </el-table-column>
+<!--      <el-table-column label="开始公里桩" align="center" prop="startKm" width='100'/>-->
+<!--      <el-table-column label="开始百米桩" align="center" prop="startHectometer" width='100'/>-->
+<!--      <el-table-column label="结束公里桩" align="center" prop="endKm" width='100'/>-->
+<!--      <el-table-column label="结束百米桩" align="center" prop="endHectometer" width='100'/>-->
       <el-table-column label="预计开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -60,11 +67,16 @@
         <template slot-scope="scope">
           <el-button
             size="mini"
+            v-if="JSON.parse(scope.row.fileUrl).length>0 "
             type="text"
             icon="el-icon-edit"
             @click="handlePreview(scope.row)"
           >查看</el-button>
-      
+          <div v-if="JSON.parse(scope.row.fileUrl).length<1 " style="font-size: 10px">暂无</div>
+
+
+
+
         </template>
       </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -75,11 +87,11 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:report:edit']"
-          >修改</el-button>      
+          >修改</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       style="background:none"
       v-show="total>0"
@@ -104,14 +116,14 @@
         <el-form-item label="开始公里桩" prop="startKm">
           <el-input v-model="form.startKm" placeholder="请输入开始公里桩" />
         </el-form-item>
-        <el-form-item label="开始百米桩" prop="startHectometer">
-          <el-input v-model="form.startHectometer" placeholder="请输入开始百米桩" />
+        <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-input v-model="form.endHectometer" placeholder="请输入结束百米桩" />
+        <el-form-item label="结束米桩" prop="endHectometer">
+          <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" />
         </el-form-item>
         <el-form-item label="预计开始时间" prop="startTime">
           <el-date-picker clearable

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

@@ -70,16 +70,20 @@
                 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-form-item label="开始米桩" prop="startHectometer">
               <el-input
                 v-model="form.startHectometer"
-                placeholder="请输入开始百米桩"
+                placeholder="请输入开始米桩"
                 style="width: 300rem"
-              />
+              >
+                <template slot="prepend">+</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -90,16 +94,20 @@
                 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-form-item label="结束米桩" prop="endHectometer">
               <el-input
                 v-model="form.endHectometer"
-                placeholder="请输入结束百米桩"
+                placeholder="请输入结束米桩"
                 style="width: 300rem"
-              />
+              >
+                <template slot="prepend">+</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="position: relative">
        <el-form-item label="时间" prop="timeRanage">
         <el-date-picker
             v-model="queryParams.timeRanage"
@@ -15,22 +15,33 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-plus" size="mini" @click="goAdd">新增</el-button>
       </el-form-item>
+
+      <div style="    position: absolute;top: 0;right: 0;">
+        <el-button type="primary" icon="el-icon-warning-outline" size="mini" @click="handleQuery">冲突检测</el-button>
+        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleQuery">合并检测</el-button>
+      </div>
     </el-form>
 
 
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="id" align="center" prop="id" /> -->
-      <el-table-column label="施工路段" align="center" prop="section" width='200'/>
+      <el-table-column label="施工路段" align="center" prop="section" width='200' fixed="left"/>
       <el-table-column label="方向" align="center" prop="direction" width='100'>
       <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_direction" :value="scope.row.direction"/>
         </template>
       </el-table-column>
-      <el-table-column label="开始公里桩" align="center" prop="startKm" width='100'/>
-      <el-table-column label="开始百米桩" align="center" prop="startHectometer" width='100'/>
-      <el-table-column label="结束公里桩" align="center" prop="endKm" width='100'/>
-      <el-table-column label="结束百米桩" align="center" prop="endHectometer" width='100'/>
+      <el-table-column label="起止桩号" align="center"  width='300'>
+        <template v-slot="scope">
+          <div>K{{scope.row.startKm?scope.row.startKm:'0' }}+{{scope.row.startHectometer?scope.row.startHectometer:'0' }} ~ K{{scope.row.endKm?scope.row.endKm:'0' }}+{{scope.row.endHectometer?scope.row.endHectometer:'0' }}</div>
+        </template>
+
+      </el-table-column>
+<!--      <el-table-column label="开始公里桩" align="center" prop="startKm" width='100'/>-->
+<!--      <el-table-column label="开始百米桩" align="center" prop="startHectometer" width='100'/>-->
+<!--      <el-table-column label="结束公里桩" align="center" prop="endKm" width='100'/>-->
+<!--      <el-table-column label="结束百米桩" align="center" prop="endHectometer" width='100'/>-->
        <el-table-column label="施工内容一" align="center" prop="contentOne" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.content_one" :value="scope.row.contentOne"/>
@@ -85,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
     style="background:none"
       v-show="total>0"

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

@@ -68,9 +68,9 @@
       <el-table-column label="施工路段" align="center" prop="section" />
       <el-table-column label="方向" align="center" prop="direction" />
       <el-table-column label="开始公里桩" align="center" prop="startKm" />
-      <el-table-column label="开始百米桩" align="center" prop="startHectometer" />
+      <el-table-column label="开始米桩" align="center" prop="startHectometer" />
       <el-table-column label="结束公里桩" align="center" prop="endKm" />
-      <el-table-column label="结束百米桩" align="center" prop="endHectometer" />
+      <el-table-column label="结束米桩" align="center" prop="endHectometer" />
       <el-table-column label="预计开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -130,14 +130,14 @@
         <el-form-item label="开始公里桩" prop="startKm">
           <el-input v-model="form.startKm" placeholder="请输入开始公里桩" />
         </el-form-item>
-        <el-form-item label="开始百米桩" prop="startHectometer">
-          <el-input v-model="form.startHectometer" placeholder="请输入开始百米桩" />
+        <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-input v-model="form.endHectometer" placeholder="请输入结束百米桩" />
+        <el-form-item label="结束米桩" prop="endHectometer">
+          <el-input v-model="form.endHectometer" placeholder="请输入结束米桩" />
         </el-form-item>
         <el-form-item label="预计开始时间" prop="startTime">
           <el-date-picker clearable

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://localhost:8080`,
-                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]: ''
@@ -132,4 +132,4 @@ module.exports = {
                 }
             )
     }
-}
+}