Merge branch 'dev' into epc

src/views/spectrum/reform/afterAssess/widget.vue

@@ -60,7 +60,6 @@
                   </el-select>
                   <el-select v-model="item.symbol" filterable clearable style="width: 100px">
                     <el-option label="大于" value="大于"></el-option>
-                    <!-- <el-option label="等于" value="="></el-option> -->
                     <el-option label="小于" value="小于"></el-option>
                   </el-select>
                   <el-input v-model="item.value" placeholder="目标值" style="width: 110px">
@@ -87,8 +86,8 @@
           <el-row style="margin-top: 15px">
             <el-button type="primary" @click="saveProject()" size="small" style="float: right; margin-left: 10px">方案保存</el-button>
             <el-button type="primary" @click="getRemouldConclusion()" size="small" style="float: right; margin-left: 10px">开始评估</el-button>
-            <el-button type="danger" size="small" style="float: right; margin-left: 10px">删 除</el-button>
-            <el-button type="warning" @click="clearPlan()" size="small" style="float: right; margin-left: 10px">清 空</el-button>
+            <el-button type="warning" @click="clearPlan()" size="small" style="float: left; margin-left: 10px">清 空</el-button>
+            <el-button type="danger" @click="removePlan()" size="small" style="float: left; margin-left: 10px">删 除</el-button>
           </el-row>
         </el-form>
       </div>
@@ -115,7 +114,9 @@
           <el-table-column prop="remouldAfterTarget" label="改造后目标值" align="center"></el-table-column>
           <el-table-column prop="compareTarget" label="较目标值" align="center">
             <template slot-scope="{ row }">
