From 5a4383dc9da3fe3fb130deb5c66000bb4d521139 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Sun, 28 Sep 2025 17:47:19 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E7=99=BD=E8=9A=81?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                       |   3 +-
 pages.json                    |   6 ++
 pages/aqjc/index.vue          |   6 +-
 pages/homeIndex/index.vue     |   2 +-
 pages/newAqjc/byTable.vue     | 121 +++++++++++++++++++++++++
 pages/newAqjc/index.vue       | 165 ++++++++++++++++++++++++++++++++++
 pages/newAqjc/slTable.vue     |  94 +++++++++++++++++++
 pages/newAqjc/zwyTable.vue    |  98 ++++++++++++++++++++
 pages/sjc/byTable.vue         | 121 +++++++++++++++++++++++++
 pages/sjc/index.vue           |  23 +++++
 pages/zhjs/subnvue/index.nvue |  51 ++++++++++-
 static/tabs/baiyi1.png        | Bin 0 -> 8383 bytes
 static/tabs/baiyi2.png        | Bin 0 -> 11393 bytes
 13 files changed, 681 insertions(+), 9 deletions(-)
 create mode 100644 pages/newAqjc/byTable.vue
 create mode 100644 pages/newAqjc/index.vue
 create mode 100644 pages/newAqjc/slTable.vue
 create mode 100644 pages/newAqjc/zwyTable.vue
 create mode 100644 pages/sjc/byTable.vue
 create mode 100644 static/tabs/baiyi1.png
 create mode 100644 static/tabs/baiyi2.png

