diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index fda09e8..65ed28e 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -844,8 +844,8 @@
         AllData.chartData3.yAxis3_line = res.data.inflowWater;
         AllData.chartData3.yAxis3_line_Name = "进水量";
         AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
+        AllData.chartData3.y1_Unit = "个"; //Y轴单位
+        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
         AllData.chartData3.y2_show = true;
         AllData.refresh3++;
         AllData.TjData3 = res.data.outletsNumber

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index fda09e8..65ed28e 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -844,8 +844,8 @@
         AllData.chartData3.yAxis3_line = res.data.inflowWater;
         AllData.chartData3.yAxis3_line_Name = "进水量";
         AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
+        AllData.chartData3.y1_Unit = "个"; //Y轴单位
+        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
         AllData.chartData3.y2_show = true;
         AllData.refresh3++;
         AllData.TjData3 = res.data.outletsNumber
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
index 4a48606..1bbe6c6 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
@@ -5,12 +5,12 @@
     </div>
     <div class="canalList">
       <div class="list flex" v-for="i in allList" :key="i">
-        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/>({{i.lengthSum}})</div></div>
+        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/><span>{{i.lengthSum}}km</span></div></div>
         <div class="info flex-1">
           <div class="ditch flex flex-justcontent-center" v-for="e in i.portChannelList" :key="e">
             <div class="one">{{e.name}}</div>
             <div class="two flex-1 flex flex-align-center"><div class="inBra" :style="{width:`${e.length/8*100}%`}"><span :style="{right:e.length<2?'-24px':''}">{{e.length}}</span></div></div>
-            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')}}</span></div>
+            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')||'--'}}</span></div>
           </div>
         </div>
       </div>
@@ -150,6 +150,9 @@
     line-height:22px;
     text-align: center;
     padding: 0 12px;
+    span{
+      white-space: nowrap;
+    }
   }
   .ditch{
     height: 24px;

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index fda09e8..65ed28e 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -844,8 +844,8 @@
         AllData.chartData3.yAxis3_line = res.data.inflowWater;
         AllData.chartData3.yAxis3_line_Name = "进水量";
         AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
+        AllData.chartData3.y1_Unit = "个"; //Y轴单位
+        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
         AllData.chartData3.y2_show = true;
         AllData.refresh3++;
         AllData.TjData3 = res.data.outletsNumber
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
index 4a48606..1bbe6c6 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
@@ -5,12 +5,12 @@
     </div>
     <div class="canalList">
       <div class="list flex" v-for="i in allList" :key="i">
-        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/>({{i.lengthSum}})</div></div>
+        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/><span>{{i.lengthSum}}km</span></div></div>
         <div class="info flex-1">
           <div class="ditch flex flex-justcontent-center" v-for="e in i.portChannelList" :key="e">
             <div class="one">{{e.name}}</div>
             <div class="two flex-1 flex flex-align-center"><div class="inBra" :style="{width:`${e.length/8*100}%`}"><span :style="{right:e.length<2?'-24px':''}">{{e.length}}</span></div></div>
-            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')}}</span></div>
+            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')||'--'}}</span></div>
           </div>
         </div>
       </div>
@@ -150,6 +150,9 @@
     line-height:22px;
     text-align: center;
     padding: 0 12px;
+    span{
+      white-space: nowrap;
+    }
   }
   .ditch{
     height: 24px;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
index 6478df3..bfd8be4 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
@@ -330,30 +330,6 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">是否穿堤</div>
-          <div class="detail-value flex flex-align-center">
-            <dict-tag :options="isNumberState" :value="dialogFormDetail.isCross" />
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">穿堤堤段</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.section }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">桩号</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.pileNumber }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">防守单位</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.defensiveUnit }}
-          </div>
-        </div>
-        <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">抽排水体</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.waterBodies }}
@@ -374,7 +350,6 @@
             ></el-image>
           </div>
         </div>
-
       </div>
     </div>
 
