fix

.gitignore

@@ -0,0 +1,5 @@
+*/target/
+ruoyi-ui/node_modules/
+home/ruoyi/logs/*
+.idea/*
+ruoyi-ui/yarn.lock

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

@@ -11,18 +11,18 @@
                    <el-row>
                      <el-col :span="12">
                        <el-form-item label="公路（桥梁或汽渡）名称" prop="name" required>
-                         <el-input v-model="form.name" placeholder="请输入名称" style="width:300rem"/>
+                         <el-input  :readonly="readonly" 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-input  :readonly="readonly" 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
-
+                         :disabled="readonly"
                            v-model="form.section"
                            placeholder="请选择路段"
                            clearable
@@ -40,14 +40,14 @@
                        </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-input  :readonly="readonly" v-model="form.level" placeholder="请输入公路等级"  style="width:300rem"/>
                      </el-form-item></el-col>
 
                      <el-col :span="24">
                       <el-row>
                         <el-col :span="12">
                           <el-form-item label="路段方向" prop="direction" required>
-                            <el-select v-model="form.direction" placeholder="请选择方向" clearable size="small">
+                            <el-select  :disabled="readonly" 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>
@@ -57,14 +57,14 @@
                             <el-row>
                               <el-col :span="7">
                                 <el-form-item label="开始公里桩" prop="startKm" required>
-                                  <el-input v-model="form.startKm" placeholder="请输入开始公里桩" style="width:300rem">
+                                  <el-input  :readonly="readonly" 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-input  :readonly="readonly" v-model="form.startHectometer" placeholder="请输入开始米桩" style="width:300rem">
                                     <template slot="prepend">+</template>
                                   </el-input>
                                 </el-form-item>
@@ -82,21 +82,21 @@
                       <el-row>
                         <el-col :span="12">
                           <el-form-item label="施工单位" prop="dept">
-                            <el-input v-model="form.dept" placeholder="请输入施工单位" style="width:300rem" />
+                            <el-input  :readonly="readonly" 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">
+                                <el-input  :readonly="readonly" 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-input  :readonly="readonly" v-model="form.endHectometer" placeholder="请输入结束米桩" style="width:300rem">
                                   <template slot="prepend">+</template>
                                 </el-input>
                               </el-form-item>
@@ -112,7 +112,7 @@
                       <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-select v-model="form.contentOne"  :disabled="readonly" 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>
@@ -125,7 +125,7 @@
                                                        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 style="width:300rem"  :readonly="readonly" v-model="form.startTime" type="datetime" placeholder="选择日期时间">
                             </el-date-picker>
                           </el-form-item>
                         </el-col>
@@ -136,8 +136,8 @@
                       <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"
+                            <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>
@@ -145,7 +145,7 @@
                         </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 clearable style="width:300rem"   :readonly="readonly" v-model="form.endTime" type="datetime" placeholder="请选择预计结束时间">
                             </el-date-picker>
                           </el-form-item>
                         </el-col>
@@ -169,6 +169,7 @@
                              :before-remove="beforeRemove"
                              :show-file-list="true"
                              :file-list="fileList"
+                             :disabled="readonly"
                            >
                              <div style="text-align:left;">
                                <el-button size="small" type="primary" plain>+点击上传</el-button>
@@ -191,7 +192,7 @@
                     </el-form>
 
 
-                    <div style="text-align:center;margin-top:100rem">
+                    <div style="text-align:center;margin-top:100rem" v-if="!readonly" >
                                <el-button  size="mini" type="primary" @click="submitForm">保存</el-button>
                                <el-button  size="mini" @click="cancle">取消</el-button>
                     </div>
@@ -216,6 +217,7 @@ export default {
       // 表单参数
       form: {},
       name:'新增',
+      readonly:false,
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
@@ -271,10 +273,30 @@ export default {
   },
   mounted:function(){
           // this.getList();
-          console.log(this.$route.query);
+
+          var queryd = localStorage.getItem("currentplan");
+          if(queryd){
+            queryd = JSON.parse(queryd);
+          }else{
+            this.$modal.msgError("发生错误");
+            this.$router.back();
+            return;
+          }
+          console.log(queryd);
+          // console.log(this.$route.query);
           this.$route.query.params = null;
-          this.form = this.$route.query
-          this.name = this.$route.query.routerName
+          this.form =queryd
+          this.name = queryd.routerName
+
+          if(this.name === '详情'  ){
+            this.readonly = true;
+          }else{
+            this.readonly=false;
+          }
+          if(this.name === '修改'){
+            this.readonly=false;
+          }
+
           // console.log(this.$route.query.status);
   },
   methods: {

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

@@ -19,7 +19,7 @@
 
     </el-form>
 
-    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" @row-click="tableclick">
       <!-- <el-table-column type="selection" width="55" align="center"/> -->
       <el-table-column label="公路(桥梁或汽渡)名称" align="center" prop="name" width='200' fixed="left"/>
       <el-table-column label="桥梁长度及净宽" align="center" prop="bridgeHeightWidth" width='200'/>
@@ -86,7 +86,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click.stop="handleUpdate(scope.row)"
             v-hasPermi="['system:plan:edit']"
           >修改</el-button>
         </template>
@@ -235,6 +235,11 @@ export default {
     this.$parent.activeIndex='1';
   },
   methods: {
+    tableclick(row, column, event){
+      row.routerName = '详情'
+      localStorage.setItem("currentplan",JSON.stringify(row));
+      this.$router.push({path: '/addPlan'})
+    },
     handlePreview(obj) {
         // console.log(file);
         console.log(obj);
@@ -307,7 +312,8 @@ export default {
     /** 修改按钮操作 */
 handleUpdate(row) {
        row.routerName = '修改'
-       this.$router.push({path: '/addPlan',query:row})
+       localStorage.setItem("currentplan",JSON.stringify(row));
+       this.$router.push('/addPlan')
     },
     /** 提交按钮 */
     submitForm() {

ruoyi-ui/vue.config.js

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