增加浦江游览详情查询和轮渡详情信息

src/apis/boats.js

@@ -11,3 +11,6 @@ export function GetBoatNum(index,size,mmsi) {
   }
   })
 }
+
+
+

src/apis/other.js

@@ -1,5 +1,19 @@
 import request from "@/request/index";
 
+
+
+export function GetLDInfo(name) {
+    return request({
+        url: '/DigitalTwain/PassengerTraffic/getBerthFlux',
+        method: "post",
+        data: {
+            berthName:name
+        },
+    })
+}
+
+
+
 export function GetWeather() {
   return request({
       url: '/weather/GetTodayWeather',

src/apis/ssky.js

@@ -19,9 +19,17 @@ export function GetMtkll() {
   })
 }
 
+// UE游览资源列表
+// export function GetLdzy() {
+//   return request({
+//     url: '/DigitalTwain/PassengerTraffic/getdjld',
+//     method: "post",
+//   })
+// }
+//新做游览资源列表
 export function GetLdzy() {
   return request({
-    url: '/DigitalTwain/PassengerTraffic/getdjld',
+    url: '/DigitalTwain/PassengerTraffic/GetVisitRes',
     method: "post",
   })
 }

src/apis/yyjg.js

@@ -50,6 +50,19 @@ export function GetZxjc(isFinish,size,index) {
   })
 }
 