@@ -904,41 +879,31 @@
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">入河方式</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.intoRiverWay">{{
-              getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe)
-            }}</span>
+            <span v-if="dialogFormDetail.intoRiverWay">{{ getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">形状</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.mouthShape">{{
-              getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang)
-            }}</span>
+            <span v-if="dialogFormDetail.mouthShape">{{ getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口一级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.oneLevelType">{{
-              getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi)
-            }}</span>
+            <span v-if="dialogFormDetail.oneLevelType">{{ getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口二级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.twoLevelType">{{
-              getpaikouInfo(dialogFormDetail.twoLevelType, leixinger)
-            }}</span>
+            <span v-if="dialogFormDetail.twoLevelType">{{ getpaikouInfo(dialogFormDetail.twoLevelType, leixinger) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口三级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.threeLevelType">{{
-              getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan)
-            }}</span>
+            <span v-if="dialogFormDetail.threeLevelType">{{ getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan) }}</span>
           </div>
         </div>
         <!-- <div class="flex flex-r">
@@ -1660,7 +1625,7 @@
 
 <script setup name="JichuXinxi">
 const { proxy } = getCurrentInstance();
-import { listwaterRegionInfo,getBaseDetail } from '@/api/MonitorAssetsOnMap';
+import { listwaterRegionInfo, getBaseDetail } from '@/api/MonitorAssetsOnMap';
 import { getChineseFun } from '@/utils/ruoyi';
 
 const rujianghe = proxy.fixDict['rujianghe'];
@@ -1740,8 +1705,6 @@
   });
 }
 
-
-
 // 排口相关name
 const getpaikouInfo = (id, data) => {
   return getChineseFun(data, 'value', id, 'label');
@@ -1750,7 +1713,7 @@
   getListlast();
   getDetailBycodeAndDataid();
   // console.log('props', props);
-  console.log('props.dataCode',props.dataCode);
+  console.log('props.dataCode', props.dataCode);
 });
 </script>
 

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index fda09e8..65ed28e 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -844,8 +844,8 @@
         AllData.chartData3.yAxis3_line = res.data.inflowWater;
         AllData.chartData3.yAxis3_line_Name = "进水量";
         AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
+        AllData.chartData3.y1_Unit = "个"; //Y轴单位
+        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
         AllData.chartData3.y2_show = true;
         AllData.refresh3++;
         AllData.TjData3 = res.data.outletsNumber
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
index 4a48606..1bbe6c6 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
@@ -5,12 +5,12 @@
     </div>
     <div class="canalList">
       <div class="list flex" v-for="i in allList" :key="i">
-        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/>({{i.lengthSum}})</div></div>
+        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/><span>{{i.lengthSum}}km</span></div></div>
         <div class="info flex-1">
           <div class="ditch flex flex-justcontent-center" v-for="e in i.portChannelList" :key="e">
             <div class="one">{{e.name}}</div>
             <div class="two flex-1 flex flex-align-center"><div class="inBra" :style="{width:`${e.length/8*100}%`}"><span :style="{right:e.length<2?'-24px':''}">{{e.length}}</span></div></div>
-            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')}}</span></div>
+            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')||'--'}}</span></div>
           </div>
         </div>
       </div>
@@ -150,6 +150,9 @@
     line-height:22px;
     text-align: center;
     padding: 0 12px;
+    span{
+      white-space: nowrap;
+    }
   }
   .ditch{
     height: 24px;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
index 6478df3..bfd8be4 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
@@ -330,30 +330,6 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">是否穿堤</div>
-          <div class="detail-value flex flex-align-center">
-            <dict-tag :options="isNumberState" :value="dialogFormDetail.isCross" />
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">穿堤堤段</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.section }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">桩号</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.pileNumber }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">防守单位</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.defensiveUnit }}
-          </div>
-        </div>
-        <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">抽排水体</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.waterBodies }}
@@ -374,7 +350,6 @@
             ></el-image>
           </div>
         </div>
