From 3964f8541ee6286d4cd8bf3f0707a11ba98cf9d6 Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 28 Nov 2022 09:15:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86scrollbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentManager/HomePage.vue | 11 +++++----- .../components/TechyTable.vue | 5 +++-- .../components/TechyVerticalTable.vue | 22 +++++++++++++++++++ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue index 9badcda..c9df281 100644 --- a/src/views/EquipmentManager/HomePage.vue +++ b/src/views/EquipmentManager/HomePage.vue @@ -226,23 +226,22 @@ export default { diff --git a/src/views/3DOverview/index.vue b/src/views/3DOverview/index.vue index 1298e55..5df4f2e 100644 --- a/src/views/3DOverview/index.vue +++ b/src/views/3DOverview/index.vue @@ -286,19 +286,11 @@ export default { width: calc(472px * var(--beilv)); } -/* 现场实时监控 */ -.ft-monitor { -} - /* 缺陷分类分析 */ .fault-analysis { width: calc(290px * var(--beilv)); } -/* 设备报警提示 */ -.eq-alert { -} - .techy-body-part__left, .techy-body-part__right { /* height: 100%; */ diff --git a/src/views/QualityManager/HomePage.vue b/src/views/QualityManager/HomePage.vue index 71309b8..e645c5e 100644 --- a/src/views/QualityManager/HomePage.vue +++ b/src/views/QualityManager/HomePage.vue @@ -207,7 +207,7 @@ :class="{ 'pl-select__active': dateMode2 === 'day' }" @click=" dateMode2 = 'day' - dataUpdateToken = Math.random()+'' + dataUpdateToken = Math.random() + '' " > 日 @@ -216,7 +216,7 @@ :class="{ 'pl-select__active': dateMode2 === 'month' }" @click=" dateMode2 = 'month' - dataUpdateToken = Math.random()+'' + dataUpdateToken = Math.random() + '' " > 月 @@ -307,7 +307,7 @@ import TechyBox from './components/TechyBox.vue' import TechyTable from './components/TechyTable.vue' import TechyAnalysisBar from './components/TechyAnalysisBar.vue' import TechyAnalysisHeader from './components/TechyAnalysisHeader.vue' -import productionRateHeader from './components/productionRateHeader.vue' +// import productionRateHeader from './components/productionRateHeader.vue' // import FaultCategoryChart from './components/charts/FaultCategoryChart.vue' import PlFaultAnalysisPieChart from './components/charts/PlFaultAnalysisPieChart.vue' import { mapGetters } from 'vuex' @@ -330,8 +330,8 @@ export default { // FaultCategoryChart, PlFaultAnalysisPieChart, TechyBar, - NewLineStack, - productionRateHeader + NewLineStack + // productionRateHeader }, data() { const quexianDatalist = [ @@ -668,47 +668,13 @@ export default { width: calc(375px * var(--beilv)); } -.fake-legend{ +.fake-legend { cursor: unset; } .fake-legend span { background: none; cursor: none; - color: #DFF1FE; + color: #dff1fe; } -/* @media all and (max-width: 1680px) { - .production-rate { - text-align: center; - } - - .production-rate >>> .top-icon, - .production-rate >>> .date-select { - display: none; - } -} - -@media all and (min-width: 1680px) { - .production-rate { - text-align: left; - } - - .production-rate >>> .top-icon { - display: none; - } -} - -@media all and (min-width: 2048px) { - .production-rate { - text-align: center; - } - - .production-rate >>> .date-select > span { - background-color: #568588; - } - - .production-rate >>> .date-select > span.date-select__active { - background-color: #42bbb7; - } -} */ diff --git a/src/views/QualityManager/components/TechyTable.vue b/src/views/QualityManager/components/TechyTable.vue index 8072121..0c50a15 100644 --- a/src/views/QualityManager/components/TechyTable.vue +++ b/src/views/QualityManager/components/TechyTable.vue @@ -126,8 +126,9 @@ export default { } .visual-base-table-container >>> ::-webkit-scrollbar-button { - width: calc(8px * var(--beilv)); - height: calc(8px * var(--beilv)); + /* width: calc(8px * var(--beilv)); + height: calc(8px * var(--beilv)); */ + display: none; background: #5bc4bf9f; position: relative; } @@ -137,15 +138,10 @@ export default { background: #5bc4bf9f; } -/* .visual-base-table-container { - min-width: 30vw; -} */ .visual-base-table-container { height: 100%; } -/* .visual-base-table-container >>> .el-table { - min-width: 120%; -} */ + /* 清除默认样式 */ .visual-base-table-container >>> th.gutter { display: none; diff --git a/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue b/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue index 89259ee..b1fd614 100644 --- a/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue +++ b/src/views/QualityManager/components/charts/PlFaultAnalysisPieChart.vue @@ -243,20 +243,20 @@ export default { const colorGradient = colors[dataIndex] if (totalRate + percent < 25) { /** 也许这里需要完善，但目前工作良好 */ - ;(() => {})() + (() => {})() } else if (totalRate + percent < 50) { colorGradient.x = 0 colorGradient.y = 0 colorGradient.x2 = 1 colorGradient.y2 = 1 - } else if (totalRate + percent >= 50 && dataIndex == 1) { + } else if (totalRate + percent >= 50 && dataIndex === 1) { colorGradient.x = 1 colorGradient.y = 1 colorGradient.x2 = 0 colorGradient.y2 = 0 } else if (totalRate + percent < 100) { /** 也许这里需要完善，但目前工作良好 */ - ;(() => {})() + (() => {})() } totalRate += percent @@ -306,21 +306,19 @@ export default { applyChartOption(datalist) { const fs5 = this.calcFontsize(5 /** px*/) const fs8 = this.calcFontsize(8 /** px*/) - const fs10 = this.calcFontsize(10 /** px*/) + // const fs10 = this.calcFontsize(10 /** px*/) const fs12 = this.calcFontsize(12 /** px*/) const fs13 = this.calcFontsize(13 /** px*/) - const fs18 = this.calcFontsize(18 /** px*/) + // const fs18 = this.calcFontsize(18 /** px*/) const fs20 = this.calcFontsize(20 /** px*/) const legendTextFixWidth = this.calcFontsize(48 /** px*/) const legnedTop = this.calcFontsize(72 /** px*/) - const legendTopRate = this.calcFontsize(30 /** % */) + // const legendTopRate = this.calcFontsize(30 /** % */) this.configs.title.text = this.dataPeriod === 'month' - ? // 如果是月数据，单位为 千片 - this.dataList.reduce((prev, curr) => prev + curr.value * 1000, 0) - : // 如果是日数据，单位为 片 - this.dataList.reduce((prev, curr) => prev + curr.value, 0) + ? this.dataList.reduce((prev, curr) => prev + curr.value * 1000, 0) // 如果是月数据，单位为 千片 + : this.dataList.reduce((prev, curr) => prev + curr.value, 0) // 如果是日数据，单位为 片 this.configs.title.textStyle.fontSize = fs20 this.configs.title.subtextStyle.fontSize = fs13