1.看板文本调整

main
董哲奇 5 months ago
parent a06a479190
commit 58db45c341

@ -1,6 +1,6 @@
import request from "@/utils/request"; import request from "@/utils/request";
// 跨为分析 // 跨为情况
//1.跨位汇总表 //1.跨位汇总表
export function zyjhzxTable(params) { export function zyjhzxTable(params) {
@ -27,4 +27,4 @@ export function today_zyjhzx(params) {
method: "get", method: "get",
params, params,
}); });
} }

@ -1,8 +1,8 @@
import request from "@/utils/request"; import request from "@/utils/request";
// 前方需求分析 // 前方需求情况
// 1.需求计划与分析 // 1.需求计划与情况
export function qfxqTable(params) { export function qfxqTable(params) {
return request({ return request({
url: "/kban/qfxqTable", url: "/kban/qfxqTable",

@ -1,6 +1,6 @@
import request from "@/utils/request"; import request from "@/utils/request";
// 线表分析 // 线表情况
// 柱状图、折线图 // 柱状图、折线图
export function kbanXbjh(params) { export function kbanXbjh(params) {

@ -1,6 +1,6 @@
import request from "@/utils/request"; import request from "@/utils/request";
// 月度计划分析 // 月度计划情况
// 汇总表 // 汇总表
export function zrcTable(params) { export function zrcTable(params) {

@ -1,5 +1,5 @@
<template> <template>
<!-- 垮位分析 --> <!-- 垮位情况 -->
<div class="amphiPosition-container"> <div class="amphiPosition-container">
<!-- 筛选 --> <!-- 筛选 -->
<!-- <div class="formData-box"> <!-- <div class="formData-box">
@ -55,7 +55,7 @@
<!-- 上料及各做业务区柱状图 --> <!-- 上料及各做业务区柱状图 -->
<div class="left-bottom-box"> <div class="left-bottom-box">
<div id="loaderBar" class="loaderBar"></div> <div id="loaderBar" class="loaderBar"></div>
<div class="desc-title">各工作区完成计划工张数数据分析</div> <div class="desc-title">各工作区完成计划工张数数据情况</div>
</div> </div>
</div> </div>
</div> </div>
@ -272,7 +272,7 @@ export default {
var myChart = this.$echarts.init(document.getElementById("loaderPie")); var myChart = this.$echarts.init(document.getElementById("loaderPie"));
var option = { var option = {
title: { title: {
text: "上料分析", text: "上料情况",
left: "center", left: "center",
bottom: 0, bottom: 0,
textStyle: { textStyle: {
@ -324,7 +324,7 @@ export default {
var option = { var option = {
title: { title: {
text: "一垮分析", text: "一垮情况",
left: "center", left: "center",
bottom: 0, bottom: 0,
textStyle: { textStyle: {
@ -379,7 +379,7 @@ export default {
var option = { var option = {
title: { title: {
text: "二垮分析", text: "二垮情况",
left: "center", left: "center",
bottom: 0, bottom: 0,
textStyle: { textStyle: {
@ -434,7 +434,7 @@ export default {
var option = { var option = {
title: { title: {
text: "三垮分析", text: "三垮情况",
left: "center", left: "center",
bottom: 0, bottom: 0,
textStyle: { textStyle: {

@ -1,5 +1,5 @@
<template> <template>
<!-- 前方需求分析 --> <!-- 前方需求情况 -->
<div class="forwardDemand-container"> <div class="forwardDemand-container">
<!-- 筛选 --> <!-- 筛选 -->
<!-- <div class="formData-box"> <!-- <div class="formData-box">
@ -69,7 +69,7 @@
<div class="right-box"> <div class="right-box">
<div class="border-out"> <div class="border-out">
<div class="border-inner"> <div class="border-inner">
<div class="right-top-title">需求与生产分析</div> <div class="right-top-title">需求与生产情况</div>
<div class="right-top-box"> <div class="right-top-box">
<div class="table-text"> <div class="table-text">
<div> <div>
@ -134,7 +134,7 @@ export default {
singleHeight: 0, singleHeight: 0,
waitTime: 500, waitTime: 500,
}, },
// 3. // 3.
rowObj: {}, rowObj: {},
xqzlSum: 0, xqzlSum: 0,
jhzlSum: 0, jhzlSum: 0,
@ -272,7 +272,7 @@ export default {
var option = { var option = {
title: { title: {
text: "需求和计划以及完工重量分析", text: "需求和计划以及完工重量情况",
left: "center", left: "center",
textStyle: { textStyle: {
color: "#fff", color: "#fff",
@ -447,7 +447,7 @@ export default {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
height: calc(100vh - 105px); height: calc(100vh - 105px);
// //
.left-box { .left-box {
width: 30%; width: 30%;
height: 100%; height: 100%;
@ -551,7 +551,7 @@ export default {
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
} }
// //
.right-top-box { .right-top-box {
height: 8%; height: 8%;
padding: 1% 1% 2% 1%; padding: 1% 1% 2% 1%;

@ -1,5 +1,5 @@
<template> <template>
<!-- 小池集成分析 --> <!-- 小池集成情况 -->
<div class="integration-container"> <div class="integration-container">
<!-- 筛选 --> <!-- 筛选 -->
<div class="formData-box"> <div class="formData-box">
@ -76,11 +76,11 @@ export default {
deviceLeftList: [ deviceLeftList: [
{ {
status:'00', status:'00',
dcCh:'', dcCh:'G175K-12',
dcPl:'', dcPl:'119',
tzbh:'', tzbh:'B119N4PX011',
beginAt:'', beginAt:'2024/11/27 13:01',
overAt:'', overAt:'2024/11/27 14:01',
img: require("@/assets/image/xc1.png"), img: require("@/assets/image/xc1.png"),
}, },
{ {
@ -88,7 +88,7 @@ export default {
dcCh:'G175K-12', dcCh:'G175K-12',
dcPl:'119', dcPl:'119',
tzbh:'B119N4PX011', tzbh:'B119N4PX011',
beginAt:'2024/11/27 7:27', beginAt:'2024/11/27 07:27',
overAt:'', overAt:'',
img: require("@/assets/image/xc1.png"), img: require("@/assets/image/xc1.png"),
}, },
@ -99,7 +99,7 @@ export default {
dcCh:'G175K-12', dcCh:'G175K-12',
dcPl:'119', dcPl:'119',
tzbh:'B119N4PX007', tzbh:'B119N4PX007',
beginAt:'2024/11/27 7:27', beginAt:'2024/11/27 07:27',
overAt:'', overAt:'',
img: require("@/assets/image/xc2.png"), img: require("@/assets/image/xc2.png"),
}, },
@ -108,7 +108,7 @@ export default {
dcCh:"G175K-12", dcCh:"G175K-12",
dcPl:'119', dcPl:'119',
tzbh:'B119N4PX016', tzbh:'B119N4PX016',
beginAt:'2024/11/27 7:27', beginAt:'2024/11/27 07:27',
overAt:'', overAt:'',
img: require("@/assets/image/xc2.png"), img: require("@/assets/image/xc2.png"),
}, },
@ -117,7 +117,7 @@ export default {
dcCh:"G175K-12", dcCh:"G175K-12",
dcPl:'119', dcPl:'119',
tzbh:'B119N4PX021', tzbh:'B119N4PX021',
beginAt:'2024/11/27 7:27', beginAt:'2024/11/27 07:27',
overAt:'', overAt:'',
img: require("@/assets/image/xc2.png"), img: require("@/assets/image/xc2.png"),
}, },
@ -126,8 +126,8 @@ export default {
dcCh:"G175K-12", dcCh:"G175K-12",
dcPl:'119', dcPl:'119',
tzbh:'B119N4PX020', tzbh:'B119N4PX020',
beginAt:'2024/11/27 7:27', beginAt:'2024/11/27 07:27',
overAt:'2024/11/27 8:15', overAt:'2024/11/27 08:15',
img: require("@/assets/image/xc2.png"), img: require("@/assets/image/xc2.png"),
}, },
], ],

@ -1,5 +1,5 @@
<template> <template>
<!-- 线表分析 --> <!-- 线表情况 -->
<div class="lineTableAnalysis-container"> <div class="lineTableAnalysis-container">
<!-- 筛选 --> <!-- 筛选 -->
<div class="formData-box"> <div class="formData-box">
@ -17,7 +17,7 @@
<div class="left-box"> <div class="left-box">
<div class="border-out"> <div class="border-out">
<div class="border-inner"> <div class="border-inner">
<!-- 线标分析-折线图 --> <!-- 线标情况-折线图 -->
<div class="left-top-box"> <div class="left-top-box">
<div class="left-top-title">线表情况</div> <div class="left-top-title">线表情况</div>
<div id="TableLine" class="TableLine"></div> <div id="TableLine" class="TableLine"></div>
@ -26,7 +26,7 @@
</div> </div>
<div class="border-out box-top"> <div class="border-out box-top">
<div class="border-inner"> <div class="border-inner">
<!-- 线标分析 -柱状图 --> <!-- 线标情况 -柱状图 -->
<div class="left-bottom-box"> <div class="left-bottom-box">
<div class="left-bottom-title">线表与月度计划</div> <div class="left-bottom-title">线表与月度计划</div>
<div id="TableBar" class="TableBar"></div> <div id="TableBar" class="TableBar"></div>
@ -39,7 +39,7 @@
<div class="border-inner"> <div class="border-inner">
<!-- 完成量-与未完成量 --> <!-- 完成量-与未完成量 -->
<div class="right-top-box"> <div class="right-top-box">
<div class="right-top-title">线表分析</div> <div class="right-top-title">线表情况</div>
<div id="ShipBar" class="ShipBar"></div> <div id="ShipBar" class="ShipBar"></div>
</div> </div>
</div> </div>
@ -94,9 +94,9 @@ export default {
}); });
this.xbjhList = res.data.xbjh; this.xbjhList = res.data.xbjh;
this.ydjhList = ydjhList; this.ydjhList = ydjhList;
// 线线 // 线线
this.TableLine(); this.TableLine();
// 线 // 线
this.TableBar(); this.TableBar();
}); });
}, },
@ -127,14 +127,14 @@ export default {
dataY.forEach((item) => { dataY.forEach((item) => {
xbListCopy[item] = xbListCopy[item].filter((em) => { xbListCopy[item] = xbListCopy[item].filter((em) => {
return em.zl >= 0; return em.zl > 0;
}); });
ydListCopy[item] = ydListCopy[item].filter((em) => { ydListCopy[item] = ydListCopy[item].filter((em) => {
return em.jhzl >= 0; return em.jhzl > 0;
}); });
xbStartData.push( xbStartData.push(
xbListCopy[item] && xbListCopy[item][0].yf xbListCopy[item] && xbListCopy[item][0]?.yf
? new Date( ? new Date(
this.$moment().format("yyyy") + this.$moment().format("yyyy") +
"/" + "/" +
@ -177,7 +177,7 @@ export default {
: "" : ""
); );
}); });
// //
this.ShipBar(dataY, xbStartData, xbEndData, ydStartData, ydEndData); this.ShipBar(dataY, xbStartData, xbEndData, ydStartData, ydEndData);
}); });
}, },
@ -566,7 +566,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
// 线线 // 线线
.left-top-box { .left-top-box {
height: 100%; height: 100%;
.left-top-title { .left-top-title {
@ -586,7 +586,7 @@ export default {
height: calc(100% - 24px); height: calc(100% - 24px);
} }
} }
// 线 // 线
.left-bottom-box { .left-bottom-box {
height: 100%; height: 100%;
.left-bottom-title { .left-bottom-title {
@ -611,7 +611,7 @@ export default {
width: 50%; width: 50%;
height: 100%; height: 100%;
margin-left: 5px; margin-left: 5px;
// 线 // 线
.right-top-box { .right-top-box {
height: 100%; height: 100%;
.right-top-title { .right-top-title {

@ -1,11 +1,11 @@
<template> <template>
<!-- 月度计划分析 --> <!-- 月度计划情况 -->
<div class="monthPlan-container"> <div class="monthPlan-container">
<div class="monthPlan-box"> <div class="monthPlan-box">
<div class="left-box"> <div class="left-box">
<div class="border-out"> <div class="border-out">
<div class="border-inner"> <div class="border-inner">
<!-- 线标分析-折线图 --> <!-- 线标情况-折线图 -->
<div class="left-top-box"> <div class="left-top-box">
<div class="left-top-title">月度计划汇总表</div> <div class="left-top-title">月度计划汇总表</div>
<table class="table-sum"> <table class="table-sum">
@ -63,7 +63,7 @@
<div class="border-out"> <div class="border-out">
<div class="border-inner"> <div class="border-inner">
<!-- 柱状图 --> <!-- 柱状图 -->
<div class="right-top-title">月度计划数据分析</div> <div class="right-top-title">月度计划数据情况</div>
<el-row class="row"> <el-row class="row">
<el-col :span="24"> <el-col :span="24">
<div id="DrawingBar" class="drawingBar"></div> <div id="DrawingBar" class="drawingBar"></div>
@ -87,7 +87,7 @@
<div class="border-out"> <div class="border-out">
<div class="border-inner"> <div class="border-inner">
<!-- 饼图 --> <!-- 饼图 -->
<div class="right-bottom-title">月度计划数据分析</div> <div class="right-bottom-title">月度计划数据情况</div>
<el-row class="row"> <el-row class="row">
<el-col :span="4"> <el-col :span="4">
<div id="DrawingPie" class="drawingPie"></div> <div id="DrawingPie" class="drawingPie"></div>
@ -601,7 +601,7 @@ export default {
var myChart = this.$echarts.init(document.getElementById("DrawingPie")); var myChart = this.$echarts.init(document.getElementById("DrawingPie"));
var option = { var option = {
title: { title: {
text: "来图与图纸分析", text: "来图与图纸情况",
left: "center", left: "center",
bottom: "10%", bottom: "10%",
textStyle: { textStyle: {
@ -627,7 +627,7 @@ export default {
}, },
series: [ series: [
{ {
name: "来图与图纸分析", name: "来图与图纸情况",
type: "pie", type: "pie",
radius: "50%", radius: "50%",
center: ["50%", "50%"], center: ["50%", "50%"],
@ -652,7 +652,7 @@ export default {
var option = { var option = {
title: { title: {
text: "计划与完成分析", text: "计划与完成情况",
left: "center", left: "center",
bottom: "10%", bottom: "10%",
textStyle: { textStyle: {
@ -678,7 +678,7 @@ export default {
}, },
series: [ series: [
{ {
name: "计划与完成分析", name: "计划与完成情况",
type: "pie", type: "pie",
radius: "50%", radius: "50%",
center: ["50%", "50%"], center: ["50%", "50%"],
@ -703,7 +703,7 @@ export default {
var option = { var option = {
title: { title: {
text: "需求与订货分析", text: "需求与订货情况",
left: "center", left: "center",
bottom: "10%", bottom: "10%",
textStyle: { textStyle: {
@ -729,7 +729,7 @@ export default {
}, },
series: [ series: [
{ {
name: "需求与订货分析", name: "需求与订货情况",
type: "pie", type: "pie",
radius: "50%", radius: "50%",
center: ["50%", "50%"], center: ["50%", "50%"],
@ -754,7 +754,7 @@ export default {
var option = { var option = {
title: { title: {
text: "需求与月度计划分析", text: "需求与月度计划情况",
left: "center", left: "center",
bottom: "10%", bottom: "10%",
textStyle: { textStyle: {
@ -780,7 +780,7 @@ export default {
}, },
series: [ series: [
{ {
name: "需求与月度计划分析", name: "需求与月度计划情况",
type: "pie", type: "pie",
radius: "50%", radius: "50%",
center: ["50%", "50%"], center: ["50%", "50%"],
@ -802,7 +802,7 @@ export default {
var myChart = this.$echarts.init(document.getElementById("FinishPie")); var myChart = this.$echarts.init(document.getElementById("FinishPie"));
var option = { var option = {
title: { title: {
text: "需求与完成分析", text: "需求与完成情况",
left: "center", left: "center",
// left:"center", // left:"center",
bottom: "10%", bottom: "10%",
@ -830,7 +830,7 @@ export default {
}, },
series: [ series: [
{ {
name: "需求与完成分析", name: "需求与完成情况",
type: "pie", type: "pie",
radius: "50%", radius: "50%",
center: ["50%", "50%"], center: ["50%", "50%"],

@ -39,31 +39,31 @@
</transition> </transition>
<transition name="fade"> <transition name="fade">
<div v-if="leftActiveIndex == 1"> <div v-if="leftActiveIndex == 1">
<!-- 线表分析 --> <!-- 线表情况 -->
<line-table-analysis /> <line-table-analysis />
</div> </div>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<div v-if="leftActiveIndex == 2"> <div v-if="leftActiveIndex == 2">
<!-- 前方需求分析 --> <!-- 前方需求情况 -->
<forward-demand /> <forward-demand />
</div> </div>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<div v-if="rightActiveIndex == 0"> <div v-if="rightActiveIndex == 0">
<!-- 月度计划分析 --> <!-- 月度计划情况 -->
<month-plan /> <month-plan />
</div> </div>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<div v-if="rightActiveIndex == 1"> <div v-if="rightActiveIndex == 1">
<!-- 跨位分析 --> <!-- 跨位情况 -->
<amphi-position /> <amphi-position />
</div> </div>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<div v-if="rightActiveIndex == 2"> <div v-if="rightActiveIndex == 2">
<!-- 小池集成分析 --> <!-- 小池集成情况 -->
<integration /> <integration />
</div> </div>
</transition> </transition>

Loading…
Cancel
Save