4.26

src/apis/hdsj.js

@@ -53,4 +53,11 @@ export function GetGcxx(year) {
       year
     }
   })
+}
+
+export function GetWhss() {
+  return request({
+    url: '/DigitalTwin/WaterDepthSpace/getHpjArea',
+    method: "post"
+  })
 }

src/utils/UIInteractions.js

@@ -517,4 +517,17 @@ export function ueCallGetNowTime() {    // 开启实时
   callUIInteractionFormat({
     "ActionName":"getNowTime"
   })
+}
+
+export function ueCallOpenMaintain(code) {    // 开启维护水深
+  callUIInteractionFormat({
+    "ActionName":"openMaintain",
+    "Parameters": { 'type': '2', 'code': code }
+  })
+}
+
+export function ueCallCloseMaintain() {    // 关闭维护水深
+  callUIInteractionFormat({
+    "ActionName":"closeMaintain"
+  })
 }

src/views/hdsj/Index.vue

@@ -6,7 +6,7 @@
         <div v-for="item in data_ssgl.value" class="plb1-item">
           <img :src="item.iconUrl" alt="">
           <div>
-            <span @click="handleToggleYuji(item)" :class="{'highlight': item.title==='淤积预警'&&isYujiOn}">{{ item.title }}</span>
+            <span @click="handleToggleSsgl(item)" :class="{'highlight': item.isHighlight}">{{ item.title }}</span>
             <div>
               <span :class="{'is-warning': item.value>0}">{{ item.value }}</span>
               <span>{{ item.unit }}</span>
@@ -14,6 +14,7 @@
           </div>
         </div>
       </div>
+      <water-depth-list v-if="listShow_whss" @close="handleCloseWhss" @pick="item => handlePickWhss(item)"/>
       <div class="pl-b2">
         <span class="title1-left">工程管理</span>
         <span class="title2-left">工程统计</span>