-
       </div>
     </div>
 
@@ -904,41 +879,31 @@
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">入河方式</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.intoRiverWay">{{
-              getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe)
-            }}</span>
+            <span v-if="dialogFormDetail.intoRiverWay">{{ getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">形状</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.mouthShape">{{
-              getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang)
-            }}</span>
+            <span v-if="dialogFormDetail.mouthShape">{{ getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口一级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.oneLevelType">{{
-              getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi)
-            }}</span>
+            <span v-if="dialogFormDetail.oneLevelType">{{ getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口二级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.twoLevelType">{{
-              getpaikouInfo(dialogFormDetail.twoLevelType, leixinger)
-            }}</span>
+            <span v-if="dialogFormDetail.twoLevelType">{{ getpaikouInfo(dialogFormDetail.twoLevelType, leixinger) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口三级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.threeLevelType">{{
-              getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan)
-            }}</span>
+            <span v-if="dialogFormDetail.threeLevelType">{{ getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan) }}</span>
           </div>
         </div>
         <!-- <div class="flex flex-r">
@@ -1660,7 +1625,7 @@
 
 <script setup name="JichuXinxi">
 const { proxy } = getCurrentInstance();
-import { listwaterRegionInfo,getBaseDetail } from '@/api/MonitorAssetsOnMap';
+import { listwaterRegionInfo, getBaseDetail } from '@/api/MonitorAssetsOnMap';
 import { getChineseFun } from '@/utils/ruoyi';
 
 const rujianghe = proxy.fixDict['rujianghe'];
@@ -1740,8 +1705,6 @@
   });
 }
 
-
-
 // 排口相关name
 const getpaikouInfo = (id, data) => {
   return getChineseFun(data, 'value', id, 'label');
@@ -1750,7 +1713,7 @@
   getListlast();
   getDetailBycodeAndDataid();
   // console.log('props', props);
-  console.log('props.dataCode',props.dataCode);
+  console.log('props.dataCode', props.dataCode);
 });
 </script>
 
diff --git a/src/views/voice/recordPage/index.vue b/src/views/voice/recordPage/index.vue
index 2cbaf46..0461230 100644
--- a/src/views/voice/recordPage/index.vue
+++ b/src/views/voice/recordPage/index.vue
@@ -11,6 +11,17 @@
       <div class="close" @click="closedia">
         <el-icon :size="20"><Close /></el-icon>
       </div>
+      <div class="bottombtn">
+        <el-button class="chongzhi" type="primary" @click="chongzhi">重置</el-button>
+        <el-button class="queding" type="primary" @click="queding">确定</el-button>
+      </div>
+      <div class="searchResult" v-if="isGuess&&data.showModal">
+        <div class="searchtext">猜您想找：</div>
+        <div class="Resultlist" v-if="guessArr.dataList?.length>0">
+          <div class="eachMay" v-for="(item) in guessArr.dataList" :key="item.id" @click="resultClick(item)">{{item.hotWordName}}</div>
+
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -21,7 +32,7 @@
 import Recorder from 'js-audio-recorder';
 import useUserStore from '@/store/modules/user';
 const appStore = useUserStore();
-import { nextTick } from 'vue';
+import { nextTick, ref } from 'vue';
 const userStore = useUserStore();
 const lockReconnect = ref(null);
 const timeoutnum = ref(null);
@@ -49,6 +60,8 @@
   miao: 0,
   recognizeWs: null,
 });
