From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html | 119 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 70 insertions(+), 49 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index fcce4ac..a00c1ab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -35,26 +35,33 @@
}
.imgicon {
- width: 100%;
- height: 30px;
- display: block;
- text-align: center;
+ /*width: 50%;
+ height: 50px;*/
+ /*display: block;*/
+ /*text-align: center;
+ line-height: 50px;
+ float: left;*/
}
.imgtitle {
+ width: 70%;
+ height: 50px;
text-align: center;
display: block;
font-size: 15px;
+ float: left;
+ line-height: 50px;
}
.cns {
border: 1px solid #5FB878;
- height: 200px;
+ height: 130px;
border-radius: 5px;
}
- .cns h5 {
- line-height: 25px;
+ .cns p {
+ font-size: 12px;
+ line-height: 18px;
margin: 0 5px;
white-space: nowrap;
text-overflow: ellipsis;
@@ -90,6 +97,13 @@
border: 1px solid rgb(0 0 0 / 10%);
width: 95%;
}
+ .btnM {
+ width: 30%;
+ height: 50px;
+ line-height: 50px;
+ float: left;
+ text-align:right;
+ }
</style>
</head>
<body>
@@ -99,51 +113,78 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-row">
- <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
- <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 500px; overflow: scroll;"></div>
+ <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 600px; overflow: scroll;"></div>
</div>
- <div class="layui-col-xs8 layui-inline" style="border: solid 1.5px #e0d6d64d;">
- <div id="btomleft" style="height:500px;display:block;overflow-y:auto;">
+ <div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
</div>
</div>
<div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
- <fieldset style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 485px;">
+ <fieldset style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
<legend style="color: #5FB878">鎿嶄綔鍙�</legend>
<div class="content4">
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 " onclick="OpenWork(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
- <span class="imgtitle">寮傚父</span>
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">寮�鏈�</span>
</div>
</div>
</div>
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 " onclick="OpenReport(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-list imgicon"></span>
- <span class="imgtitle">鎭㈠</span>
+ <div class="btnM">
+ <span class="layui-icon layui-icon-list imgicon"></span>
+ </div>
+ <span class="imgtitle">鏁呴殰鐧昏</span>
</div>
</div>
</div>
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 " onclick="OpenEnd(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-logout imgicon"></span>
- <span class="imgtitle">鍌績</span>
+ <div class="btnM">
+ <span class="layui-icon layui-icon-logout imgicon"></span>
+ </div>
+ <span class="imgtitle">缁翠慨</span>
</div>
</div>
</div>
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-pause imgicon"></span>
- <span class="imgtitle">鎶ヨ</span>
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">鍋滄満</span>
</div>
</div>
</div>
-
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">灞ュ巻</span>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+ <div class="cnt bottomright">
+ <div class="btnM">
+ <span class="layui-icon layui-icon-pause imgicon"></span>
+ </div>
+ <span class="imgtitle">宸ヨ壓</span>
+ </div>
+ </div>
+ </div>
</div>
</fieldset>
</div>
@@ -241,7 +282,7 @@
for (var i = 0; i < LoadData1.length; i++) {
var html1 = '';
- html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 10px;width: 190px;">';
+ html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 6px;width: 135px;">';
html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
html1 += '<dl>';
html1 += '<dd class="tcenter">';
@@ -255,33 +296,13 @@
html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
- html1 += '<h5><span>浜х嚎锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].浜х嚎 + '</span></h5>';
- html1 += '<h5><span>璁㈠崟锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].璁㈠崟 + '</span></h5>';
- html1 += '<h5><span>璁″垝鏁伴噺锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].璁″垝鏁伴噺 + '</span></h5>';
- html1 += '<h5><span>瀹屾垚鏁伴噺锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].瀹屾垚鏁伴噺 + '</span></h5>';
- html1 += '<h5><span>鐘舵�侊細</span><span>' + LoadData1[i].鐘舵�� + '</span><span style="margin-left:20px;">鏃堕暱锛�</span><span>' + LoadData1[i].璁″垝鏁伴噺 + '</span></h5>';
- html1 += '<h5><span>浜ゆ湡锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span></h5>';
- switch (LoadData1[i].鐘舵��) {
- case "寰呯敓浜�":
- html1 += '<h5><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].鐘舵�� + '</span></h5>';
- break;
- case "鐢熶骇涓�":
- html1 += '<h5><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].鐘舵�� + '</span></h5>';
- break;
- case "鎸傝捣":
- html1 += '<h5><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].鐘舵�� + '</span></h5>';
- break;
- case "瀹屽伐":
- html1 += '<h5><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].鐘舵�� + '</span></h5>';
- break;
- default:
- }
- html1 += '<span class="prs">鐢熶骇杩涘害锛�</span>';
- html1 += '<div class="layui-progress layui-progress-big" lay-showPercent="yes">';
- html1 += '<div class="layui-progress-bar" lay-percent="' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%" style="width:' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%;">';
- html1 += '<span class="layui-progress-text">' + ((LoadData1[i].HDateFinishQty / LoadData1[i].HDatePlanQty) * 100).toFixed(2) + '%</span>';
- html1 += '</div > ';
- html1 += '</div>';
+ html1 += '<p><span>浜х嚎锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].浜х嚎 + '</span></p>';
+ html1 += '<p><span>褰撳墠璁㈠崟锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].璁㈠崟 + '</span></p>';
+ html1 += '<p><span>浜ч噺锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
+ html1 += '<p><span>鐘舵�侊細</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
+ html1 += '<p><span>杩愯鏃堕暱锛�</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
+ html1 += '<p><span>缁翠慨鏃堕暱锛�</span><span>' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
+ html1 += '<p><span>绋煎姩鐜囷細</span><span>35%</span></p>';
html1 += '</dd>';
html1 += '</dl>';
html1 += '</div>';
--
Gitblit v1.9.1