diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
index 152d659..a0fd894 100644
--- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
+++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
@@ -17,8 +17,8 @@ body {
position: absolute;
width: 7.6%;
height: 8.5%;
- top: 89.1%;
- left: 36.1%;
+ top: 30.1%;
+ right: 0%;
}
.btnTwo {
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png);
@@ -26,17 +26,17 @@ body {
position: absolute;
width: 7.6%;
height: 8.5%;
- top: 89.1%;
- left: 56.2%;
+ top: 45.1%;
+ right: 0%;
}
.layerOne{
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png);
background-size: 100% 100%;
position: absolute;
- width: 112%;
- height: 100.2%;
- top: -0.9%;
- left: -4.7%;
+ width: 95.7%;
+ height: 71.4%;
+ top: 14.7%;
+ left: 1.6%;
display: block;
z-index: -1;
}
@@ -44,10 +44,10 @@ body {
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png);
background-size: 100% 100%;
position: absolute;
- width: 112.2%;
- height: 99.6%;
- top: 1%;
- left: -4.3%;
+ width: 95.7%;
+ height: 71.4%;
+ top: 14.7%;
+ left: 1.6%;
z-index: -1;
display: none;
}
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif
new file mode 100644
index 0000000..52ded74
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/arrows.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg
index fbd9693..1a5b8bf 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg.jpg differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg2.jpg b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg2.jpg
new file mode 100644
index 0000000..e72b60d
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/backgroundImg2.jpg differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png
index d838e40..65cf2bf 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png
index 0f61277..d9681f9 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/veer.gif b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/veer.gif
new file mode 100644
index 0000000..01afd3d
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/veer.gif differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/介绍窗口.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/介绍窗口.png
new file mode 100644
index 0000000..60b8a12
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/介绍窗口.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-坐标.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-坐标.png
new file mode 100644
index 0000000..2f1fbf6
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-坐标.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-大弹窗.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-大弹窗.png
new file mode 100644
index 0000000..e2320c0
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-大弹窗.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-弹窗.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-弹窗.png
new file mode 100644
index 0000000..c9719db
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称-弹窗.png differ
diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称.png
new file mode 100644
index 0000000..a17ef70
Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/名称.png differ
diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
index 03cffb2..f12373d 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js
@@ -109,7 +109,25 @@ $(() => {
autoUpdate(url + "/selectQualityInfo ", INTERVAL, data => {
PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.item, value.type, value.qty, `${value.rate}%`]), Object.keys(["检测项", "质量缺陷", "数量", '占比']))
- pieChart(data.map(val => {
+ pieChart(data.map((val,index) => {
+ if (index == 0 ) {
+ return {
+ name: val.type,
+ value: val.qty,
+ itemStyle: {
+ color: 'red',
+ }
+ }
+ }
+ if (index == 1) {
+ return {
+ name: val.type,
+ value: val.qty,
+ itemStyle: {
+ color: 'yellow',
+ }
+ }
+ }
return {
name: val.type,
value: val.qty
diff --git a/ruoyi-admin/src/main/resources/static/js/board/week.js b/ruoyi-admin/src/main/resources/static/js/board/week.js
index 3c2ee1c..7b18975 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/week.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/week.js
@@ -3,70 +3,14 @@ $(() => {
safe('#safe')
importData('#importData')
// 公共请求地址
- let url = '/broad/mtk'
+ let url = '/broad/zhou'
// 轮询间隔时间
const INTERVAL = 30000
+ const orderDetailsTable = new AutoScrollTable(document.getElementById("IQC"), ["编号", "型号", "计划数量", "完成数量", "差异值"], {width: ['13%', '40%', null, null, '9%']}, 8)
//每日人力出勤轮询
- autoUpdate(url + "/team6s ", INTERVAL, data => {
- data ??= [
- {
- teamName: '班组1',
- teamNumber: 72,
- path: ''
- },
- {
- teamName: '班组2',
- teamNumber: 52,
- path: ''
- },
- {
- teamName: '班组3',
- teamNumber: 72,
- path: ''
- },
- {
- teamName: '班组4',
- teamNumber: 29,
- path: ''
- },
- {
- teamName: '班组5',
- teamNumber: 82,
- path: ''
- },
- {
- teamName: '班组6',
- teamNumber: 82,
- path: ''
- },
- {
- teamName: '班组7',
- teamNumber: 28,
- path: ''
- },
- {
- teamName: '班组8',
- teamNumber: 62,
- path: ''
- },
- {
- teamName: '班组9',
- teamNumber: 82,
- path: ''
- },
- {
- teamName: '班组10',
- teamNumber: 38,
- path: ''
- },
- {
- teamName: '班组11',
- teamNumber: 93,
- path: ''
- },
- ]
+ autoUpdate("/broad/mtk/team6s ", INTERVAL, data => {
data.sort((a, b) => {
return b.teamNumber - a.teamNumber
})
@@ -78,49 +22,85 @@ $(() => {
})
// 三日订单执行情况
- autoUpdate(url + "/selectOrderInfoBy3d", INTERVAL, data => {
- // console.log(data)
- horizontalRoundedBarChartWithBackgroundTwo({
- yNameOne: data.map(val => val.name),
- yData: data.map(val => val.rate),
- status:data.map(val => val.qty),
- xDataName: "达成率",
- }, document.getElementById("IQC"))
- })
-
- autoUpdate(url + "/mtk_selectOrderInfoBy3dTatle", INTERVAL, data => {
- total(data.find(val => val.name === '入库订单统计').qty, '#total')
- Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips')
- })
-
-
- // 当日订单入库统计
- autoUpdate(url + "/selectInstoreNumByday", INTERVAL, data => {
+ autoUpdate(url + "/selectOrderRateInfo", INTERVAL, data => {
singleVerticalBarChart({
- xName: data.map(val => val.name),
- yData: data.map(val => val.qty),
+ xName: data.map(val => val.name_sub),
+ yData: data.map(val => val.actual_number),
}, document.getElementById("productionEfficiency"), -20)
+ orderDetailsTable.loadData(data.map(value => [value.plan_code, value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number]), Object.keys(["编号", "型号", "计划数量", "完成数量", "差异值"]))
+
})
+ // autoUpdate(url + "/mtk_selectOrderInfoBy3dTatle", INTERVAL, data => {
+ // total(data.find(val => val.name === '入库订单统计').qty, '#total')
+ // Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips')
+ // })
+
// 当日订单入库统计
- autoUpdate("/broad/beforeLibrary/selectQualityInfo", INTERVAL, data => {
- pieChart(data.map(val => {
- return {
- name: val.type,
- value: val.qty
- }
-
- }), document.getElementById("equipmentPower"));
+ autoUpdate(url + "/zhou_selectQaItemInfo", INTERVAL, data => {
+ let arr = [0,0,0,0,0,0]
+ let yDataOne = [...(data.find(val => val.code == '内胆检漏')?.list.map(val => val.qty) || []),...arr]
+ let yDataTwo = [...(data.find(val => val.code == '安全检测')?.list.map(val => val.qty) || []),...arr]
+ let yDataThree = [...(data.find(val => val.code == '成品检漏')?.list.map(val => val.qty) || []),...arr]
+ let yDataFour = [...(data.find(val => val.code == '测温性能')?.list.map(val => val.qty) || []),...arr]
+ let yDataFive = [...(data.find(val => val.code == '成品外观')?.list.map(val => val.qty) || []),...arr]
+ multipleBrokenLineAreaDiagramTwo(
+ {
+ xData: data.find(val => val.code == '横坐标')?.list.map(val => val.name),
+ yDataOne: yDataOne,
+ yDataTwo: yDataTwo,
+ yDataThree: yDataThree,
+ yDataFour: yDataFour,
+ yDataFive: yDataFive,
+ yDataOneName: '内胆检漏',
+ yDataTwoName: '安全检测',
+ yDataThreeName: '成品检漏',
+ yDataFourName: '测温性能',
+ yDataFiveName: '成品外观',
+ }, document.getElementById("equipmentPower"))
+ // pieChart(data.map((val, index) => {
+ // if (index == 0 ) {
+ // return {
+ // name: val.type,
+ // value: val.qty,
+ // itemStyle: {
+ // color: 'red',
+ // }
+ // }
+ // }
+ // if (index == 1) {
+ // return {
+ // name: val.type,
+ // value: val.qty,
+ // itemStyle: {
+ // color: 'yellow',
+ // }
+ // }
+ // }
+ // return {
+ // name: val.type,
+ // value: val.qty,
+ // }
+ //
+ // }
+ // ), document.getElementById("equipmentPower"));
})
- autoUpdate(url + "/selectInstoreNumByday", INTERVAL, data => {
+ autoUpdate(url + "/selectProductInStore", INTERVAL, data => {
+ let list = data.map(val => val.list)
+ let yDataOne = []
+ let yDataTwo = []
+ list.forEach(val => {
+ yDataOne.push(val.find(val => val.name == '目标')?.qty || 0)
+ yDataTwo.push(val.find(val => val.name == '产量')?.qty || 0)
+ })
multipleVerticalBarChartTwo({
- xName: ['1月', '2月', '3月', '4月', '5月', '6月', '7月'],
- yDataOne: [22, 52, 55, 12, 35, 44, 66],
- yDataOneName: '项目1',
- yDataTwo: [32, 42, 50, 22, 30, 40, 52],
- yDataTwoName: "项目2",
+ xName: data.map(val => val.code),
+ yDataOne: yDataOne,
+ yDataOneName: '目标',
+ yDataTwo: yDataTwo,
+ yDataTwoName: "产量",
}, document.getElementById("topLeft"), -20)
})
@@ -148,13 +128,13 @@ const curWeek = () => {
const moduleTitle = () => {
const html = `
- 订单可视化及安全生产平台
- 第${curWeek()}周 班组6S排行榜
- 三日订单执行情况
- 当日订单入库统计
- 安全生产
- 质量分析(TOP3)
- 重点工序质量监控
+ 周看板
+ 第${curWeek()}周 产量统计
+ 周订单执行情况
+ 班组 6s 排行榜
+ 周生产型号统计
+ 周质量分析
+ 安全生产
`
$('body').append(html)
}
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 2bb50ef..049f8b7 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1,7 +1,9 @@
const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
-let time1 = () => {
+var time1 = () => {
}
-let time2 = () => {
+var time2 = () => {
+}
+var time3 = () => {
}
// 随机数
const random = (val = 1) => {
@@ -941,6 +943,7 @@ const barChartAndLineChartFour = function (data, id) {
// 饼图
const pieChart = function (data, id) {
let charts = echarts.init(id);
+ console.log(data)
if (!data) {
data = [
{
@@ -982,9 +985,10 @@ const pieChart = function (data, id) {
type: "pie",
radius: "70%",
center: ["50%", "50%"],
- color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
+ colorBy: 'data',
+ // color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
data: data,
- // roseType: "radius",
+ roseType: "radius",
label: {
normal: {
formatter: "{b|{b}} \n {c|{c}次}",
@@ -1386,7 +1390,7 @@ const multipleVerticalBarChart = function (data, id) {
charts.setOption(option);
$(window).resize(charts.resize);
}
-const multipleVerticalBarChartTwo = function (data, id,rotate = 0) {
+const multipleVerticalBarChartTwo = function (data, id, rotate = 0) {
let charts = echarts.init(id);
if (!data) {
data = {
@@ -1423,8 +1427,8 @@ const multipleVerticalBarChartTwo = function (data, id,rotate = 0) {
type: 'category',
axisTick: {show: false},
axisLabel: {
- rotate:rotate,
- margin:20,
+ rotate: rotate,
+ margin: 20,
textStyle: {
fontSize: 0.75 * vw,
color: "#F1F1F3",
@@ -1517,6 +1521,7 @@ const multipleVerticalBarChartTwo = function (data, id,rotate = 0) {
// 单个垂直柱状图
const singleVerticalBarChart = function (data, id, rotate = 0, bottom = '15%') {
+ clearInterval(time3)
let charts = echarts.init(id);
if (!data) {
data = {
@@ -1609,8 +1614,37 @@ const singleVerticalBarChart = function (data, id, rotate = 0, bottom = '15%') {
},
],
};
+ if (data.yData.length > 8) {
+ option.dataZoom.push({
+ show: false,
+ type: 'slider',
+ bottom: '0%',
+ xAxisIndex: 0,
+ height: 12,
+ start: 0,
+ end: 1 / (data.yData.length / 9) * 100,
+ textStyle: {
+ fontSize: 0,
+ color: 'rgba(0,0,0,0)'
+ }
+ })
-
+ let step = 1 / (data.yData.length / 9) * 100
+ time3 = setInterval(() => {
+ option.dataZoom[0].end += step
+ option.dataZoom[0].start += step
+ if (option.dataZoom[0].start >= 100) {
+ option.dataZoom[0].start = 0
+ option.dataZoom[0].end = step
+ }
+ if (option.dataZoom[0].end >= 100) {
+ option.dataZoom[0].end = 100
+ option.dataZoom[0].start = option.dataZoom[0].end - step
+ }
+ charts.setOption(option);
+ }, 6000)
+ // time()
+ }
charts.setOption(option);
$(window).resize(charts.resize);
}
@@ -1744,7 +1778,6 @@ const singleVerticalBarChartTwo = function (data, id) {
symbol: 'diamond',
itemStyle: {
color: function (val) {
- console.log(val)
if (data.yData.length - val.dataIndex === 1) {
return 'red'
} else if (data.yData.length - val.dataIndex === 2) {
@@ -1767,7 +1800,6 @@ const singleVerticalBarChartTwo = function (data, id) {
symbol: 'diamond',
itemStyle: {
color: function (val) {
- console.log(val)
if (data.yData.length - val.dataIndex === 1) {
return 'red'
} else if (data.yData.length - val.dataIndex === 2) {
@@ -2101,6 +2133,371 @@ const multipleBrokenLineAreaDiagram = (data, ids) => {
charts.setOption(option);
$(window).resize(charts.resize);
}
+const multipleBrokenLineAreaDiagramTwo = (data, ids) => {
+ let charts = echarts.init(ids);
+
+ function Fun() {
+ this.randomNum = function () {
+ let arr = []
+ for (let i = 0; i < 12; i++) {
+ arr.push(parseInt(Math.random() * 100))
+ }
+ return arr
+ }
+ }
+
+ if (!data) {
+ data = {
+ xData: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+ yDataOne: new Fun().randomNum(),
+ yDataTwo: new Fun().randomNum(),
+ yDataOneName: '制氢量',
+ yDataTwoName: '发电量',
+ }
+ }
+ let max = Math.round(Math.max(...data.yDataOne, ...data.yDataTwo, ...data.yDataThree, ...data.yDataFour, ...data.yDataFive))
+ let min = Math.round(Math.min(...data.yDataOne, ...data.yDataTwo, ...data.yDataThree, ...data.yDataFour, ...data.yDataFive))
+
+ let option = {
+ tooltip: {
+ trigger: "axis",
+ axisPointer: {
+ lineStyle: {
+ color: "#57617B",
+ },
+ },
+ },
+ legend: {
+ icon: "rect",
+ itemWidth: 0.75 * vw,
+ itemHeight: 0.25 * vw,
+ itemGap: 0.75 * vw,
+ data: [data.yDataOneName, data.yDataTwoName, data.yDataThreeName, data.yDataFourName, data.yDataFiveName],
+ right: "4%",
+ textStyle: {
+ fontSize: 0.75 * vw,
+ color: "#F1F1F3",
+ },
+ },
+ grid: {
+ top: "20%",
+ left: "3%",
+ right: "4%",
+ bottom: "3%",
+ containLabel: true,
+ },
+ dataZoom: [],
+ xAxis: [
+ {
+ type: "category",
+ boundaryGap: false,
+ axisLine: {
+ lineStyle: {
+ color: "#57617B",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: '#fff',
+ interval: 0,
+ },
+ data: data.xData,
+ },
+ ],
+ yAxis: [
+ {
+ type: "value",
+ axisTick: {
+ show: false,
+ },
+ max: max + 1,
+ min: min,
+ axisLine: {
+ lineStyle: {
+ color: "#57617B",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: '#fff',
+ interval: 0.5,
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: "#57617B",
+ },
+ },
+ },
+ ],
+ series: [
+ {
+ name: data.yDataOneName,
+ type: "line",
+ smooth: false,
+ lineStyle: {
+ normal: {
+ width: 1,
+ },
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(137, 189, 27, 0.6)",
+ },
+ {
+ offset: 0.8,
+ color: "rgba(137, 189, 27, 0.2)",
+ },
+ ],
+ false
+ ),
+ shadowColor: "rgba(0, 0, 0, 0.1)",
+ shadowBlur: 10,
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "rgb(137,189,27)",
+ },
+ },
+ label: {
+ //图形上的文本标签
+ normal: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
+ data: data.yDataOne,
+ },
+ {
+ name: data.yDataTwoName,
+ type: "line",
+ smooth: false,
+ lineStyle: {
+ normal: {
+ width: 1,
+ },
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(0, 136, 212, 0.6)",
+ },
+ {
+ offset: 0.8,
+ color: "rgba(0, 136, 212, 0.2)",
+ },
+ ],
+ false
+ ),
+ shadowColor: "rgba(0, 0, 0, 0.1)",
+ shadowBlur: 10,
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "rgb(0,136,212)",
+ },
+ },
+ label: {
+ //图形上的文本标签
+ normal: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
+ data: data.yDataTwo,
+ },
+ {
+ name: data.yDataThreeName,
+ type: "line",
+ smooth: false,
+ lineStyle: {
+ normal: {
+ width: 1,
+ },
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(219, 50, 51, 0.6)",
+ },
+ {
+ offset: 0.8,
+ color: "rgba(219, 50, 51, 0.2)",
+ },
+ ],
+ false
+ ),
+ shadowColor: "rgba(0, 0, 0, 0.1)",
+ shadowBlur: 10,
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "rgb(219,50,51)",
+ },
+ },
+ label: {
+ //图形上的文本标签
+ normal: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
+ data: data.yDataThree,
+ },
+ {
+ name: data.yDataFourName,
+ type: "line",
+ smooth: false,
+ lineStyle: {
+ normal: {
+ width: 1,
+ },
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(0, 136, 212, 0.6)",
+ },
+ {
+ offset: 0.8,
+ color: "rgba(0, 136, 212, 0.2)",
+ },
+ ],
+ false
+ ),
+ shadowColor: "rgba(0, 0, 0, 0.1)",
+ shadowBlur: 10,
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "rgb(0,136,212)",
+ },
+ },
+ label: {
+ //图形上的文本标签
+ normal: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
+ data: data.yDataFour,
+ },
+ {
+ name: data.yDataFiveName,
+ type: "line",
+ smooth: false,
+ lineStyle: {
+ normal: {
+ width: 1,
+ },
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(219, 50, 51, 0.6)",
+ },
+ {
+ offset: 0.8,
+ color: "rgba(219, 50, 51, 0.2)",
+ },
+ ],
+ false
+ ),
+ shadowColor: "rgba(0, 0, 0, 0.1)",
+ shadowBlur: 10,
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "rgb(219,50,51)",
+ },
+ },
+ label: {
+ //图形上的文本标签
+ normal: {
+ show: true,
+ position: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
+ data: data.yDataFive,
+ },
+ ],
+ };
+
+
+ charts.setOption(option);
+ $(window).resize(charts.resize);
+}
// 空心饼图
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index f710edf..8eba5b1 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -508,10 +508,11 @@
times++
}
getTable(classes,dataOne)
- total(Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(4) + '%',
+ total(
+ Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(4) + '%',
totalNum,
eval(data.map(val => val.qty).join('+')),
- (Number(eval(data.map(val => val.qty).join('+')) / eval(data.map(val => val.plan_number).join('+'))) * 100).toFixed(2)+ '%',
+ (Number(eval(data.map(val => val.qty).join('+')) / totalNum) * 100).toFixed(2)+ '%',
eval(data.map(val => val.h1).join('+')),
eval(data.map(val => val.h2).join('+')),
eval(data.map(val => val.h3).join('+')),
diff --git a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
index f0a505e..5436bf1 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
@@ -25,6 +25,9 @@
+
@@ -38,8 +41,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+