+const isGuess=ref(false)
+const guessArr=ref({})
 
 onMounted(() => {
   // 绑定事件-打印的是当前录音数据
@@ -72,9 +85,9 @@
   if (window.location.protocol.includes('https')) {
     wsuri = `wss://${window.location.host}/voiceWebsocket`;
   } else {
-    // wsuri = `ws://192.168.20.43:8102/voiceWebsocket`;
+    wsuri = `ws://192.168.20.43:8102/voiceWebsocket`;
     // wsuri = `ws://139.155.49.237:8201/voiceWebsocket`;
-    wsuri = `ws://${window.location.host}/voiceWebsocket`;
+    // wsuri = `ws://${window.location.host}/voiceWebsocket`;
   }
   data.recognizeWs = new WebSocket(wsuri);
 
@@ -100,11 +113,17 @@
       if (uploadbusinessSourceCode.value == data.type) {
         // 将返回的type数据与语音指令的业务code进行精准匹配 如果匹配上了 才说明是发送的这条数据
         nowword.value = params.recognitionResult;
-        if (params.recognitionActionCode == 'error') {
+        if (params.recognitionActionCode == 'error'||params.recognitionDataSourceCode=='error') {
           // nowword.value = `指令未识别，请您再说一遍`;
+          isGuess.value=true
+          guessArr.value=params
+          console.log('guessArr.value',guessArr.value);
+          
         } else {
-          // 匹配业务来源编号去区分相关的操作
+            // 匹配业务来源编号去区分相关的操作
           switchRecognitionActionCode(params);
+          
+          
         }
       }
     }
@@ -129,7 +148,7 @@
     case 'detail':
       // 查看的操作
       // 查看动态弹框
-      dynamicPopUp(params)
+      dynamicPopUp(params);
       break;
 
     default:
@@ -137,24 +156,35 @@
       break;
   }
 }
-async function  dynamicPopUp (params){
-  console.log('params111',params);
+function resultClick(item){
+  console.log('item',item);
+  let at=guessArr.value
+  let data={
+    recognitionDataId:item.businessDataId,
+    recognitionActionCode: at.recognitionActionCode == 'error'?at.actionList[0].businessSourceCode:at.recognitionActionCode,
+    recognitionDataSourceCode:at.recognitionDataSourceCode,
+    recognitionResult:at.recognitionResult,
+  }
+  switchRecognitionActionCode(data)
+  
+}
+async function dynamicPopUp(params) {
+  console.log('params111', params);
   let allData = [];
-   await appStore.MapData.map(item => {
+  await appStore.MapData.map(item => {
     allData = allData.concat(item.data);
   });
-  let item=await findDictObj2(allData,'id',params.recognitionDataId);
-  console.log('item匹配到',item);
-  if(item.id){
-        item.stType=item.pointType
-        let geometry=item.geometry;
+  let item = await findDictObj2(allData, 'id', params.recognitionDataId);
+  console.log('item匹配到', item);
+  if (item.id) {
+    item.stType = item.pointType;
+    let geometry = item.geometry;
     let feature = turf.feature(Terraformer.WKT.parse(geometry), _.cloneDeep(item));
     newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
     bus.emit('setGeoJSON', { json: turf.featureCollection([feature]), key: 'temporary' });
-    if(feature){
-      feature.properties.type=feature.properties.pointType
-  bus.emit("xiaofeifei", feature);
-
+    if (feature) {
+      feature.properties.type = feature.properties.pointType;
+      bus.emit('xiaofeifei', feature);
     }
   }
 }
@@ -212,17 +242,26 @@
   uploadaudioformwebSocket();
 }
 
+// 重置
+function chongzhi() {
+  // 先结束录音
+  stopRecorder();
+  // 清除两个定时器
+  clearTimeout(settimEnd.value);
+  clearInterval(timEnd.value);
+  process.value = 1;
+  STARTVOICE();
+}
+
+// 确定
+function queding() {
+  STARTVOICE();
+}
+
 // 机器人所用方法
 function STARTVOICE() {
-  // console.log(window.location);
-  // console.log(window.location.href);
-  // if (window.location.href.includes('/FloodControlAndDrainage')) {
-  // }
-  // // bus.emit('changeHeadePath', '/WaterAssets');
-  // // bus.emit('changeHeadePath', '/FloodControlAndDrainage');
-
-  // return;
   console.log('process.value', process.value);
+    isGuess.value=false
   clearInterval(timEnd.value);
   if (process.value == 1) {
     startRecorder('begin');
@@ -396,7 +435,7 @@
     .msg {
       overflow: hidden;
       overflow-y: auto;
-      max-height: 80px;
+      max-height: 60px;
       position: absolute;
       top: 50px;
       left: 20px;
@@ -424,6 +463,51 @@
         }
       }
     }
+    .searchResult {
+      width: 100%;
+      height: 200px;
+      position: absolute;
+      left: 0;
+      bottom: -200px;
+        background: url('@/assets/images/pictureOnMap/contentBgc.png') no-repeat center;
+  background-size: 100% 100%;
+  .searchtext {
+    padding:5px ;
+  }
+  .Resultlist {
+    height: 170px;
+    overflow-y: auto;
+    padding: 0 10px;
+    
+    .eachMay {
+      margin-bottom: 5px;
+      cursor: pointer;
+      line-height: 22px;
+      padding-left: 5px;
+    }
+    .eachMay:hover{
+      background: rgba(255,255,255,.2);
+    }
+  }
+    }
+  }
+}
+
+.bottombtn {
+  z-index: 99;
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translate(-50%);
+
+  .chongzhi {
+    background: #09bcd7;
+    height: 26px;
+  }
+
+  .queding {
+    background: #18a7f2;
+    height: 26px;
   }
 }
 </style>

diff --git a/src/utils/fixDict.js b/src/utils/fixDict.js
index 3195d1e..2079b53 100644
--- a/src/utils/fixDict.js
+++ b/src/utils/fixDict.js
@@ -209,4 +209,28 @@
         value: '4',
       },
 ],
