From 3e7d1c54e2d157c92d270facde45741ba507fd74 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 12 五月 2025 16:29:45 +0800
Subject: [PATCH] 1、全局删除设备类型以及设备级别展示字段 2、设备详情弹窗删除有效轴数和最大轴数展示字段 3、限制设备日志工作曲线弹窗采集周期最小值为100
---
src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue | 158 ----------------------------------------------------
1 files changed, 0 insertions(+), 158 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
index 8f038ea..92abd30 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -85,143 +85,11 @@
<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
- title="杩愯鏁版嵁"
- v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
- :column="4"
- >
- <a-descriptions-item label="涓昏酱鍊嶇巼(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰鍊嶇巼(%)">{{resultData.feedbeilv}}</a-descriptions-item>
- <a-descriptions-item label="涓昏酱璐熻嵎(%)">{{resultData.spindleload}}</a-descriptions-item>
- <a-descriptions-item label="涓昏酱杞��(rpm)">{{resultData.spindlespeed}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰閫熷害(mm/min)">{{resultData.feedrate}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="杩愯鏁版嵁 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="涓昏酱鍊嶇巼(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
- <a-descriptions-item label="璁惧姝ｅ父杩愯鏃堕棿">{{resultData.equipmentNormalTime}}</a-descriptions-item>
- <a-descriptions-item label="蹇�熻繘缁欏�嶇巼(%)">{{resultData.rapidfeed}}</a-descriptions-item>
- <a-descriptions-item label="NC姝ｅ父杩愯鏃堕棿">{{resultData.nCNormalTime}}</a-descriptions-item>
- <a-descriptions-item label="杩涚粰鍊嶇巼(%)">{{resultData.feedbeilv}}</a-descriptions-item>
- <a-descriptions-item label="璁惧杩愯鏃堕棿">{{resultData.equipmentTime}}</a-descriptions-item>
- <a-descriptions-item label="褰撳墠鍒�鍏峰彿">{{resultData.toolNum}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!-- <a-descriptions
- title="绋嬪簭淇℃伅"
- v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
- :column="4"
- >
- <a-descriptions-item label="搴忓垪鍙�">{{resultData.sequencenumber}}</a-descriptions-item>
- <a-descriptions-item
- label="褰撳墠鎵ц浠ｇ爜"
- :span="2"
- >{{resultData.executingcode}}</a-descriptions-item>
- <a-descriptions-item label="宸ヤ欢鍚嶇О">{{resultData.productName}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!-- <a-descriptions
- title="绋嬪簭淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="褰撳墠绋嬪簭">{{resultData.program}}</a-descriptions-item>
- <a-descriptions-item label="绋嬪簭鎵ц鐐�">{{resultData.programPosition}}</a-descriptions-item>
- <a-descriptions-item label="鎿嶄綔妯″紡">{{resultData.operationType}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅缂栧彿涓�">{{resultData.firstErrorNum}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅涓�">{{resultData.firstError}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅">{{resultData.errorinfo}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅缂栧彿浜�">{{resultData.secondErrorNum}}</a-descriptions-item>
- <a-descriptions-item label="閿欒淇℃伅浜�">{{resultData.secondError}}</a-descriptions-item>
- </a-descriptions> -->
-
- <!--<a-descriptions
- title="杞寸洃鎺ф暟鎹� fro SIEMENS840DSL"
- v-if="driverType == 'SIEMENS840DSL'"
- :column="4"
- >
- <a-descriptions-item label="X杞存俯搴�">{{resultData.temperatureX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞存俯搴�">{{resultData.temperatureY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞存俯搴�">{{resultData.temperatureZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞存俯搴�">{{resultData.temperatureA}}</a-descriptions-item>
- <a-descriptions-item label="B杞存俯搴�">{{resultData.temperatureB}}</a-descriptions-item>
- <a-descriptions-item label="X杞寸數娴�">{{resultData.equipmentCurrentX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞寸數娴�">{{resultData.equipmentCurrentY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞寸數娴�">{{resultData.equipmentCurrentZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞寸數娴�">{{resultData.equipmentCurrentA}}</a-descriptions-item>
- <a-descriptions-item label="B杞寸數娴�">{{resultData.equipmentCurrentB}}</a-descriptions-item>
- <a-descriptions-item label="X杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorX}}</a-descriptions-item>
- <a-descriptions-item label="Y杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorY}}</a-descriptions-item>
- <a-descriptions-item label="Z杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorZ}}</a-descriptions-item>
- <a-descriptions-item label="A杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorA}}</a-descriptions-item>
- <a-descriptions-item label="B杞撮殢鍔ㄨ宸�">{{resultData.equipmentLagErrorB}}</a-descriptions-item>
- </a-descriptions>
--->
- <!-- <a-descriptions
- title="鍧愭爣淇℃伅 "
- v-if="driverType == 'FANUC'"
- :column="3"
- >
- <a-descriptions-item label="缁濆鍧愭爣X">{{resultData.xabsolute}}</a-descriptions-item>
- <a-descriptions-item label="缁濆鍧愭爣Y">{{resultData.yabsolute}}</a-descriptions-item>
- <a-descriptions-item label="缁濆鍧愭爣Z">{{resultData.zabsolute}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣X">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣Y">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="鏈哄簥鍧愭爣Z">{{resultData.zmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅 for lsv2"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions>
-
- <a-descriptions
- title="鍧愭爣淇℃伅"
- v-if="driverType == 'LSV2'"
- :column="4"
- >
- <a-descriptions-item label="X鍧愭爣">{{resultData.xmachine}}</a-descriptions-item>
- <a-descriptions-item label="Y鍧愭爣">{{resultData.ymachine}}</a-descriptions-item>
- <a-descriptions-item label="Z鍧愭爣">{{resultData.zmachine}}</a-descriptions-item>
- <a-descriptions-item label="A鍧愭爣">{{resultData.amachine}}</a-descriptions-item>
- <a-descriptions-item label="B鍧愭爣">{{resultData.bmachine}}</a-descriptions-item>
- <a-descriptions-item label="C鍧愭爣">{{resultData.cmachine}}</a-descriptions-item>
- </a-descriptions> -->
<!---鏁版嵁婧愯皟鏁� 鍔ㄦ�佸睍绀� 杩愯鏁版嵁---->
<a-descriptions
@@ -247,32 +115,6 @@
</a-descriptions-item>
</a-descriptions>
-
- <!--<a-descriptions-->
- <!--title="鍧愭爣淇℃伅"-->
- <!--v-show="xyzAliasesList != null"-->
- <!--v-if="driverType != 'PLC'"-->
- <!--:column="4"-->
- <!-->-->
- <!--<a-descriptions-item-->
- <!--v-for="(item,id) in xyzAliasesList "-->
- <!--:key="item.id"-->
- <!--:label="item.title"-->
- <!-->{{item.value}}</a-descriptions-item>-->
- <!--</a-descriptions>-->
-
- <!--<a-descriptions-->
- <!--title="鐗堟湰淇℃伅 for lsv2"-->
- <!--v-if="driverType == 'LSV2'"-->
- <!--:column="4"-->
- <!--class="lsv2Data"-->
- <!-->-->
- <!--<a-descriptions-item label="NC鐗堟湰">{{resultData.ncversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="TNC鐗堟湰">{{resultData.tncversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="OPT鐗堟湰">{{resultData.optversion}}</a-descriptions-item>-->
- <!--<a-descriptions-item label="PLC鐗堟湰">{{resultData.plcversion}}</a-descriptions-item>-->
- <!--</a-descriptions>-->
-
</td>
</tr>
</table>
--
Gitblit v1.9.3