@@ -149,9 +150,10 @@ export default {
   import {
     ueCallInitShujun, ueCallClickShujun, ueCallRunShujun, ueCallBeforeShujun, ueCallClearShujun,
     ueCallAfterShujun, ueCallBackShujun, ueCallInitWaterShujun, ueCallStartYjyj, ueCallCloseYjyj,
-    ueCallOpenWater, ueCallCloseWater
+    ueCallOpenWater, ueCallCloseWater, ueCallOpenMaintain, ueCallCloseMaintain
   } from '@/utils/UIInteractions'
   import bus from '@/utils/bus';
+  import WaterDepthList from './cpns/WaterDepthList.vue'
 
   onMounted(() => {
     setSjjk(document.getElementById('chart_fstj'), chartData_fstj.value)
@@ -162,32 +164,49 @@ export default {
   })
   
   const data_ssgl = reactive({value: [
-    { title: '维护水深', value:  8, unit: '米', iconUrl: require('@/assets/imgs/page_hdsj/logo-whss.png') },
-    { title: '淤积预警', value:  0, unit: '处', iconUrl: require('@/assets/imgs/page_hdsj/logo-yjyj.png') },
+    { title: '维护水深', isHighlight: false, value:  '-', unit: '米', iconUrl: require('@/assets/imgs/page_hdsj/logo-whss.png') },
+    { title: '淤积预警', isHighlight: false, value:  0, unit: '处', iconUrl: require('@/assets/imgs/page_hdsj/logo-yjyj.png') },
   ]})
 
-  const isYujiOn = ref(false)
+  const listShow_whss = ref(false)
 
-  function handleToggleYuji(item) {
+  function handlePickWhss(item) {
+    data_ssgl.value[0].value = Math.abs(+item.height)
+    ueCallCloseMaintain()
+    setTimeout(() => {
+      ueCallOpenMaintain(item.id)
+    }, 500);
+  }
+
+  function handleCloseWhss() {
+    data_ssgl.value[0].isHighlight = false
+    data_ssgl.value[0].value = '-'
+    listShow_whss.value = false
+    ueCallCloseMaintain()
+  }
+
+  function handleToggleSsgl(item) {
     if(item.title==='淤积预警'&&item.value>0) {
-      if(isYujiOn.value === false) {
+      if(data_ssgl.value[1].isHighlight === false) {
         ueCallCloseWater()
         ueCallStartYjyj()
       } else {
         ueCallOpenWater()
         ueCallCloseYjyj()
       }
-      isYujiOn.value = !isYujiOn.value
+      data_ssgl.value[1].isHighlight = !data_ssgl.value[1].isHighlight
+    }
+    if(item.title==='维护水深') {
+      if(listShow_whss.value) {
+        handleCloseWhss()
+      } else {
+        data_ssgl.value[0].isHighlight = true
+        listShow_whss.value = true
+      }
     }
   }
 
-  const listData_gcxx = reactive({value: [
-    // { id: '1', prjName: '2022年董家渡弯道疏浚项目',projectStartTime: '2022-11-15',projectEndTime:'2022-11-15',investment: '1567万元', quantities:'17.42万方' },
-    // { id: '2', prjName: '2022年董家渡弯道疏浚项目',projectStartTime: '2022-11-15',projectEndTime:'2022-11-15',investment: '1567万元', quantities:'17.42万方' },
-    // { id: '3', prjName: '2022年董家渡弯道疏浚项目',projectStartTime: '2022-11-15',projectEndTime:'2022-11-15',investment: '1567万元', quantities:'17.42万方' },
-    // { id: '4', prjName: '2022年董家渡弯道疏浚项目',projectStartTime: '2022-11-15',projectEndTime:'2022-11-15',investment: '1567万元', quantities:'17.42万方' },
-    // { id: '4', prjName: '2022年董家渡弯道疏浚项目',projectStartTime: '2022-11-15',projectEndTime:'2022-11-15',investment: '1567万元', quantities:'17.42万方' },
-  ]})
+  const listData_gcxx = reactive({value: []})
 
   function handleChangeProject(id) {
     currentProjectId.value = id
@@ -236,21 +255,13 @@ export default {
     sta: [
       { title: '施工范围长度', value: '-', unit: 'km', iconUrl: require('@/assets/imgs/page_hdsj/logo-hdzc.png') },
       { title: '疏浚船舶', value: '-', unit: '艘', iconUrl: require('@/assets/imgs/page_hdsj/logo-sjcb.png') },
-    ],
-    // cata: [
-    //   { name: '工区', value: '-' },
-    //   { name: '排泥场', value: '-' },
-    //   { name: '固化场', value: '-' },
-    // ]
+    ]
   })
 
   function getBoatNum(id) {
     GetBoatNum(id).then(res => {
       data_gcgk.sta[0].value = 1.469
       data_gcgk.sta[1].value = res.data.data || '-'
-      // data_gcgk.cata[0].value = 6
-      // data_gcgk.cata[1].value = 17
-      // data_gcgk.cata[2].value = 3
     })
   }
 

src/views/hdsj/cpns/WaterDepthList.vue

@@ -0,0 +1,121 @@
+<template>
+  <div id="water-depth-list">
+    <span class="dialog-close" @click="emit('close')"></span>
+    <span class="title-dialog">维护水深</span>
+    <table class="wdl-table">
+      <thead>
+        <th>区段名称</th>
+        <th>通航宽度(m)</th>
+        <th>维护底标高(m)</th>
+      </thead>
+      <tbody>
+        <tr v-for="item in tableData.value" @click="handleClickRow(item)" :class="{'highlight': currentId===item.id}">
+          <td>{{ item.name }}</td>
+          <td>{{ item.width }}</td>
+          <td>{{ item.height }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+// import { GetWhss } from '@/apis/hdsj'
+
+/* onMounted(() => {
+  GetWhss().then(res => {
+    if(res?.data?.Rows.length>0) {
+      tableData.value = res.data.Rows.filter(row => row.TYPE==2)
+    }
+  })
+}) */
+
+const tableData = reactive({value: [
+  { id: 'H0-H8', name: '101灯浮~长江西路隧道', width: '200', height: '-9.0' },
+  { id: 'H8-H11', name: '长江西路隧道~军工路码头', width: '200', height: '-8.5' },
+  { id: 'H11-H32', name: '军工路码头~杨树浦发电厂码头', width: '200', height: '-8.0' },
+  { id: 'H32-H44', name: '杨树浦发电厂码头~东方明珠游船码头', width: '165', height: '-8.0' },
+  { id: 'H44-H71', name: '东方明珠游船码头~临浦渡口', width: '127', height: '-8.3' },
+  { id: 'H71-H81', name: '临浦渡口~徐浦大桥', width: '200', height: '-8.3' },
+  { id: 'H81-H83', name: '徐浦大桥~远洋船务工程公司码头', width: '168', height: '-8.3' },
+  { id: 'H83-H88', name: '远洋船务工程公司码头~吴泾航道下游末端', width: '168~100', height: '-8.3' },
+  { id: 'H88-H93', name: '吴泾航道', width: '100', height: '-8.3' },
+]})
+
+const currentId = ref('')
+
+const emit = defineEmits(['close', 'pick'])
+
+function handleClickRow(item) {
+  currentId.value = item.id
+  emit('pick', item)
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+#water-depth-list {
+  position: absolute;
+  top: 70px;
+  left: 340px;
+  width: 520px;
+  height: 315px;
+  background: url('@/assets/imgs/page_yyjg/danger-panel.png');
+  background-size: 100% 100%;
+  box-sizing: border-box;
+  padding: 15px;
+  
+  .dialog-close {
+    top: 13px;
+    right: 10px;
+  }
+  .wdl-table {
+    width: 100%;
+    border-spacing: 0 7px;
+    thead, tbody>tr {
+      display: table;
+      width: 100%;
+      table-layout: fixed;
+    }
+    td,th {
+      &:nth-child(1) {
+        width: 57%;
+      }
+      &:nth-child(2) {
+        width: 20%;
+      }
+      &:nth-child(3) {
+        width: 23%;
+      }
+    }
+    thead {
+      th {
+        font-size: 16px;
+        font-weight: bold;
+      }
+    }
+    tbody {
+      display: block;
+      height: 215px;
+      overflow-y: auto;
+      tr {
+        cursor: pointer;
+        td {
+          font-size: 14px;
+          color: #ddd;
+        }
+        &:hover {
+          &>td {
+            color: #fff;
+          }
+        }
+        &.highlight>td {
+          color: rgb(249, 238, 117);
+        }
+      }
+    }
+  }
+}
+</style>

src/views/ssky/cpns/BoatDockList.vue

@@ -9,7 +9,7 @@
           <div>
             <span>{{item.shipName}}</span>
             <span>MMSI : {{item.mmsi}}</span>
-            <span>{{+item.velocity===0?'停泊中':'航行中'}}</span>
+            <span>{{item.velocity&&+item.velocity>=1?'航行中':'停泊中'}}</span>
           </div>
         </li>
       </ul>

src/views/yyjg/Index.vue

@@ -632,6 +632,8 @@ export default {
         cursor: pointer;
         &>input {
           margin-right: 3px;
+          width: 13px;
+          height: 13px;
         }
       }
       &>span {
@@ -863,6 +865,9 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: flex-end;
+          &>span {
+            font-size: 18px;
+          }
         }
 
         .value-boat, .value-ent {