From 7e88876cd6c68e963ec0560f4e329e5dad483d9c Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 28 十一月 2025 16:58:16 +0800
Subject: [PATCH] 增加casno等7个字段
---
HTML/views/home/console2.html | 141 ++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/HTML/views/home/console2.html b/HTML/views/home/console2.html
index f4666e1..0be7e97 100644
--- a/HTML/views/home/console2.html
+++ b/HTML/views/home/console2.html
@@ -264,7 +264,7 @@
</div>
</div>
</div> -->
- <div style="width: 100%;height: 38.33%;">
+ <div style="width: 100%;height: 40%;">
<div class="layui-card-header">
<img src="../../img/console/xiexian.png" style="height: 20px;">
搴撳瓨鐗╂枡绫诲瀷鍒嗗竷
@@ -275,7 +275,7 @@
</div>
</div>
</div>
- <div style="width: 80%;margin-top: 15%;height: 38.33%;">
+ <div style="width: 100%;margin-top: 15%;height: 50%;">
<div class="layui-card-header">
<img src="../../img/console/xiexian.png" style="height: 20px;">
搴撳瓨璐ㄩ噺鐘舵�佸垎甯�
@@ -411,26 +411,26 @@
<!-- 鍙� -->
<div class="layui-col-md4" style="height: 100%;margin-top: 10px;">
<div class="layui-card" style="height: 100%;border-radius: 15px;box-shadow: 0px 0px 10px 1px #a4a3a3;">
- <div style="width: 100%;height: 33.33%;">
+ <div style="width: 100%;height: 45%;">
<div class="layui-card-header">
<img src="../../img/console/xiexian.png" style="height: 20px;">
杩戜竴鏈堢儹搴︾墿鏂�
</div>
- <div class="layui-card-body" style="padding: 0;height: 90%;width: 90%;margin-left: 5%;">
+ <div class="layui-card-body" style="height: 90%;width: 90%;margin-left: 5%;">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list" border="0"
cellpadding="0" cellspacing="0"></table>
</div>
</div>
- <div style="width: 100%;height: 33.33%;">
+ <div style="width: 100%;height: 45%;">
<div class="layui-card-header">
<img src="../../img/console/xiexian.png" style="height: 20px;">
瀹夊叏搴撳瓨棰勮
</div>
- <div class="layui-card-body" style="padding: 0;height: 90%;width: 90%;margin-left: 5%;">
+ <div class="layui-card-body" style="height: 90%;width: 90%;margin-left: 5%;">
<table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
</div>
</div>
- <div style="width: 100%;height: 33.33%;">
+ <!-- <div style="width: 100%;height: 33.33%;">
<div class="layui-card-header">
<img src="../../img/console/xiexian.png" style="height: 20px;">
鏈堝害鍑哄叆搴撹秼鍔�
@@ -440,7 +440,7 @@
style="width: 100%; height: 100%; display: flex; align-items: center;justify-content: center;">
</div>
</div>
- </div>
+ </div> -->
</div>
</div>
</div>
@@ -603,20 +603,20 @@
sendData(IP + "/Statistical/GetQualityStatusFb", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
//搴撳瓨璐ㄩ噺鐘舵�佸垎甯�(楗肩姸)
- this.chartYuan = echarts.init(document.getElementById("yuanOrder"));
+ var chartYuan = echarts.init(document.getElementById("yuanOrder"));
var option2 = {
tooltip: {
trigger: 'item'
},
legend: {
- top: '5%',
+ top: '0%',
left: 'center'
},
series: [{
name: '鏁伴噺',
type: 'pie',
- radius: ['40%', '75%'],
- avoidLabelOverlap: false,
+ radius: ['30%', '60%'],
+ avoidLabelOverlap: true,//鑷姩閬垮厤閲嶅彔
itemStyle: {
borderRadius: 10,
borderColor: '#fff',
@@ -625,12 +625,13 @@
label: {
show: true, // 鏄剧ず鏍囩
position: 'outside', // 鏍囩浣嶇疆鍦ㄩゼ鍥惧閮�
- formatter: '{b}: {c} ({d}%)' // 鏍囩鏍煎紡锛屾樉绀哄悕绉般�佸�煎拰鐧惧垎姣�
+ //formatter: '{b}:{c} ({d}%)' // 鏍囩鏍煎紡锛屾樉绀哄悕绉般�佸�煎拰鐧惧垎姣�
+ formatter: '{b}:({d}%)' // 鏍囩鏍煎紡锛屾樉绀哄悕绉般�佸�煎拰鐧惧垎姣�
},
labelLine: {
show: true, // 鏄剧ず寮曞绾�
- length: 20, // 绗竴娈靛紩瀵肩嚎鐨勯暱搴�
- length2: 30 // 绗簩娈靛紩瀵肩嚎鐨勯暱搴�
+ // length: 20, // 绗竴娈靛紩瀵肩嚎鐨勯暱搴�
+ // length2: 30 // 绗簩娈靛紩瀵肩嚎鐨勯暱搴�
},
data: res.data.map(function (item) {
return {
@@ -640,7 +641,7 @@
})
}]
};
- this.chartYuan.setOption(option2);
+ chartYuan.setOption(option2);
}
else { //涓嶆垚鍔�
layer.msg('鑾峰彇鎬婚噺鍒楄〃淇℃伅澶辫触锛�', {
@@ -652,57 +653,57 @@
};
- //鑾峰彇鏈堝害鍑哄叆搴撹秼鍔匡紙鎶樼嚎锛�
- this.chartXian = echarts.init(document.getElementById("xianOrder"));
- var option3;
+ // //鑾峰彇鏈堝害鍑哄叆搴撹秼鍔匡紙鎶樼嚎锛�
+ // this.chartXian = echarts.init(document.getElementById("xianOrder"));
+ // var option3;
- option3 = {
- title: {
- text: ''
- },
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['鍏ュ簱', '鍑哄簱']
- },
- grid: {
- top: '15%',
- left: '5%',
- bottom: '15%',
- containLabel: true
- },
- toolbox: {
- feature: {
- //saveAsImage: {}//淇濆瓨鍥剧墖
- }
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'],
- axisLine: { show: false }, // 闅愯棌 x 杞寸嚎
- axisTick: { show: false }, // 闅愯棌 x 杞村埢搴︾嚎
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- name: '鍏ュ簱',
- type: 'line',
- stack: 'Total',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '鍑哄簱',
- type: 'line',
- stack: 'Total',
- data: [220, 182, 191, 234, 290, 330, 310]
- }
- ]
- };
- this.chartXian.setOption(option3);
+ // option3 = {
+ // title: {
+ // text: ''
+ // },
+ // tooltip: {
+ // trigger: 'axis'
+ // },
+ // legend: {
+ // data: ['鍏ュ簱', '鍑哄簱']
+ // },
+ // grid: {
+ // top: '15%',
+ // left: '5%',
+ // bottom: '15%',
+ // containLabel: true
+ // },
+ // toolbox: {
+ // feature: {
+ // //saveAsImage: {}//淇濆瓨鍥剧墖
+ // }
+ // },
+ // xAxis: {
+ // type: 'category',
+ // boundaryGap: false,
+ // data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'],
+ // axisLine: { show: false }, // 闅愯棌 x 杞寸嚎
+ // axisTick: { show: false }, // 闅愯棌 x 杞村埢搴︾嚎
+ // },
+ // yAxis: {
+ // type: 'value'
+ // },
+ // series: [
+ // {
+ // name: '鍏ュ簱',
+ // type: 'line',
+ // stack: 'Total',
+ // data: [120, 132, 101, 134, 90, 230, 210]
+ // },
+ // {
+ // name: '鍑哄簱',
+ // type: 'line',
+ // stack: 'Total',
+ // data: [220, 182, 191, 234, 290, 330, 310]
+ // }
+ // ]
+ // };
+ // this.chartXian.setOption(option3);
//浠撳簱鐘跺喌鎬�
@@ -775,7 +776,8 @@
function refreshTable() {
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-600',
+ //height: 'full-600',
+ height: '270%',
id: 'LAY-app-content-list',
page: false,
limit: pageCnt,
@@ -819,7 +821,8 @@
function refreshTable2() {
infoOptions2 = {
elem: '#LAY-app-content-list2',
- height: 'full-600',
+ //height: 'full-600',
+ height: '270%',
id: 'LAY-app-content-list2',
page: false,
limit: pageCnt,
@@ -830,7 +833,7 @@
{ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
- { title: '鎵规', field: 'LotNo', align: 'center' },
+ { field: 'LotNo', title: '鎵规', align: 'center' },
{ field: 'ResidueQty', title: '鍓╀綑鏁伴噺', align: 'center' },
]]
};
--
Gitblit v1.8.0