From 79e9110f1db6ec93e2937512836364b4ee86c2db Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 8 Nov 2022 16:09:34 +0800 Subject: [PATCH 01/25] update 3d homepage middlebox --- src/views/3DOverview/index.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/3DOverview/index.vue b/src/views/3DOverview/index.vue index 5e0cd42..be83e9c 100644 --- a/src/views/3DOverview/index.vue +++ b/src/views/3DOverview/index.vue @@ -207,7 +207,8 @@ export default { padding: calc(100vmin / 1920 * 36); padding-bottom: 0; display: flex; - justify-content: space-between; + /* justify-content: space-between; */ + gap: calc(100vmin / 1920 * 36); } .bottom-part { @@ -243,9 +244,14 @@ export default { } .techy-body-part__middle { + flex: 1; + position: relative; +} + +.techy-body-part__middle .techy-box { position: absolute; - top: 9%; - left: 26%; + top: 0; + left: 0; height: 136px; width: 176px; } From 0db0f987918e988cb2b8395d1391a2ca49fb6748 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 8 Nov 2022 16:43:08 +0800 Subject: [PATCH 02/25] update homepage --- src/layout/components/Navbar.vue | 58 ++++++++++++------- .../3DOverview/components/TechyContainer.vue | 2 +- src/views/3DOverview/index.vue | 6 +- src/views/ChoicePart/index.vue | 12 ++-- 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ecd396f..3567ee2 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,27 +1,24 @@ + @@ -20,18 +37,52 @@ diff --git a/src/icons/svg/alarm-old.svg b/src/icons/svg/alarm-old.svg new file mode 100644 index 0000000..2cd3ac9 --- /dev/null +++ b/src/icons/svg/alarm-old.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/alarm.svg b/src/icons/svg/alarm.svg index 2cd3ac9..d5b848b 100644 --- a/src/icons/svg/alarm.svg +++ b/src/icons/svg/alarm.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + 2 + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/alarmb.svg b/src/icons/svg/alarmb.svg new file mode 100644 index 0000000..56883ab --- /dev/null +++ b/src/icons/svg/alarmb.svg @@ -0,0 +1,14 @@ + + + 2 + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/chrome-old.svg b/src/icons/svg/chrome-old.svg new file mode 100644 index 0000000..17fcca4 --- /dev/null +++ b/src/icons/svg/chrome-old.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/chrome.svg b/src/icons/svg/chrome.svg index 17fcca4..2777d04 100644 --- a/src/icons/svg/chrome.svg +++ b/src/icons/svg/chrome.svg @@ -1,2 +1,10 @@ - \ No newline at end of file + + + 3 + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/chromeb.svg b/src/icons/svg/chromeb.svg new file mode 100644 index 0000000..c975528 --- /dev/null +++ b/src/icons/svg/chromeb.svg @@ -0,0 +1,10 @@ + + + 3 + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/home-old.svg b/src/icons/svg/home-old.svg new file mode 100644 index 0000000..4e97c20 --- /dev/null +++ b/src/icons/svg/home-old.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/home.svg b/src/icons/svg/home.svg index 4e97c20..4a9ac68 100644 --- a/src/icons/svg/home.svg +++ b/src/icons/svg/home.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + 1 + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/homeb.svg b/src/icons/svg/homeb.svg new file mode 100644 index 0000000..c6d1237 --- /dev/null +++ b/src/icons/svg/homeb.svg @@ -0,0 +1,10 @@ + + + 1 + + + + + + + \ No newline at end of file diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 81cb597..a52ce72 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -19,13 +19,15 @@
-
+
- {{ 'navbar.homepage' | i18nFilter }} + + {{ 'navbar.homepage' | i18nFilter }} +
- + 暂无数据 @@ -73,7 +75,7 @@
@@ -291,8 +293,12 @@ export default { clearInterval(logoutInterval) }, async toHome() { - this.$store.dispatch('app/setChoicepart') - this.$router.push('/') + if (this.showhome) { + this.$store.dispatch('app/setChoicepart') + this.$router.push('/') + } else { + this.goToRootPage() + } }, handleAlarm() {}, getAlarm() { @@ -324,13 +330,15 @@ export default { diff --git a/src/views/EquipmentManager/mockData.js b/src/views/EquipmentManager/mockData.js index d7f154e..657dc14 100644 --- a/src/views/EquipmentManager/mockData.js +++ b/src/views/EquipmentManager/mockData.js @@ -45,11 +45,11 @@ export const equipmentExceptionDatalist = [ { 'eqName': 'A1一次固化机', 'pl': 'E线', 'content': '开化是专品直', 'creator': '郭娜', 'time': '1997-06-08 06:14:37', 'priority': 1 }, { 'eqName': 'B1一次冷却机', 'pl': 'B线', 'content': '书记因地观同展土军信', 'creator': '薛洋', 'time': '2006-03-15 10:39:30', 'priority': 2 }, { 'eqName': 'A1预热机', 'pl': 'D线', 'content': '说资把话', 'creator': '曾刚', 'time': '1985-01-29 23:21:53', 'priority': 3 }, - { 'eqName': 'A钢化炉', 'content': '即压连识打', 'creator': '张杰', 'time': '1975-05-12 18:54:07', 'priority': 5 }, + { 'eqName': 'A钢化炉', 'content': '即压连识打', 'creator': '张杰', 'time': '1975-05-12 18:54:07', 'priority': 2 }, { 'eqName': 'A2一次固化机', 'pl': 'C线', 'content': '向江比把设', 'creator': '夏敏', 'time': '1996-12-22 09:29:57', 'priority': 3 }, { 'eqName': 'A2一次固化机', 'content': '统山数里们步在', 'creator': '龙洋', 'time': '1989-07-19 05:01:55', 'priority': 3 }, { 'eqName': 'A钢化炉', 'content': '快制放产口快', 'creator': '金艳', 'time': '1987-02-25 18:45:17', 'priority': 4 }, - { 'eqName': 'A1一次固化机', 'content': '住指时化统高线', 'creator': '顾敏', 'time': '1982-05-09 15:28:29', 'priority': 5 }, + { 'eqName': 'A1一次固化机', 'content': '住指时化统高线', 'creator': '顾敏', 'time': '1982-05-09 15:28:29', 'priority': 1 }, { 'eqName': 'B1二次镀膜机', 'pl': 'B线', 'content': '命些种保较会', 'creator': '罗秀英', 'time': '1986-04-02 07:40:03', 'priority': 2 }, { 'pl': 'B线', 'content': '增元少号安场明去在亲', 'creator': '于丽', 'time': '2004-08-11 11:10:57', 'priority': 4 }] @@ -89,16 +89,16 @@ export const equipmentAlarmProps = [ export const equipmentAlarmDatalist = [ { 'eqName': 'A1预热机', 'eqCode': 'SB501464', 'pl': 'C线', 'content': '使决方不相动', 'priority': 3 }, - { 'eqName': 'A1一次固化机', 'eqCode': 'SB373383', 'pl': 'C线', 'content': '规问示况将料组美联', 'priority': 5 }, + { 'eqName': 'A1一次固化机', 'eqCode': 'SB373383', 'pl': 'C线', 'content': '规问示况将料组美联', 'priority': 1 }, { 'eqName': 'B1二次镀膜机', 'eqCode': 'SB788842', 'pl': 'D线', 'content': '了进改京人表无当市手', 'priority': 2 }, - { 'eqName': 'A1预热机', 'eqCode': 'SB743966', 'pl': 'D线', 'content': '经府极元算进', 'priority': 5 }, + { 'eqName': 'A1预热机', 'eqCode': 'SB743966', 'pl': 'D线', 'content': '经府极元算进', 'priority': 2 }, { 'eqName': 'B1一次冷却机', 'eqCode': 'SB138810', 'pl': 'E线', 'content': '代利值才之', 'priority': 1 }, - { 'eqName': 'A2一次冷却机', 'eqCode': 'SB861428', 'pl': 'D线', 'content': '还总速活直', 'priority': 5 }, + { 'eqName': 'A2一次冷却机', 'eqCode': 'SB861428', 'pl': 'D线', 'content': '还总速活直', 'priority': 3 }, { - 'eqName': 'B1一次冷却机', 'eqCode': 'SB88566', 'content': '么中相育成他', 'priority': 5 + 'eqName': 'B1一次冷却机', 'eqCode': 'SB88566', 'content': '么中相育成他', 'priority': 4 }, - { 'eqName': 'A2一次固化机', 'eqCode': 'SB955674', 'pl': 'E线', 'content': '并来水报克见克代', 'priority': 5 }, - { 'eqName': 'A1预热机', 'eqCode': 'SB415026', 'pl': 'C线', 'content': '元动增断量争', 'priority': 5 }, + { 'eqName': 'A2一次固化机', 'eqCode': 'SB955674', 'pl': 'E线', 'content': '并来水报克见克代', 'priority': 2 }, + { 'eqName': 'A1预热机', 'eqCode': 'SB415026', 'pl': 'C线', 'content': '元动增断量争', 'priority': 1 }, { 'eqName': 'A钢化炉', 'eqCode': 'SB19064', 'pl': 'D线', 'content': '很这置合它里革民', 'priority': 4 } ] From 472ac0a19f6e7093683ec12d2e21b0cd5cafd10d Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 9 Nov 2022 16:49:56 +0800 Subject: [PATCH 15/25] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentManager/HomePage.vue | 85 ++++++++++++++----------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue index 712af31..5a2cca8 100644 --- a/src/views/EquipmentManager/HomePage.vue +++ b/src/views/EquipmentManager/HomePage.vue @@ -77,13 +77,15 @@
- +
+ +
@@ -292,26 +294,14 @@ export default { sparepartsProps, sparepartsDatalist, rightSideProps, - rightSideDatalist, + rightSideDatalist // refreshKey: 0 - scale: 1 } }, computed: { ...mapGetters(['sidebar']) - }, - mounted() { - this.$nextTick(() => { - this.scale = this.$refs['cockpit-container-equipment'].offsetWidth / 1920 - this.$refs['cockpit-container-equipment'].style.setProperty('--scale', this.scale) - - this.$watch(() => this.$refs['cockpit-container-equipment'].offsetWidth, function(v, o) { - console.log('resize ... ref..') - this.scale = this.$refs['cockpit-container-equipment'].offsetWidth / 1920 - this.$refs['cockpit-container-equipment'].style.setProperty('--scale', this.scale) - }) - }) }, + mounted() {}, methods: { changeFullScreen() { @@ -342,8 +332,6 @@ export default { .visual-container { width: 100%; - min-width: 1280px; - /* height: calc(100vh - 128px); */ background: url('./assets/bg.png') no-repeat; background-size: cover; overflow: hidden; @@ -353,27 +341,28 @@ export default { .techy-body { height: calc(100vh - 64px); width: 100%; - /* overflow: hidden; */ - /* padding: 24px; */ - padding: calc(100vw / 1920 * 24); - /* display: grid; - grid-template-columns: 3fr 1fr; */ + padding: calc(24px * var(--beilv)); display: flex; - gap: calc(100vw / 1920 * 16); + gap: calc(16px * var(--beilv)); } .tech-body__col-1 { - height: calc(100% - 28px); - flex: 1 3; + /* height: calc(100% - 28px); */ + height: 100%; + flex: 1; display: flex; flex-direction: column; - gap: calc(100vw / 1920 * 16); + gap: calc(16px * var(--beilv)); + width: 70%; + background-color: #aaaa; } .tech-body__col-2 { - flex: 1 1; - max-width: 25%; - height: calc(100% - 28px); + width: 25%; + flex: 0; + /* height: calc(100% - 28px); */ + height: 100%; + background-color: #cccc; } .techy-container__inner { @@ -388,18 +377,40 @@ export default { flex: 1 1; } +.row-1, +.row-2, +.row-3 { + height: 30%; +} + .row-1 { flex: 1; display: flex; gap: calc(100vw / 1920 * 16); } +.row-2 { + flex: 0; +} + +.row-3 { + flex: 0; +} + .equipment-exception { - flex: 3 1; + min-width: 20%; + flex: 3; } .equipment-alarm { - flex: 2 1; + min-width: 20%; + flex: 2; +} + +.table-wrapper { + height: calc(100% - 3vh); + overflow: scroll; + background-color: #f003; } .grid { From 3567838049ef1dfe8c0408e3aabcfb09bb16bdaf Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 9 Nov 2022 17:03:20 +0800 Subject: [PATCH 16/25] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84techytable=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentManager/HomePage.vue | 6 +- .../components/TechyTable.vue | 147 +++++++++--------- 2 files changed, 77 insertions(+), 76 deletions(-) diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue index 5a2cca8..dd9673d 100644 --- a/src/views/EquipmentManager/HomePage.vue +++ b/src/views/EquipmentManager/HomePage.vue @@ -354,15 +354,12 @@ export default { flex-direction: column; gap: calc(16px * var(--beilv)); width: 70%; - background-color: #aaaa; } .tech-body__col-2 { width: 25%; flex: 0; - /* height: calc(100% - 28px); */ height: 100%; - background-color: #cccc; } .techy-container__inner { @@ -386,7 +383,7 @@ export default { .row-1 { flex: 1; display: flex; - gap: calc(100vw / 1920 * 16); + gap: calc(16px * var(--beilv)); } .row-2 { @@ -410,7 +407,6 @@ export default { .table-wrapper { height: calc(100% - 3vh); overflow: scroll; - background-color: #f003; } .grid { diff --git a/src/views/EquipmentManager/components/TechyTable.vue b/src/views/EquipmentManager/components/TechyTable.vue index 38eb3e1..4215bc1 100644 --- a/src/views/EquipmentManager/components/TechyTable.vue +++ b/src/views/EquipmentManager/components/TechyTable.vue @@ -6,28 +6,8 @@ * @Description: -->
- + {{ title }}
@@ -21,6 +21,8 @@ diff --git a/src/views/EquipmentManager/components/TechyHeader.vue b/src/views/EquipmentManager/components/TechyHeader.vue index dbed9e4..bc9f7af 100644 --- a/src/views/EquipmentManager/components/TechyHeader.vue +++ b/src/views/EquipmentManager/components/TechyHeader.vue @@ -95,8 +95,7 @@ export default { position: relative; color: white; /* font-size: 24px; */ - font-size: 2vh; - padding: calc(100vw / 1920 * 32) 0; + padding: calc(24px * var(--beilv)) 0; line-height: 1; background: url(./header-new.png) no-repeat; /** 背景图片好像左右不对称 : */ @@ -104,22 +103,22 @@ export default { /* background-size: cover; */ background-size: 100% 100%; /* background-position: bottom left calc(100vw / 1920 * 40); */ - background-position: bottom left calc(100vw / 1920 * 40); - height: calc(100vmin / 1920 * 128); + background-position: bottom left calc(32px * var(--beilv)); + height: calc(96px * var(--beilv)); } .logo-img { - width: calc(100vmin / 1920 * 48); + width: calc(28px * var(--beilv)); } .techy-header__title { display: line-block; - margin-left: calc(100vmin / 1920 * 12); + margin-left: calc(12px * var(--beilv)); /* font-size: 29px; */ - font-size: calc(100vmin / 1920 * 48); - line-height: 41px; - letter-spacing: 4px; - text-shadow: 0px 0px 11px rgba(221, 237, 255, 0.34); + font-size: calc(29px * var(--beilv)); + line-height: calc(41px * var(--beilv)); + letter-spacing: calc(2.23px * var(--beilv)); + text-shadow: 0px 0px calc(11px * var(--beilv)) rgba(221, 237, 255, 0.34); } .date, @@ -146,20 +145,17 @@ export default { } .fullscreen-btn { - /* height: 32px; */ cursor: pointer; position: absolute; - /* right: 24px; */ /** techy-body 的内部 padding 值 */ - right: calc(100vmin / 1920 * 32); - /* top: 42px; */ - top: calc(100vmin / 1920 * 64); + right: calc(24px * var(--beilv)); + top: calc(44px * var(--beilv)); bottom: 0; } .fullscreen-btn > span { display: inline-block; - width: calc(100vmin / 1920 * 52); - height: calc(100vmin / 1920 * 52); + width: calc(32px * var(--beilv)); + height: calc(32px * var(--beilv)); } diff --git a/src/views/EquipmentManager/components/icons.js b/src/views/EquipmentManager/components/icons.js new file mode 100644 index 0000000..487aa46 --- /dev/null +++ b/src/views/EquipmentManager/components/icons.js @@ -0,0 +1,125 @@ +// 扳手 +export const IconBanshou = ` +setting tools + + + + + + + + + + + + + + + +` + +// 趋势+放大镜 +export const IconTrend = ` +analysis + + + + + + + + + + + + + + + + + + + + + + + +` + +// 菜单+齿轮 +export const IconMenuChilun = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 闪电安全帽 +export const IconSafetyHat = ` +hatplus + + + + + + + + + + + + + + + + + + + +` diff --git a/src/views/QualityManager/components/TechyContainer.vue b/src/views/QualityManager/components/TechyContainer.vue index dc29f96..bdcab67 100644 --- a/src/views/QualityManager/components/TechyContainer.vue +++ b/src/views/QualityManager/components/TechyContainer.vue @@ -12,7 +12,7 @@
- + {{ title }}
@@ -21,6 +21,8 @@ diff --git a/src/views/QualityManager/components/TechyHeader.vue b/src/views/QualityManager/components/TechyHeader.vue index 5d2c835..0987a1f 100644 --- a/src/views/QualityManager/components/TechyHeader.vue +++ b/src/views/QualityManager/components/TechyHeader.vue @@ -1,17 +1,36 @@ diff --git a/src/views/QualityManager/components/icons.js b/src/views/QualityManager/components/icons.js new file mode 100644 index 0000000..487aa46 --- /dev/null +++ b/src/views/QualityManager/components/icons.js @@ -0,0 +1,125 @@ +// 扳手 +export const IconBanshou = ` +setting tools + + + + + + + + + + + + + + + +` + +// 趋势+放大镜 +export const IconTrend = ` +analysis + + + + + + + + + + + + + + + + + + + + + + + +` + +// 菜单+齿轮 +export const IconMenuChilun = ` +编组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` + +// 闪电安全帽 +export const IconSafetyHat = ` +hatplus + + + + + + + + + + + + + + + + + + + +` From f19f50623dc0e0ec49b849594e9bf74f3a06adf6 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 10 Nov 2022 10:39:46 +0800 Subject: [PATCH 18/25] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/EquipmentManager/HomePage.vue | 186 ++++-------------- .../components/EquipmentAnalysisBox.vue | 44 ++--- .../EquipmentManager/components/TechyBox.vue | 4 +- .../components/charts/pl-JDL-Chart.vue | 9 +- 4 files changed, 70 insertions(+), 173 deletions(-) diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue index e8e6d14..d542a6b 100644 --- a/src/views/EquipmentManager/HomePage.vue +++ b/src/views/EquipmentManager/HomePage.vue @@ -42,10 +42,10 @@ -
-
- -

+
+ + + > 各产线稼动率 -

+ --> + 各产线稼动率
@@ -143,124 +143,6 @@ import { import { mapGetters } from 'vuex' import screenfull from 'screenfull' -const equipmentExceptionSVG = ` - setting tools - - - - - - - - - - - - - - - -` -const equipmentAlarmSVG = ` - hatplus - - - - - - - - - - - - - - - - - - - -` -const equipmentOrderSVG = ` - 编组 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -` -const equipmentAnalysisSVG = ` - analysis - - - - - - - - - - - - - - - - - - - - - - - -` export default { name: 'EquipmentManageHome', components: { @@ -281,10 +163,6 @@ export default { props: {}, data() { return { - equipmentExceptionSVG, - equipmentAlarmSVG, - equipmentOrderSVG, - equipmentAnalysisSVG, equipmentExceptionProps, equipmentExceptionDatalist, equipmentAlarmProps, @@ -379,7 +257,7 @@ export default { } .row-1, -.row-2, +/* .row-2, */ .row-3 { height: 30%; } @@ -395,7 +273,7 @@ export default { } .row-3 { - flex: 0; + flex: 1; } .equipment-exception { @@ -417,32 +295,52 @@ export default { display: grid; } -.columns-2 { - grid-template-columns: 1fr 3fr; - /* gap: 8px; */ - gap: 0.5vw; +.equipment-analysis__inner { + height: calc(100% - 32px); + display: flex; + gap: calc(8px * var(--beilv)); +} + +.pl-jdl { + padding: calc(8px * var(--beilv)) calc(16px * var(--beilv)); + height: calc(191px * var(--beilv)); + width: calc(245px * var(--beilv)); + display: flex; + flex-direction: column; +} + +.pl-jdl__title { + font-size: calc(15px * var(--beilv)); + line-height: calc(18px * var(--beilv)); + color: #01cfcc; +} + +.eqs-oee-mtbr-btbf { + flex: 1; + height: calc(191px * var(--beilv)); + overflow: hidden; + overflow-y: scroll; } .grid-2-3 { grid-template-columns: repeat(3, 1fr); grid-template-rows: 1fr 1fr; - /* gap: 4px; */ - gap: 0.6vh 0.3vw; + gap: calc(8px * var(--beilv)) calc(4px * var(--beilv)); } .product-line-selection { border: none; outline: none; - border-radius: 2px 4px 4px 2px; + border-radius: calc(4px * var(--beilv)); background: #31878c45; /* opacity: 0.29; */ color: white; position: absolute; - padding: 0.5vh; - width: 5vw; - font-size: 12px; - line-height: 18px; - top: calc(1vh + 8px); - left: calc(5vw + 32px); + padding: calc(4px * var(--beilv)); + width: calc(114px * var(--beilv)); + font-size: calc(12px * var(--beilv)); + line-height: calc(18px * var(--beilv)); + top: calc(24px * var(--beilv)); + left: calc(140px * var(--beilv)); } diff --git a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue index cb64904..b1bbca4 100644 --- a/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue +++ b/src/views/EquipmentManager/components/EquipmentAnalysisBox.vue @@ -52,12 +52,11 @@ const ProgreeBar = { 'div', { style: { - height: '0.5vh', + height: '100%', width: '100%', - borderRadius: '8px', + borderRadius: 'calc(8px * var(--beilv))', position: 'relative', background: '#1E2D4590', - // background: 'red', overflow: 'hidden' } }, @@ -71,7 +70,7 @@ const ProgreeBar = { top: 0, width: this.process + '%', height: '100%', - borderRadius: '8px', + borderRadius: 'calc(8px * var(--beilv))', background: `linear-gradient(to right, ${this.colors[0]}, ${this.colors[1]})` } }, @@ -114,10 +113,10 @@ export default { } .equipment-analysis-box__title { - font-size: 1.25vh; - line-height: 2vh; - letter-spacing: 1px; - width: 3vw; + font-size: calc(14px * var(--beilv)); + line-height: calc(18px * var(--beilv)); + letter-spacing: calc(1px * var(--beilv)); + width: 30%; overflow-wrap: break-word; align-self: center; text-align: center; @@ -130,12 +129,9 @@ export default { .param-name { opacity: 70%; text-align: right; - /* font-size: 12px; - line-height: 14px; - width: 36px; */ - font-size: 1vh; - line-height: 1.2; - width: 2vw; + font-size: calc(12px * var(--beilv)); + line-height: calc(14px * var(--beilv)); + width: 20%; } .param-value { opacity: 70%; @@ -143,20 +139,22 @@ export default { /* font-size: 12px; line-height: 14px; width: 24px; */ - font-size: 1vh; - line-height: 1.2; - width: 1.5vw; + font-size: calc(12px * var(--beilv)); + line-height: calc(14px * var(--beilv)); + width: 15%; } .param-list::before { content: ''; position: absolute; - left: -11px; - top: 10%; - width: 1px; - /* height: 100%; */ - height: 80%; - background: linear-gradient(to bottom, transparent, #ffffff8c, transparent); + left: calc(-10px * var(--beilv)); + width: 2px; + height: 100%; + background: linear-gradient(to bottom, transparent, #455670, transparent); +} + +.progress-bar { + height: calc(8px * var(--beilv)); } .flex { diff --git a/src/views/EquipmentManager/components/TechyBox.vue b/src/views/EquipmentManager/components/TechyBox.vue index e8e0a62..e421ad3 100644 --- a/src/views/EquipmentManager/components/TechyBox.vue +++ b/src/views/EquipmentManager/components/TechyBox.vue @@ -11,10 +11,10 @@ export default {} diff --git a/src/views/EquipmentManager/components/charts/pl-JDL-Chart.vue b/src/views/EquipmentManager/components/charts/pl-JDL-Chart.vue index bbc4f6a..a1625a6 100644 --- a/src/views/EquipmentManager/components/charts/pl-JDL-Chart.vue +++ b/src/views/EquipmentManager/components/charts/pl-JDL-Chart.vue @@ -34,7 +34,7 @@ export default { }, axisLine: { lineStyle: { - color: '#ffffff3d' + color: '#5982B233' } }, axisLabel: { @@ -47,17 +47,18 @@ export default { type: 'value', splitLine: { lineStyle: { - color: '#ffffff3d' + color: '#5982B233' } }, axisLine: { lineStyle: { - color: '#ffffff3d' + color: '#5982B233' } }, axisLabel: { color: '#ffffff9d' - } + }, + axisTick: { show : false } } ], series: [ From 8a9df0fd174e955f922273e94149de0b68be3b91 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 10 Nov 2022 11:33:18 +0800 Subject: [PATCH 19/25] update techy-table --- .../components/TechyTable.vue | 143 +++++++----------- 1 file changed, 53 insertions(+), 90 deletions(-) diff --git a/src/views/EquipmentManager/components/TechyTable.vue b/src/views/EquipmentManager/components/TechyTable.vue index 4215bc1..972e093 100644 --- a/src/views/EquipmentManager/components/TechyTable.vue +++ b/src/views/EquipmentManager/components/TechyTable.vue @@ -6,7 +6,7 @@ * @Description: -->