From ccb5c15ee5cf72d8567997ae25fce6518fb63ae0 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期六, 11 五月 2024 15:43:15 +0800
Subject: [PATCH] 平面库区优化
---
代码管理/WMS/WMS_Client/src/views/Home.vue | 40 ++++++++++++++++++++++++++++------------
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs | 2 +-
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Home.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Home.vue"
index d6a97bb..395ddcb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Home.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Home.vue"
@@ -1,22 +1,25 @@
<template>
- <div>
- <el-button type="success" style="width: 10%;height: 50px;" v-on:click="selList()">鍒锋柊</el-button>
- </div>
- <div v-for="(index,inst) in datalist.length" :key="inst" style="padding: 10px;">
- <h1 style="border-bottom: 1px dashed silver; padding: 5px;;height: 52px;">
- <span v-if="inst==0">鍙犵洏鍖�</span>
- <span v-else-if="inst==1">涓婃枡鍖�</span>
- <span v-else-if="inst==2">涓嬫枡鍖�</span>
- <span v-else-if="inst==3">澶栧崗鍖�</span>
- <span v-else-if="inst==4">鎵樼洏鍙犳斁鍖�</span>
- <span v-else>{{inst-3}}搴撳尯</span>
- <span style="margin-left: 40px;">
+ <div class="fixed-row">
+ <el-button type="success" style="width: 10%;height: 40px;font-size: 35px;" v-on:click="selList()">鍒锋柊</el-button>
+ <span style="margin-left: 40px;">
<el-button circle style="background-color: #409eff;color: #000;">鏈夎揣</el-button>
<el-button circle style="background-color: lightgreen;color: #000;">绌鸿揣浣�</el-button>
<el-button circle style="background-color: yellow;color: #000;">鍑哄叆搴撳崰鐢�</el-button>
<el-button circle style="background-color: red;color: #000;">寮傚父</el-button>
<el-button circle style="background-color: #C0C4CC;color: #000;">绂佺敤</el-button>
</span>
+ </div>
+ <div style="height: 50px;">
+
+ </div>
+ <div v-for="(index,inst) in datalist.length" :key="inst" style="padding: 10px;">
+ <h1 style="border-bottom: 1px dashed silver; padding: 5px;;height: 52px;">
+ <span v-if="inst==0">鎵樼洏鍙犳斁鍖�</span>
+ <span v-else-if="inst==1">涓婃枡鍖�</span>
+ <span v-else-if="inst==2">涓嬫枡鍖�</span>
+ <span v-else-if="inst==3">澶栧崗鍖�</span>
+ <span v-else-if="inst==4">鍙犵洏鍖�</span>
+ <span v-else>{{inst-3}}搴撳尯</span>
</h1>
<div class="table-container">
<div class="scrollable-table">
@@ -26,9 +29,11 @@
:style="{ 'background-color': getBackgroundColor(items.enable,items.location_state) }">
<el-tooltip class="item" effect="dark" placement="right" >
<template #content v-if="items.stationType!=='' && items.bindSN !== '' && items.stationType!==null && items.bindSN !== null">
+ <div>搴撲綅缂栧彿锛歿{ items.stationCode }}</div>
<div>鐗╂枡绫诲瀷(鍥惧彿)锛� {{ items.stationType }}</div>
<div>鐐夊彿锛� {{ items.heatNumber }}</div>
<div>杞﹁疆SN鍙凤細{{ items.bindSN }}</div>
+ <div>閽㈠澂鍙凤細{{ items.billetID }}</div>
</template>
<template #content v-else>
<div>鐩墠鏆傛棤淇℃伅</div>
@@ -94,8 +99,12 @@
return 'yellow';
case 'OutBusy':
return 'yellow';
+ case 'Busy':
+ return 'yellow';
case 'Abnormal':
return 'red';
+ case 'Abnormal':
+ return 'yellow';
default:
return 'transparent';
}
@@ -154,4 +163,11 @@
.table-container::-webkit-scrollbar-thumb {
background-color: #ccc;
}
+
+.fixed-row {
+ position: fixed;
+ width: 100%; /* 璁╄鐨勫搴﹀崰婊℃暣涓绐� */
+ background-color: #fff; /* 濡傛灉闇�瑕侊紝璁剧疆鑳屾櫙鑹� */
+ z-index: 3; /* 纭繚鍥哄畾琛屽湪鍏朵粬鍐呭涔嬩笂 */
+}
</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
index a7492eb..a9c5dbf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
@@ -180,7 +180,7 @@
WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
- string[] stationCodes = { "DD","S", "X", "W","A", "B", "C", "D01" };
+ string[] stationCodes = { "A","S", "X", "W", "DD","B", "C", "D01"};
List<Tuple<List<dt_stationinfo>, int>> responseData = new List<Tuple<List<dt_stationinfo>, int>>();
foreach (string code in stationCodes)
{
--
Gitblit v1.9.3