From 3706fb22a858169204aa05a01b38ec1a4e04b5c7 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 16:22:31 +0800
Subject: [PATCH] 大屏
---
LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue | 23 -
LuLiScreen/css/style_new20241126.css | 20 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 98 +++++---
LuLiScreen/index3.html | 577 +++++++++++++++++++-----------------------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 2
5 files changed, 318 insertions(+), 402 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
index 2f6c772..0040df2 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ReportCenter/storageView/index.vue
@@ -58,10 +58,7 @@
<div class="storage-grid">
<div class="row rowMy0">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex < 20">
- <span class="textK"
-
- :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }"
- >
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
<!-- {{ cell.laneNo }} -->
{{ cell.layerNo }}{{ cell.columnNo }}
</span>
@@ -69,7 +66,7 @@
</div>
<div class="row rowMy1">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 20 && cellIndex < 40">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
<!-- {{ cell.laneNo }} -->
{{ cell.layerNo }}{{ cell.columnNo }}
</span>
@@ -77,7 +74,7 @@
</div>
<div class="row rowMy2">
<div class="cell" v-for="(cell, cellIndex) in item.data" :key="cellIndex" v-show="cellIndex >= 40 && cellIndex <= 60">
- <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
+ <span class="textK" :style="{ background: setBgColor(cell.placeStatus), boxShadow: '0 1px 1px' + setBgColor(cell.placeStatus) }">
<!-- {{ cell.laneNo }} -->
{{ cell.layerNo }}{{ cell.columnNo }}
</span>
@@ -101,7 +98,7 @@
</div> -->
<!-- 缁熻鍖哄煙 -->
- <!-- <count-view :countData="countList"></count-view> -->
+ <!-- <count-view :countData="countList"></count-view> -->
<!-- 搴撲綅灞曠ず -->
<!-- <content-view :contentData="dataList"></content-view> -->
</div>
@@ -275,7 +272,7 @@
// return
// }
//璁剧疆鑳屾櫙
-
+
var res = await getStorageView(Object.assign(formModel.value, {}));
if (res.data.code == 200) {
const { data } = res;
@@ -448,15 +445,17 @@
}
}
.t1 {
- margin: 10px 0 2px 0;font-size: 16px !important;
+ margin: 10px 0 2px 0;
+ font-size: 16px !important;
+ padding-bottom:10px
}
.textK {
display: flex; /* 浣跨敤 Flexbox 甯冨眬 */
flex-direction: column;
font-size: 12px;
text-align: center;
- width: 100%;
- height: 100%;
- color: white;
+ width: 100%;
+ height: 100%;
+ color: white;
}
</style>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
index d66d8dd..d173fd4 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
@@ -1,6 +1,6 @@
锘�<template>
<div class="wmsOrderPurchase-container">
- <!-- 榻愬绠＄悊 -->
+ <!-- 榻愬绠＄悊 -->
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row>
@@ -93,7 +93,7 @@
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<div class="table-container">
<!-- 宸︿晶琛ㄦ牸 -->
- <div class="left-table">
+ <!-- <div class="left-table">
<p class="text-xtiny">榻愬鍒楄〃</p>
<el-table
@@ -116,17 +116,30 @@
</template>
</el-table-column>
<el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <!-- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" /> -->
</el-table>
- </div>
+ </div> -->
+
+ <!-- ///
+ <summary>/// 鐢熶骇鍗曞彿 ///</summary>
+ public string Info5 { get; set; } ///
+ <summary>/// 鎵规鍙� ///</summary>
+ public string PlanNo { get; set; } ///
+ <summary>/// 璁㈠崟鍙� ///</summary>
+ public string OrderId { get; set; } ///
+ <summary>/// 鏄惁榻愬 ///</summary>
+ public bool? IsKitting { get; set; } ///
+ <summary>/// 鍖呮暟 ///</summary>
+ public int PackageNum { get; set; } ///
+ <summary>/// 宸蹭笅绾垮寘鏁� ///</summary>
+ public int UnLinePackageNum { get; set; } ///
+ <summary>/// 鏈笅绾垮寘鏁� ///</summary>
+ public int NoUnLinePackageNum { get; set; } ///
+ <summary>/// 鎬诲寘瑁呴潰绉� ///</summary>
+ public decimal AllPackageArea { get; set; } ///
+ <summary>/// 宸叉壂鎻忓寘瑁呴潰绉� ///</summary>
+ public decimal ScanPackageArea { get; set; } ///
+ <summary>/// 鏈壂鎻忓寘瑁呴潰绉� ///</summary>
+ public decimal NoScanPackageArea { get; set; } -->
<!-- 鍙充晶琛ㄦ牸 -->
<div class="right-table">
@@ -144,29 +157,38 @@
>
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<!-- <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" /> -->
- <el-table-column label="璁㈠崟鍙�" prop="packageCode" width="150" align="left" show-overflow-tooltip>
+ <el-table-column label="鐢熶骇鍗曞彿" prop="info5" width="150" align="left" show-overflow-tooltip>
<template #default="scope">
<span class="under_line" @click="openDrawer(1, scope.row)">
- {{ scope.row.orderId }}
+ {{ scope.row.info5 }}
</span>
</template>
</el-table-column>
- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <!-- <el-table-column prop="count" label="鏁伴噺" show-overflow-tooltip="" />
- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" /> -->
+ <el-table-column prop="planNo" label="鎵规鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="isKitting" label="鏄惁榻愬" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag v-if="scope.row.isKitting"> 鏄� </el-tag>
+ <el-tag type="danger" v-else> 鍚� </el-tag>
+
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="packageNum" label="鍖呮暟" show-overflow-tooltip="" />
+ <el-table-column prop="unLinePackageNum" label="宸蹭笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="noUnLinePackageNum" label="鏈笅绾垮寘鏁�" show-overflow-tooltip="" />
+ <el-table-column prop="allPackageArea" label="鎬诲寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="scanPackageArea" label="宸叉壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="noScanPackageArea" label="鏈壂鎻忓寘瑁呴潰绉�" show-overflow-tooltip="" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
+ <el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" />
</el-table>
</div>
</div>
</el-card>
-<!--
+ <!--
<editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" /> -->
<importExcelDialog
ref="importExcelDialogRefWmsOrderDeliver"
@@ -204,6 +226,7 @@
import { exportPageExcel } from '/@/utils/exportPageExcel'; //寮曞叆瀵煎嚭鏂规硶
import OpenAllprop from './component/openAllprop.vue';
import { ExcellTableDataExport } from '/@/hooks/exportTableDataExcell';
+import { pageMes_Order_Gather } from '/@/api/main/WmsOrder/mes_Order_Gather';
const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
// ------------灏佽瀵煎嚭鍔熻兘--鍓嶇瀵煎嚭+琛ㄦ牸鏍囬---------------
@@ -285,19 +308,20 @@
// 8888888888888鏌ヨ鎿嶄綔 IsKitting
const handleQuery = async () => {
loading.value = true;
- var res = await KittingList(Object.assign(queryParams.value, {
- ...tableParams.value,
- IsKitting:true
- }));
- tableData.value = res.data.result ?? [];
+ // var res = await KittingList(Object.assign(queryParams.value, {
+ // ...tableParams.value,
+ // IsKitting:true
+ // }));
+ // tableData.value = res.data.result ?? [];
+ var res2 = await pageMes_Order_Gather(
+ Object.assign(queryParams.value, {
+ ...tableParams.value,
+ IsKitting: false,
+ })
+ );
- var res2 = await KittingList(Object.assign(queryParams.value, {
- ...tableParams.value,
- IsKitting:false
- }));
-
- newTableData.value = res2.data.result ?? [];
+ newTableData.value = res2.data.result.items ?? [];
// tableParams.value.total = res.data.result?.total;
loading.value = false;
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 3e84433..ded416f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -138,7 +138,7 @@
public async Task<Mes_Order_Gather> QueryCurrentOrder()
{
//鑾峰彇涓婄彮鏃堕棿銆�
- var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
+ var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�")
{
return null;
diff --git a/LuLiScreen/css/style_new20241126.css b/LuLiScreen/css/style_new20241126.css
index 4bf7fa4..f75dc8a 100644
--- a/LuLiScreen/css/style_new20241126.css
+++ b/LuLiScreen/css/style_new20241126.css
@@ -279,7 +279,7 @@
}
.text01_div p:nth-child(2) {
- font-size: 35px;
+ font-size: 29px;
color: #ffff43;
font-weight: 600;
@@ -296,6 +296,7 @@
margin-bottom: 25px;
display: flex;
justify-content: space-between;
+ overflow: hidden;
}
.div_any_child {
@@ -357,8 +358,12 @@
padding-top: 5px;
padding-bottom: 5px;
flex-shrink: 0;
- width:14.28%;
+ width:12.6%;
text-align: center;
+}
+
+.table_p span:first-child{
+ width: 22%;
}
.table_p .dowebok{
@@ -403,7 +408,8 @@
display: block;
color: #ffffff;
flex-shrink: 0;
- width:14.28%;
+ /* width:14.28%; */
+ word-wrap: break-word;
}
@@ -442,4 +448,12 @@
}
.title_rt{
right: 10px;
+}
+.table_p span.no_data{
+ color: white !important;
+ font-size: 20px !important;
+ text-align: center !important;
+ display: block !important;
+ width: 100%;
+ padding-top: 4%;
}
\ No newline at end of file
diff --git a/LuLiScreen/index3.html b/LuLiScreen/index3.html
index 64c9aa9..b88c36a 100644
--- a/LuLiScreen/index3.html
+++ b/LuLiScreen/index3.html
@@ -15,20 +15,20 @@
<link rel="stylesheet" href="./css//font/icomoon/style.css">
<link rel="stylesheet" href="./css/liMarquee.css">
<link rel="stylesheet" href="./css/style_new20241126.css">
- <title>椴佷附鏈ㄤ笟鍖呰绾�</title>
+ <title>椴佷附瀹跺眳鍖呰绾�</title>
</head>
<body>
<div class="container-flex" tabindex="0" hidefocus="true">
<div class="box-center">
- <p class="titleHt title_lt">褰撳墠鐧婚檰浜�:
- <span>鍒樺伐 </span>
-
+ <p class="titleHt title_lt">褰撳墠鐧婚檰浜�:
+ <span id="idLoginName"> </span>
+
</p>
- <p class="titleHt title_rt">鐧诲綍鏃堕棿:
- <span> 2024-01-05 </span>
-
-
+ <p class="titleHt title_rt">鐧诲綍鏃堕棿:
+ <span id="idLoginTime"> </span>
+
+
</p>
<div class="center-top">
<h1>椴佷附鏈ㄤ笟鍖呰绾�</h1>
@@ -43,29 +43,29 @@
<div class="con_div_text">
<img src="./images/img/info_2.png" class=" text01_img">
<div class=" text01_div">
- <p>鎬昏鍗曟暟</p>
- <p>55</p>
+ <p>鎬荤敓浜ц鍗曟暟</p>
+ <p id="idTotalOrder">0</p>
</div>
</div>
<div class="con_div_text">
<img src="./images/img/info_2.png" class=" text01_img">
<div class=" text01_div">
<p>鎬婚潰绉暟</p>
- <p>55</p>
+ <p id="idTotalArea">0</p>
</div>
</div>
<div class="con_div_text">
<img src="./images/img/info_2.png" class=" text01_img">
<div class=" text01_div">
<p>鎬诲寘鏁�</p>
- <p>66</p>
+ <p id="idTotalPackage">0</p>
</div>
</div>
<div class="con_div_text">
<img src="./images/img/info_2.png" class=" text01_img">
<div class=" text01_div">
<p>宸ヤ綔鏃堕暱(h)</p>
- <p>44</p>
+ <p id="idTotalWorkTime">0</p>
</div>
</div>
</div>
@@ -74,34 +74,28 @@
<div class="box_up_right">
<div class=" div_table_box">
<div class="div_any_child div_any_child2">
- <div class="div_any_title"><img src="./images/img/title_4.png">褰撳墠浜х嚎宸ヤ欢鍒楄〃 </div>
+ <div class="div_any_title"><img src="./images/img/title_4.png">褰撳墠璁㈠崟宸ヤ欢鍒楄〃 </div>
<div class="table_p table_p_my3">
<div class="tt">
- <span>璁㈠崟鍙�</span>
- <span>宸ヤ欢鏁�</span>
- <span>杩樺樊鏁�</span>
- <span>涓嬬嚎鏁�</span>
- <span>鎬婚潰绉�</span>
- <span>褰撳墠闈㈢Н</span>
- <span>涓嬬嚎闈㈢Н</span>
+ <span>鐢熶骇鍗曞彿</span>
+ <span>鍖呮暟</span>
+ <span>宸蹭笅绾垮寘鏁�</span>
+ <span>鏈笅绾垮寘鏁�</span>
+ <span>鎬诲寘瑁呴潰绉�</span>
+ <span>宸叉壂鍖呰闈㈢Н</span>
+ <span>鏈壂鍖呰闈㈢Н</span>
</div>
<div class="dowebok">
- <ul>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
+ <ul id="idList1">
+ <!-- <li>
<span>涓嬬嚎闈㈢Н77</span>
- </li>
+ </li> -->
</ul>
</div>
</div>
</div>
</div>
-
+
</div>
</div>
@@ -111,332 +105,49 @@
<div class=" div_table_box">
<div class="div_any_child">
- <div class="div_any_title"><img src="./images/img/title_4.png">鍘嗗彶浜х嚎宸ヤ欢鍒楄〃 </div>
+ <div class="div_any_title"><img src="./images/img/title_4.png">鍘嗗彶璁㈠崟宸ヤ欢鍒楄〃 </div>
<div class="table_p">
<div class="tt">
- <span>璁㈠崟鍙�</span>
- <span>宸ヤ欢鏁�</span>
- <span>杩樺樊鏁�</span>
- <span>涓嬬嚎鏁�</span>
- <span>鎬婚潰绉�</span>
- <span>褰撳墠闈㈢Н</span>
- <span>涓嬬嚎闈㈢Н</span>
+ <span>鐢熸垚鍗曞彿</span>
+ <span>鎬诲寘鏁�</span>
+ <span>宸蹭笅绾垮寘鏁�</span>
+ <span>鏈笅绾垮寘鏁�</span>
+ <span>鎬诲寘瑁呴潰绉�</span>
+ <span>宸叉壂鍖呰闈㈢Н</span>
+ <span>鏈壂鍖呰闈㈢Н</span>
</div>
<div class="dowebok dowebok1">
- <ul>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
+ <ul id="idList2">
+ <!-- <li>
+ <span>鐢熸垚鍗曞彿11</span>
+ </li> -->
</ul>
</div>
</div>
</div>
<div class="div_any_child">
- <div class="div_any_title"><img src="./images/img/title_4.png">璁″垝浜х嚎浠跺彿鍒楄〃 </div>
+ <div class="div_any_title"><img src="./images/img/title_4.png">璁″垝璁㈠崟宸ヤ欢鍒楄〃 </div>
<div class="table_p">
-
-
<div class="tt">
- <span>璁㈠崟鍙�</span>
- <span>宸ヤ欢鏁�</span>
- <span>杩樺樊鏁�</span>
- <span>涓嬬嚎鏁�</span>
- <span>鎬婚潰绉�</span>
- <span>褰撳墠闈㈢Н</span>
- <span>涓嬬嚎闈㈢Н</span>
+ <span>鐢熸垚鍗曞彿</span>
+ <span>鎬诲寘鏁�</span>
+ <span>宸蹭笅绾垮寘鏁�</span>
+ <span>鏈笅绾垮寘鏁�</span>
+ <span>鎬诲寘瑁呴潰绉�</span>
+ <span>宸叉壂鍖呰闈㈢Н</span>
+ <span>鏈壂鍖呰闈㈢Н</span>
</div>
<div class="dowebok dowebok2">
- <ul>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
+ <ul id="idList3">
+ <!-- <li>
+ <span>鐢熸垚鍗曞彿11</span>
</li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
- <li>
- <span>璁㈠崟鍙�11</span>
- <span>宸ヤ欢鏁�22</span>
- <span>杩樺樊鏁�33</span>
- <span>涓嬬嚎鏁�44</span>
- <span>鎬婚潰绉�55</span>
- <span>褰撳墠闈㈢Н66</span>
- <span>涓嬬嚎闈㈢Н77</span>
- </li>
+ -->
</ul>
</div>
</div>
@@ -450,18 +161,186 @@
<script src="./js/jquery-1.8.3.min.js"></script>
<script src="./js/jquery.liMarquee.js"></script>
<script>
- $(function () {
- $('.dowebok1').liMarquee({
- direction: 'up',
- scrollamount:20,
- runshort: false
- });
+ $('document').ready(function () {
+ function fetchAllData() {
- $('.dowebok2').liMarquee({
- direction: 'up',
- scrollamount:20,
- runshort: false
- });
+ // 11111111111111111 褰撳墠鐢熶骇璁㈠崟璁板綍
+ fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryCurrentOrder`, 'GET', {}, (res) => {
+ $('#idList1').html('');
+ var dataList1 = res.result;
+ if (!dataList1) {
+ $('#idList1').html(' <span class="no_data">鏆傛棤鏁版嵁</span>');
+ } else {
+ var item = dataList1;
+ var listItems1 = '';
+ listItems1 += `<li>
+ <span>${item.info5}</span> <!-- 鐢熶骇鍗曞彿 -->
+ <span>${item.packageNum}</span> <!-- 鍖呮暟 -->
+ <span>${item.unLinePackageNum}</span> <!-- 宸蹭笅绾垮寘鏁� -->
+ <span>${item.noUnLinePackageNum}</span> <!-- 鏈笅绾垮寘鏁� -->
+ <span>${item.allPackageArea}</span> <!-- 鎬诲寘瑁呴潰绉� -->
+ <span>${item.scanPackageArea}</span> <!-- 宸叉壂鎻忓寘瑁呴潰绉� -->
+ <span>${item.noScanPackageArea}</span> <!-- 鏈壂鎻忓寘瑁呴潰绉� -->
+ </li>`;
+ $('#idList1').append(listItems1);
+ }
+ });
+
+
+ // <span>${item.Info5}</span> <!-- 鐢熶骇鍗曞彿 -->
+ // <span>${item.planNo}</span> <!-- 鎵规鍙� -->
+ // <span>${item.orderId}</span> <!-- 璁㈠崟鍙� -->
+ // <span>${item.isKitting}</span> <!-- 鏄惁榻愬 -->
+ // <span>${item.isUnline}</span> <!-- 鏄惁涓嬬嚎 -->
+ // <span>${item.unlineTime}</span> <!-- 涓嬬嚎鏃堕棿 -->
+ // <span>${item.unlinePerson}</span> <!-- 涓嬬嚎浜� -->
+ // <span>${item.packageNum}</span> <!-- 鍖呮暟 -->
+ // <span>${item.unLinePackageNum}</span> <!-- 宸蹭笅绾垮寘鏁� -->
+ // <span>${item.noUnLinePackageNum}</span> <!-- 鏈笅绾垮寘鏁� -->
+ // <span>${item.allPackageArea}</span> <!-- 鎬诲寘瑁呴潰绉� -->
+ // <span>${item.scanPackageArea}</span> <!-- 宸叉壂鎻忓寘瑁呴潰绉� -->
+ // <span>${item.noScanPackageArea}</span> <!-- 鏈壂鎻忓寘瑁呴潰绉� -->
+
+
+ // 22222222222222222 鍘嗗彶
+ fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryHistoryOrderList`, 'GET', {}, (res) => {
+ $('#idList2').html('');
+ var dataList1 = res.result;
+ if (dataList1 == null || dataList1.length == 0) {
+ $('#idList2').html(' <span class="no_data">鏆傛棤鏁版嵁</span>');
+ } else {
+ var listItems1 = '';
+ dataList1.forEach(item => {
+ listItems1 += `<li>
+ <span>${item.info5}</span>
+ <span>${item.packageNum}</span>
+ <span>${item.unLinePackageNum}</span>
+ <span>${item.noUnLinePackageNum}</span>
+ <span>${item.allPackageArea}</span>
+ <span>${item.scanPackageArea}</span>
+ <span>${item.noScanPackageArea}</span>
+ </li>`;
+ });
+ $('#idList2').append(listItems1);
+ }
+ });
+
+ // 瀛楁鍚�: info5, 涓枃鎻忚堪: 鐢熶骇鍗曞彿
+ // 瀛楁鍚�: packageNum, 涓枃鎻忚堪: 鍖呮暟
+ // 瀛楁鍚�: unLinePackageNum, 涓枃鎻忚堪: 宸蹭笅绾垮寘鏁�
+ // 瀛楁鍚�: noUnLinePackageNum, 涓枃鎻忚堪: 鏈笅绾垮寘鏁�
+ // 瀛楁鍚�: allPackageArea, 涓枃鎻忚堪: 鎬诲寘瑁呴潰绉�
+ // 瀛楁鍚�: scanPackageArea, 涓枃鎻忚堪: 宸叉壂鎻忓寘瑁呴潰绉�
+ // 瀛楁鍚�: noScanPackageArea, 涓枃鎻忚堪: 鏈壂鎻忓寘瑁呴潰绉�
+
+ // 瀛楁鍚�: planNo, 涓枃鎻忚堪: 鎵规鍙�
+ // 瀛楁鍚�: orderId, 涓枃鎻忚堪: 璁㈠崟鍙�
+ // 瀛楁鍚�: isKitting, 涓枃鎻忚堪: 鏄惁榻愬
+ // 瀛楁鍚�: isUnline, 涓枃鎻忚堪: 鏄惁涓嬬嚎
+ // 瀛楁鍚�: unlineTime, 涓枃鎻忚堪: 涓嬬嚎鏃堕棿
+ // 瀛楁鍚�: unlinePerson, 涓枃鎻忚堪: 涓嬬嚎浜�
+
+
+
+ // 33333333333333333333 璁″垝
+
+ fetchData(`${baseUrl}/api/WmsCommonnQuery/QueryPlanOrderList`, 'GET', {}, (res) => {
+ $('#idList3').html('');
+ var dataList1 = res.result;
+ if (dataList1 == null || dataList1.length == 0) {
+ $('#idList3').html(' <span class="no_data">鏆傛棤鏁版嵁</span>');
+ } else {
+ var listItems1 = '';
+ dataList1.forEach(item => {
+ listItems1 += `<li>
+ <span>${item.info5}</span>
+ <span>${item.packageNum}</span>
+ <span>${item.unLinePackageNum}</span>
+ <span>${item.noUnLinePackageNum}</span>
+ <span>${item.allPackageArea}</span>
+ <span>${item.scanPackageArea}</span>
+ <span>${item.noScanPackageArea}</span>
+ </li>`;
+ });
+ $('#idList3').append(listItems1);
+ }
+ });
+
+
+
+
+
+ //4444444444444444
+ // 鐧诲綍浜� 姹囨��
+ // [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ // [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ fetchData(`${baseUrl}/api/WmsCommonnQuery/ScreenLogin`, 'GET', {}, (res) => {
+ $('#idTotalOrder').html('');
+ $('#idTotalArea').html('');
+ $('#idTotalPackage').html('');
+ $('#idTotalWorkTime').html('');
+ $('#idLoginName').html('');
+ $('#idLoginTime').html('');
+
+ var dataList1 = res.result;
+ if (dataList1 == null || dataList1.length == 0) {
+ $('#idList2').html(' <span class="no_data">鏆傛棤鏁版嵁</span>');
+ } else {
+ // var LoginName = res.result?.items[0].value;
+ $('#idTotalOrder').html(res.result.allOrderNum);
+ $('#idTotalArea').html(res.result?.allPackageArea);
+ $('#idTotalPackage').html(res.result?.packageNum);
+
+ const formattedWorkTime = res.result?.workTime.toFixed(2);
+ $('#idTotalWorkTime').html(formattedWorkTime);
+
+ $('#idLoginName').append(res.result?.loginUser);
+ $('#idLoginTime').append(res.result?.timeLogin);
+ }
+ });
+
+ // $(function () {
+ // $('.dowebok1').liMarquee({
+ // direction: 'up',
+ // scrollamount:20,
+ // runshort: false
+ // });
+
+ // $('.dowebok2').liMarquee({
+ // direction: 'up',
+ // scrollamount:20,
+ // runshort: false
+ // });
+ // });
+
+
+ }
+
+
+
+
+
+ function fetchData(url, method = 'GET', data = {}, callback) {
+ $.ajax({
+ url: url,
+ data: data,
+ type: method,
+ dataType: 'json',
+ timeout: 5000,
+ success: (res) => {
+ // 璋冪敤鍥炶皟鍑芥暟骞跺皢缁撴灉浼犻�掔粰瀹�
+ callback(res);
+ },
+ error: (jqXHR, textStatus, errorThrown) => {
+ console.error("AJAX Error: " + textStatus, errorThrown);
+ // 鍙互鍦ㄨ繖閲屽鐞嗛敊璇紝濡傛灉闇�瑕�
+ }
+ });
+ }
+
+ // 姣忎袱绉掕皟鐢ㄤ竴娆�
+ setInterval(fetchAllData, 2000);
+
});
</script>
</body>
--
Gitblit v1.9.3