校对界面优化；

src/views/zhpt/dataCheck/jianceAndtance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -77,6 +75,7 @@
                 <el-table-column prop="videoSectionDataOne" label="视频显示断面数据1" width="160px"></el-table-column>
                 <el-table-column prop="videoSectionDataTwo" label="视频显示断面数据2" width="160px"></el-table-column>
                 <el-table-column prop="pdCheckLength" label="判读预处理长度" width="140px"></el-table-column>
+                <el-table-column prop="noHandleLength" label="暂无法预处理长度" width="140px"></el-table-column>
                 <el-table-column fixed="right" prop="checkMessage.result" label="校对结果" width="100px">
                   <template slot-scope="scope">
                     <span :style="{color:checkResultsColors[scope.row.checkMessage.level]}">{{scope.row.checkMessage.result}}</span>
@@ -98,7 +97,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="检测数据重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -144,7 +142,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -535,7 +532,7 @@ export default class JianceAndTanceCheck extends Vue {
             this.$message.error('校对失败')
             return
           }
-          this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+          this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
           this.getDataList()
         })
         .catch((err) => {
@@ -653,7 +650,7 @@ export default class JianceAndTanceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding:  0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -680,14 +677,4 @@ export default class JianceAndTanceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/jiancejiesuanAndtance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -88,7 +86,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="检测结算重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -134,7 +131,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -508,7 +504,7 @@ export default class jiancejiesuanAndTanceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -627,7 +623,7 @@ export default class jiancejiesuanAndTanceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -655,13 +651,4 @@ export default class jiancejiesuanAndTanceCheck extends Vue {
   }
 }
 
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/jiesuanAndjiance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -88,7 +86,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="检测结算重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -134,7 +131,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -517,7 +513,7 @@ export default class jiesuanAndjianceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -631,7 +627,7 @@ export default class jiesuanAndjianceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -658,14 +654,4 @@ export default class jiesuanAndjianceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/jiesuanAndyuchuli/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -68,7 +66,7 @@
                   <el-table-column :formatter="(row,column,cellVal)=>getPipeLength(row,cellVal,'污水',true)" label="水位20cm以上长度(m)" prop="type" align="center" width="170px"></el-table-column>
                 </el-table-column>
                 <el-table-column label="雨水完成量" align="center">
-                  <el-table-column prop="diameterLevel" label="管径" align="center"></el-table-column>
+                  <el-table-column :formatter="(row,column,cellVal)=>getDiamLevel(row,cellVal)" prop="diameterLevel" label="管径" align="center"></el-table-column>
                   <el-table-column prop="pipeLength" label="长度(m)" align="center"></el-table-column>
                 </el-table-column>
                 <el-table-column label="雨污混流完成量" align="center">
@@ -98,7 +96,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="预处理结算重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -144,7 +141,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -417,6 +413,13 @@ export default class jiesuanAndyuchuliCheck extends Vue {
       return '-'
     }
   }
