From c51d05cd23da050ab7896c95592affd445bd7377 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 10 Nov 2022 17:04:04 +0800 Subject: [PATCH 01/19] update icons.js to latest --- src/views/3DOverview/components/icons.js | 394 ++++++++++++++++++ .../EquipmentManager/components/icons.js | 269 ++++++++++++ src/views/QualityManager/components/icons.js | 170 +++++++- 3 files changed, 832 insertions(+), 1 deletion(-) create mode 100644 src/views/3DOverview/components/icons.js diff --git a/src/views/3DOverview/components/icons.js b/src/views/3DOverview/components/icons.js new file mode 100644 index 0000000..ae4b7ce --- /dev/null +++ b/src/views/3DOverview/components/icons.js @@ -0,0 +1,394 @@ +// 扳手 +export const IconBanshou = ` +setting tools + + + + + + + + + + + + + + + +` + +// 趋势+放大镜 +export const IconTrend = ` +analysis + + + + + + + + + + + + + + + + + + + + + + + +` + +// 菜单+齿轮 +export const IconMenuChilun = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 闪电安全帽 +export const IconSafetyHat = ` +hatplus + + + + + + + + + + + + + + + + + + + +` + +// 质量 +export const IconQuality = ` +质量上报 + + + + + + + + + + + + + + + + + + + + +` + +// 质量 +export const IconQuality2 = ` +质量异常报警 + + + + + + + + + + + + + + + + + + + + + +` + +// 质量 +export const IconQuality3 = ` +质量缺陷分析 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 折角的菜单图标 +export const IconMenu1 = ` +编组 + + + + + + + + + + + + + + + + +` + +// 菜单+放大镜 +export const IconMenuSearch = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+安全帽 +export const IconPCAlert = ` +编组 + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+三横 +export const IconPCTriple = ` +编组 + + + + + + + + + + + + + + + + + +` + +// 三个菱形叠加 +export const IconTriple = ` +物料信息 + + + + + + + + +` + +// 菜单 only +export const IconMenuOnly = ` +菜单 + + + + + + + + + + + + + + + + + + +` + +// TODO 放到 tech-container 里 +// let icon = '' +// switch (icon) { +// case 'menuIcon': return IconMenuOnly; +// case 'stackIcon': return IconTriple; +// case 'zhejiaoMenuListIcon': return IconMenu1; +// case 'trendAnalysisIcon': return IconTrend; +// case 'alertMenuIcon': return IconPCTriple; +// case 'lightHatIcon': return IconSafetyHat; +// case 'menuAnalysisIcon': return IconMenuSearch; +// case 'alertWarningIcon': return IconPCAlert; +// } \ No newline at end of file diff --git a/src/views/EquipmentManager/components/icons.js b/src/views/EquipmentManager/components/icons.js index 487aa46..ae4b7ce 100644 --- a/src/views/EquipmentManager/components/icons.js +++ b/src/views/EquipmentManager/components/icons.js @@ -123,3 +123,272 @@ export const IconSafetyHat = ` +质量上报 + + + + + + + + + + + + + + + + + + + + +` + +// 质量 +export const IconQuality2 = ` +质量异常报警 + + + + + + + + + + + + + + + + + + + + + +` + +// 质量 +export const IconQuality3 = ` +质量缺陷分析 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 折角的菜单图标 +export const IconMenu1 = ` +编组 + + + + + + + + + + + + + + + + +` + +// 菜单+放大镜 +export const IconMenuSearch = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+安全帽 +export const IconPCAlert = ` +编组 + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+三横 +export const IconPCTriple = ` +编组 + + + + + + + + + + + + + + + + + +` + +// 三个菱形叠加 +export const IconTriple = ` +物料信息 + + + + + + + + +` + +// 菜单 only +export const IconMenuOnly = ` +菜单 + + + + + + + + + + + + + + + + + + +` + +// TODO 放到 tech-container 里 +// let icon = '' +// switch (icon) { +// case 'menuIcon': return IconMenuOnly; +// case 'stackIcon': return IconTriple; +// case 'zhejiaoMenuListIcon': return IconMenu1; +// case 'trendAnalysisIcon': return IconTrend; +// case 'alertMenuIcon': return IconPCTriple; +// case 'lightHatIcon': return IconSafetyHat; +// case 'menuAnalysisIcon': return IconMenuSearch; +// case 'alertWarningIcon': return IconPCAlert; +// } \ No newline at end of file diff --git a/src/views/QualityManager/components/icons.js b/src/views/QualityManager/components/icons.js index cee1ae4..ae4b7ce 100644 --- a/src/views/QualityManager/components/icons.js +++ b/src/views/QualityManager/components/icons.js @@ -223,4 +223,172 @@ export const IconQuality3 = ` -` \ No newline at end of file +` + +// 折角的菜单图标 +export const IconMenu1 = ` +编组 + + + + + + + + + + + + + + + + +` + +// 菜单+放大镜 +export const IconMenuSearch = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+安全帽 +export const IconPCAlert = ` +编组 + + + + + + + + + + + + + + + + + + + + + +` + +// 电脑+感叹号+三横 +export const IconPCTriple = ` +编组 + + + + + + + + + + + + + + + + + +` + +// 三个菱形叠加 +export const IconTriple = ` +物料信息 + + + + + + + + +` + +// 菜单 only +export const IconMenuOnly = ` +菜单 + + + + + + + + + + + + + + + + + + +` + +// TODO 放到 tech-container 里 +// let icon = '' +// switch (icon) { +// case 'menuIcon': return IconMenuOnly; +// case 'stackIcon': return IconTriple; +// case 'zhejiaoMenuListIcon': return IconMenu1; +// case 'trendAnalysisIcon': return IconTrend; +// case 'alertMenuIcon': return IconPCTriple; +// case 'lightHatIcon': return IconSafetyHat; +// case 'menuAnalysisIcon': return IconMenuSearch; +// case 'alertWarningIcon': return IconPCAlert; +// } \ No newline at end of file -- 2.45.2 From c88648e8d2c826e05d286663b3027d09c9b968ba Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 11 Nov 2022 09:31:20 +0800 Subject: [PATCH 02/19] =?UTF-8?q?update=203d=E7=9A=84header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3DOverview/components/TechyContainer.vue | 321 +++--------------- .../3DOverview/components/TechyHeader.vue | 75 ++-- .../{header-longer.png => header-new.png} | Bin src/views/3DOverview/index.vue | 18 +- 4 files changed, 95 insertions(+), 319 deletions(-) rename src/views/3DOverview/components/{header-longer.png => header-new.png} (100%) diff --git a/src/views/3DOverview/components/TechyContainer.vue b/src/views/3DOverview/components/TechyContainer.vue index cc9317c..17be035 100644 --- a/src/views/3DOverview/components/TechyContainer.vue +++ b/src/views/3DOverview/components/TechyContainer.vue @@ -21,234 +21,16 @@ - diff --git a/src/views/3DOverview/index.vue b/src/views/3DOverview/index.vue index e285719..e34dd2f 100644 --- a/src/views/3DOverview/index.vue +++ b/src/views/3DOverview/index.vue @@ -1,7 +1,6 @@ -- 2.45.2 From eab0a7da5a2c11f5446588af45de9234a9100eb7 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 11 Nov 2022 16:18:55 +0800 Subject: [PATCH 07/19] =?UTF-8?q?update=203d=20=E7=9A=84=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/3DOverview/components/LeftContentOrder.vue | 2 +- src/views/3DOverview/components/RightContentQualityAnalysis.vue | 2 +- src/views/3DOverview/components/TechyTable.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/3DOverview/components/LeftContentOrder.vue b/src/views/3DOverview/components/LeftContentOrder.vue index 074f07f..a860ba1 100644 --- a/src/views/3DOverview/components/LeftContentOrder.vue +++ b/src/views/3DOverview/components/LeftContentOrder.vue @@ -197,6 +197,6 @@ export default { font-size: calc(12px * var(--beilv)) !important; line-height: calc(14px * var(--beilv)) !important; left: calc(-2px * var(--beilv)); - color: #ffffff50 !important; + color: #ffffffb3 !important; } diff --git a/src/views/3DOverview/components/RightContentQualityAnalysis.vue b/src/views/3DOverview/components/RightContentQualityAnalysis.vue index e273eae..9203cb5 100644 --- a/src/views/3DOverview/components/RightContentQualityAnalysis.vue +++ b/src/views/3DOverview/components/RightContentQualityAnalysis.vue @@ -53,7 +53,7 @@ export default { display: grid; grid-template-columns: 1fr 1fr; grid-auto-rows: min-content; - gap: calc(100vmin / 1920 * 10) calc(100vmin / 1920 * 20); + gap: calc(4px * var(--beilv)) calc(6px * var(--beilv)); justify-content: end; } diff --git a/src/views/3DOverview/components/TechyTable.vue b/src/views/3DOverview/components/TechyTable.vue index 3cba4c0..56f1ed1 100644 --- a/src/views/3DOverview/components/TechyTable.vue +++ b/src/views/3DOverview/components/TechyTable.vue @@ -178,7 +178,7 @@ export default { } .visual-base-table-container >>> td span { - color: #ffffff50; + color: #ffffffb3; font-size: calc(12px * var(--beilv)); line-height: calc(14px * var(--beilv)); } -- 2.45.2 From 92126a2b6b9dc39268986a43f3233e2386a3fffe Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 11 Nov 2022 16:34:07 +0800 Subject: [PATCH 08/19] =?UTF-8?q?update=203d=20=E7=9A=84=E5=85=AC=E7=94=A8?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=B6=88=E8=80=97=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LeftContentOrder.vue | 61 -------------- .../components/LeftContentPublicConsume.vue | 82 ++++++------------- src/views/3DOverview/index.vue | 4 +- 3 files changed, 26 insertions(+), 121 deletions(-) diff --git a/src/views/3DOverview/components/LeftContentOrder.vue b/src/views/3DOverview/components/LeftContentOrder.vue index a860ba1..73938d0 100644 --- a/src/views/3DOverview/components/LeftContentOrder.vue +++ b/src/views/3DOverview/components/LeftContentOrder.vue @@ -125,67 +125,6 @@ export default { text-align: left; } -.left-content-order { - height: calc(100% - 3vh); - overflow: auto; -} - -/* -.el-table-wrapper { - height: 100%; -} - -.el-table-wrapper >>> * { - background: transparent; -} -.el-table-wrapper >>> .el-table::before, -.el-table-wrapper >>> .el-table--group::after, -.el-table-wrapper >>> .el-table--border::after { - background: transparent; -} - -.el-table-wrapper >>> .el-table { - font-size: 8px; - background-color: transparent; - color: #fff9; - border: 0; -} - -.el-table-wrapper >>> .el-table th.is-leaf, -.el-table-wrapper >>> .el-table td { - border-color: #0d1728; - padding: 0; -} - -.el-table__row--striped:hover > td, -.el-table-wrapper >>> .el-table__row:hover > td { - background-color: rgba(79, 114, 136, 0.29) !important; -} - -.el-table-wrapper >>> table { - border: unset; -} - -.el-table-wrapper >>> thead { - color: #fff; -} -.el-table-wrapper >>> tr { - background: unset; -} -.el-table-wrapper >>> tbody td > div, -.el-table-wrapper >>> thead th > div { - white-space: nowrap; -} -.el-table-wrapper >>> th, -.el-table-wrapper >>> td { - padding: 0; -} - -.el-table-wrapper >>> tbody > tr:nth-child(even) { - background: rgba(76, 97, 123, 0.2); -} -*/ - .left-content-order >>> .el-progress-circle { position: relative; left: calc(24px * var(--beilv)); diff --git a/src/views/3DOverview/components/LeftContentPublicConsume.vue b/src/views/3DOverview/components/LeftContentPublicConsume.vue index d818d88..ab25df1 100644 --- a/src/views/3DOverview/components/LeftContentPublicConsume.vue +++ b/src/views/3DOverview/components/LeftContentPublicConsume.vue @@ -1,30 +1,5 @@