update

src/utils/request.ts

@@ -178,13 +178,5 @@ service.interceptors.response.use(
     }
   }
 )
-// 森鑫炬接口
-export function getSXJList(data) {
-  return service({
-    url: '/gis/sxjDocking/send',
-    method: 'post',
-    data
-  })
-}
 
 export default service

src/views/groupPage/components/GaugeChart/percentGaugeChart.vue

@@ -8,7 +8,7 @@ import { fontSize } from '@/views/groupPage/util'
 export default {
   name: 'percentGaugeChart', //设计施工综合图表
   props: {
-    value: {},
+    value: { default: 0 },
     title: {}
   },
   data() {

src/views/groupPage/districtPageModules/customTools/excavationAnalysis/crossSectionChart.vue

@@ -391,9 +391,11 @@ export default {
         this.crossResult = n.crossResult
         this.SelectPipe = n.SelectPipe
         this.crossLinePoints = n.crossLinePoints
-        this.drawSectionPicture()
-      }
-      // deep:true
+        this.$nextTick(() => {
+          this.drawSectionPicture()
+        })
+      },
+      immediate: true
     }
   }
 }

src/views/groupPage/districtPageModules/customTools/excavationAnalysis/index.vue

@@ -36,11 +36,11 @@
           </el-form>
         </el-header>
         <el-container>
-          <el-aside>
+          <el-aside v-if="isdrawSectionInfo > 0">
             <crossSectionChart :drawSectionInfo="drawSectionInfo" />
           </el-aside>
-          <el-main>
-            <detailsTable :detailsData="detailsData" @location="location($event)" v-if="detailsData.length > 0" />
+          <el-main v-if="detailsData.length > 0">
+            <detailsTable :detailsData="detailsData" @location="location($event)" />
           </el-main>
         </el-container>
       </el-container>
@@ -60,8 +60,6 @@ import Config from './config.json'
 import detailsTable from './detailsTable.vue'
 const Cesium = (window as any).Cesium
 const SuperMap = (window as any).SuperMap
