From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/mdc/base/modules/shift/ShiftSystem.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index 864b89b..7197ad4 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -1,11 +1,11 @@
<template>
- <a-card :bordered="false" class="shift_system">
+ <div class="shift_system">
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button type="primary" @click="handleAdd" icon="plus">鏂板</a-button>
</div>
<!-- table鍖哄煙-begin -->
- <div>
+ <div style="flex: 1;overflow: auto">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="false" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}">
@@ -55,7 +55,7 @@
</div>
<shift-system-model ref="modalForm" @ok="modalFormOk"></shift-system-model>
- </a-card>
+ </div>
</template>
<script>
@@ -117,10 +117,16 @@
let _this = this
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
- _this.$message.success('鎿嶄綔鎴愬姛锛�')
+ _this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ })
_this.loadData()
} else {
- _this.$message.warning('鎿嶄綔澶辫触锛�')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -189,34 +195,35 @@
</script>
<style lang="less" scoped>
+ .shift_system{
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px){
.shift_system{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.shift_system{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.shift_system{
height: 600px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.shift_system{
height: 501px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.shift_system{
height: 501px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3