diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 9f7f611..2a1c286 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -22,7 +22,7 @@ export default { }, computed: { changeColor() { - console.log(this.$route); + // console.log(this.$route); if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { return true } else { @@ -34,19 +34,17 @@ export default { changeColor(val) { if (val == true) { let item = document.getElementsByClassName('el-breadcrumb__separator') - for (let i in item) { - console.log(item[i]) - if (item[i]) { - item[i].style.color = 'rgba(255, 255, 255, 0.45)' - } - } + // for (let i in item) { + // console.log('item[i]',item, item[i]) + // if (item[i].style) { + item[0].style.color = 'rgba(255, 255, 255, 0.45)' + item[1].style.color = 'rgba(255, 255, 255, 0.45)' + // } + // } } else { let item = document.getElementsByClassName('el-breadcrumb__separator') - for (let i in item) { - if (item[i]) { - // item[i].style.color = '#c0c4cc' - } - } + item[0].style.color = '' + item[1].style.color = '' } }, $route(route) { diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue index 6255da3..ea6a832 100644 --- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue +++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue @@ -1,7 +1,7 @@ @@ -81,7 +81,10 @@ export default { // console.log(item.color, color); res += "
" + - `` + + `${params[i].seriesType === "line" + ? '' + : `` + }` + `${params[i].seriesName}` + `${params[i].value ? params[i].value + '%' : 0 + '%'}`; } diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue index 571f4f4..27d681e 100644 --- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue +++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue @@ -81,7 +81,10 @@ export default { // console.log(item.color, color); res += "
" + - `` + + `${params[i].seriesType === "line" + ? '' + : `` + }` + `${params[i].seriesName}` + `${params[i].value ? params[i].value + '%' : 0 + '%'}`; } diff --git a/src/views/dashboard/charts/ChipYieldChart.vue b/src/views/dashboard/charts/ChipYieldChart.vue index 543d4a6..f6a5da1 100644 --- a/src/views/dashboard/charts/ChipYieldChart.vue +++ b/src/views/dashboard/charts/ChipYieldChart.vue @@ -1,7 +1,7 @@ @@ -91,7 +91,7 @@ export default { }, subtext: `\u2002${year}年累计产出\u2002`, subtextStyle: { - fontSize: 12, + fontSize: 15, fontWeight: 100, color: "#fffd", align: "right", diff --git a/src/views/dashboard/charts/LeftChartBase.vue b/src/views/dashboard/charts/LeftChartBase.vue index e172432..439ee34 100644 --- a/src/views/dashboard/charts/LeftChartBase.vue +++ b/src/views/dashboard/charts/LeftChartBase.vue @@ -84,7 +84,7 @@ export default { // console.log(item.color, color); res += "
" + - `` + + `` + `${params[i].seriesName}` + `${params[i].value ? params[i].value + '片' : 0 + '片'}`; } @@ -137,7 +137,7 @@ export default { { name: '', // this.series[0].name, type: "bar", - barWidth: 12, + barWidth: 16, label: { show: true, //开启显示 align: 'right', //在上方显示 @@ -181,7 +181,7 @@ export default { { name: '', // this.series[1].name, type: "bar", - barWidth: 12, + barWidth: 16, label: { show: true, //开启显示 align: 'left', //在上方显示 diff --git a/src/views/dashboard/charts/RightChartBase.vue b/src/views/dashboard/charts/RightChartBase.vue index 4082e49..7bf2e05 100644 --- a/src/views/dashboard/charts/RightChartBase.vue +++ b/src/views/dashboard/charts/RightChartBase.vue @@ -1,7 +1,7 @@ @@ -90,12 +90,16 @@ export default { // console.log(item.color, color); res += "
" + - `` + + `${params[i].seriesType === "line" + ? '' + : `` + }` + `${params[i].seriesName}` + `${params[i].value ? params[i].value + '片' : 0 + '片'}`; } return res; }, + }, xAxis: { axisTick: { @@ -178,7 +182,7 @@ export default { { name: "", // "2023年", type: "bar", - barWidth: 12, + barWidth: 16, itemStyle: { borderRadius: [10, 10, 0, 0], color: { @@ -213,7 +217,7 @@ export default { { name: "", // "2024年", type: "bar", - barWidth: 12, + barWidth: 16, // tooltip: { // valueFormatter: function (value) { // return value + " ml"; diff --git a/src/views/dashboard/components/CompanyInfo.vue b/src/views/dashboard/components/CompanyInfo.vue index 6158c62..80b175f 100644 --- a/src/views/dashboard/components/CompanyInfo.vue +++ b/src/views/dashboard/components/CompanyInfo.vue @@ -96,7 +96,8 @@ h2 { margin: 6px 0; font-family: 优设标题黑; color: #fff; - letter-spacing:5px; + letter-spacing:4px; + text-align: left; // font-size: 24px; font-size: 1.276em; } diff --git a/src/views/dashboard/components/Container.vue b/src/views/dashboard/components/Container.vue index 33e914f..d577d11 100644 --- a/src/views/dashboard/components/Container.vue +++ b/src/views/dashboard/components/Container.vue @@ -90,18 +90,18 @@ export default { position: relative; box-shadow: inset 0 0 20px 1px #fff1; - // &::after { - // content: ""; - // position: absolute; - // display: inline-block; - // width: 60%; - // height: 0.31415vh; - // border-radius: 2px; - // left: 8%; - // bottom: 0; - // background: linear-gradient(to right, #024798, transparent); - // z-index: 0; - // } + &::after { + content: ""; + position: absolute; + display: inline-block; + width: 85%; + height: 0.31415vh; + border-radius: 2px; + left: 8%; + bottom: 0; + background: linear-gradient(to left, #024798, transparent); + z-index: 0; + } .container-head { // height: 40px; diff --git a/src/views/dashboard/components/leftContainer.vue b/src/views/dashboard/components/leftContainer.vue new file mode 100644 index 0000000..d671eb8 --- /dev/null +++ b/src/views/dashboard/components/leftContainer.vue @@ -0,0 +1,204 @@ + + + + + + + diff --git a/src/views/index.vue b/src/views/index.vue index d57a579..ef623da 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -17,12 +17,12 @@
- + - - + + - +
@@ -53,6 +53,7 @@ import store from "@/store"; import DashboardHeader from "./dashboard/components/Header.vue"; import CompanyInfo from "./dashboard/components/CompanyInfo.vue"; import Container from "./dashboard/components/Container.vue"; +import leftContainer from "./dashboard/components/leftContainer.vue"; import FtoChart from "./dashboard/charts/Fto.vue"; import ChipInvestChart from "./dashboard/charts/ChipInvest.vue"; import BipvChart from "./dashboard/charts/Bipv.vue"; @@ -84,6 +85,7 @@ export default { name: "Index", components: { CompanyInfo, + leftContainer, ksCompanyInfo: CompanyInfo, hdCompanyInfo: CompanyInfo, bbCompanyInfo: CompanyInfo, @@ -340,7 +342,7 @@ export default { .db-left, .db-right { // width: 420px; - width: 24vw; + width: 24.5vw; padding: 20px; display: flex; flex-direction: column; diff --git a/src/views/produce/data/index.vue b/src/views/produce/data/index.vue index 0fc9b7d..045b823 100644 --- a/src/views/produce/data/index.vue +++ b/src/views/produce/data/index.vue @@ -1,7 +1,7 @@ @@ -415,7 +415,7 @@ export default { type: 'bar', stack: String(fac.id), data: Array(xAxisData.length).fill(0), - barWidth: 20, + barWidth: 16, itemStyle: { color: this.colorList[i] }, @@ -441,7 +441,7 @@ export default { type: 'bar', stack: String(fac.id), data: Array(xAxisData.length).fill(0), - barWidth: 20, + barWidth: 16, itemStyle: { color: this.colorList[i] }, @@ -472,7 +472,7 @@ export default { // type: 'bar', // stack: String(fac.id), // data: Array(xAxisData.length).fill(0), - // barWidth: 20, + // barWidth: 16, // itemStyle: { // color: this.colorList[i] // } diff --git a/src/views/produce/workOrder/add-or-updata.vue b/src/views/produce/workOrder/add-or-updata.vue index d32a01d..f984abf 100644 --- a/src/views/produce/workOrder/add-or-updata.vue +++ b/src/views/produce/workOrder/add-or-updata.vue @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ {{ '详情' }} - 导出 +
@@ -304,7 +304,7 @@ export default { { data: barData, type: 'bar', - barWidth: '40%', + barWidth: 16, label: { show: true, position: 'top' @@ -402,7 +402,7 @@ export default { { data: yAxisList, type: 'bar', - barWidth: '50%', + barWidth: 16, label: { show: true, position: 'top' diff --git a/src/views/produce/workOrder/dayReportComponents/ExportDayReport.vue b/src/views/produce/workOrder/dayReportComponents/ExportDayReport.vue new file mode 100644 index 0000000..7f45482 --- /dev/null +++ b/src/views/produce/workOrder/dayReportComponents/ExportDayReport.vue @@ -0,0 +1,129 @@ + + + diff --git a/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/beProcessed.vue b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/beProcessed.vue new file mode 100644 index 0000000..035cd78 --- /dev/null +++ b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/beProcessed.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/hisChart.vue b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/hisChart.vue new file mode 100644 index 0000000..35daad7 --- /dev/null +++ b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/hisChart.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/produceDetail.vue b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/produceDetail.vue new file mode 100644 index 0000000..ed4bc26 --- /dev/null +++ b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/produceDetail.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue new file mode 100644 index 0000000..9124f42 --- /dev/null +++ b/src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/produce/workOrder/index.vue b/src/views/produce/workOrder/index.vue index 62abff1..aebe1aa 100644 --- a/src/views/produce/workOrder/index.vue +++ b/src/views/produce/workOrder/index.vue @@ -1,7 +1,7 @@ @@ -10,7 +10,7 @@
- +
@@ -27,13 +27,14 @@
- +
- {{ factoryNum[index] }} + {{ factoryNum[index] + }} {{item}}
@@ -49,27 +50,28 @@
- + - + +
+ + -