-const queryUrl = 'http://221.182.8.141:8090/iserver/services/map-sxgk_yc/rest/maps/hnyy_geoquery'
-const queryDataService = 'http://221.182.8.141:8090/iserver/services/data-sxgk_yc/rest/data'
 //管道开挖综合分析
 @Component({ name: 'ExcavationAnalysis', components: { crossSectionChart, detailsTable } })
 export default class ExcavationAnalysis extends Vue {
@@ -99,19 +97,25 @@ export default class ExcavationAnalysis extends Vue {
   g_crossResult = []
   g_crossInfos = []
   drawSectionInfo = {} //断面图表信息
+  isdrawSectionInfo = 0
   detailsData = []
   get AppX() {
     return this.$store.state.bigScreen.mapConfig
   }
-  mounted() {
+  get isInitViewer() {
+    return this.$store.state.bigScreen.isInitViewer
+  }
+  @Watch('isInitViewer', { immediate: true })
+  onChangeMethod() {
     if (!(window as any).viewer) return
     this.viewer = (window as any).viewer
     this.init()
   }
+  mounted() {}
   init() {
     if (!this.AppX) return
     this.apiUrls.sjfw = this.AppX.gisResource.tiplayers.config['sjfw'].url
-    this.apiUrls.bjsmidfw = this.AppX.gisResource.tiplayers.config['bjsmidfw'].url
+    this.apiUrls.bjsmidfw = this.AppX.gisResource.tiplayers.config['geoquery'].url
     this.apiUrls.sjdt = this.AppX.gisResource.maps.config['sjdt'].url
   }
   //选取事件
@@ -403,7 +407,7 @@ export default class ExcavationAnalysis extends Vue {
       spinner: 'el-icon-loading',
       background: 'rgba(0, 0, 0, 0.7)'
     })
-    const url = queryUrl
+    const url = this.apiUrls.bjsmidfw
     const layers = this.viewer.scene.layers
     const pipes = PipeQueryHelper.pipe.filter((item) => {
       const layer = layers.find(item.name)
@@ -804,7 +808,7 @@ export default class ExcavationAnalysis extends Vue {
    * @param queryType
    */
   query(geometry) {
-    const url = queryUrl
+    const url = this.apiUrls.bjsmidfw
     const layers = this.viewer.scene.layers
     const pipes = PipeQueryHelper.pipe.filter((item) => {
       const layer = layers.find(item.name)
@@ -972,7 +976,7 @@ export default class ExcavationAnalysis extends Vue {
     }
     const SID = crossInfo.feature.fieldValues[crossInfo.feature.fieldNames.indexOf(queryField)]
     PipeQueryHelper.queryByAttribute({
-      url: queryDataService,
+      url: this.apiUrls.sjfw,
       datasetNames: [pipe.datasource + ':' + pipe.origindataset],
       whereclause: queryField + "='" + SID + "'",
       fields: [],
@@ -985,10 +989,12 @@ export default class ExcavationAnalysis extends Vue {
     let crossResult = this.g_crossResult
     let SelectPipe = this.currentSelectPipe
     let crossLinePoints = this.g_crossLinePoints
+
+    this.isdrawSectionInfo = 1
     this.drawSectionInfo = {
-      crossResult: crossResult,
-      SelectPipe: SelectPipe,
-      crossLinePoints: crossLinePoints
+      crossResult,
+      SelectPipe,
+      crossLinePoints
     }
   }
   //地形开挖
@@ -1062,6 +1068,7 @@ export default class ExcavationAnalysis extends Vue {
       radius: '3'
     }
     this.drawSectionInfo = {} //断面图表信息
+    this.isdrawSectionInfo = 0
     this.detailsData = []
     this.init()
   }
@@ -1082,8 +1089,8 @@ export default class ExcavationAnalysis extends Vue {
 }
 .widget-ExcavationAnalysis {
   bottom: 0.078125rem /* 15/192 */;
-  left: calc(50% - 4.322917rem /* 830/192 */);
-  width: 8.854167rem /* 1700/192 */;
+  left: calc(50% - 1.5625rem /* 300/192 */);
+  max-width: 8.854167rem /* 1700/192 */;
   height: 1.770833rem /* 340/192 */;
   position: absolute;
   font-family: Source Han Sans CN;
@@ -1189,10 +1196,10 @@ export default class ExcavationAnalysis extends Vue {
     height: calc(100% - 0.197917rem /* 38/192 */);
   }
   .el-aside {
-    flex: 0.4;
+    width: 3.4375rem /* 660/192 */ !important;
   }
   .el-main {
-    flex: 0.6;
+    width: calc(100% - 3.4375rem /* 660/192 */);
     padding: 0 !important;
     height: 100%;
   }

src/views/groupPage/districtPageModules/customTools/infoComponents/artifactsInfo.vue

@@ -3,7 +3,9 @@
     <ComCardBox @close="close()">
       <div class="widget-artifactsInfo">
         <div class="header">
-          <div class="name">{{ info.name }}</div>
+          <el-tooltip class="item" effect="dark" :content="info.name" placement="top">
+            <div class="name">{{ info.name }}</div>
+          </el-tooltip>
         </div>
         <div class="content">
           <div class="content-item">

src/views/groupPage/districtPageModules/customTools/infoComponents/deviceInfo.vue

@@ -3,7 +3,9 @@
     <ComCardBox @close="close()" :styleData="info.deviceType == '摄像头' ? videoCardStyle : cardStyle">
       <div class="widget-deviceInfo">
         <div class="header">
-          <div class="name">{{ info.name }}【{{ info.status }}】</div>
+          <el-tooltip class="item" effect="dark" :content="info.name" placement="top">
+            <div class="name">{{ info.name }}【{{ info.status }}】</div>
+          </el-tooltip>
         </div>
         <div class="vcontent" v-if="info.deviceType == '摄像头'">
           <div class="left-content">

src/views/groupPage/districtPageModules/customTools/infoComponents/pipeInfo.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="widget-pipeInfo" ref="widget-pipeInfo" v-show="isShow">
     <div class="header">
-      <div class="name">{{ displayData.name }}</div>
+      <el-tooltip class="item" effect="dark" :content="displayData.name" placement="top">
+        <div class="name">{{ displayData.name }}</div>
+      </el-tooltip>
       <!-- <div class="status">{{ '建设中' }}</div> -->
     </div>
     <div class="content">

src/views/groupPage/districtPageModules/customTools/infoComponents/projectInfo.vue

@@ -3,7 +3,10 @@
     <ComCardBox @close="close()" :styleData="cardStyle">
       <div class="widget-projectInfo">
         <div class="header">
-          <div class="name">{{ info.name }}</div>
+          <!-- <div class="name" :title="info.name">{{ info.name }}</div> -->
+          <el-tooltip class="item" effect="dark" :content="info.name" placement="top">
+            <div class="name">{{ info.name }}</div>
+          </el-tooltip>
           <!-- <div class="status">{{ '建设中' }}</div> -->
         </div>
         <div class="content">

src/views/groupPage/districtPageModules/pipeUnitInfo/Quality.vue

@@ -84,6 +84,7 @@
  */
 import apis from '@/api/PipeUnitInfo'
 import { setNullAndUndefined } from '@/views/groupPage/util'
+import { baseAddress } from '@/utils/request'
 export default {
   name: 'UnitQuality',
   data() {
@@ -117,7 +118,7 @@ export default {
             if (item.files && item.files.length > 0) {
               item.files.forEach((item) => {
                 let picurl =
-                  'https://yeepms.yeec.com.cn/gis-api' +
+                  baseAddress +
                   '/base/file/loadImg' +
                   '?remotePath=' +
                   item.fileUrl +
@@ -128,7 +129,8 @@ export default {
             } else {
               item.files = []
               let url =
-                'http://221.182.8.141:7081/base/file/loadImg?remotePath=/sxgk/app/diary/1526740327785644033.jpg' +
+                baseAddress +
+                '/base/file/loadImg?remotePath=/sxgk/app/diary/1526740327785644033.jpg' +
                 '&access_token=' +
                 sessionStorage.getItem('token')
               this.picList.push(url)