提交下源码

src/views/ChannelSetting.vue

 <template>
 <div>
-  <el-tabs type="card" style="height: 50vh">
+  <el-tabs type="card" style="height: calc(100vh - 126px)">
     <el-tab-pane label="系统配置">
       <el-card>  
         <el-form :model="sysForm" :inline="true">

src/views/HomeView.vue

@@ -9,7 +9,7 @@
       </template>
       <component :is="item.template" :ref="item.template" @refresh="handleRefresh" @logChange="handleLogChange"></component>
     </el-tab-pane>
-    <div style="bottom: 107px;height: 20px;border: 1px solid #000;">{{log}}</div>
+    <el-card>{{log}}</el-card>
   </el-tabs>
 </template>
 
@@ -57,11 +57,14 @@ export default defineComponent({
 })
 </script>
 
-<style>
+<style scope>
 .menu-tabs > .el-tabs__content {
   height: calc(100vh - 71px);
 }
 .el-tabs {
   --el-tabs-header-height: 60px !important;
 }
+.el-tabs--border-card>.el-tabs__content {
+  padding: 0px !important;
+}
 </style>

src/views/InTask.vue

 <template>
   <el-row :gutter="20">
     <el-col :span="16">
-      <el-card style="height: 45vh;">
+      <el-card style="height: calc(50vh - 68px);">
         <template #header>
           <div class="card-header">
             <span>计划任务</span>
             <el-button class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button>
           </div>
         </template>
-        <el-table :data="billList" ref="bill" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="billClick">
+        <el-table :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="bizBillNo" label="单据号" align="center"/>
           <el-table-column prop="billName" label="凭证号" align="center"/>
@@ -44,11 +44,11 @@
           :total="total"
         />
       </el-card>
-      <el-card style="height: 45vh;margin-top: 20px;">
+      <el-card style="height: calc(50vh - 68px);margin-top: 10px;">
         <template #header>
           <span>物资列表</span>
         </template>
-        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="goodsClick">
+        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="goodsCode" label="品名代码" align="center"/>
           <el-table-column prop="goodsName" label="品名" align="center"/>
@@ -67,11 +67,11 @@
       </el-card>
     </el-col>
     <el-col :span="8">
-      <el-card style="height: 92vh;">
+      <el-card style="height: calc(100vh - 126px)">
         <template #header>
           <span>号型列表</span>
         </template>
-        <el-table :data="modelList" border style="width: 100%;height: 78vh;">
+        <el-table :data="modelList" border style="width: 100%;height: 70vh;">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="modelName" label="号型名称" align="center" width="180"/>
           <el-table-column prop="planAmount" label="计划数量" align="center"/>

src/views/OutTask.vue

 <template>
   <el-row :gutter="20">
     <el-col :span="16">
-      <el-card style="height: 45vh;">
+      <el-card style="height: calc(50vh - 68px);">
         <template #header>
           <div class="card-header">
             <span>计划任务</span>
             <el-button class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button>
           </div>
         </template>
-        <el-table :data="billList" ref="bill" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="billClick">
+        <el-table :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="bizBillNo" label="单据号" align="center"/>
           <el-table-column prop="billName" label="凭证号" align="center"/>
@@ -44,11 +44,11 @@
           :total="total"
         />
       </el-card>
-      <el-card style="height: 45vh;margin-top: 20px;">
+      <el-card style="height: calc(50vh - 68px);margin-top: 10px;">
         <template #header>
           <span>物资列表</span>
         </template>
-        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="goodsClick">
+        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="goodsCode" label="品名代码" align="center"/>
           <el-table-column prop="goodsName" label="品名" align="center"/>
@@ -67,11 +67,11 @@
       </el-card>
     </el-col>
     <el-col :span="8">
-      <el-card style="height: 92vh;">
+      <el-card style="height: calc(100vh - 126px)">
         <template #header>
           <span>号型列表</span>
         </template>
-        <el-table :data="modelList" border style="width: 100%;height: 78vh;">
+        <el-table :data="modelList" border style="width: 100%;height: 70vh;">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="modelName" label="号型名称" align="center" width="180"/>
           <el-table-column prop="planAmount" label="计划数量" align="center"/>

src/views/Query.vue

@@ -2,7 +2,7 @@
   <el-row :gutter="20">
     <el-col :span="6">
       <el-card>
-        <el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;height: 88vh;">
+        <el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;height: calc(100vh - 168px);">
           <el-form-item label="开始时间">
             <el-date-picker v-model="searchData.startTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;"/>
           </el-form-item>
@@ -26,8 +26,8 @@
       </el-card>
     </el-col>
     <el-col :span="18">
-      <el-card>
-        <el-table :data="logList" border size="large" style="width: 100%;height: 85vh;">
+      <el-card style="height: calc(100vh - 126px);">
+        <el-table :data="logList" border size="large" style="width: 100%;height: 78vh;">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="inState" label="出入库" align="center">
             <template #default="scope"> 

src/views/RFID.vue

@@ -2,7 +2,7 @@
   <div>
     <el-tabs type="border-card" v-model="activeTab">
       <el-tab-pane v-for="item in channelList" :key="item" :label="'通道' + item.stationId" :name="item.stationId">
-        <el-card>
+        <el-card style="height: calc(100vh - 187px)">
           <template #header>
             <div class="card-header">
               <span>实时出入库数据</span>
@@ -264,12 +264,17 @@ export default defineComponent({
       const websocketOnopen = (res) => {
         console.log("WebSocket连接成功");
       };
+
+      const map = new Map()
       // Websoket接收消息事件
       const websocketOnmessage = (res) => {
         let message = JSON.parse(res.data)
+        logData.value = ''
         if (message.noticeType == 0) {
-          // logData.value()
-          logData.value.push('通道' + message.stationId + ': ' + message.noticeInfo)
+          map.set(message.stationId, '【通道' + message.stationId + ': ' + message.noticeInfo+"】\n")
+          for(let value of map.values()) {
+            logData.value += value
+          }
           emit('logChange', logData.value)
         }
         if (message.noticeType == 2) {

src/views/Setting.vue

@@ -2,7 +2,7 @@
   <el-row :gutter="20">
     <el-col :span="6">
       <el-card>
-        <el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;height: 88vh;">
+        <el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;height: calc(100vh - 168px);">
           <el-form-item label="通道">
             <el-select v-model="formData.stationId" style="width: 100%;" filterable placeholder="请选择通道" @change="changeStation">
               <el-option v-for="item in bindList" :key="item.stationId" :label="item.stationId" :value="item.stationId"/>
@@ -35,7 +35,7 @@
     </el-col>
     <el-col :span="18">
       <el-card>
-        <el-table :data="bindList" border size="large" style="width: 100%;height: 88vh;">
+        <el-table :data="bindList" border size="large" style="width: 100%;height: calc(100vh - 168px);">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="stationId" label="通道号" align="center"/>
           <el-table-column prop="state" label="状态" align="center">