yj há 3 anos atrás
pai
commit
babc41a2a2

+ 4 - 4
src/views/pipelineDefect/manage/defect/widget.vue

@@ -13,7 +13,7 @@
             class="serch-input"
           >
           </el-input>
-          <div class="title">检测日期:</div>
+          <!-- <div class="title">检测日期:</div>
           <div class="sampleTime">
             <el-row style="display: flex; justify-content: center; align-items: center">
               <el-col :span="11">
@@ -40,7 +40,7 @@
                 ></el-date-picker>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <!-- <div class="title">结构性缺陷等级:</div>
           <el-select clearable v-model="searchValue.structClass" placeholder="全部">
             <el-option v-for="(item, i) in gradeArr" :key="i" :label="item" :value="item"></el-option>
@@ -194,7 +194,7 @@ export default {
         '检测视频': 'videoFileName',
         '工程名称': 'prjName',
         '工程地点': 'checkAddress',
-        '检测日期': 'sampleTime',
+        // '检测日期': 'sampleTime',
         '管道内部状况描述': 'structEstimate',
         '缺陷名称代码': 'defectCode'
       },
@@ -265,7 +265,7 @@ export default {
         { width: '100', sortable: true, label: '等级', name: 'defectLevel' },
         { width: '100', sortable: false, label: '工程名称', name: 'prjName' },
         { width: '100', sortable: false, label: '工程地点', name: 'checkAddress' },
-        { width: '100', sortable: true, label: '检测日期', name: 'sampleTime' }
+        // { width: '100', sortable: true, label: '检测日期', name: 'sampleTime' }
         // { label: '结构性缺陷评价', name: 'structEstimate' },
         // { label: '检测地点', name: 'checkAddress' },
       ],

+ 7 - 7
src/views/pipelineDefect/manage/evaluate/widget.vue

@@ -13,7 +13,7 @@
             class="serch-input"
           >
           </el-input>
-          <div class="title">检测时间:</div>
+          <!-- <div class="title">检测时间:</div>
           <div class="sampleTime">
             <el-row style="display: flex; justify-content: center; align-items: center">
               <el-col :span="11">
@@ -40,7 +40,7 @@
                 ></el-date-picker>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <div class="title">结构性缺陷等级:</div>
           <el-select clearable v-model="searchValue.structClass" placeholder="全部">
             <el-option v-for="(item, i) in gradeArr" :key="i" :label="item" :value="item"></el-option>
@@ -100,8 +100,8 @@
         </el-table-column>
         <el-table-column fixed="right" header-align="center" label="操作" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.stop="toVideo(scope.row)">视频</el-button>
-            <el-button type="text" size="small" @click.stop="toPdfPage(scope.row.pdfFilePath)">报告</el-button>
+            <el-button type="text" size="small" :disabled="!scope.row.videopath" @click.stop="toVideo(scope.row)">视频</el-button>
+            <!-- <el-button type="text" size="small"  @click.stop="toPdfPage(scope.row.pdfFilePath)">报告</el-button> -->
             <el-button type="text" size="small" @click.stop="openDetails(scope.row)">详情</el-button>
           </template>
         </el-table-column>
@@ -256,7 +256,7 @@ export default {
         '检测照片': 'picnum',
         '检测视频': 'videoFileName',
         '检测地点': 'checkAddress',
-        '检测日期': 'sampleTime',
+        // '检测日期': 'sampleTime',
         '结构性缺陷等级': 'structClass',
         '功能性缺陷等级': 'funcClass'
       },
@@ -309,7 +309,7 @@ export default {
         { width: '150', sortable: true, label: '功能性缺陷等级', name: 'funcClass' },
         { width: '200', sortable: false, label: '结构性缺陷评价', name: 'structEstimate' },
         { width: '200', sortable: false, label: '功能性缺陷评价', name: 'funcEstimate' },
-        { width: '100', sortable: true, label: '检测日期', name: 'sampleTime' },
+        // { width: '100', sortable: true, label: '检测日期', name: 'sampleTime' },
         { width: '200', sortable: false, label: '工程名称', name: 'prjName' },
       ],
       gradeArr: ['Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ'], // 缺陷等级
@@ -504,9 +504,9 @@ export default {
         })
         return false
       } else {
+        // url = '/wordInfoDoc/153/202208251654400591.docx'
         window.open(baseAddress + '/psjc/file' + url, '_blank')
       }
-      console.log('url', !url)
     },
     clearAll() {
       this.vectorLayer && this.map.removeLayer(this.vectorLayer)

+ 6 - 6
src/views/pipelineDefect/manage/report/widget.vue

@@ -13,7 +13,7 @@
             class="serch-input"
           >
           </el-input>
-          <div class="title">检测日期:</div>
+          <!-- <div class="title">检测日期:</div>
           <div class="sampleTime">
             <el-row style="display: flex; justify-content: center; align-items: center">
               <el-col :span="11">
@@ -40,7 +40,7 @@
                 ></el-date-picker>
               </el-col>
             </el-row>
-          </div>
+          </div> -->
           <div class="release-radio">
             <p class="release-title">发布状态:</p>
             <el-checkbox-group v-model="searchValue.checkList">
@@ -396,11 +396,11 @@
           <!-- 右边部分 -->
           <div class="right">
             <el-tabs v-model="activeRight" @tab-click="handleClick">
-              <el-tab-pane label="原始检测报告" name="one">
+              <!-- <el-tab-pane label="原始检测报告" name="one">
                 <div class="releaseContent">
                   <pdf-see :pdfUrl="pdfUrl"></pdf-see>
                 </div>
-              </el-tab-pane>
+              </el-tab-pane> -->
               <el-tab-pane label="数据地图" name="two">
                 <!-- 数据地图 -->
                 <div class="map-box">
@@ -600,8 +600,8 @@ export default {
         { sortable: true, label: '检测长度(m)', name: 'jclength' },
         { sortable: false, label: '工程名称', name: 'prjName' },
         { sortable: false, label: '工程地点', name: 'address' },
-        { sortable: false, label: '施工单位', name: 'sgunit' },
-        { sortable: true, label: '检测日期', name: 'jcDate' },
+        { sortable: false, label: '检测单位', name: 'sgunit' },
+        // { sortable: true, label: '检测日期', name: 'jcDate' },
         { sortable: false, label: '入库人', name: 'createUserName' },
         { sortable: true, label: '入库时间', name: 'createTime' }
       ],

+ 1 - 1
src/views/pipelineDefect/mixin/map.ts

@@ -231,7 +231,7 @@ export const mapMixin = {
             let idText = ['id', 'expNo', 'wordId'][type], 
                 height = [150, 500, 6000],
                 center,
-                findFeas = []
+                findFeas = [];
             if (type) {
                 let pEntities = this.getSource(this.pSname).entities.values
                 findFeas = pEntities.filter(e => e[this.propertyName][idText] === id).map(i => i[this.propertyName])