diff --git a/main.js b/main.js
index f7188fc..90df911 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,8 @@ import {
 Vue.config.productionTip = false
 uni.$http = $http
 // $http.baseUrl = 'http://223.75.53.141:83'
-$http.baseUrl = 'http://local.gunshiiot.com:18083'
+// $http.baseUrl = 'http://local.gunshiiot.com:18083'
+$http.baseUrl = 'http://192.168.66.27:24105'
 // 请求拦截器
 $http.beforeRequest = function (options) {
 	if (options.url.indexOf('/doLogin') == -1) {
diff --git a/pages.json b/pages.json
index dc160d1..866e480 100644
--- a/pages.json
+++ b/pages.json
@@ -56,6 +56,12 @@
       "style": {
         "navigationBarTitleText": ""
       }
+    },
+     {
+      "path": "pages/newAqjc/index",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
       "path": "pages/homeIndex/index",
diff --git a/pages/aqjc/index.vue b/pages/aqjc/index.vue
index e95f175..b145c06 100644
--- a/pages/aqjc/index.vue
+++ b/pages/aqjc/index.vue
@@ -1,11 +1,11 @@
 <template>
   <view :style="{height:'100vh',overflow:'hidden',backgroundColor:'#fff'}">
-    <u-status-bar></u-status-bar>
+    <!-- <u-status-bar></u-status-bar>
     <u-navbar title="安全监测" :autoBack="true" :titleStyle="{
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
-    </u-navbar>
-    <picker @change="bindPickerChange" :range="array" range-key="profileName" style="margin-top:50px;padding: 0 10px;">
+    </u-navbar> -->
+    <picker @change="bindPickerChange" :range="array" range-key="profileName" style="margin-top:0px;padding: 0 10px;">
       <view class="uni-input12">
         <view>{{profileName}}</view>
         <u-icon name="arrow-down-fill" color="#000" size="15"></u-icon>
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 5deae81..bec6fa1 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -184,7 +184,7 @@ export default {
           value: "安全监测",
           key: 4,
           icon: "../../static/tabs/aqjc.png",
-          url: "/pages/aqjc/index",
+          url: "/pages/newAqjc/index",
         },
         {
           value: "巡查任务",
diff --git a/pages/newAqjc/byTable.vue b/pages/newAqjc/byTable.vue
new file mode 100644
index 0000000..6bcbee7
--- /dev/null
+++ b/pages/newAqjc/byTable.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="table_div">
+              <div class="table_cur">
+                <table style="width:100%;display:block">
+                  <tr>
+                    <th style="width: 40%;">
+                      监测时间
+                      </th>
+                    <th style="width: 40%;">测点编号</th>
+                    <th style="width: 20%;">有无白蚁</th>
+                  </tr>
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                <tr v-for="(item, index) in tableData" :key="index">
+                      <td style="width: 40%;">{{item.obDate}}</td>
+                      <td style="width: 40%;">{{item.mnNo}}</td>
+                      <td style="width:20%;"><span :class="item.status === 1 ? 'has-ant' : 'no-ant'">{{ simpleData(item.status) }}</span></td>
+                    </tr>
+                    <div style="height:180px"></div>
+                  </div>
+                </table>
+              </div>
+            </div>
+
+</template>
+
+<script>
+  import moment from "moment"
+   export default {
+     props:{
+       tableData:{
+         type:Array,
+         default:[],
+       }
+     },
+     methods: {
+          simpleData(status){
+           if(status === 1) {
+             return '有'
+           } else if(status === 0) {
+             return '无'
+           } else {
+             return ''
+           }
+         }
+     },
+   }
+</script>
+
+<style lang="scss" scoped>
+  .table_div {
+    height: 100%;
+    max-width: calc(100% - 0px);
+    // max-height: calc(80vh);
+    flex: 1;
+    padding-top: 0px;
+    // overflow-x: scroll;
+  }
+  /*table样式*/
+  .table_cur {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(100vh - 180px);
+    overflow-y: auto;
+    width:'100%'
+  }
+  .table_cur tr {
+    display: flex;
+    line-height: 75rpx;
+  }
+  .table_cur th {
+    height: 85rpx;
+    color: #3399ef;
+    background: #e1f3ff;
+    font-size: 14px;
+    // font-weight: bold;
+    padding: 0px 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  
+  .table_cur td {
+    height: 65rpx;
+    // border-bottom: 1px solid #d8ddeb;
+    font-size: 14px;
+    color: #2f4056;
+    padding: 0 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+
+  .has-ant {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    border-radius: 50%;
+    background-color: red;
+    color: white;
+    text-align: center;
+    font-size: 12px;
+  }
+  .no-ant {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    border-radius: 50%;
+    background-color: green;
+    color: white;
+    text-align: center;
+    font-size: 12px;
+  }
+  /*table样式 end*/
+</style>
\ No newline at end of file
diff --git a/pages/newAqjc/index.vue b/pages/newAqjc/index.vue
new file mode 100644
index 0000000..7a49dcb
--- /dev/null
+++ b/pages/newAqjc/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <view class="rain-detail-box">
+    <u-status-bar></u-status-bar>
+    <view class="nav-bar">
+      <u-icon name="arrow-left" color="#000" size="20" @click="backTo" style="margin-left:10px"></u-icon>
+      <view class="title">
+        安全监测
+      </view>
+    </view>
+    <view class="tab-bar">
+      <uni-swiper-dot  :current="current" field="content" :dotsStyles="dotsStyles">
+        <swiper class="swiper-box" style="height: 30px;" @change="change">
+          <swiper-item>
+            <view style="display: flex;justify-content: space-between;">
+              <view class="jcsj" @click="activeOne = 0" :class="{ 'active': activeOne == 0 }">
+                位移监测
+              </view>
+              <!-- style="margin: 0 25px;" -->
+              <view class="tjsj" @click="activeOne = 1" :class="{ 'active': activeOne == 1 }" style="margin: 0 4%">
+                渗压监测
+              </view>
+              <!-- style="margin: 0 25px 0 0;" -->
+              <view class="zrtx" @click="activeOne = 2" :class="{ 'active': activeOne == 2 }">
+                渗流监测
+              </view>
+              <view class="txjc" @click="activeOne = 3" :class="{ 'active': activeOne == 3 }" style="margin-left:4%">
+                白蚁监测
+              </view>
+            </view>
+          </swiper-item>
+        </swiper>
+      </uni-swiper-dot>
+
+    </view>
+    <view class="rain-detail-content">
+      <SlTable :tableData="slData" v-if="activeOne == 2" />
+      <SyView v-else-if="activeOne == 1" />
+      <WyTable :tableData="zwyData" v-else-if="activeOne == 0" />
+      <ByTable :tableData="byData" v-else-if="activeOne == 3" />
+    </view>
+  </view>
+</template>
+
+<script>
+import SlTable from "./slTable.vue"
+import SyView from "../aqjc/index.vue"
+import WyTable from "./zwyTable.vue"
+import ByTable from "./byTable.vue"
+export default {
+  data() {
+    return {
+      activeOne: 0,
+      current: 0,
+      slData: [],
+      zwyData: [],
+      byData:[],
+      dotsStyles: {
+        bottom: 0,
+        selectedBackgroundColor: "#d9001b"
+      }
+    }
+  },
+  components: {
+    SlTable,
+    SyView,
+    WyTable,
+    ByTable
+  },
+  methods: {
+    backTo() {
+      uni.navigateBack({ delta: 1 })
+    },
+    change(e) {
+      console.log(e.detail.current);
+      this.current = e.detail.current;
+    },
+    async getSlData() {
+      try {
+        const { data } = await uni.$http.get(
+          "/gunshiApp/tsg/osmoticPressR/list/value?type=2"
+        );
+        if (data.code == 200) {
+          this.slData = data.data;
+        }
+      } catch (error) {
+        uni.$showMsg();
+      }
+    },
+    async getZwyData() {
+      try {
+        const { data } = await uni.$http.get(
+          "/gunshiApp/tsg/osmoticShiftR/list/value"
+        );
+        if (data.code == 200) {
+          this.zwyData = data.data;
+        }
+      } catch (error) {
+        uni.$showMsg();
+      }
+    },
+     async getByData() {
+      try {
+        const { data } = await uni.$http.get(
+          `/gunshiApp/tsg/termite/survey/listNewData`
+        );
+        if (data.code == 200) {
+          this.byData = data.data;
+        }
+      } catch (error) {
+        uni.$showMsg();
+      }
+    },
+  },
+  mounted() {
+    this.getSlData();
+    this.getZwyData();
+    this.getByData();
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.rain-detail-box {
+  height: 100vh;
+  overflow: hidden;
+  position: relative;
+
+  .nav-bar {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 44px;
+    // margin-top: 30px;
+    // padding-top: 20px;
+    // padding-bottom: 10px;
+    border-bottom: 1px solid #dfdfdf;
+    // box-shadow: 0 5px 10px -8px #dfdfdf inset;
+  }
+
+  .title {
+    flex: 1;
+    text-align: center;
+    margin-right: 18px;
+    font-size: 18px;
+  }
+
+  .tab-bar {
+    // width: 100%;
+    display: flex;
+    justify-content: space-between;
+    padding: 5px 30px;
+    border-bottom: 1px solid #dfdfdf;
+    // overflow-x: auto;
+  }
+
+  .active {
+    color: #39a6ff;
+  }
+
+  .rain-detail-content {
+    padding: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/newAqjc/slTable.vue b/pages/newAqjc/slTable.vue
new file mode 100644
index 0000000..92d5cc0
--- /dev/null
+++ b/pages/newAqjc/slTable.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="table_div">
+              <div class="table_cur">
+                <table style="width:100%;display:block">
+                  <tr>
+                    <th style="width: 30%;">
+                      监测点
+                      </th>
+                    <th style="width: 40%;">
+                      监测时间
+                      </th>
+                    <th style="width: 30%;">渗流量(L/s)</th>
+                  </tr>
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                <tr v-for="(item, index) in tableData" :key="index">
+                      <td style="width: 30%;">{{item.stationCode}}</td>
+                      <td style="width: 40%;">{{simpleData(item.tm)}}</td>
+                      <td style="width:30%;">{{ item.value }}</td>
+                    </tr>
+                    <div style="height:180px"></div>
+                  </div>
+                </table>
+              </div>
+            </div>
+
+</template>
+
+<script>
+  import moment from "moment"
+   export default {
+     props:{
+       tableData:{
+         type:Array,
+         default:[],
+       }
+     },
+     methods: {
+         simpleData(tm){
+         return tm ? moment(tm).format("MM-DD HH:mm") :''
+         }
+     },
+   }
+</script>
+
+<style lang="scss" scoped>
+  .table_div {
+    height: 100%;
+    max-width: calc(100% - 0px);
+    // max-height: calc(80vh);
+    flex: 1;
+    padding-top: 0px;
+    // overflow-x: scroll;
+  }
+  /*table样式*/
+  .table_cur {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(55vh - 180px);
+    overflow-y: auto;
+    width:'100%'
+  }
+  .table_cur tr {
+    display: flex;
+    line-height: 75rpx;
+  }
+  .table_cur th {
+    height: 85rpx;
+    color: #3399ef;
+    background: #e1f3ff;
+    font-size: 14px;
+    // font-weight: bold;
+    padding: 0px 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  
+  .table_cur td {
+    height: 65rpx;
+    // border-bottom: 1px solid #d8ddeb;
+    font-size: 14px;
+    color: #2f4056;
+    padding: 0 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  /*table样式 end*/
+</style>
\ No newline at end of file
diff --git a/pages/newAqjc/zwyTable.vue b/pages/newAqjc/zwyTable.vue
new file mode 100644
index 0000000..90a2230
--- /dev/null
+++ b/pages/newAqjc/zwyTable.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="table_div">
+              <div class="table_cur">
+                <table style="width:100%;display:block">
+                  <tr>
+                    <th style="width: 20%;">
+                      监测点
+                      </th>
+                    <th style="width: 20%;">
+                      监测时间
+                      </th>
+                    <th style="width: 20%;">x方向(mm)</th>
+                    <th style="width: 20%;">y方向(mm)</th>
+                    <th style="width: 20%;">h方向(mm)</th>
+                  </tr>
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                <tr v-for="(item, index) in tableData" :key="index">
+                      <td style="width: 20%; height: 30%;">{{item.cdnm}}</td>
+                      <td style="width: 20%;">{{simpleData(item.tm)}}</td>
+                      <td style="width:20%;">{{ item.de }}</td>
+                      <td style="width:20%;">{{ item.dn }}</td>
+                      <td style="width:20%;">{{ item.du }}</td>
+                    </tr>
+                    <div style="height:180px"></div>
+                  </div>
+                </table>
+              </div>
+            </div>
+
+</template>
+
+<script>
+  import moment from "moment"
+   export default {
+     props:{
+       tableData:{
+         type:Array,
+         default:[],
+       }
+     },
+     methods: {
+         simpleData(tm){
+           if(!tm) return ''
+          return moment(tm).format("MM-DD HH:mm")
+         }
+     },
+   }
+</script>
+
+<style lang="scss" scoped>
+  .table_div {
+    height: 100%;
+    max-width: calc(100% - 0px);
+    // max-height: calc(80vh);
+    flex: 1;
+    padding-top: 0px;
+    // overflow-x: scroll;
+  }
+  /*table样式*/
+  .table_cur {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(100vh - 180px);
+    overflow-y: auto;
+    width:'100%'
+  }
+  .table_cur tr {
+    display: flex;
+  }
+  .table_cur th {
+    color: #3399ef;
+    background: #e1f3ff;
+    font-size: 14px;
+    padding: 0px 10px;
+    box-sizing: border-box;
+    white-space: wrap;
+    text-align: center !important;
+    display: flex;
+    align-items: center;
+  }
+  
+  .table_cur td {
+    height: 75rpx;
+    // border-bottom: 1px solid #d8ddeb;
+    font-size: 14px;
+    color: #2f4056;
+    padding: 0 10px;
+    box-sizing: border-box;
+    white-space: wrap;
+    text-align: center !important;
+  }
+  /*table样式 end*/
+</style>
\ No newline at end of file
diff --git a/pages/sjc/byTable.vue b/pages/sjc/byTable.vue
new file mode 100644
index 0000000..6bcbee7
--- /dev/null
+++ b/pages/sjc/byTable.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="table_div">
+              <div class="table_cur">
+                <table style="width:100%;display:block">
+                  <tr>
+                    <th style="width: 40%;">
+                      监测时间
+                      </th>
+                    <th style="width: 40%;">测点编号</th>
+                    <th style="width: 20%;">有无白蚁</th>
+                  </tr>
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                <tr v-for="(item, index) in tableData" :key="index">
+                      <td style="width: 40%;">{{item.obDate}}</td>
+                      <td style="width: 40%;">{{item.mnNo}}</td>
+                      <td style="width:20%;"><span :class="item.status === 1 ? 'has-ant' : 'no-ant'">{{ simpleData(item.status) }}</span></td>
+                    </tr>
+                    <div style="height:180px"></div>
+                  </div>
+                </table>
+              </div>
+            </div>
+
+</template>
+
+<script>
+  import moment from "moment"
+   export default {
+     props:{
+       tableData:{
+         type:Array,
+         default:[],
+       }
+     },
+     methods: {
+          simpleData(status){
+           if(status === 1) {
+             return '有'
+           } else if(status === 0) {
+             return '无'
+           } else {
+             return ''
+           }
+         }
+     },
+   }
+</script>
+
+<style lang="scss" scoped>
+  .table_div {
+    height: 100%;
+    max-width: calc(100% - 0px);
+    // max-height: calc(80vh);
+    flex: 1;
+    padding-top: 0px;
+    // overflow-x: scroll;
+  }
+  /*table样式*/
+  .table_cur {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(100vh - 180px);
+    overflow-y: auto;
+    width:'100%'
+  }
+  .table_cur tr {
+    display: flex;
+    line-height: 75rpx;
+  }
+  .table_cur th {
+    height: 85rpx;
+    color: #3399ef;
+    background: #e1f3ff;
+    font-size: 14px;
+    // font-weight: bold;
+    padding: 0px 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  
+  .table_cur td {
+    height: 65rpx;
+    // border-bottom: 1px solid #d8ddeb;
+    font-size: 14px;
+    color: #2f4056;
+    padding: 0 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+
+  .has-ant {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    border-radius: 50%;
+    background-color: red;
+    color: white;
+    text-align: center;
+    font-size: 12px;
+  }
+  .no-ant {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    border-radius: 50%;
+    background-color: green;
+    color: white;
+    text-align: center;
+    font-size: 12px;
+  }
+  /*table样式 end*/
+</style>
\ No newline at end of file
diff --git a/pages/sjc/index.vue b/pages/sjc/index.vue
index 560f9fd..afb2b34 100644
--- a/pages/sjc/index.vue
+++ b/pages/sjc/index.vue
@@ -42,6 +42,10 @@
         :tableData="zwyData"
         v-else-if="name == '灌溉发电洞变形监测'"
       ></ZwyTable>
+      <ByTable
+        :tableData="byData"
+        v-else-if="name == '白蚁监测'"
+      ></ByTable>
     </view>
   </view>
 </template>
@@ -49,11 +53,13 @@
 import SlTable from "./slTable.vue";
 import ZwyTable from "./zwyTable.vue";
 import ZsyTable from "./zsyTable.vue";
+import ByTable from "./byTable.vue";
 export default {
   components: {
     SlTable,
     ZwyTable,
     ZsyTable,
+    ByTable
   },
   data() {
     return {
@@ -62,7 +68,9 @@ export default {
       zsyData: [], //主坝渗压监测
       sdData: [], //发电洞渗压监测
       fbData: [], //副坝渗压监测
+      byData:[],
       name: "",
+      deviceId:""
     };
   },
   methods: {
@@ -97,6 +105,19 @@ export default {
         uni.$showMsg();
       }
     },
+
+    async getByData() {
+      try {
+        const { data } = await uni.$http.get(
+          `/gunshiApp/tsg/termite/survey/listNewData?deviceId=${this.deviceId}`
+        );
+        if (data.code == 200) {
+          this.byData = data.data;
+        }
+      } catch (error) {
+        uni.$showMsg();
+      }
+    },
     async getZwyData() {
       try {
         const { data } = await uni.$http.get(
@@ -171,9 +192,11 @@ export default {
     this.getSlData();
     this.getZwyData();
     this.getzsyData();
+    this.getByData();
   },
   onLoad(options) {
     this.name = options.name;
+    this.deviceId = options.deviceId || '';
   },
 };
 </script>
diff --git a/pages/zhjs/subnvue/index.nvue b/pages/zhjs/subnvue/index.nvue
index 3c3bab4..98cdea9 100644
--- a/pages/zhjs/subnvue/index.nvue
+++ b/pages/zhjs/subnvue/index.nvue
@@ -37,9 +37,9 @@
 
         <view style="margin-top: 30px;">
           <text style="font-size: 16px;">监视对象</text>
-          <view style="display: flex;flex-direction: row; padding:10px;">
+          <view style="display: flex;flex-direction: row; padding:10px;flex-wrap:wrap">
             <view v-for="item in watchObj" :key="item.id"
-              style="display: flex; align-items: center; margin-right: 10px;">
+              style="display: flex; align-items: center; margin-right: 5px; margin-top:5px">
               <cover-image :src="item.showIcon" style="width: 50rpx;height: 50rpx;"
                 @click="toggleIcon(item)"></cover-image>
               <text :style="{color: item.textColor,fontSize:14}">{{item.name}}</text>
@@ -114,6 +114,10 @@
       1: '/static/tabs/zweiyi1.png',
       2: "/static/tabs/zweiyi2.png"
     },
+    "白蚁监测": {
+      1: '/static/tabs/baiyi1.png',
+      2: "/static/tabs/baiyi2.png"
+    },
   }
   export default {
     data() {
@@ -261,7 +265,8 @@
         map: null,
         windowHeight: 0,
         windowHeight: 0,
-        watchObj: [{
+        watchObj: [
+          {
             icon1: "/static/tabs/shuiku1.png",
             icon2: "/static/tabs/shuiku2.png",
             name: "水库工程",
@@ -287,7 +292,6 @@
             showIcon: "/static/tabs/shuiyu2.png",
             textColor: "#02a7f0",
             isSelected3: true,
-
           },
           {
             icon1: "/static/tabs/sxt1.png",
@@ -297,6 +301,15 @@
             showIcon: "/static/tabs/sxt2.png",
             textColor: "#02a7f0",
             isSelected4: true,
+          },
+           {
+            icon1: "/static/tabs/baiyi1.png",
+            icon2: "/static/tabs/baiyi2.png",
+            name: "白蚁监测",
+            id: 5,
+            showIcon: "/static/tabs/baiyi2.png",
+            textColor: "#02a7f0",
+            isSelected5: true,
           }
         ]
       }
@@ -359,6 +372,8 @@
           url='/pages/skInfo/detail/index?value=2&key=2'
         }else if(type == "副坝位移"){
           url=`/pages/sjc/index?name=副坝位移监测`
+        }else if(type == "白蚁监测"){
+          url=`/pages/sjc/index?name=白蚁监测&deviceId=${data.id}`
         }
         uni.navigateTo({url})
       },
@@ -483,6 +498,33 @@
           uni.$showMsg();
         }
       },
+
+        // 获取白蚁监测点
+      async getByList() {
+        try {
+          const {
+            data
+          } = await uni.$http.get("/gunshiApp/tsg/termite/survey/list/byDevice")
+          if (data.code == 200) {
+            const byList = data.data.map(item => ({
+              ...item,
+               latitude: wgs84ToGcj02(item.lon,item.lat)[1],
+              longitude: wgs84ToGcj02(item.lon,item.lat)[0],
+              iconPath: '/static/tabs/baiyi1.png',
+              width: 15,
+              height: 15,
+              title: item.name,
+              pointType: "白蚁监测",
+              name: "白蚁监测",
+               // joinCluster:true
+            }))
+            console.log("byList",byList)
+            this.markers = [...this.markers, ...byList]
+          }
+        } catch (error) {
+          uni.$showMsg();
+        }
+      },
     },
     computed: {
       marker() {
@@ -496,6 +538,7 @@
     mounted() {
       this.getVideoList();
       this.getRainList();
+      this.getByList();
     }
   }
 </script>
diff --git a/static/tabs/baiyi1.png b/static/tabs/baiyi1.png
new file mode 100644
index 0000000000000000000000000000000000000000..952b6c4a4d5fa5f62c802bac38764226b0d08b91
GIT binary patch
literal 8383
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
O0VM_XXC(;p;Qs*(u!A`O

literal 0
HcmV?d00001

diff --git a/static/tabs/baiyi2.png b/static/tabs/baiyi2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9698833089f24cc23e222f09a944f5b57155065
GIT binary patch
literal 11393
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
F{{bi_q9XtR

literal 0
HcmV?d00001