+// factorEchartsColor:[//对应的监测因子echarts颜色
+
+//   {
+//     label: 'z',
+//     value: '#99FF55',
+//   },
+//   {
+//     label: 'va',
+//     value: '#B14DE5',
+//   },
+//   {
+//     label: 'cond',
+//     value: '#FFC155',
+//   },
+//   {
+//     label: 'sbl1',
+//     value: '#19D5FF',
+//   },
+//   {
+//     label: 'pn05',
+//     value: '#19D5FF',
+//   },
+  
+// ],
 };
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 6bd052a..71b2be0 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -601,7 +601,7 @@
     });
   } else if (Row.layerId == "point") {
     // 点位
-    if (Row.properties.pointType == "rainwater_pipeline_quality") {
+    if (Row.properties.pointType == "sewage_pipeline_quality") {
       if (AllData.RightShowID == Row.properties.id) {
         // 说明是同样的一个点点了两次,所以进行关闭
         AllData.RightShow = false;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index fda09e8..65ed28e 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -844,8 +844,8 @@
         AllData.chartData3.yAxis3_line = res.data.inflowWater;
         AllData.chartData3.yAxis3_line_Name = "进水量";
         AllData.chartData3.yAxis3_line_Index = 1;
-        AllData.chartData3.y1_Unit = "万方"; //Y轴单位
-        AllData.chartData3.y2_Unit = "个"; //Y轴单位
+        AllData.chartData3.y1_Unit = "个"; //Y轴单位
+        AllData.chartData3.y2_Unit = "万方"; //Y轴单位
         AllData.chartData3.y2_show = true;
         AllData.refresh3++;
         AllData.TjData3 = res.data.outletsNumber
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
index 4a48606..1bbe6c6 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right.vue
@@ -5,12 +5,12 @@
     </div>
     <div class="canalList">
       <div class="list flex" v-for="i in allList" :key="i">
-        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/>({{i.lengthSum}})</div></div>
+        <div class="name flex flex-justcontent-center flex-align-center"><div>{{i.waterRegionName}}<br/><span>{{i.lengthSum}}km</span></div></div>
         <div class="info flex-1">
           <div class="ditch flex flex-justcontent-center" v-for="e in i.portChannelList" :key="e">
             <div class="one">{{e.name}}</div>
             <div class="two flex-1 flex flex-align-center"><div class="inBra" :style="{width:`${e.length/8*100}%`}"><span :style="{right:e.length<2?'-24px':''}">{{e.length}}</span></div></div>
-            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')}}</span></div>
+            <div class="tre">目标：<span :class="`color${e.targetQuality}`">{{getChineseFun(level,'label', e.targetQuality,'value')||'--'}}</span></div>
           </div>
         </div>
       </div>
@@ -150,6 +150,9 @@
     line-height:22px;
     text-align: center;
     padding: 0 12px;
+    span{
+      white-space: nowrap;
+    }
   }
   .ditch{
     height: 24px;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
index 6478df3..bfd8be4 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/JichuXinxi.vue
@@ -330,30 +330,6 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">是否穿堤</div>
-          <div class="detail-value flex flex-align-center">
-            <dict-tag :options="isNumberState" :value="dialogFormDetail.isCross" />
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">穿堤堤段</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.section }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">桩号</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.pileNumber }}
-          </div>
-        </div>
-        <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">防守单位</div>
-          <div class="detail-value flex flex-align-center">
-            {{ dialogFormDetail.defensiveUnit }}
-          </div>
-        </div>
-        <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">抽排水体</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.waterBodies }}
@@ -374,7 +350,6 @@
             ></el-image>
           </div>
         </div>
-
       </div>
     </div>
 
@@ -904,41 +879,31 @@
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">入河方式</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.intoRiverWay">{{
-              getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe)
-            }}</span>
+            <span v-if="dialogFormDetail.intoRiverWay">{{ getpaikouInfo(dialogFormDetail.intoRiverWay, rujianghe) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">形状</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.mouthShape">{{
-              getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang)
-            }}</span>
+            <span v-if="dialogFormDetail.mouthShape">{{ getpaikouInfo(dialogFormDetail.mouthShape, paikouxingzhuang) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口一级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.oneLevelType">{{
-              getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi)
-            }}</span>
+            <span v-if="dialogFormDetail.oneLevelType">{{ getpaikouInfo(dialogFormDetail.oneLevelType, leixingyi) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口二级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.twoLevelType">{{
-              getpaikouInfo(dialogFormDetail.twoLevelType, leixinger)
-            }}</span>
+            <span v-if="dialogFormDetail.twoLevelType">{{ getpaikouInfo(dialogFormDetail.twoLevelType, leixinger) }}</span>
           </div>
         </div>
         <div class="flex flex-r">
           <div class="detail-label flex flex-align-center">排口三级分类</div>
           <div class="detail-value flex flex-align-center">
-            <span v-if="dialogFormDetail.threeLevelType">{{
-              getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan)
-            }}</span>
+            <span v-if="dialogFormDetail.threeLevelType">{{ getpaikouInfo(dialogFormDetail.threeLevelType, leixingsan) }}</span>
           </div>
         </div>
         <!-- <div class="flex flex-r">
