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/eam/modules/operationCertificate/OperationCertificateModal.vue | 93 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/src/views/eam/modules/operationCertificate/OperationCertificateModal.vue b/src/views/eam/modules/operationCertificate/OperationCertificateModal.vue
index e881924..ca4cea7 100644
--- a/src/views/eam/modules/operationCertificate/OperationCertificateModal.vue
+++ b/src/views/eam/modules/operationCertificate/OperationCertificateModal.vue
@@ -1,63 +1,64 @@
<template>
<j-modal
- :title="title"
- :width="1200"
- :visible="visible"
- :maskClosable="false"
+ :title='title'
+ :width='1200'
+ :visible='visible'
+ :maskClosable='false'
switchFullscreen
- @ok="handleOk"
+ @ok='handleOk'
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- @cancel="handleCancel">
- <operation-certificate-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
+ @cancel='handleCancel'>
+ <operation-certificate-form ref='realForm' @ok='submitCallback' :disabled='disableSubmit' :loadSubTableData='loadSubTableDataFlag' />
</j-modal>
</template>
<script>
- import OperationCertificateForm from './OperationCertificateForm'
+import OperationCertificateForm from './OperationCertificateForm'
- export default {
- name: 'OperationCertificateModal',
- components: {
- OperationCertificateForm
+export default {
+ name: 'OperationCertificateModal',
+ components: {
+ OperationCertificateForm
+ },
+ data() {
+ return {
+ title: '',
+ width: 800,
+ visible: false,
+ disableSubmit: false,
+ loadSubTableDataFlag: true
+ }
+ },
+ methods: {
+ add() {
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.realForm.add()
+ })
},
- data() {
- return {
- title:'',
- width:800,
- visible: false,
- disableSubmit: false
- }
+ edit(record) {
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.realForm.edit(record)
+ })
},
- methods:{
- add () {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.add();
- })
- },
- edit (record) {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.edit(record);
- })
- },
- close () {
- this.$emit('close');
- this.visible = false;
- },
- handleOk () {
- this.$refs.realForm.handleOk();
- },
- submitCallback(){
- this.$emit('ok');
- this.visible = false;
- },
- handleCancel () {
- this.close()
- }
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleOk() {
+ this.$refs.realForm.handleOk()
+ },
+ submitCallback() {
+ this.$emit('ok')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
}
}
+}
</script>
<style scoped>
--
Gitblit v1.9.3