diff --git a/components.d.ts b/components.d.ts index c7ef020..6f7c782 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,17 +10,13 @@ declare module 'vue' { Confirm: typeof import('./src/components/Confirm.vue')['default'] ConfirmModal: typeof import('./src/components/ConfirmModal.vue')['default'] DialogModal: typeof import('./src/components/dialogs/DialogModal.vue')['default'] - ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCol: typeof import('element-plus/es')['ElCol'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElFooter: typeof import('element-plus/es')['ElFooter'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElRow: typeof import('element-plus/es')['ElRow'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue index ce4c471..6023dfd 100644 --- a/src/pages/Index/History.vue +++ b/src/pages/Index/History.vue @@ -39,7 +39,7 @@ @@ -419,19 +419,20 @@ const handleExport = async () => { padding: 20px 20px 0 20px; box-sizing: border-box; .table-box { - height: calc(100% - 80px); + height: calc(100% - 7rem); .el-table { font-size: 18px; } } .history-table-footer { - height: 80px; + height: 7rem; display: flex; align-items: center; justify-content: space-around; .el-button { - width: 100px; - font-size: 18px; + width: 150px; + height: 50px; + font-size: 24px; } } } diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index c6b1e59..b9290be 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -56,7 +56,7 @@ class="test-control" > - 开始测试 @@ -1006,7 +1006,7 @@ watch( .nav-bar { width: 100%; - height: 60px; + height: 7rem; margin-bottom: 2px; display: flex; justify-content: space-between; @@ -1048,6 +1048,9 @@ watch( height: 48px; background-color: #73bc54; font-size: 20px; + border: 0px solid; + height: 4.75rem; + font-size: 2rem; } .pause-test, @@ -1311,8 +1314,7 @@ watch( } .logo-img{ - width: 130px; - height: 3.75rem; + width: 11rem; padding-top: 5px; } diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue index f89912b..3524a92 100644 --- a/src/pages/Index/Regular/Running.vue +++ b/src/pages/Index/Regular/Running.vue @@ -259,14 +259,14 @@ watch( justify-content: space-around; align-items: center; background-color: #f9fafb; - height: 88vh; + height: 85vh; /* 更柔和的背景色 */ // 孵育盘 .circular-loader { position: relative; - width: 900px; - height: 900px; + width: 54.25rem; + height: 54.25rem; border-radius: 50%; background-color: #f0f2f5; display: flex; @@ -515,7 +515,7 @@ watch( .plate-temp { position: fixed; - top: 11.75rem; + top: 12.75rem; right: 0.575rem; padding: 10px; background-color: rgb(209, 229, 255); diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index 79a7f90..807c4bb 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -321,11 +321,11 @@ const updateTubeSettings = async (rackIdx: number, tubeIdx: number) => { box-sizing: border-box; } @active-color: rgb(82, 140, 254); - @setting-panel-height: 185px; + @setting-panel-height: 13.5625rem; box-sizing: border-box; position: relative; - height: calc(100vh - 180px); + height: calc(100vh - @setting-panel-height); .el-message { width: 200px; diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue index ac7d3f7..e20a1b0 100644 --- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue +++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue @@ -376,7 +376,7 @@ const changePlate = (index: number) => { .controller { width: 136px; - height: 130px; + height: 6rem; color: #54a4e8; border: 3px solid #54a4e8; border-radius: 10px; @@ -437,6 +437,9 @@ const changePlate = (index: number) => { font-size: 26px; font-weight: 500; } + .content{ + font-size: 1.36rem; + } .controller-button, .id-button, diff --git a/src/pages/Index/components/Consumables/SpttingPlates.vue b/src/pages/Index/components/Consumables/SpttingPlates.vue index fcca324..65703d3 100644 --- a/src/pages/Index/components/Consumables/SpttingPlates.vue +++ b/src/pages/Index/components/Consumables/SpttingPlates.vue @@ -180,7 +180,7 @@ const updateSliderEndVal = async (plateNum, order) => { .card { width: 355px; - height: 95px; + height: 5.5rem; padding: 0px; border: 1px solid black; @@ -199,7 +199,7 @@ const updateSliderEndVal = async (plateNum, order) => { display: flex; justify-content: center; align-items: center; - transform: translateY(8px); + transform: translateY(.2rem); } .slider-area { diff --git a/src/pages/Index/components/Consumables/TabBar.vue b/src/pages/Index/components/Consumables/TabBar.vue index f7d812f..1432d03 100644 --- a/src/pages/Index/components/Consumables/TabBar.vue +++ b/src/pages/Index/components/Consumables/TabBar.vue @@ -67,7 +67,7 @@ const onTabClick = (index: any) => { \ No newline at end of file