+// 浦江游览企业信息
+export function GetPJYLUnits(index,size) {
+    return request({
+        url: '/DigitalTwain/PassengerTraffic/GetPjUnit',
+        method: "post",
+        data: {
+            index, //分页页码
+            size //分页大小
+        }
+    })
+}
+
+
 export function GetWggj() {
   return request({
       url: '/DigitalTwin/businessManage/GetWarningInfo',

src/components/UeVideo.vue

@@ -21,8 +21,8 @@ export default {
 
     onMounted(()=>{
 
-      bus.emit('ueRec_BoatClick',{'mmsi':412433850})
-      // bus.emit('click_Lundu',{name:'陆家浜轮渡站',nowLiu:500,xing:66,erlun:30,sanlun:20,yuzhi:20,yujing:'是'})
+      // bus.emit('ueRec_BoatClick',{'mmsi':412433850})
+      // bus.emit('click_Lundu',{name:'陆家浜轮渡站'})
       // console.log('video.value', video.value);
 
       videoInstance = initLoad({

src/views/hdsj/Index.vue

@@ -286,7 +286,7 @@
 
   const data_gcgk = reactive({
     sta: [
-      { title: '施工范围长度', value: '-', unit: 'km', iconUrl: require('@/assets/imgs/page_hdsj/logo-hdzc.png') },
+      { 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') },
     ]
   })

src/views/home/Header.vue

@@ -23,17 +23,19 @@
         </div>
       </div>
     </div>
-    <div class="sub">
-      <ul>
-        <li v-for="item,index in subList" :class="{'highlight': item.status}">
-          <span @click="handleToggleLayer(index)">{{ item.name }}</span>
-        </li>
-      </ul>
-    </div>
+<!--    <div class="sub">-->
+<!--      <ul>-->
+<!--        <li v-for="item,index in subList" :class="{'highlight': item.status}">-->
+<!--          <span @click="handleToggleLayer(index)">{{ item.name }}</span>-->
+<!--        </li>-->
+<!--      </ul>-->
+<!--    </div>-->
     <MiForChange v-if="miForChangeShow"/>
     <water-level v-if="waterDeepShow"/>
     <Tools v-if="checkTool" />
+
     <LunDuMessage v-if="checkLinDu" :datas="ldData.value"/>
+    <SelectForUnit  v-if="showSelect"  />
   </div>
 </template>
 
@@ -57,9 +59,11 @@ export default {
   import MiForChange from './cpns/MiForChange.vue'
   import Tools from './cpns/tools/Tools.vue'
   import LunDuMessage from './cpns/boatPanel/LunDuMessage.vue'
+  import SelectForUnit from './SelectForUnit.vue'
+
   import { asideShow } from '@/store/index'
   import {ElMessage} from "element-plus";
-  let ldData=reactive({value: {}})
+  let ldData=reactive({value: ''})
   const  checkLinDu=ref(false)
   const checkSelect = ref(false)
   const checkTool = ref(false)
@@ -69,11 +73,15 @@ export default {
   const checkCeMian = ref(false)
   const checkClear = ref(false)
 
+
+  const showSelect = ref(false)
+
+
   bus.on('click_Lundu', (data) => {
+    console.log(data)
     if(data!=null && data!='') {
       checkLinDu.value=true
       ldData.value=data
-      console.log(ldData.value.name)
     }
   })
   const  isCheck=ref({
@@ -96,8 +104,17 @@ export default {
   const weather = ref('qing')
 
   function changeImage(index,name) {
-    isCheck.value.data.forEach(i=>{if(i.imageName===name&&!i.click){i.click=true;i.checkIoc=true}else {i.click=false;i.checkIoc=false}})
+    isCheck.value.data.forEach(i=>{
+      if(i.imageName===name&&!i.click){
+        i.click=true;i.checkIoc=true
+           showSelect.value=true
+      }
+      else {
+        i.click=false;i.checkIoc=false
+      }
+    })
   }
+
   function getWeather() {
     GetWeather().then(res => {
       switch(res.data.weather) {

src/views/home/SelectForUnit.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="select_content">
+        <div class="select_header">
+            <span>
+                <el-select  v-model="selectValue" popper-class="select_type" placeholder="请选择">
+                    <el-option
+                            v-for="item in selectType"
+                            :key="item.key"
+                            :label="item.name"
+                            :value="item.key">
+                    </el-option>
+                </el-select>
+            </span><i class="select_downImage"></i><input alt="请输出查询内容" /><i class="select_selectImage"></i>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "SelectForUnit"
+    }
+</script>
+<script setup>
+    import { onMounted, reactive, ref } from 'vue';
+    import {ElSelect,ElOption} from "element-plus"
+    import 'element-plus/es/components/select/style/css'
+    import 'element-plus/es/components/option/style/css'
+    const  selectType=ref([{key:0,name:"企业"},{key:1,name:"船舶"}])
+    let   selectValue=""
+</script>
+
+<style lang="scss" scoped>
+.select_content{
+    position: fixed;
+    top: 30px;
+    right: 18%;
+    width: 280px;
+    height: 320px;
+    background: #00FF95;
+    .select_header{
+        margin-top: 10px;
+        background: #1A5482;
+        height:40px;
+      .select_type{
+          width: 80px;
+              color: #fff;
+              /*border: 1px solid #176168 !important;*/
+              // background: #176168 !important;
+
+              .el-select-dropdown__list {
+                  text-align: right;
+                  background: none!important;
+              }
+              .el-select-dropdown__item {
+                  color: #fff;
+                  background: none!important;
+              }
+              .el-select-dropdown__item.hover,
+              .el-select-dropdown__item:hover {
+                  background: none
+                  !important;
+              }
+      }
+    }
+}
+</style>

src/views/home/cpns/boatPanel/LunDuMessage.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="Lundu-info">
     <div class="bodyForLundu">
-      <span class="lundu-title">{{ props.datas.name|| '未查到信息' }}</span>
+      <span class="lundu-title">{{ LdInfo.value.berthName|| '未查到信息' }}</span>
       <div  class="lundu-body">
         <div class="bin-left">
-        <li><span>当前总客流:</span><span>{{ props.datas.nowLiu}}</span></li>
-        <li><span>二轮车数:</span><span>{{ props.datas.erlun}}</span></li>
-        <li><span>客流阈值:</span><span>{{ props.datas.yuzhi}}</span></li>
+        <li><span>当前总客流:</span><span>{{ LdInfo.value.total}}</span></li>
+        <li><span>二轮车数:</span><span>{{ LdInfo.value.twoWheels}}</span></li>
+        <li><span>客流阈值:</span><span>{{ LdInfo.value.threshold == null?'无': LdInfo.value.threshold }}</span></li>
       </div>
         <div class="bin-right">
-          <li><span>行人数:</span><span>{{ props.datas.xing}}</span></li>
-          <li><span>三轮车数:</span><span>{{ props.datas.sanlun}}</span></li>
-          <li><span>是否预警:</span><span>{{ props.datas.yujing}}</span></li>
+          <li><span>行人数:</span><span>{{ LdInfo.value.passerby}}</span></li>
+          <li><span>三轮车数:</span><span>{{LdInfo.value.triWheels}}</span></li>
+          <li><span>是否预警:</span><span>{{ LdInfo.value.isWarn == null?'无': LdInfo.value.isWarn}}</span></li>
         </div>
       </div>
 
@@ -26,22 +26,35 @@ export default {
 </script>
 
 <script setup>
-  import {ref, reactive, onMounted, onBeforeUnmount} from 'vue'
+  import {ref, reactive, onMounted} from 'vue'
   import { ElMessage } from 'element-plus'
   import 'element-plus/es/components/message/style/css'
   import 'element-plus/es/components/date-picker/style/css'
+
+  import { GetLDInfo } from '@/apis/other'
+
   import bus from "@/utils/bus";
-  import {ueCallBoatCloseDrive} from "@/utils/UIInteractions";
+  // import {ueCallBoatCloseDrive} from "@/utils/UIInteractions";
   const props = defineProps(['datas'])
-
-  onBeforeUnmount(() => {
-    bus.off('click_Lundu')
-    ueCallBoatCloseDrive()
-  })
   onMounted(() => {
-    console.log('----'+props.name)
-    console.log('----'+props.datas.name)
+    console.log(props.name)
+    console.log(props.datas.name)
+    getData()
   })
+  let LdInfo = reactive({value:{berthName:null,total:0,twoWheels:0,threshold:null,passerby:0,triWheels:0,isWarn:null}})
+
+
+ function getData()
+ {
+   console.log(props.datas.name)
+   GetLDInfo(props.datas.name).then(res=>{
+     if (res.data!=null && res.data!=undefined && res.data!='')
+     {
+       LdInfo.value= res.data.Rows[0]
+     }
+   })
+ }
+
 
 
 

src/views/ssky/Index.vue

@@ -245,7 +245,7 @@ export default {
   function getLdzy() {
     GetLdzy().then(res => {
       ldzyData.dk = res.data.pierNumber
-      youlanSource.value.data[0].numbers=res.data.pierNumber
+      youlanSource.value.data[0].numbers=res.data.waterTrafficNumber
       youlanSource.value.data[1].numbers=res.data.pierNumber
       ldzyData.dc = res.data.shipNumber
       youlanSource.value.data[2].numbers=res.data.shipNumber

src/views/ssky/cpns/PuJiangUnitList.vue

@@ -3,13 +3,13 @@
     <span class="dialog-close" @click="handleClose"></span>
     <span class="title-dialog">浦江游览企业信息</span>
     <el-table :data="tableData.value" class="table-default dw-table"  stripe>
-      <el-table-column label="序号"  type="index" />
-      <el-table-column label="企业名称" prop="unitName" min-width="160" show-overflow-tooltip />
-      <el-table-column label="水路运输经营许可证号" prop="shipName" min-width="90" show-overflow-tooltip />
-      <el-table-column label="法定代表人" prop="cargoName" min-width="60" show-overflow-tooltip />
+      <el-table-column label="序号"  type="index" :dataformatas="indexCreate" />
+      <el-table-column label="企业名称" prop="companyName" min-width="160" show-overflow-tooltip />
+      <el-table-column label="水路运输经营许可证号" prop="certNumber" min-width="90" show-overflow-tooltip />
+      <el-table-column label="法定代表人" prop="legalPerson" min-width="60" show-overflow-tooltip />
       <el-table-column label="有效期" min-width="90" show-overflow-tooltip>
         <template #default="scope">
-          <span>{{ scope.row.startTime.slice(5,16) }}</span>-<span>{{ scope.row.endTime.slice(5,16) }}</span>
+          <span>{{ scope.row.effectDate}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -20,6 +20,7 @@
       :total="total"
       layout="prev, pager, next"
       @current-change="handlePageChange"
+      @size-change="handleSizeChange"
     >
     </el-pagination>
   </div>
@@ -27,39 +28,43 @@
 </template>
 
 <script setup>
-import { reactive, ref, watch } from 'vue'
-import { GetZxjc } from '@/apis/yyjg'
+  import {onMounted, reactive, ref, watch} from 'vue'
+import { GetZxjc,GetPJYLUnits } from '@/apis/yyjg'
 import { ElTable, ElTableColumn, ElPagination } from 'element-plus'
 import 'element-plus/es/components/table/style/css'
 import 'element-plus/es/components/table-column/style/css'
 import 'element-plus/es/components/pagination/style/css'
 
-
-const dangerIsFinishList = ref(0)
-
 const tableData = reactive({value: []})
 
-function getData(isFinish, size, index) {
-  GetZxjc(isFinish, size, index).then(res => {
+function getData() {
+  GetPJYLUnits(currentPage.value,pageSize.value).then(res => {
     tableData.value = res.data?.Rows || []
     total.value = res.data.TotalRowCount
   })
 }
-
+  onMounted(() => {
+    getData()
+  })
 const currentPage = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
+function  indexCreate(row, column, cellValue, index) {
+  return index + 1 + pageSize.value*(currentPage.value - 1)
+}
 
 function handlePageChange(val) {
   currentPage.value = val
-  getData(dangerIsFinishList.value, pageSize.value, val)
+  getData()
 }
 
-watch(dangerIsFinishList, (val) => {
-  getData(val, pageSize.value, 1)
-},{immediate:true})
-
+function handleSizeChange(val) {
+  // debugger
+  pageSize.value = val
+  currentPage.value = 1
+  getData()
 
+}
 const emits = defineEmits(['closeBoatList'])
 
 function handleClose() {