- 排水检测修改

public/config.js

@@ -36,6 +36,7 @@ export const appconfig = {
 }
 
 export function setParams (xzq) {
+  console.log('设置坐标')
   const parmas = { 
     '宜昌': { proj: 'proj46', center: { "lon": "111.291353", "lat": "30.705687", "height": "50159.21860055598" } },
     '岳阳': { proj: 'proj47', center: { "lon": "113.17326715436977", "lat": "29.37027846440258", "height": "50159.21860055598" } },
@@ -43,4 +44,5 @@ export function setParams (xzq) {
   let { proj, center } = parmas[xzq]
   appconfig.currCenter = center
   appconfig.currPRJ = proj
+  AppX.appConfig.initPosition = center
 }

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

@@ -232,7 +232,7 @@
                   height="250"
                 >
                   <template slot="empty">
-        <img src="@/assets/icon/null.png" alt="暂无数据" />
+                    <img src="@/assets/icon/null.png" alt="暂无数据" />
                   </template>
 
                   <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
@@ -439,7 +439,7 @@
     <!-- 删除提示框 -->
     <div class="delete-box">
       <!-- 删除提示框 -->
-      <el-dialog title="提示" :visible.sync="deleteDialogVisible" width="30%">
+      <el-dialog title="提示" :visible.sync="deleteDialogVisible" width="30%" :modal='false'>
         <div style="display: flex; align-items: center">
           <!-- <i class="el-icon-info" style="color: #e6a23c"></i> -->
           <span class="iconfont icondtbz" style="font-size: 22px; color: #e6a23c"></span>

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

@@ -578,7 +578,6 @@ export default {
       this.defectLegend[2].level.forEach((l, index) => {
         l.num = funcNum[index]
       })
-      // 把数量填充到图例
       this.defectLegend[0].level.forEach((l, index) => {
         l.num = defectNum[index]
       })
@@ -587,24 +586,6 @@ export default {
       function isExit(pipeId, feasType) {
         return features[feasType].some(fea => fea['bsdata'].expNo === pipeId)
       }
-      function getIconRat([startPoint, endPoint]) {
-        let rotation = 0
-        // 因为要垂直管线显示，所以图片旋转 90°
-        let imgRt = Math.PI / 2
-
-        // 计算旋转弧度
-        if (endPoint[0] === startPoint[0]) {
-          // 竖直
-          rotation = endPoint[1] > startPoint[1] ? -imgRt : Math.PI - imgRt
-        } else if (endPoint[1] === startPoint[1]) {
-          // 水平
-          rotation = endPoint[1] > startPoint[1] ? Math.PI / 2 - imgRt : (Math.PI * 3) / 2 - imgRt
-        } else {
-          // 其他角度
-          rotation = Math.atan((endPoint[0] - startPoint[0]) / (endPoint[1] - startPoint[1])) - imgRt
-        }
-        return rotation
-      }
     },
 
         getEntity (type, positions, style, data) {

src/views/pipelineDefect/mixin/map.ts

@@ -328,9 +328,9 @@ export const mapMixin = {
         // this.setSourceVisible(this.dSname, false)
     },
     watch: {
-        '$store.state.app.activeSideItem': function(n, o) {
-            if (n === '工程管理') { this.$store.dispatch('map/mapLaoding', false) }
-            this.setPipeAndDefectVisible()
-        }
+        // '$store.state.app.activeSideItem': function(n, o) {
+        //     if (n === '工程管理') { this.$store.dispatch('map/mapLaoding', false) }
+        //     this.setPipeAndDefectVisible()
+        // }
     }
 }

src/views/widgets/cesiumMap.vue

@@ -132,6 +132,8 @@ export default {
           roll: 0
         }
       })
+      console.log('加载地图')
+      this.$emit('afterMapLoad')
       setTimeout(
         function () {
           this.addInitScene()

src/views/zhpt/index.vue

@@ -14,7 +14,7 @@
           <check-dialog @sendBool="setDetailVisible" v-if="detailsDialogFormVisible" :checkParam="DetailsId"></check-dialog>
 
           <div id="mapView" class="mapView">
-            <cesium-map></cesium-map>
+            <cesium-map @afterMapLoad='afterMapLoad'></cesium-map>
             <!-- <div
               id="any"
               ref="any"
@@ -105,8 +105,9 @@
   import cesiumMap from '@/views/widgets/cesiumMap.vue'
   import popupWindow from '@/views/pipelineDefect/components/popupWindow.vue'
   import checkDialog from '@/views/pipelineDefect/components/checkDetails.vue'
-import HandleManage from '../pipelineDefect/common/cesiumEvent'
-
+  import HandleManage from '../pipelineDefect/common/cesiumEvent'
+  import { appconfig } from 'staticPub/config'
+  import CesiumUtil from '../pipelineDefect/common/cesiumUtil'
   @Component({
     components: {
       HalfPanels,
@@ -252,8 +253,16 @@ import HandleManage from '../pipelineDefect/common/cesiumEvent'
         // dS.entities.values.forEach(e => pS.entities.remove(e))
       }
     }
+    afterMapLoad () {
+    }
+
+    setView () {
+      const { viewer } = <any>window
+      let { lon, lat, height } = appconfig.currCenter
+      new CesiumUtil(viewer).setView(CesiumUtil.degrees2Car3(parseFloat(lon), parseFloat(lat), parseFloat(height)))
+    }
     setDetailVisible(bool: boolean) {
-      console.log('显示弹窗')
+
       this.detailsDialogFormVisible = bool
     }
     setDefectId (id: (string | number)) {