-              <span :style="{ color: row.result == '达标' ? '#36c46e' : '#f33d48' }">{{ row.compareTarget }}</span>
+              <span :style="{ color: row.result == '达标' ? '#36c46e' : '#f33d48' }">
+                {{ row.result == '达标' ? `+${row.compareTarget}` : row.compareTarget }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column prop="result" label="结论" align="center">
@@ -158,6 +159,7 @@ import {
   getProjectScheme,
   saveProjectScheme,
   getProjectSchemeById,
+  deleteProjectSchemeById,
   remouldHourCurve
 } from '@/views/spectrum/reform/api/api'
 import { getRainfallHour } from '@/views/spectrum/dynamicMonitor/api/api'
@@ -426,10 +428,6 @@ export default {
       }
       const data = {
         params: params,
-        // beginTime: '2022-07-10 15:00:00',
-        // endTime: '2022-07-14 15:00:00',
-        // afterBeginTime: '2022-07-15 15:00:00',
-        // afterEndTime: '2022-07-19 15:00:00'
         beginTime: this.$moment(this.form.beforeRemouldDate[0]).format('YYYY-MM-DD 00:00:00'),
         endTime: this.$moment(this.form.beforeRemouldDate[1]).format('YYYY-MM-DD 23:59:59'),
         afterBeginTime: this.$moment(this.form.afterRemouldDate[0]).format('YYYY-MM-DD 00:00:00'),
@@ -473,7 +471,6 @@ export default {
         const beforeRainDataObj = this.getRainDataObj(beforeRainFall) // 改造前计算雨量数据对象
         const afterRainDataObj = this.getRainDataObj(afterRainFall) // 改造后计算雨量数据对象
 
-        console.log('scm', curveData);
         for (let index = 0; index < curveData.length; index++) {
           const item = curveData[index];
           const domeId = `chart${item.code}`
@@ -589,6 +586,26 @@ export default {
       this.chartsData = this.$options.data().chartsData
       this.curveData = this.$options.data().curveData
     },
+    /**
+     * 删除当前方案
+     */
+    removePlan() {
+      const { id } = this.form;
+      if (!id) return
+      this.$confirm('确认删除该方案?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteProjectSchemeById(id).then(res => {
+          if (res.code == 1) {
+            this.clearPlan()
+            this.getProjectScheme()
+            this.$message.success('删除方案成功');
+          }
+        })
+      })
+    },
     /**
      * 监测查看
      */

src/views/spectrum/reform/afterAssess/zbItem/index.vue

@@ -6,12 +6,14 @@
     </div>
     <div class="zb-item-right">
       <div class="progress-info" v-for="(item,index) in data.echartsData.xaxisData" :key="index">
+        <!-- <div class="zb-des" v-if="item=='remouldAfter'">改造后：<span style="color:#2d74e7">{{data.remouldAfter||''}}</span></div>
+        <div class="zb-des" v-else-if="item=='remouldAfterTarget'">预期目标：<span :style="{color:data.result=='达标'?'#0cc96e':'#f33d48'}">{{data.remouldAfterTarget||''}} {{data.result||''}}</span></div>
+        <div class="zb-des" v-else-if="item=='remouldBefore'">改造前：<span style="color:#05cad7">{{data.remouldBefore||''}}</span></div> -->
+        <div class="zb-des">{{`${{remouldAfter:'改造后',remouldAfterTarget:'预期目标',remouldBefore:'改造前'}[item]}：`}}</div>
         <div class="progress-div">
-          <el-progress :percentage="getPercentage(data.echartsData.seriesData,index)" :color="{remouldAfter:'#2d74e7',remouldAfterTarget:'#0cc96e',remouldBefore:'#05cad7'}[item]" :show-text="false" :stroke-width="15"></el-progress>
+          <el-progress :percentage="getPercentage(data.echartsData.seriesData,index)" :color="{remouldAfter:'#2d74e7',remouldAfterTarget:'#0cc96e',remouldBefore:'#05cad7'}[item]" :text-inside="true" :stroke-width="15"
+            :class="[getClass(item,data)]" :format="(value)=>{return progressText(item,data)}"></el-progress>
         </div>
-        <div class="zb-des" v-if="item=='remouldAfter'">改造后：<span style="color:#2d74e7">{{data.remouldAfter||''}}</span></div>
-        <div class="zb-des" v-else-if="item=='remouldAfterTarget'">预期目标：<span :style="{color:data.result=='达标'?'#0cc96e':'#f33d48'}">{{data.remouldAfterTarget||''}} {{data.result||''}}</span></div>
-        <div class="zb-des" v-else-if="item=='remouldBefore'">改造前：<span style="color:#05cad7">{{data.remouldBefore||''}}</span></div>
       </div>
     </div>
   </div>
@@ -27,6 +29,22 @@ export default {
       // const total = max * [1.01,1.02,1.03,1.04,1.05][Math.round(Math.random()*4)]
       const total = max * 1.03
       return (seriesData[index] / total) * 100
+    },
+    /**
+     * 格式化显示文字
+     */
+    progressText(item, data) {
+      if (item == 'remouldAfter') return data.remouldAfter || '';
+      else if (item == 'remouldAfterTarget') return `${data.remouldAfterTarget || ''} ${data.result || ''}`;
+      else if (item == 'remouldBefore') return data.remouldBefore || '';
+    },
+    /**
+     * 自定义类
+     */
+    getClass(item, data) {
+      if (item == 'remouldAfter') return 'remouldAfter';
+      else if (item == 'remouldAfterTarget') return data.result == '达标' ? 'remouldAfterTarget-up' : 'remouldAfterTarget-down';
+      else if (item == 'remouldBefore') return 'remouldBefore';
     }
   }
 }
