From a2b2309c0cead11d8b73c2f0f52f05df4a9fa588 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 13 十一月 2023 17:32:15 +0800
Subject: [PATCH] 1、优化车间看板页面开启拖拽及缩放功能时关闭鼠标悬浮弹出设备详情弹窗功能 2、优化用户登陆时若输入密码错误后登录按钮将被禁用问题
---
src/views/WorkshopSignage.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/WorkshopSignage.vue b/src/views/WorkshopSignage.vue
index 81b35a5..e3f9e6b 100644
--- a/src/views/WorkshopSignage.vue
+++ b/src/views/WorkshopSignage.vue
@@ -14,7 +14,7 @@
:disabled="isSwitchChecked"
/>
</a-space>
- <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi">淇濆瓨浣嶇疆 </a-button>
+ <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi">淇濆瓨浣嶇疆</a-button>
</div>
</header>
@@ -267,19 +267,21 @@
},
openDetail(item) {
- if (item.equipmentStatus == 0) {
- // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
- this.$message.warning('璁惧澶勪簬鍏虫満鐘舵�侊紒')
- return false
+ if (!this.isSwitchChecked) {
+ if (item.equipmentStatus == 0) {
+ // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ this.$message.warning('璁惧澶勪簬鍏虫満鐘舵�侊紒')
+ return false
+ }
+ console.log(item)
+ console.log(this.$refs.EquipmentDetailModal)
+ this.$refs.EquipmentDetailModal.initData(item.equId)
+ this.$refs.EquipmentDetailModal.timerModel(item.equId)
+ // this.equipMessageTimer = setInterval(() => {
+ // setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
+ // },1000*10)
}
- console.log(item)
- console.log(this.$refs.EquipmentDetailModal)
- this.$refs.EquipmentDetailModal.initData(item.equId)
- this.$refs.EquipmentDetailModal.timerModel(item.equId)
- // this.equipMessageTimer = setInterval(() => {
- // setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
- // },1000*10)
- },
+ }
},
created() {
--
Gitblit v1.9.3