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/deviceCalendar/DeviceCalendarModel.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index f48a441..6d15f94 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -8,7 +8,7 @@
<a-col :span="24">
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
- @search="deviceSearch" enter-button/>
+ @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
</a-form-item>
</a-col>
</a-row>
@@ -44,6 +44,7 @@
</a-form>
</a-spin>
<device-calend-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-calend-list-model>
+ <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-modal>
</div>
</template>
@@ -62,10 +63,11 @@
} from '@/api/api'
import Calendar from 'vue-calendar-component';
+ import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'
export default {
name: 'ShiftInfoModel',
- components: {DeviceCalendListModel,Calendar},
+ components: { SelectDeviceDrawer, DeviceCalendListModel,Calendar},
props: {},
data() {
return {
@@ -239,9 +241,10 @@
this.value = value;
},
deviceSearch() {
- this.$refs.deviceRepairListModel.openPage()
- this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
- this.$refs.deviceRepairListModel.disableSubmit = false
+ this.$refs.selectDeviceDrawer.visible = true
+ this.$refs.selectDeviceDrawer.selectedRowKeys = []
+ this.$refs.selectDeviceDrawer.selectedRows = []
+ this.$refs.selectDeviceDrawer.checkedKeys = this.form.getFieldValue('equipmentId') ? this.form.getFieldValue('equipmentId').split(',') : []
},
getDeviceRows(val) {
console.log("========",val);
@@ -342,6 +345,21 @@
this.close()
},
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @param data 宸查�夋嫨鐨勮澶�
+ */
+ selectOK(data) {
+ // let params = {}
+ // params.equipmentIdList = []
+ // for (var a = 0; a < data.length; a++) {
+ // params.equipmentIdList.push(data[a])
+ // }
+ console.log('data=', data)
+ this.form.setFieldsValue({
+ equipmentId: data.join(',')
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3