+  getDiamLevel(row, cellValue){
+    if(cellValue){
+      return DiameterLevel[cellValue - 1]
+    }else{
+      return '-'
+    }
+  }
   getPipeLength(row, cellValue, type, isUp) {
     const filed = isUp ? 'pipeLengthUp' : 'pipeLengthDown'
     if (cellValue === type) {
@@ -561,7 +564,7 @@ export default class jiesuanAndyuchuliCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -683,7 +686,7 @@ export default class jiesuanAndyuchuliCheck extends Vue {
       }
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -710,14 +713,4 @@ export default class jiesuanAndyuchuliCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/rainAndyuchuli/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -101,7 +99,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="预处理数据重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -147,7 +144,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -446,7 +442,7 @@ export default class RainAndyuchuliCheck extends Vue {
         console.log('无对应雨水任务单数据，请检查');
         return;
       }
-      saveByCheckData(row)
+      saveByCheckData(rwData)
         .then((result) => {
           if (result.code === 1) {
             this.$message.success('新增成功')
@@ -588,7 +584,7 @@ export default class RainAndyuchuliCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -706,7 +702,7 @@ export default class RainAndyuchuliCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -733,14 +729,4 @@ export default class RainAndyuchuliCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/renwuAndtance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -97,7 +95,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="探测数据重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -143,7 +140,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -568,7 +564,7 @@ export default class RenwuAndTanceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -686,7 +682,7 @@ export default class RenwuAndTanceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -713,14 +709,4 @@ export default class RenwuAndTanceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/yuchuliAndjiance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -89,7 +87,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="预处理数据重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -135,7 +132,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -518,7 +514,7 @@ export default class yuchuliAndjianceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -637,7 +633,7 @@ export default class yuchuliAndjianceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -664,14 +660,4 @@ export default class yuchuliAndjianceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/yuchuliAndtance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -103,7 +101,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="预处理数据重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -149,7 +146,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -544,7 +540,7 @@ export default class yuchuliAndtanceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -663,7 +659,7 @@ export default class yuchuliAndtanceCheck extends Vue {
       height: calc(100% - 97px);
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -690,14 +686,4 @@ export default class yuchuliAndtanceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataCheck/yuchulijiesuanAndtance/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div style="height:100%;padding:0 20px;">
-    <el-tabs class="impTabs" v-model="activeTab">
-      <el-tab-pane label="数据校对" name="check">
         <tf-page class="pagePanel">
           <template #action>
             <el-form :inline="true" class="searchPanel">
@@ -68,7 +66,7 @@
                   <el-table-column :formatter="(row,column,cellVal)=>getPipeLength(row,cellVal,'污水',true)" label="水位20cm以上长度(m)" prop="type" align="center" width="170px"></el-table-column>
                 </el-table-column>
                 <el-table-column label="雨水完成量" align="center">
-                  <el-table-column prop="diameterLevel" label="管径" align="center"></el-table-column>
+                  <el-table-column :formatter="(row,column,cellVal)=>getDiamLevel(row,cellVal)" prop="diameterLevel" label="管径" align="center"></el-table-column>
                   <el-table-column prop="pipeLength" label="长度(m)" align="center"></el-table-column>
                 </el-table-column>
                 <el-table-column label="雨污混流完成量" align="center">
@@ -98,7 +96,6 @@
             </el-col>
           </el-row>
         </tf-page>
-      </el-tab-pane>
       <!-- <el-tab-pane label="预处理结算重新导入" name="import">
         <tf-page class="pagePanel">
           <template #action>
@@ -144,7 +141,6 @@
           </tf-table>
         </tf-page>
       </el-tab-pane> -->
-    </el-tabs>
     <tf-dialog title="重新导入" :visible.sync='isAddDialogShow' class="addDialog" width="1000px">
       <el-steps simple :active="importStep" finish-status="success">
         <el-step title="上传导入文件"></el-step>
@@ -402,6 +398,13 @@ export default class yuchulijiesuanAndtanceCheck extends Vue {
     }
    
   }
+  getDiamLevel(row, cellValue){
+    if(cellValue){
+      return DiameterLevel[cellValue - 1]
+    }else{
+      return '-'
+    }
+  }
   getPipeLength(row, cellValue, type,isUp){
     const filed=isUp?'pipeLengthUp':'pipeLengthDown';
     if(cellValue===type){
@@ -543,7 +546,7 @@ export default class yuchulijiesuanAndtanceCheck extends Vue {
           this.$message.error('校对失败')
           return
         }
-        this.$message.success('校对结果为完全对应的数据标记为已校对，标记成功')
+        this.$message.success('所有数据均以标记为已校对（除“数据缺失”以外）')
         this.getDataList()
       })
       .catch((err) => {
@@ -665,7 +668,7 @@ export default class yuchulijiesuanAndtanceCheck extends Vue {
       }
     }
     .tf-table.right {
-      padding: 0 0 5px 15px;
+      padding: 0 0 5px 0;
       .difColor {
         color: #d9001b;
       }
@@ -692,14 +695,4 @@ export default class yuchulijiesuanAndtanceCheck extends Vue {
     }
   }
 }
-
-.impTabs {
-  height: 100%;
-  >>> .el-tabs__content {
-    height: calc(100% - 55px);
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-}
 </style>

src/views/zhpt/dataImport/common/index.scss

@@ -1,4 +1,4 @@
-//数据校对、数据导入模块
+//数据导入模块
 .el-tab-pane {
   >>> .actions {
     padding: 0 15px;
@@ -21,6 +21,29 @@
     }
   }
 }
+//数据校对
+.pagePanel{
+  >>> .actions {
+    padding: 15px 0 0 0;
+    margin-bottom: 0;
+    .el-form {
+      .el-input {
+        max-width: 120px;
+      }
+      .el-select {
+        max-width: 150px;
+      }
+      .el-date-editor {
+        max-width: 200px;
+      }
+    }
+  }
+  .content {
+    .tf-table {
+      padding: 0;
+    }
+  }
+}
 .container{
   background: #fff;
 }

src/views/zhpt/dataImport/jianceData/index.vue

@@ -205,7 +205,7 @@ export default class JianCeDataImport extends Vue {
     { prop: 'videoSectionDataTwo', label: '视频显示断面数据2', width: '150px' },
     { prop: 'pdCheckLength', label: '判读检测长度', width: '150px' },
     { prop: 'noHandleLength', label: '暂无法预处理长度', width: '150px' },
-    { prop: 'pdRemark', label: '判读备注' },
+    { prop: 'pdRemark', label: '判读备注', showOverflowTooltip: true, width: '150px' },
     { prop: 'isCheck', label: '是否检测' },
     { prop: 'rainTask', label: '雨水任务单', showOverflowTooltip: true, width: '100px' },
     { prop: 'remark', label: '探测备注', showOverflowTooltip: true },

src/views/zhpt/filesManage/fileImport/index.vue

@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="导入时间">
-                <el-date-picker type="datetimerange" size="small" v-model="searchInfo.timeRange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+                <el-date-picker value-format='yyyy-MM-dd HH:mm:ss' type="datetimerange" size="small" v-model="searchInfo.timeRange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
                 </el-date-picker>
             </el-form-item>
           <el-form-item>
@@ -46,7 +46,7 @@
         <el-step title="导入结果"></el-step>
       </el-steps>
       <div v-if="importStep==0">
-        <el-form v-model="addForm" label-width="100px" :rules="addRules" :disabled="formType==='edit'">
+        <el-form :model="addForm" label-width="100px" :rules="addRules" :disabled="formType==='edit2'">
           <tf-title>项目信息</tf-title>
           <el-row>
             <el-col :span="12">
@@ -118,7 +118,7 @@ export default class ProjectFileImport extends Vue {
     project: '', //项目
     department:'',//单位
     fileType: '', //文件类型
-    timeRange: '' //导入时间
+    timeRange: [] //导入时间
   }
   /**列名 */
   columns = [
@@ -131,7 +131,7 @@ export default class ProjectFileImport extends Vue {
     { prop: 'checkFileCount', label: '校对成功文件数(个)' },
     { prop: 'checkFailedCount', label: '校对失败数（个）' },
     { prop: 'departmentName', label: '操作单位' },
-    { prop: 'createUser', label: '操作人' },
+    { prop: 'createUserName', label: '操作人' },
     { prop: 'createTime', label: '操作时间' }
   ]
   /**添加表单 */
@@ -164,19 +164,6 @@ export default class ProjectFileImport extends Vue {
   pagination = getDefaultPagination()
   /**单位列表 */
   departments = []
-  @Watch('isAddDialogShow')
-  dialogShow(newVla, oldValue) {
-    if (!newVla) {
-      this.fileList = []
-      this.files = []
-      this.importStep=0
-      this.addForm = {
-        project: '',
-        fileType: ''
-      }
-    }
-  }
-
   get deptmentTree() {
     const getChildren = (parent) => {
       const { id: parentId } = parent
@@ -258,7 +245,9 @@ export default class ProjectFileImport extends Vue {
     let parames = {
       fileType: this.searchInfo.fileType,
       prjId: this.searchInfo.project,
-      departmentId: this.searchInfo.department
+      departmentId: this.searchInfo.department,
+      startTime:this.searchInfo.timeRange&&this.searchInfo.timeRange.length>=1?this.searchInfo.timeRange[0]:'',
+      endTime:this.searchInfo.timeRange&&this.searchInfo.timeRange.length==2?this.searchInfo.timeRange[1]:''
     }
     parames = { ...parames, ...this.pagination }
     fileImportPage(parames)
@@ -293,6 +282,13 @@ export default class ProjectFileImport extends Vue {
   showAddDialog() {
     this.isAddDialogShow = true
     this.formType = 'add'
+    this.fileList = []
+      this.files = []
+      this.importStep=0
+      this.addForm = {
+        project: '',
+        fileType: ''
+      }
   }
   /**单位列表 */
   getDepartments() {
@@ -333,7 +329,7 @@ export default class ProjectFileImport extends Vue {
             return
           }
           const filelist = result.result.map((fileinfo) => {
-            return { fileId: fileinfo.fileId, fileNmae: fileinfo.fileName }
+            return { fileId: fileinfo.fileId, fileName: fileinfo.fileName }
           })
           const data = {
             prjId: this.addForm.project,

src/views/zhpt/filesManage/fileManage/index.vue

@@ -16,11 +16,11 @@
               </el-form-item>
               <el-form-item label="道路名称">
                 <el-input v-model="searchInfo.roadName" size="small"></el-input>
-                 <el-button type="primary" size="mini" icon="el-icon-search" @click="getDataTreeList">查询</el-button>
+                 <el-button type="primary" size="mini" icon="el-icon-search" @click="getTreeList">查询</el-button>
               </el-form-item>
             </el-form>
           </template>
-          <el-tree :data="fileLinkTree" :props="treeProps"></el-tree>
+          <el-tree @node-click='treeNodeClick' :data="fileLinkTree" :props="treeProps"></el-tree>
         </tf-page>
       </el-col>
       <el-col :span="18" style="height:100%;">
@@ -145,8 +145,9 @@ export default class ProjectFileImport extends Vue {
   tbSearchInfo={
     filType: '', //文件类型
     fileName: '', //文件名称
-    department: ''//单位
-  }
+    department: '',//单位
+    linkName:''//关联名称
+}
   /**树数据 */
   treeList=[
     {
@@ -186,7 +187,7 @@ export default class ProjectFileImport extends Vue {
     } },
     { prop: 'fileName', label: '文件名称' },
     { prop: 'departmentName', label: '导入单位' },
-    { prop: 'createUser', label: '导入人' },
+    { prop: 'createUserName', label: '导入人' },
     { prop: 'createTime', label: '导入时间' }
   ]
   /**行政区 */
@@ -326,31 +327,17 @@ export default class ProjectFileImport extends Vue {
     this.listSelect = selection
   }
   /**左侧结构树 */
-  getDataTreeList(){
-    let parames = {
-      area: this.searchInfo.district,
-      testingZone: this.searchInfo.testingZone,
-      roadName: this.searchInfo.roadName
-    }
-    parames = { ...parames, ...this.pagination }
-    fileManagerPage(parames)
-      .then((result) => {
-        if (result.code === 1) {
-          this.list = result.result.records
-          const { current, size, total } = result.result
-          this.pagination = { current, size, total }
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
+  treeNodeClick(row){
+    this.tbSearchInfo.linkName=row.label
+    this.getDataList();
   }
   /**主表格数据 */
   getDataList() {
     let parames = {
       fileType: this.tbSearchInfo.filType,
       fileName: this.tbSearchInfo.fileName,
-      departmentId: this.tbSearchInfo.department
+      departmentId: this.tbSearchInfo.department,
+      linkName:this.tbSearchInfo.linkName
     }
     parames = { ...parames, ...this.pagination }
     fileManagerPage(parames)
@@ -372,7 +359,7 @@ export default class ProjectFileImport extends Vue {
       roadName: this.searchInfo.roadName,
       testingZone: this.searchInfo.testingZone
     }
-    parames = { ...parames, ...this.pagination }
+    parames = { ...parames }
     getRecordLinkData(parames)
       .then((result) => {
         if (result.code === 1) {
@@ -478,7 +465,7 @@ export default class ProjectFileImport extends Vue {
             return
           }
           const filelist = result.result.map((fileinfo) => {
-            return { fileId: fileinfo.fileId, fileNmae: fileinfo.fileName }
+            return { fileId: fileinfo.fileId, fileName: fileinfo.fileName }
           })
           const data = {
             prjId: this.addForm.project,

src/views/zhpt/projectManage/index.vue

@@ -47,17 +47,17 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="探测单位" prop="tcUnit">
-              <el-cascader collapse-tags v-model="addForm.tcUnit" :options="deptmentTree" :props="{multiple: true, expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" filterable clearable />
+              <el-cascader collapse-tags v-model="addForm.tcUnit" :options="deptmentTree" :props="{multiple: true, expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="预处理单位" prop="yclUnit">
-              <el-cascader collapse-tags v-model="addForm.yclUnit" :options="deptmentTree" :props="{multiple: true,  expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" filterable clearable />
+              <el-cascader collapse-tags v-model="addForm.yclUnit" :options="deptmentTree" :props="{multiple: true,  expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检测单位" prop="jcUnit">
-              <el-cascader collapse-tags v-model="addForm.jcUnit" :options="deptmentTree" :props="{ multiple: true, expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" filterable clearable />
+              <el-cascader collapse-tags v-model="addForm.jcUnit" :options="deptmentTree" :props="{ multiple: true, expandTrigger: 'hover', label: 'name', value: 'id'}" size="small" style="width: 100%" clearable />
             </el-form-item>
           </el-col>
         </el-row>