From e205cad00ed14b91f7c7395146941ade750982bb Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 17 一月 2024 15:29:13 +0800
Subject: [PATCH] 1、扭矩配置页面更名为参数配置，增加字段“进给参数” 2、设备监控页面设备表增加状态异常说明字段以及操作列状态反馈功能（具备鉴权功能） 3、设备加工工件报表页面取消分页器及日期字段 4、设备日志页面增加扭矩及进给参数工作曲线 5、设备运行参数报警页面新增至mdc模块数据报表菜单下并完成所有布局及功能实现 6、优化车间看板页面代码，手动设置拖拽区域高度以试图解决进入页面后无法随意拖拽问题（未在现场调试），全屏模式下无法使用功能，从全屏模式切换至普通模式下刷新页面以及优化设备详情弹窗样式
---
src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue | 93 ++++++++++++----------------------------------
1 files changed, 25 insertions(+), 68 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index c234759..8f038ea 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -81,18 +81,18 @@
title="鍩虹淇℃伅"
:column="4"
>
- <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName}}</a-descriptions-item>
- <a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIP}}</a-descriptions-item>
- <a-descriptions-item label="绔彛鍙�">{{resultData.dataPort}}</a-descriptions-item>
- <a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion}}</a-descriptions-item>
- <a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel}}</a-descriptions-item>
- <a-descriptions-item label="璁惧绫诲瀷">{{resultData.deviceType}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower}}</a-descriptions-item>
- <a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis}}</a-descriptions-item>
- <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis}}</a-descriptions-item>
- <a-descriptions-item label="澶囨敞">{{resultData.remark}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIP|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="绔彛鍙�">{{resultData.dataPort|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="绯荤粺鐗堟湰鍙�">{{resultData.systemVersion|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍨嬪彿">{{resultData.equipmentModel|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧绫诲瀷">{{resultData.deviceType|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="璁惧鍔熺巼">{{resultData.devicePower|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="鏈夋晥杞存暟">{{resultData.validAxis|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="鏈�澶ц酱鏁�">{{resultData.maxAxis|formatDescriptionsItem}}</a-descriptions-item>
+ <a-descriptions-item label="澶囨敞">{{resultData.remark|formatDescriptionsItem}}</a-descriptions-item>
</a-descriptions>
<!-- <a-descriptions
@@ -239,9 +239,9 @@
>
<a-tooltip @mouseenter="mouseEnterItem">
<template slot="title">
- {{item.value}}
+ {{item.value|formatDescriptionsItem}}
</template>
- <div class="description-item-class">{{item.value}}</div>
+ <div class="description-item-class">{{item.value|formatDescriptionsItem}}</div>
</a-tooltip>
</a-descriptions-item>
@@ -331,6 +331,11 @@
},
watch: {},
+ filters:{
+ formatDescriptionsItem(value){
+ return value?value:'鏃�'
+ }
+ },
methods: {
drawLine() {
let _this = this
@@ -1423,10 +1428,7 @@
},
mouseEnterItem(e){
- console.log(e, e.target, e.target.clientWidth, e.target.scrollWidth)
- if (e.target.clientWidth >= e.target.scrollWidth) {
- e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
- }
+ if (e.target.clientWidth >= e.target.scrollWidth) e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢 pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
},
beforeDestroy() {
@@ -1495,9 +1497,9 @@
margin-bottom: 0;
}
- /deep/ .ant-descriptions-view {
- padding: 0 20px;
- }
+ /*/deep/ .ant-descriptions-view {*/
+ /*padding: 0 20px;*/
+ /*}*/
/deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
padding-bottom: 5px;
@@ -1505,63 +1507,18 @@
/deep/ .ant-descriptions-item-colon {
color: #fff;
- width: 5.1vw;
+ /*width: 5.1vw;*/
}
/deep/ .ant-descriptions-item-content {
color: #fff;
border: 1px solid #4bcfc8;
padding: 0 10px;
- width: auto;
min-width: 130px;
- /*max-width: 300px;*/
- height: 25px;
}
.mdcEquipMon {
color: #fff;
- }
-
- fieldset {
- border: 1px solid #16738d;
- padding: 17px;
- margin: 14px;
- }
-
- fieldset legend {
- display: inline;
- width: 88px;
- }
-
- table tr td {
- text-align: left;
- color: #fff;
- }
-
- table tr td input {
- border: 1px solid #a6eff9;
- }
-
- .ant-btn {
- padding: 0 10px;
- margin-left: 3px;
- color: #fff !important;
- background-color: #1191b0;
- border: none;
- }
-
- .ant-form-item-control {
- line-height: 0px;
- }
-
- /** 涓昏〃鍗曡闂磋窛 */
- .ant-form .ant-form-item {
- margin-bottom: 10px;
- }
-
- /** Tab椤甸潰琛岄棿璺� */
- .ant-tabs-content .ant-form-item {
- margin-bottom: 0px;
}
/deep/ .ant-descriptions-item-label{
@@ -1574,7 +1531,7 @@
.lsv2Data .ant-descriptions-item-content
{
width: 130px;
- overflow: hidden;
+ vertical-align: bottom;
}
.description-item-class{
--
Gitblit v1.9.3