From d55fef9c7205b412cadc99c2bb2dea9329b7a2c9 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 31 七月 2024 09:39:19 +0800
Subject: [PATCH] 1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头 3、OEE综合效率分析页面新增车间字段
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index a14070b..adac88d 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -6,10 +6,10 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�" :disabledDate="disabledDate"
class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"
- :disabledTime="disabledDateTime"></j-date>
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
@@ -23,11 +23,11 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
:disabledDate="disabledDate"
class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"
- :disabledTime="disabledDateTime"></j-date>
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
@@ -171,7 +171,7 @@
disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+2, 'day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
--
Gitblit v1.9.3