@@ -1660,7 +1625,7 @@
 
 <script setup name="JichuXinxi">
 const { proxy } = getCurrentInstance();
-import { listwaterRegionInfo,getBaseDetail } from '@/api/MonitorAssetsOnMap';
+import { listwaterRegionInfo, getBaseDetail } from '@/api/MonitorAssetsOnMap';
 import { getChineseFun } from '@/utils/ruoyi';
 
 const rujianghe = proxy.fixDict['rujianghe'];
@@ -1740,8 +1705,6 @@
   });
 }
 
-
-
 // 排口相关name
 const getpaikouInfo = (id, data) => {
   return getChineseFun(data, 'value', id, 'label');
@@ -1750,7 +1713,7 @@
   getListlast();
   getDetailBycodeAndDataid();
   // console.log('props', props);
-  console.log('props.dataCode',props.dataCode);
+  console.log('props.dataCode', props.dataCode);
 });
 </script>
 
diff --git a/src/views/voice/recordPage/index.vue b/src/views/voice/recordPage/index.vue
index 2cbaf46..0461230 100644
--- a/src/views/voice/recordPage/index.vue
+++ b/src/views/voice/recordPage/index.vue
@@ -11,6 +11,17 @@
       <div class="close" @click="closedia">
         <el-icon :size="20"><Close /></el-icon>
       </div>
