xieqy 3 роки тому
батько
коміт
6ded4cb10b

+ 1 - 2
src/views/groupPage/districtPageModules/commonModules/SearchBox.vue

@@ -63,8 +63,7 @@ export default class SearchBox extends Vue {
   apiurl = {
     sjfw: '',
     dtfw: '',
-    smiddtfw: '',
-    pipeAndNodeProcess: '/tofly-sxgk/newPipeAndNodeScan/mapSearch'
+    smiddtfw: ''
   }
   backImg = require('@/views/groupPage/images/searchBoxBack.png')
   layerdown = 0

+ 22 - 7
src/views/groupPage/districtPageModules/customTools/infoComponents/pipeInfo.vue

@@ -10,16 +10,31 @@
         <div class="value">{{ displayData.roadName }}</div>
       </div>
       <div class="content-item">
-        <div class="name">设计单位:</div>
-        <div class="value">{{ displayData.design.name }}</div>
+        <div class="name">(设计):</div>
+        <div class="value">
+          {{ displayData.design.name }}<br />
+          设计长度{{ displayData.design.total }}KM, 管道部件{{ displayData.design.pipe }}个,管点部件{{
+            displayData.design.node
+          }}个
+        </div>
       </div>
       <div class="content-item">
-        <div class="name">施工单位:</div>
-        <div class="value">{{ displayData.con.name }}</div>
+        <div class="name">(施工):</div>
+        <div class="value">
+          {{ displayData.con.name }}<br />
+          施工{{ displayData.con.pipeLen }}米,扫码{{ displayData.con.part }}个部件,扫码{{
+            displayData.con.times
+          }}次,上传{{ displayData.con.pictures }}张图片
+        </div>
       </div>
       <div class="content-item">
-        <div class="name">监理单位:</div>
-        <div class="value">{{ displayData.spv.name }}</div>
+        <div class="name">(监理):</div>
+        <div class="value">
+          {{ displayData.spv.name }}<br />
+          监理{{ displayData.spv.pipeLen }}米,扫码{{ displayData.spv.part }}个部件,扫码{{
+            displayData.spv.times
+          }}次,上传{{ displayData.spv.pictures }}张图片
+        </div>
       </div>
     </div>
   </div>
@@ -88,7 +103,7 @@ export default class pipeInfo extends Vue {
 
 <style lang='scss' scoped>
 .widget-pipeInfo {
-  width: 300px;
+  width: 350px;
   height: auto;
   background: rgba(0, 0, 0, 0.6);
   border-radius: 5px;

+ 8 - 2
src/views/groupPage/districtPageModules/customTools/infoComponents/projectInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <ComMapBox ref="ComMapBox">
-    <ComCardBox @close="close()">
+    <ComCardBox @close="close()" :styleData="cardStyle">
       <div class="widget-projectInfo">
         <div class="header">
           <div class="name">{{ info.originname }}</div>
@@ -45,9 +45,15 @@ let handler = null
 //属性查看
 @Component({ name: 'projectInfo', components: { ComMapBox, ComCardBox } })
 export default class projectInfo extends Vue {
-  info: object = null
+  info: any = {}
   position: Array<any> = []
   viewer
+  cardStyle: object = {
+    '--height': '1.354167rem' /* 260/192 */, //高度
+    '--width': '2.083333rem' /* 400/192 */, //宽度
+    '--borderColor': 'rgba(25, 137, 252, 1)', //边框线颜色
+    '--backgroundColor': 'rgba(2, 20, 37, 0.45)' //背景颜色
+  }
   mounted() {
     this.viewer = (window as any).viewer
     this.addEntity()

+ 2 - 2
src/views/groupPage/districtPageModules/customTools/projectPipeSpeedInfoCheck.vue

@@ -12,7 +12,7 @@
         </span>
         <el-select
           v-model="selectPrj"
-          placeholder="全部工程"
+          placeholder="请选择"
           :popper-append-to-body="false"
           size="small"
           filterable
@@ -197,7 +197,7 @@ export default class ProjectPipeSpeedInfoCheck extends Vue {
       this.clearSpeedInfos()
       return
     } else {
-      // this.splitTime()
+      this.splitTime()
       const start = this.dateValue[0]
       const end = this.dateValue[1]
       const data2 = {