航道维护水深图层加载和定位

src/utils/map/Channel.js

@@ -70,8 +70,8 @@ export function compareSjBeforeAfter(value,isShow) {
  */
 export function showWhss(isShow){
     addLayer({
-        id: 'portLayer',
-        title: 'portLayer',
+        id: 'warterDeepsAreaLayer',
+        title: 'warterDeepsAreaLayer',
         type: 'feature',
         url: 'https://10.83.240.193:8090/arcgis/rest/services/digitalTwain_3857/MapServer/8',
         visible: isShow,
@@ -79,13 +79,16 @@ export function showWhss(isShow){
         token: '',
         is_goto: true
     })
+    if(!isShow){
+        locationOneWhss('',false)
+    }
 }
 
 export function locationOneWhss(code,isShow){
     if(isShow){
         layerQuery({
             title: "digitalTwain",
-            layerId: "1",
+            layerId: "8",
             where: "控制点区域='" + code + "'",
             symbol: null,
             is_draw: true,

src/views/hdsj/Index.vue

@@ -126,7 +126,7 @@
           </div>
         </div>
       </div>
-      <div class="pr-b3 pr">
+      <div class="pr-b3 pr tab-table table-carousel">
         <span class="title2-right">越界预警</span>
 <!--        <el-carousel-->
 <!--               style="width: 100%"-->
@@ -153,10 +153,11 @@
                   </li>
                 </ul>
         <el-pagination
-                class="pageForDown"
+                class="pageForDown pagi-default"
                 style="opacity: 0.6;color: #eff7fb"
                 small
                 background="false"
+                pager-count="4"
                 :current-page="currentPage"
                 :page-size="pageSize"
                 :total="totals"
@@ -210,7 +211,7 @@
 
   import ShowYuWarning from '@/views/hdsj/cpns/ShowYuWarning'
   import {addLayerByName} from "@/utils/map/Layer"
-  import {compareSjBeforeAfter} from "@/utils/map/Channel";
+  import {compareSjBeforeAfter, showWhss} from "@/utils/map/Channel";
 
 
   const type =ref('计划方量')
@@ -257,6 +258,8 @@ function handleShowBingTu()
   }
 
   function handleCloseWhss() {
+    showWhss(false)
+
     data_ssgl.value[0].isHighlight = false
     data_ssgl.value[0].value = '-'
     listShow_whss.value = false
@@ -288,6 +291,7 @@ function handleShowBingTu()
       data_ssgl.value[1].isHighlight = !data_ssgl.value[1].isHighlight
     }
     if(item.title==='维护水深') {
+      showWhss(true)
       if(listShow_whss.value) {
         handleCloseWhss()
       } else {
@@ -553,7 +557,7 @@ function handleShowBingTu()
     })
   }
   const currentPage = ref(1)
-  const pageSize = ref(5)
+  const pageSize = ref(3)
   const totals = ref(0)
   function  indexCreate(row, column, cellValue, index) {
     return index + 1 + pageSize.value*(currentPage.value - 1)
@@ -1026,7 +1030,7 @@ function handleShowBingTu()
 
         .prb3-item2 {
           width: 85%;
-          height: 24px;
+          height: 25px;
           display: flex;
           align-items: center;
           margin: 10px 0;
@@ -1052,11 +1056,9 @@ function handleShowBingTu()
       }
     }
     .pageForDown{
-      height: 20px;
+      height: 40px;
+      width: 80%;
       margin: 0 auto;
-      button{
-        opacity: 0.5;
-      }
     }
   }
 </style>

src/views/hdsj/cpns/WaterDepthList.vue

@@ -21,6 +21,8 @@
 
 <script setup>
 import { reactive, ref, onMounted } from 'vue'
+
+import {showWhss,locationOneWhss} from "@/utils/map/Channel";
 // import { GetWhss } from '@/apis/hdsj'
 
 /* onMounted(() => {
@@ -49,6 +51,8 @@ const emit = defineEmits(['close', 'pick'])
 
 function handleClickRow(item) {
   currentId.value = item.id
+  locationOneWhss(null,false)
+  locationOneWhss(item.id,true)
   emit('pick', item)
 }
 

src/views/map/BaseMapArea.vue

@@ -65,8 +65,8 @@
 
   .basemap-area {
     position: absolute;
-    bottom: 5vh;
-    right: 30vh;
+    bottom: 7vh;
+    right: 35vh;
     z-index: 0;
     background: rgba(255,255,255,0);
     transition: width 0.5s;

src/views/map/Index.vue

@@ -42,6 +42,7 @@
             <button @click="test('轨迹回放')">轨迹回放</button>
             <button @click="test('结束回放')">结束回放</button>
             <button @click="test('维护水深面')">维护水深面</button>
+            <button @click="test('维护水深面-定位')">维护水深面-定位</button>
         </div>
     </div>
 </template>
@@ -53,7 +54,7 @@
     import {setBoat, setBoatPath, onLocationBoat, locationBoat, boatDriving, drawArea, setMultiBoatHistory, playAreaBoatHistory,djldBoatHistory} from '@/utils/map/Boat'
     import {setCenter, setVideoCamera} from '@/utils/map/Common'
     import {addDefaultServer,addLayerByName,closeAllLayer} from '@/utils/map/Layer'
-    import {compareSjBeforeAfter,showWhss} from '@/utils/map/Channel'
+    import {compareSjBeforeAfter, locationOneWhss, showWhss} from '@/utils/map/Channel'
 
     export default {
         name: "MapHome",
@@ -241,6 +242,10 @@
                         this.isWhss = !this.isWhss
                         showWhss(this.isWhss);
                         break
+                    case '维护水深面-定位':
+                        this.isWhss = !this.isWhss
+                        locationOneWhss('H44-H71',this.isWhss);
+                        break
                     default:
                 }
             },

src/views/ssky/Index.vue

@@ -131,21 +131,23 @@
             <span :class="item.delayType==='延时'? 'yj-orange': 'yj-red'">{{item.delayType}}</span>
           </div>
         </div>
+        <el-pagination
+                class="pageForDown pagi-default"
+                style="opacity: 0.6;color: #eff7fb"
+                small
+                background="false"
+                pager-count="4"
+                popper-class="is-first"
+                :current-page="currentPage"
+                :page-size="pageSize"
+                :total="total"
+                layout="prev, pager, next"
+                @current-change="handlePageChange"
+                @size-change="handleSizeChange"
+        >
+        </el-pagination>
       </div>
-      <el-pagination
-              class="pageForDown"
-              style="opacity: 0.6;color: #eff7fb"
-              small
-              background="false"
-              popper-class="is-first"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              :total="total"
-              layout="prev, pager, next"
-              @current-change="handlePageChange"
-              @size-change="handleSizeChange"
-      >
-      </el-pagination>
+
     </div>
 
 
@@ -194,7 +196,7 @@ export default {
   const boatDockListShow = ref(false)
 
   const currentPage = ref(1)
-  const pageSize = ref(10)
+  const pageSize = ref(3)
   const total = ref(0)
   function  indexCreate(row, column, cellValue, index) {
     return index + 1 + pageSize.value*(currentPage.value - 1)
@@ -937,10 +939,10 @@ export default {
       margin-bottom: 2vh;
     }
     .prb3-item {
-      margin: 0 15px 20px 0;
+      margin: 0 15px 10px 0;
       &>div:nth-child(1) {
         width: 276px;
-        height: 24px;
+        height: 20px;
         display: flex;
         align-items: center;
         background: url('@/assets/imgs/page_ssky/bg-lundu-line.png') no-repeat;
@@ -972,7 +974,7 @@ export default {
         span:nth-child(2) {
           display: inline-block;
           width: 65px;
-          height: 32px;
+          height: 30px;
           font-size: 13px;
           line-height: 32px;
           text-align: center;
@@ -990,13 +992,8 @@ export default {
     }
   }
   .pageForDown{
-    height: 20px;
-    position: absolute;
-    right: 10vh;
-    bottom: 20px;
-    button{
-    opacity: 0.5;
-    }
+    height: 40px;
+    margin: 0 auto;
   }
 }
 </style>