+      <div class="bottombtn">
+        <el-button class="chongzhi" type="primary" @click="chongzhi">重置</el-button>
+        <el-button class="queding" type="primary" @click="queding">确定</el-button>
+      </div>
+      <div class="searchResult" v-if="isGuess&&data.showModal">
+        <div class="searchtext">猜您想找：</div>
+        <div class="Resultlist" v-if="guessArr.dataList?.length>0">
+          <div class="eachMay" v-for="(item) in guessArr.dataList" :key="item.id" @click="resultClick(item)">{{item.hotWordName}}</div>
+
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -21,7 +32,7 @@
 import Recorder from 'js-audio-recorder';
 import useUserStore from '@/store/modules/user';
 const appStore = useUserStore();
-import { nextTick } from 'vue';
+import { nextTick, ref } from 'vue';
 const userStore = useUserStore();
 const lockReconnect = ref(null);
 const timeoutnum = ref(null);
@@ -49,6 +60,8 @@
   miao: 0,
   recognizeWs: null,
 });
+const isGuess=ref(false)
+const guessArr=ref({})
 
 onMounted(() => {
   // 绑定事件-打印的是当前录音数据
@@ -72,9 +85,9 @@
   if (window.location.protocol.includes('https')) {
     wsuri = `wss://${window.location.host}/voiceWebsocket`;
   } else {
-    // wsuri = `ws://192.168.20.43:8102/voiceWebsocket`;
+    wsuri = `ws://192.168.20.43:8102/voiceWebsocket`;
     // wsuri = `ws://139.155.49.237:8201/voiceWebsocket`;
-    wsuri = `ws://${window.location.host}/voiceWebsocket`;
+    // wsuri = `ws://${window.location.host}/voiceWebsocket`;
   }
   data.recognizeWs = new WebSocket(wsuri);
 
@@ -100,11 +113,17 @@
       if (uploadbusinessSourceCode.value == data.type) {
         // 将返回的type数据与语音指令的业务code进行精准匹配 如果匹配上了 才说明是发送的这条数据
         nowword.value = params.recognitionResult;
-        if (params.recognitionActionCode == 'error') {
+        if (params.recognitionActionCode == 'error'||params.recognitionDataSourceCode=='error') {
           // nowword.value = `指令未识别，请您再说一遍`;
+          isGuess.value=true
+          guessArr.value=params
+          console.log('guessArr.value',guessArr.value);
+          
         } else {
-          // 匹配业务来源编号去区分相关的操作
+            // 匹配业务来源编号去区分相关的操作
           switchRecognitionActionCode(params);
+          
+          
         }
       }
     }
@@ -129,7 +148,7 @@
     case 'detail':
       // 查看的操作
       // 查看动态弹框
-      dynamicPopUp(params)
+      dynamicPopUp(params);
       break;
 
     default:
@@ -137,24 +156,35 @@
       break;
   }
 }
