- 缺陷显示

public/config.js

@@ -38,8 +38,8 @@ export const appconfig = {
 export function setParams(geoInfo) {
   console.log('设置坐标')
   // const parmas = { 
-  //   '宜昌': { proj: 'proj46', center: { "lon": "111.291353", "lat": "30.705687", "height": "30159.21860055598" } },
-  //   '岳阳': { proj: 'proj47', center: { "lon": "113.17326715436977", "lat": "29.37027846440258", "height": "30159.21860055598" } },
+  //   '宜昌': { proj: '4546', center: { "lon": "111.291353", "lat": "30.705687", "height": "30159.21860055598" } },
+  //   '岳阳': { proj: '4547', center: { "lon": "113.17326715436977", "lat": "29.37027846440258", "height": "30159.21860055598" } },
   // }
   let { wkid: proj, geo_info: center } = geoInfo
   appconfig.currCenter = center

src/views/pipelineDefect/common/proj.ts

@@ -21,7 +21,8 @@ export class projUtil {
         '4495': "EPSG:4495",
         '4544': "EPSG:4544", // rs
         '4546': 'EPSG:4546', // 宜昌
-        '4547': "EPSG:4547" // 岳阳
+        '4547': "EPSG:4547", // 岳阳
+        'proj46': 'EPSG:4546'
     }
 
     constructor () {

src/views/pipelineDefect/manage/defect/widget.vue

@@ -46,7 +46,7 @@
             <el-option v-for="(item, i) in gradeArr" :key="i" :label="item" :value="item"></el-option>
           </el-select> -->
           <div class="title">缺陷等级：</div>
-          <el-select clearable v-model="searchValue.defectLevel" placeholder="全部">
+          <el-select style="width:120px" clearable v-model="searchValue.defectLevel" placeholder="全部">
             <el-option v-for="(item, i) in defectLevel" :key="i" :label="item" :value="item"></el-option>
           </el-select>
           <!-- <div class="title">功能性缺陷等级：</div>
@@ -355,7 +355,7 @@ export default {
       let { videopath, videoFileName } = row
       if (!videopath) return this.$message.warning('暂无视频')
       let address = baseAddress + '/psjc/file' + videopath
-      this.videoTitle = `${videoFileName}`
+      this.videoTitle = `${videoFileName || '视频查看'}`
       this.videoUrl = address
       this.showVideo = true
     },
@@ -485,11 +485,13 @@ export default {
         defectLevel: this.searchValue.defectLevel
       }
       queryPageDefectInfo(data).then((res) => {
-        let { records, total } = res.result
-        this.tableData = records.map(d => {
-          return { ...d, defectNameCode: `(${d.defectCode})${d.defectName}` }
-        })
-        this.paginationTotal = total
+        if (res && res.code == 1) {
+          let { result: { records, total }, code } = res
+          this.tableData = records.map(d => {
+            return { ...d, defectNameCode: `${d.defectName}(${d.defectCode})` }
+          })
+          this.paginationTotal = total
+        }
       })
     },
     // 分页触发的事件(主表格)

src/views/pipelineDefect/manage/engineer/components/detail.vue

@@ -379,7 +379,7 @@ export default class Detail extends Vue {
       uploadItemDictId: this.updataParamsId.uploadItemDictId
     }
     let fileRes = await queryPageEnclosure(params)
-    console.log('附件分页数据', fileRes)
+    console.log('附件数据', fileRes)
     this.fileListData = fileRes.result.records
     Promise.resolve()
   }

src/views/pipelineDefect/manage/evaluate/widget.vue

@@ -42,11 +42,11 @@
             </el-row>
           </div> -->
           <div class="title">结构性缺陷等级：</div>
-          <el-select clearable v-model="searchValue.structClass" placeholder="全部">
+          <el-select style="width:120px" clearable v-model="searchValue.structClass" placeholder="全部">
             <el-option v-for="(item, i) in gradeArr" :key="i" :label="item" :value="item"></el-option>
           </el-select>
           <div class="title">功能性缺陷等级：</div>
-          <el-select clearable v-model="searchValue.funcClass" placeholder="全部">
+          <el-select style="width:120px" clearable v-model="searchValue.funcClass" placeholder="全部">
             <el-option v-for="(item, i) in gradeArr" :key="i" :label="item" :value="item"></el-option>
           </el-select>
           <el-button size="small" style="margin-left: 26px" type="primary" @click="searchApi"> 搜索 </el-button>
@@ -491,7 +491,7 @@ export default {
       let { videopath, videoFileName } = row
       if (!videopath) return this.$message.warning('暂无视频')
       let address = baseAddress + '/psjc/file' + videopath
-      this.videoTitle = `${videoFileName} 视频`
+      this.videoTitle = `${videoFileName || '视频查看'}`
       this.videoUrl = address
       this.showVideo = true
     },

src/views/pipelineDefect/mixin/map.ts

@@ -68,8 +68,10 @@ export const mapMixin = {
         // 设置图层显隐
         setSourceVisible (sourceName, visible) {
             let source = this.getSource(sourceName)
-            let entities = source.entities.values
-            entities.forEach(e => { e.show = visible })
+            if (source) {
+                let entities = source.entities.values
+                entities.forEach(e => { e.show = visible })
+            }
         },
         // 设置默认的显隐
         setPipeAndDefectVisible () {