From 3a73cd63039981d1f7cd324afea8f14f37738467 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 07 三月 2025 11:24:49 +0800
Subject: [PATCH] 1、统计分析和统计图表、对比分析和利用率走势分析、利用率分段分析和报警分析页面新增筛选条件保持跟TEEP页面一致 2、全局中重要程度的筛选方式由多选改为单选 3、设备监控与车间看板页面的设备详情弹窗中的图表调整为一直展示但若无数据则不展示图表的指针与数值
---
src/views/mdc/base/modules/shift/ShiftInfo.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfo.vue b/src/views/mdc/base/modules/shift/ShiftInfo.vue
index 19a856d..e6d104e 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfo.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfo.vue
@@ -1,11 +1,11 @@
<template>
- <a-card :bordered="false" class="shift_info">
+ <div class="shift_info">
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button type="primary" v-if="Object.keys(shiftSystemRow).length>0" @click="handleAdd" icon="plus">閰嶇疆</a-button>
</div>
<!-- table鍖哄煙-begin -->
- <div style="width: 100%;">
+ <div style="width: 100%;flex: 1;overflow: auto">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="false" :loading="loading">
<span
@@ -50,7 +50,7 @@
</div>
<shift-info-model ref="modalForm" @ok="modalFormOk"></shift-info-model>
- </a-card>
+ </div>
</template>
<script>
@@ -201,34 +201,35 @@
</script>
<style lang="less" scoped>
+ .shift_info{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px){
.shift_info{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.shift_info{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.shift_info{
height: 600px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.shift_info{
height: 501px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.shift_info{
height: 501px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3