-async function  dynamicPopUp (params){
-  console.log('params111',params);
+function resultClick(item){
+  console.log('item',item);
+  let at=guessArr.value
+  let data={
+    recognitionDataId:item.businessDataId,
+    recognitionActionCode: at.recognitionActionCode == 'error'?at.actionList[0].businessSourceCode:at.recognitionActionCode,
+    recognitionDataSourceCode:at.recognitionDataSourceCode,
+    recognitionResult:at.recognitionResult,
+  }
+  switchRecognitionActionCode(data)
+  
+}
+async function dynamicPopUp(params) {
+  console.log('params111', params);
   let allData = [];
-   await appStore.MapData.map(item => {
+  await appStore.MapData.map(item => {
     allData = allData.concat(item.data);
   });
-  let item=await findDictObj2(allData,'id',params.recognitionDataId);
-  console.log('item匹配到',item);
-  if(item.id){
-        item.stType=item.pointType
-        let geometry=item.geometry;
+  let item = await findDictObj2(allData, 'id', params.recognitionDataId);
+  console.log('item匹配到', item);
+  if (item.id) {
+    item.stType = item.pointType;
+    let geometry = item.geometry;
     let feature = turf.feature(Terraformer.WKT.parse(geometry), _.cloneDeep(item));
     newfiberMap.map.easeTo({ center: turf.getCoords(turf.center(feature)), zoom: 15 });
     bus.emit('setGeoJSON', { json: turf.featureCollection([feature]), key: 'temporary' });
-    if(feature){
-      feature.properties.type=feature.properties.pointType
-  bus.emit("xiaofeifei", feature);
-
+    if (feature) {
+      feature.properties.type = feature.properties.pointType;
+      bus.emit('xiaofeifei', feature);
     }
   }
 }
@@ -212,17 +242,26 @@
   uploadaudioformwebSocket();
 }
 
+// 重置
+function chongzhi() {
+  // 先结束录音
+  stopRecorder();
+  // 清除两个定时器
+  clearTimeout(settimEnd.value);
+  clearInterval(timEnd.value);
+  process.value = 1;
+  STARTVOICE();
+}
+
+// 确定
+function queding() {
+  STARTVOICE();
+}
+
 // 机器人所用方法
 function STARTVOICE() {
-  // console.log(window.location);
-  // console.log(window.location.href);
-  // if (window.location.href.includes('/FloodControlAndDrainage')) {
-  // }
-  // // bus.emit('changeHeadePath', '/WaterAssets');
-  // // bus.emit('changeHeadePath', '/FloodControlAndDrainage');
-
-  // return;
   console.log('process.value', process.value);
+    isGuess.value=false
   clearInterval(timEnd.value);
   if (process.value == 1) {
     startRecorder('begin');
@@ -396,7 +435,7 @@
     .msg {
       overflow: hidden;
       overflow-y: auto;
-      max-height: 80px;
+      max-height: 60px;
       position: absolute;
       top: 50px;
       left: 20px;
@@ -424,6 +463,51 @@
         }
       }
     }
+    .searchResult {
+      width: 100%;
+      height: 200px;
+      position: absolute;
+      left: 0;
+      bottom: -200px;
+        background: url('@/assets/images/pictureOnMap/contentBgc.png') no-repeat center;
+  background-size: 100% 100%;
+  .searchtext {
+    padding:5px ;
+  }
+  .Resultlist {
+    height: 170px;
+    overflow-y: auto;
+    padding: 0 10px;
+    
+    .eachMay {
+      margin-bottom: 5px;
+      cursor: pointer;
+      line-height: 22px;
+      padding-left: 5px;
+    }
+    .eachMay:hover{
+      background: rgba(255,255,255,.2);
+    }
+  }
+    }
+  }
+}
+
+.bottombtn {
+  z-index: 99;
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translate(-50%);
+
+  .chongzhi {
+    background: #09bcd7;
+    height: 26px;
+  }
+
+  .queding {
+    background: #18a7f2;
+    height: 26px;
   }
 }
 </style>
diff --git a/vite.config.js b/vite.config.js
index 6db1546..ca8d2ce 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,10 +5,10 @@
 import autoprefixer from 'autoprefixer';
 
 const Timestamp = new Date().getTime(); //随机时间戳
-let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
+// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
 // let ipLink = 'http://192.168.16.124:9100';
-// let ipLink = 'http://192.168.20.43:9100'; // 谢杨
+let ipLink = 'http://192.168.20.43:9100'; // 刘总
 /*  */
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {