diff --git a/frontend/src/views/aiQuantity/index.vue b/frontend/src/views/aiQuantity/index.vue index ceafa41..77eab9a 100644 --- a/frontend/src/views/aiQuantity/index.vue +++ b/frontend/src/views/aiQuantity/index.vue @@ -37,7 +37,7 @@ function formatTime(dateStr: string): string { const tableData = computed(() => { const alarms = state.alarms || [] - const firstThree = alarms.slice(0, 1) + const firstThree = alarms.slice(0, 2) return firstThree.map(list => { return { id: list.id || 0, @@ -97,8 +97,7 @@ onMounted(() => { - - + @@ -118,24 +117,24 @@ onMounted(() => { .ai-container { width: 100%; height: 100%; - padding: 15px; + padding: 10px; .top-title { font-weight: 700; font-style: normal; font-size: 16px; color: #363636; - margin-bottom: 10px; + margin-bottom: 4px; } .ai-container-top { width: 100%; - margin-bottom: 10px; + margin-bottom: 4px; .container-top-box { width: 100%; - height: 460px; - padding: 20px; + height: 404px; + padding: 8px 10px; background: #ffffff; box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 4px; @@ -150,8 +149,8 @@ onMounted(() => { .header-cell { flex: 1; - height: 28px; - line-height: 28px; + height: 25px; + line-height: 25px; background-color: #f8f9fc; border: 1px solid #e8e8e8; border-radius: 4px; @@ -173,8 +172,8 @@ onMounted(() => { .cell { flex: 1; - height: 28px; - line-height: 28px; + height: 25px; + line-height: 25px; border: 1px solid #e8e8e8; border-radius: 4px; text-align: center; @@ -191,8 +190,8 @@ onMounted(() => { .container-bottom-box { width: 100%; - height: calc(100vh - 590px); - padding: 15px 20px; + height: 66px; + padding: 0px; background: #ffffff; box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 4px; @@ -201,7 +200,7 @@ onMounted(() => { display: flex; align-items: center; color: #787878; - height: 40px; + height: 33px; font-size: 14px; color: #505050; border-bottom: 1px solid #f2f2f2; diff --git a/frontend/src/views/analogQuantity/index.vue b/frontend/src/views/analogQuantity/index.vue index 69533df..df1769b 100644 --- a/frontend/src/views/analogQuantity/index.vue +++ b/frontend/src/views/analogQuantity/index.vue @@ -120,7 +120,7 @@ function formatTime(dateStr: string): string { const tableData = computed(() => { const alarms = state.alarms || [] - const firstThree = alarms.slice(0, 1) + const firstThree = alarms.slice(0, 2) return firstThree.map(list => { return { id: list.id || 0, @@ -207,7 +207,7 @@ onMounted(() => { - + @@ -227,24 +227,24 @@ onMounted(() => { .analog-quantity-container { width: 100%; height: 100%; - padding: 15px; + padding: 10px; .top-title { font-weight: 700; font-style: normal; font-size: 16px; color: #363636; - margin-bottom: 10px; + margin-bottom: 5px; } .analog-quantity-container-top { width: 100%; - margin-bottom: 10px; + margin-bottom: 5px; .container-top-box { width: 100%; - height: 440px; - padding: 15px 20px; + height: 385px; + padding: 10px; background: #ffffff; box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 4px; @@ -299,7 +299,7 @@ onMounted(() => { } .container-top-box-content { - margin-top: 15px; + margin-top: 10px; .container-top-box-content-top { .container-top-box-content-line1 { @@ -312,8 +312,8 @@ onMounted(() => { .table-line1-item { width: 20%; background: #f9fafe; - height: 40px; - line-height: 40px; + height: 35px; + line-height: 35px; text-align: center; border: 1px solid #e4e4e4; border-radius: 4px; @@ -321,8 +321,8 @@ onMounted(() => { .table-line1-item2 { width: 20%; - height: 40px; - line-height: 40px; + height: 35px; + line-height: 35px; text-align: center; border: 1px solid #e4e4e4; border-radius: 4px; @@ -341,17 +341,16 @@ onMounted(() => { .container-bottom-box { width: 100%; - height: calc(100vh - 575px); - padding: 15px 20px; + height: 72px; background: #ffffff; box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 4px; - overflow: auto; + // overflow: auto; .container-bottom-box-line1 { display: flex; align-items: center; color: #787878; - height: 40px; + height: 36px; font-size: 14px; color: #505050; border-bottom: 1px solid #f2f2f2; diff --git a/frontend/src/views/switchQuantity/index.vue b/frontend/src/views/switchQuantity/index.vue index 4ab9ee9..b508bd9 100644 --- a/frontend/src/views/switchQuantity/index.vue +++ b/frontend/src/views/switchQuantity/index.vue @@ -1,7 +1,7 @@