@@ -67,16 +85,41 @@ export default {
       overflow: hidden;
       .progress-div {
         float: left;
-        width: calc(100% - 240px);
+        width: calc(100% - 160px);
         margin-bottom: 15px;
         .el-progress {
           >>> .el-progress-bar__outer {
             border-radius: 0;
             background-color: transparent;
+            overflow: visible;
             .el-progress-bar__inner {
               border-radius: 0;
             }
           }
+          >>> .el-progress-bar__innerText {
+            position: absolute;
+            font-size: 14px;
+          }
+          &.remouldAfter {
+            >>> .el-progress-bar__innerText {
+              color: #2d74e7;
+            }
+          }
+          &.remouldAfterTarget-up {
+            >>> .el-progress-bar__innerText {
+              color: #0cc96e;
+            }
+          }
+          &.remouldAfterTarget-down {
+            >>> .el-progress-bar__innerText {
+              color: #f33d48;
+            }
+          }
+          &.remouldBefore {
+            >>> .el-progress-bar__innerText {
+              color: #05cad7;
+            }
+          }
         }
       }
       &:last-child {
@@ -86,7 +129,7 @@ export default {
       }
       .zb-des {
         float: left;
-        width: 240px;
+        width: 70px;
         font-size: 14px;
         text-align: right;
         color: #333333;

src/views/spectrum/reform/api/api.ts

@@ -192,4 +192,11 @@ export function remouldHourCurve(data) {
         method: 'post',
         data
     })
+}
+// 通过id删除方案
+export function deleteProjectSchemeById(params) {
+    return request({
+        url: '/survey/projectScheme/' + params,
+        method: 'delete'
+    })
 }

src/views/spectrum/reform/defectLocation/defectPopup/index.vue

@@ -33,18 +33,19 @@
         </div>
       </div>
       <div class="content_base">
-        <span>等级：{{currentPage.pipeDiameter||'--'}}</span>
-        <span>管径：{{currentPage.pipeDiameter||'--'}}</span>
-        <span>管道长度：{{currentPage.pipeLength||'--'}}m</span>
-        <span>材质：{{currentPage.texture||'--'}}</span>
+        <span>等级：<span style="color:#2d74e7">{{currentPage.pipelineLevel||'--'}}</span></span>
+        <span>管径：<span style="color:#2d74e7">{{currentPage.pipeDiameter||'--'}}</span></span>
+        <span>管道长度：<span style="color:#2d74e7">{{currentPage.pipeLength||'--'}}m</span></span>
+        <span>材质：<span style="color:#2d74e7">{{currentPage.texture||'--'}}</span></span>
       </div>
       <div class="content_info">
-        <p>缺陷类型：<span style="font-weight:600">{{currentPage.hiddenDangerType||'--'}}</span></p>
-        <p>告警监测点：{{currentPage.siteName||'--'}}（{{currentPage.deviceTypeName||'--'}}）
-          <span class="iconfont iconqidian1 location-btn"></span></p>
-        <p>监测点距离管线：{{currentPage.monitorLocation||'--'}}</p>
-        <p>最近告警日期：{{currentPage.monitorDate||'--'}}</p>
-        <p class="cause">告警原因：{{currentPage.warningCause||'--'}}</p>
+        <p><span style="color:#b1b1b1">缺陷类型：</span><span style="font-weight:600">{{currentPage.hiddenDangerType||'--'}}</span></p>
+        <p><span style="color:#b1b1b1">告警监测点：</span>{{currentPage.siteName||'--'}}（{{currentPage.deviceTypeName||'--'}}）
+          <span class="iconfont iconqidian1 location-btn" @click="locationSite()"></span>
+        </p>
+        <p><span style="color:#b1b1b1">监测点距离管线：</span>{{currentPage.distance||'--'}}</p>
+        <p><span style="color:#b1b1b1">最近告警日期：</span>{{currentPage.monitorDate||'--'}}</p>
+        <p class="cause"><span style="color:#f38a27">告警原因：</span>{{currentPage.warningCause||'--'}}</p>
       </div>
     </div>
   </MapPopup>
@@ -53,6 +54,8 @@
 <script lang="ts">
 import MapPopup from '@/components/ComPopup/index.vue'
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
+
+import { getSiteIcon } from '@/views/spectrum/common/siteIcon/siteIcon' // 站点图标
 //属性查看
 @Component({ name: 'serachInfo', components: { MapPopup } })
 export default class serachInfo extends Vue {
@@ -73,8 +76,6 @@ export default class serachInfo extends Vue {
   }
 
   mounted() {
-    console.log('》》》》',this.position);
-    
     this.initInfoPop(this.position)
     this.page = `${1}/${this.data.length}`
     this.currentPage = this.data[this.currentIndex]
@@ -85,6 +86,29 @@ export default class serachInfo extends Vue {
     ;(this.$refs['MapPopup'] as any).setPosition(position)
   }
 
+  locationSite() {
+    const Cesium = (window as any).Cesium
+    const viewer = (window as any).viewer
+    const { longitude, latitude, deviceType } = this.data[this.currentIndex]
+    const position = Cesium.Cartesian3.fromDegrees(longitude, latitude, 0)
+    if (viewer.entities.getById('marker-finder-site')) viewer.entities.removeById('marker-finder-site')
+    let entity = new Cesium.Entity({
+      id: 'marker-finder-site',
+      position: position,
+      billboard: {
+        image: getSiteIcon({ deviceType: deviceType }, false),
+        width: 32,
+        height: 32,
+        heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+        eyeOffset: Cesium.Cartesian3.ZERO,
+        disableDepthTestDistance: Number.POSITIVE_INFINITY
+      }
+    })
+
+    viewer.entities.add(entity)
+    viewer.flyTo(entity)
+  }
+
   remove() {
     ;(this.$refs['MapPopup'] as any).remove()
   }
@@ -110,7 +134,7 @@ export default class serachInfo extends Vue {
 
 <style lang='scss' scoped>
 .popup-container {
-  width: 420px;
+  width: 520px;
   height: 240px;
   background-color: #ffffff;
   z-index: 99999;
@@ -152,8 +176,8 @@ export default class serachInfo extends Vue {
     line-height: 30px;
     color: #6a6f74;
     > span {
-      &:nth-child(n + 1) {
-        margin-left: 5px;
+      &:nth-child(n + 2) {
+        margin-left: 10px;
       }
     }
   }

src/views/spectrum/reform/defectLocation/widget.vue

@@ -93,6 +93,7 @@ import Vue from 'vue'
 import { getFlawLocation, getFlawDetail } from '../api/api'
 import defectPopup from './defectPopup/index.vue'
 
+import * as turf from '@turf/turf'
 import { fetchDictionary } from '@/api/common/index'
 export default {
   data() {
@@ -121,6 +122,8 @@ export default {
     let ety = window.viewer.entities.getById('liner')
     if (ety) window.viewer.entities.remove(ety)
     if (this.popup) this.popup.remove()
+    const viewer = window.viewer
+    if (viewer.entities.getById('marker-finder-site')) viewer.entities.removeById('marker-finder-site')
   },
   methods: {
     /**
@@ -204,13 +207,24 @@ export default {
 
         if (res.code == 1) {
           let data = res.result
+          console.log('管线信息：', data);
+          const list = data.map(item => {
+            const { longitude, latitude } = item
+            const pt = turf.point([longitude, latitude]);
+            const line = turf.lineString([[row.longitude, row.latitude], [row.longitude2, row.latitude2]]);
+            // 监测站点到管线距离
+            const distance = turf.pointToLineDistance(pt, line, { units: 'kilometers' });
+            console.log('距离：', distance);
+            item['distance'] = distance > 1 ? `${distance.toFixed(2)} 千米` : `${(distance / 1000).toFixed(1)} 米`
+            return item
+          })
           const defectPopup2 = Vue.extend(defectPopup)
           if (this.popup) this.popup.remove()
           this.popup = new defectPopup2({
             data: {
               id: 'gu',
               position: Cesium.Cartesian3.fromDegrees(lon, lat, elev),
-              data: data
+              data: list
             },
             store: this.$store
           }).$mount()

src/views/spectrum/reform/groundWater/widget.vue

@@ -22,12 +22,12 @@
       <div class="middle-box">
         <div class="head-title">
           <span>监测点</span>
-          <span style="position: absolute;right: 80px;">
+          <!-- <span style="position: absolute;right: 80px;">
             <el-checkbox-group v-model="checkList" @change="getHiddenDangerAnalyse()" class="site-type-list">
               <el-checkbox label="2">发现地下水入侵监测点（{{yhCount}}）</el-checkbox>
               <el-checkbox label="1,3,4">其他相关监测点（{{allCount - yhCount}}）</el-checkbox>
             </el-checkbox-group>
-          </span>
+          </span> -->
         </div>
         <el-table :data="tableData1" style="width: 100%" stripe :header-cell-style="{ background: 'rgba(45, 116, 231,0.2)', 
       color: '#333333', height: '40px', textAlign: 'center' }" height="200px">
@@ -63,7 +63,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="降雨量" label-width="60px" style="margin:0 0 10px 0">
+          <!-- <el-form-item label="降雨量" label-width="60px" style="margin:0 0 10px 0">
             <el-select v-model="form.dailyRainfall" placeholder="请选择" style="width:150px" clearable>
               <el-option v-for="(item,index) in rainFallOptions" :key="index" :label="item.notes" :value="item.codeValue"></el-option>
             </el-select>
@@ -82,7 +82,7 @@
           <el-form-item label="日期范围" style="margin:0 0 10px 0">
             <el-date-picker v-model="form.date" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" clearable style="width:260px">
             </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label-width="20px" style="margin:0 0 10px 0">
             <el-button type="primary" @click="queryWarningPage()">查询</el-button>
           </el-form-item>
@@ -95,12 +95,12 @@
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{scope.$index+1}}</template>
           </el-table-column>
-          <el-table-column prop="monitorDate" label="监测日期" align="center"></el-table-column>
-          <el-table-column prop="siteName" label="监测点" align="center"></el-table-column>
-          <el-table-column prop="dailyRainfall" label="日降雨量" align="center"></el-table-column>
-          <el-table-column prop="hiddenDangerType" label="隐患类型" align="center"></el-table-column>
-          <el-table-column prop="warningCause" label="告警原因" align="center"></el-table-column>
-          <el-table-column prop="analyseDate" label="告警时间" align="center"></el-table-column>
+          <!-- <el-table-column prop="monitorDate" label="监测日期" align="center"></el-table-column> -->
+          <el-table-column prop="siteName" label="监测点" align="center" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column prop="dailyRainfall" label="日降雨量" align="center"></el-table-column> -->
+          <!-- <el-table-column prop="hiddenDangerType" label="隐患类型" align="center"></el-table-column> -->
+          <el-table-column prop="warningCause" label="告警原因" align="center" width="300" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="analyseDate" label="告警时间" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column label="监测曲线" align="center">
             <template slot-scope="{row}">
               <el-button type="text" style="padding:0" @click="viewCurve(row)">查看</el-button>
@@ -134,6 +134,8 @@ import {
 
 import { getSites } from '@/views/spectrum/dynamicMonitor/api/api'
 import { fetchDictionary } from '@/api/common/index'
+
+import { getSiteIcon } from '@/views/spectrum/common/siteIcon/siteIcon' // 站点图标
 export default {
   components: {
     miniMap,
@@ -147,7 +149,7 @@ export default {
       tableData1: [],
       tableData2: [],
       tableData3: [],
-      checkList: [],
+      checkList: ['2'],
       dangerTypes: [],
       activeName: 'first',
       moniterVisible: false,
@@ -209,12 +211,12 @@ export default {
             color: ['#15d0ea', '#f6b638'],
             series: [
               {
-                name: '管网评估情况',
+                name: '监测点',
                 type: 'pie',
-                radius: '80%',
+                radius: '70%',
                 data: result,
                 label: {
-                  formatter: '{b}\n{d}%',
+                  formatter: '{b} {c}个',
                   fontSize: 14,
                   fontWeight: 500
                 },
@@ -292,6 +294,19 @@ export default {
         if (res.code == 1) {
           let dataList = res.result
           this.tableData1 = dataList
+          let points = dataList.filter((item, index, self) => {
+            return self.findIndex(el => el.monitorId == item.monitorId) === index
+          })
+          const _points = points.map(item => {
+            return {
+              x: item.longitude,
+              y: item.latitude,
+              icon: getSiteIcon(item, false)
+            }
+          })
+          setTimeout(() => {
+            this.$refs.minimap.addMarkers(_points)
+          }, 200);
         }
       })
     },
@@ -302,9 +317,9 @@ export default {
       const { latitude, longitude } = row;
       this.$refs.minimap.addMarker([longitude, latitude])
     },
-     /**
-     * 关联管网定位
-     */
+    /**
+    * 关联管网定位
+    */
     locationPipe(row) {
       const { monitorId } = row;
       if (!monitorId) {

src/views/spectrum/reform/preAssess/widget.vue

@@ -262,7 +262,10 @@ export default {
      * 查询监测点
      */
     getHiddenDangerAnalyse() {
-      getHiddenDangerAnalyse({ hiddenDangerType: this.checkList.join(',') }).then((res) => {
+      let params = ''
+      if(this.checkList.length==0) params = '1,4';
+      else params = this.checkList.join(',')
+      getHiddenDangerAnalyse({ hiddenDangerType: params }).then((res) => {
         if (res.code == 1) {
           let dataList = res.result
           this.tableData1 = dataList

src/views/spectrum/reform/sewageDirect/widget.vue

@@ -22,12 +22,12 @@
       <div class="middle-box">
         <div class="head-title">
           <span>监测点</span>
-          <span style="position: absolute;right: 80px;">
+          <!-- <span style="position: absolute;right: 80px;">
             <el-checkbox-group v-model="checkList" @change="getHiddenDangerAnalyse()" class="site-type-list">
               <el-checkbox label="3">发现污水直排监测点（{{yhCount}}）</el-checkbox>
               <el-checkbox label="1,2,4">其他相关监测点（{{allCount - yhCount}}）</el-checkbox>
             </el-checkbox-group>
-          </span>
+          </span> -->
         </div>
         <el-table :data="tableData1" style="width: 100%" stripe :header-cell-style="{ background: 'rgba(45, 116, 231,0.2)', 
       color: '#333333', height: '40px', textAlign: 'center' }" height="200px">
@@ -63,26 +63,26 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="降雨量" label-width="60px" style="margin:0 0 10px 0">
+          <!-- <el-form-item label="降雨量" label-width="60px" style="margin:0 0 10px 0">
             <el-select v-model="form.dailyRainfall" placeholder="请选择" style="width:150px" clearable>
               <el-option v-for="(item,index) in rainFallOptions" :key="index" :label="item.notes" :value="item.codeValue"></el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item label="隐患类型" label-width="70px" style="margin:0 0 10px 0">
+          </el-form-item> -->
+          <!-- <el-form-item label="隐患类型" label-width="70px" style="margin:0 0 10px 0">
             <el-select v-model="form.hiddenDangerType" placeholder="请选择" style="width:150px" clearable>
               <el-option v-for="(item,index) in dangerTypes" :key="index" :label="item.notes" :value="item.codeValue"></el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item label="是否最新数据" label-width="100px" style="margin:0 0 10px 0">
+          </el-form-item> -->
+          <!-- <el-form-item label="是否最新数据" label-width="100px" style="margin:0 0 10px 0">
             <el-select v-model="form.isNew" placeholder="请选择" style="width:150px" clearable>
               <el-option label="是" value="1"></el-option>
               <el-option label="否" value="0"></el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item label="日期范围" style="margin:0 0 10px 0">
+          </el-form-item> -->
+          <!-- <el-form-item label="日期范围" style="margin:0 0 10px 0">
             <el-date-picker v-model="form.date" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" clearable style="width:260px">
             </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label-width="20px" style="margin:0 0 10px 0">
             <el-button type="primary" @click="queryWarningPage()" style="width:100px">查询</el-button>
           </el-form-item>
@@ -95,12 +95,12 @@
           <el-table-column label="序号" align="center" width="50">
             <template slot-scope="scope">{{scope.$index+1}}</template>
           </el-table-column>
-          <el-table-column prop="monitorDate" label="监测日期" align="center"></el-table-column>
-          <el-table-column prop="siteName" label="监测点" align="center"></el-table-column>
-          <el-table-column prop="dailyRainfall" label="日降雨量" align="center"></el-table-column>
-          <el-table-column prop="hiddenDangerType" label="隐患类型" align="center"></el-table-column>
-          <el-table-column prop="warningCause" label="告警原因" align="center"></el-table-column>
-          <el-table-column prop="analyseDate" label="告警时间" align="center"></el-table-column>
+          <!-- <el-table-column prop="monitorDate" label="监测日期" align="center"></el-table-column> -->
+          <el-table-column prop="siteName" label="监测点" align="center" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column prop="dailyRainfall" label="日降雨量" align="center"></el-table-column> -->
+          <!-- <el-table-column prop="hiddenDangerType" label="隐患类型" align="center"></el-table-column> -->
+          <el-table-column prop="warningCause" label="告警原因" align="center" width="300" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="analyseDate" label="告警时间" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column label="监测曲线" align="center">
             <template slot-scope="{row}">
               <el-button type="text" style="padding:0" @click="viewCurve(row)">查看</el-button>
@@ -133,6 +133,8 @@ import {
 } from '@/views/spectrum/reform/api/api'
 import { getSites } from '@/views/spectrum/dynamicMonitor/api/api'
 import { fetchDictionary } from '@/api/common/index'
+
+import { getSiteIcon } from '@/views/spectrum/common/siteIcon/siteIcon' // 站点图标
 export default {
   components: {
     miniMap,
@@ -146,7 +148,7 @@ export default {
       tableData1: [],
       tableData2: [],
       tableData3: [],
-      checkList: [],
+      checkList: ['3'],
       dangerTypes: [],
       activeName: 'first',
       moniterVisible: false,
@@ -208,12 +210,12 @@ export default {
             color: ['#15d0ea', '#f6b638'],
             series: [
               {
-                name: '管网评估情况',
+                name: '监测点',
                 type: 'pie',
-                radius: '80%',
+               radius: '70%',
                 data: result,
                 label: {
-                  formatter: '{b}\n{d}%',
+                  formatter: '{b} {c}个',
                   fontSize: 14,
                   fontWeight: 500
                 },
@@ -292,6 +294,19 @@ export default {
         if (res.code == 1) {
           let dataList = res.result
           this.tableData1 = dataList
+          let points = dataList.filter((item, index, self) => {
+            return self.findIndex(el => el.monitorId == item.monitorId) === index
+          })
+          const _points = points.map(item => {
+            return {
+              x: item.longitude,
+              y: item.latitude,
+              icon: getSiteIcon(item, false)
+            }
+          })
+          setTimeout(() => {
+            this.$refs.minimap.addMarkers(_points)
+          }, 200);
         }
       })
     },

src/views/widgets/miniMap/index.vue

@@ -365,7 +365,7 @@ export default {
             height: 32,
             heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
             eyeOffset: Cesium.Cartesian3.ZERO,
-            disableDepthTestDistance: 9999999
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
           }
         })
         this._viewer.entities.add(entity)
@@ -385,6 +385,7 @@ export default {
      */
     addMarkers(points = [], removeExist = true) {
       if (removeExist) this.removeMarkers()
+      this._viewer.scene.globe.depthTestAgainstTerrain = true; 
       for (let index = 0; index < points.length; index++) {
         const point = points[index]
         const position = Cesium.Cartesian3.fromDegrees(point.x, point.y, 0)
@@ -397,7 +398,7 @@ export default {
             height: 64,
             heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
             eyeOffset: Cesium.Cartesian3.ZERO,
-            disableDepthTestDistance: 9999999
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
           }
         })
         this.pointEntities.push(entity)