From bebed734a1651f29042678af2223f046cf02b4e5 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 27 十一月 2024 10:10:57 +0800
Subject: [PATCH] 1、设备信息弹窗修改字段 2、调整设备开动率等报表样式
---
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 684 ++++++++++++++++++++++-----------------------------------
1 files changed, 264 insertions(+), 420 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index 524ca0e..de34628 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -1,7 +1,6 @@
<template>
<div ref="wrap">
<a-modal
- :title="title"
width="70%"
:visible="visible"
:getContainer="() => this.$refs.wrap"
@@ -74,20 +73,21 @@
</div>
</td>
</tr>
+
<tr>
<td colspan="5">
<a-descriptions
title="鍩虹淇℃伅"
:column="4"
>
- <a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentID}}</a-descriptions-item>
+ <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="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.driveType}}</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>
@@ -95,147 +95,20 @@
</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
title="杩愯鏁版嵁"
- v-show="mdcDriveTypeParamConfigList != null"
- v-if="driverType != 'PLC'"
+ v-show="runData"
+ v-if="resultData.driveType != 'PLC'"
:column="4"
class="operationData"
>
<a-descriptions-item
- v-for="(item,id) in mdcDriveTypeParamConfigList "
+ v-for="(item,id) in runData"
:key="item.id"
- :label="item.chineseName"
+ :label="item.key"
>
<a-tooltip @mouseenter="mouseEnterItem">
<template slot="title">
@@ -257,7 +130,8 @@
:style="{ marginRight: '8px' }"
@click="handleCancel"
style="color: #1191b0;"
- >鍏抽棴</a-button>
+ >鍏抽棴
+ </a-button>
</template>
</a-modal>
</div>
@@ -276,29 +150,27 @@
props: {},
data() {
return {
- mdcDriveTypeParamConfigList: [],
- xyzAliasesList: [],
- title: '',
+ runData: [],
+ // xyzAliasesList: [],
//涓昏酱鍊嶇巼
- spindlebeilv: 1,
+ spindlebeilv: 0,
//杩涚粰鍊嶇巼
- feedbeilv: 1,
+ feedbeilv: 0,
// 涓昏酱璐熻嵎
- spindleload: 1,
+ spindleload: 0,
//蹇�熻繘缁欏�嶇巼
- rapidfeed: 1,
+ rapidfeed: 0,
visible: false,
resultData: {},
- driverType: '',
- deviceTypeDict: '',
url: {
mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
},
- modalTimer:null,
- ee:" "
+ modalTimer: null
}
},
- mounted() {
+ beforeDestroy() {
+ clearInterval(this.modalTimer)
+ this.modalTimer = null
},
methods: {
drawLine() {
@@ -308,12 +180,12 @@
let mdcEquiMoniGauge1 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge1'), 'macarons')
let mdcEquiMoniGaugeOption1 = {
tooltip: {
- formatter: "{a} <br/>{b} : {c}%"
+ formatter: '{a} <br/>{b} : {c}%'
},
series: [{
- name: "澶栭儴绾�",
- type: "gauge",
+ name: '澶栭儴绾�',
+ type: 'gauge',
radius: '65%', // 鍔ㄦ��
startAngle: 225,
endAngle: -45,
@@ -326,19 +198,19 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: { //鏍囬
- show: false,
+ show: false
}
},
{
@@ -355,26 +227,26 @@
lineStyle: {
color: [
[1, 'rgba(0,0,0,0)']
- ],
+ ]
}
}, //浠〃鐩樿酱绾�
axisLabel: {
show: true,
color: '#31F3FF',
fontSize: 10, // 鍔ㄦ��
- distance: -20, // 鍔ㄦ��
+ distance: -20 // 鍔ㄦ��
}, //鍒诲害鏍囩銆�
axisTick: {
- show: false,
+ show: false
}, //鍒诲害鏍峰紡
splitLine: {
- show: false,
- },
+ show: false
+ }
},
{
- name: "鍐呴儴瀹界嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴瀹界嚎鏉�',
+ type: 'gauge',
radius: '55%',
startAngle: 225,
endAngle: -45,
@@ -387,24 +259,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鍐呴儴缁嗙嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴缁嗙嚎鏉�',
+ type: 'gauge',
radius: '40%',
startAngle: 225,
endAngle: -45,
@@ -417,24 +289,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "闂撮殧鏉″舰",
- type: "gauge",
+ name: '闂撮殧鏉″舰',
+ type: 'gauge',
radius: '52.5%',
z: 4,
splitNumber: 35,
@@ -446,7 +318,7 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
show: false,
@@ -464,12 +336,12 @@
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鏁版嵁",
- type: "gauge",
+ name: '鏁版嵁',
+ type: 'gauge',
radius: '52.5%',
z: 3,
startAngle: 225,
@@ -488,10 +360,10 @@
show: false
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
show: false
@@ -505,8 +377,8 @@
pointer: {
show: true,
width: 3,
- itemStyle:{
- color:'#fff',
+ itemStyle: {
+ color: '#fff'
}
},
data: [{
@@ -516,60 +388,60 @@
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�',
- "type": 'pie',
- "radius": ['4%', '2%'],
- "hoverAnimation": false,
+ 'name': '鍐呭渾鐜�',
+ 'type': 'pie',
+ 'radius': ['4%', '2%'],
+ 'hoverAnimation': false,
tooltip: {
show: false
},
- cursor: "default",
- "labelLine": {
- "normal": {
- "show": false
+ cursor: 'default',
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#fff'
},
animation: false,
- "data": [1]
+ 'data': [1]
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�2',
- "type": 'pie',
- "radius": '2%',
- "hoverAnimation": false,
- cursor: "default",
+ 'name': '鍐呭渾鐜�2',
+ 'type': 'pie',
+ 'radius': '2%',
+ 'hoverAnimation': false,
+ cursor: 'default',
tooltip: {
show: false
},
- "labelLine": {
- "normal": {
- "show": false
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#31F3FF'
},
animation: false,
- "data": [1]
- },
+ 'data': [1]
+ }
]
- };
+ }
mdcEquiMoniGauge1.setOption(mdcEquiMoniGaugeOption1)
}
if (_this.feedbeilv) {
let mdcEquiMoniGauge2 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge2'), 'macarons')
let mdcEquiMoniGaugeOption2 = {
tooltip: {
- formatter: "{a} <br/>{b} : {c}%"
+ formatter: '{a} <br/>{b} : {c}%'
},
series: [{
- name: "澶栭儴绾�",
- type: "gauge",
+ name: '澶栭儴绾�',
+ type: 'gauge',
radius: '65%', // 鍔ㄦ��
startAngle: 225,
endAngle: -45,
@@ -582,19 +454,19 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: { //鏍囬
- show: false,
+ show: false
}
},
{
@@ -611,26 +483,26 @@
lineStyle: {
color: [
[1, 'rgba(0,0,0,0)']
- ],
+ ]
}
}, //浠〃鐩樿酱绾�
axisLabel: {
show: true,
color: '#31F3FF',
fontSize: 10, // 鍔ㄦ��
- distance: -20, // 鍔ㄦ��
+ distance: -20 // 鍔ㄦ��
}, //鍒诲害鏍囩銆�
axisTick: {
- show: false,
+ show: false
}, //鍒诲害鏍峰紡
splitLine: {
- show: false,
- },
+ show: false
+ }
},
{
- name: "鍐呴儴瀹界嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴瀹界嚎鏉�',
+ type: 'gauge',
radius: '55%',
startAngle: 225,
endAngle: -45,
@@ -643,24 +515,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鍐呴儴缁嗙嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴缁嗙嚎鏉�',
+ type: 'gauge',
radius: '40%',
startAngle: 225,
endAngle: -45,
@@ -673,24 +545,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "闂撮殧鏉″舰",
- type: "gauge",
+ name: '闂撮殧鏉″舰',
+ type: 'gauge',
radius: '52.5%',
z: 4,
splitNumber: 35,
@@ -702,7 +574,7 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
show: false,
@@ -720,12 +592,12 @@
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鏁版嵁",
- type: "gauge",
+ name: '鏁版嵁',
+ type: 'gauge',
radius: '52.5%',
z: 3,
startAngle: 225,
@@ -744,10 +616,10 @@
show: false
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
show: false
@@ -761,8 +633,8 @@
pointer: {
show: true,
width: 3,
- itemStyle:{
- color:'#fff'
+ itemStyle: {
+ color: '#fff'
}
},
data: [{
@@ -772,60 +644,60 @@
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�',
- "type": 'pie',
- "radius": ['4%', '2%'],
- "hoverAnimation": false,
+ 'name': '鍐呭渾鐜�',
+ 'type': 'pie',
+ 'radius': ['4%', '2%'],
+ 'hoverAnimation': false,
tooltip: {
show: false
},
- cursor: "default",
- "labelLine": {
- "normal": {
- "show": false
+ cursor: 'default',
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#fff'
},
animation: false,
- "data": [1]
+ 'data': [1]
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�2',
- "type": 'pie',
- "radius": '2%',
- "hoverAnimation": false,
- cursor: "default",
+ 'name': '鍐呭渾鐜�2',
+ 'type': 'pie',
+ 'radius': '2%',
+ 'hoverAnimation': false,
+ cursor: 'default',
tooltip: {
show: false
},
- "labelLine": {
- "normal": {
- "show": false
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#31F3FF'
},
animation: false,
- "data": [1]
- },
+ 'data': [1]
+ }
]
- };
+ }
mdcEquiMoniGauge2.setOption(mdcEquiMoniGaugeOption2)
}
if (_this.spindleload) {
let mdcEquiMoniGauge3 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge3'), 'macarons')
let mdcEquiMoniGaugeOption3 = {
tooltip: {
- formatter: "{a} <br/>{b} : {c}%"
+ formatter: '{a} <br/>{b} : {c}%'
},
series: [{
- name: "澶栭儴绾�",
- type: "gauge",
+ name: '澶栭儴绾�',
+ type: 'gauge',
radius: '65%', // 鍔ㄦ��
startAngle: 225,
endAngle: -45,
@@ -838,19 +710,19 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: { //鏍囬
- show: false,
+ show: false
}
},
{
@@ -867,26 +739,26 @@
lineStyle: {
color: [
[1, 'rgba(0,0,0,0)']
- ],
+ ]
}
}, //浠〃鐩樿酱绾�
axisLabel: {
show: true,
color: '#31F3FF',
fontSize: 10, // 鍔ㄦ��
- distance: -20, // 鍔ㄦ��
+ distance: -20 // 鍔ㄦ��
}, //鍒诲害鏍囩銆�
axisTick: {
- show: false,
+ show: false
}, //鍒诲害鏍峰紡
splitLine: {
- show: false,
- },
+ show: false
+ }
},
{
- name: "鍐呴儴瀹界嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴瀹界嚎鏉�',
+ type: 'gauge',
radius: '55%',
startAngle: 225,
endAngle: -45,
@@ -899,24 +771,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鍐呴儴缁嗙嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴缁嗙嚎鏉�',
+ type: 'gauge',
radius: '40%',
startAngle: 225,
endAngle: -45,
@@ -929,24 +801,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "闂撮殧鏉″舰",
- type: "gauge",
+ name: '闂撮殧鏉″舰',
+ type: 'gauge',
radius: '52.5%',
z: 4,
splitNumber: 35,
@@ -958,7 +830,7 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
show: false,
@@ -976,12 +848,12 @@
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鏁版嵁",
- type: "gauge",
+ name: '鏁版嵁',
+ type: 'gauge',
radius: '52.5%',
z: 3,
startAngle: 225,
@@ -1000,10 +872,10 @@
show: false
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
show: false
@@ -1017,8 +889,8 @@
pointer: {
show: true,
width: 3,
- itemStyle:{
- color:'#fff'
+ itemStyle: {
+ color: '#fff'
}
},
data: [{
@@ -1028,60 +900,60 @@
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�',
- "type": 'pie',
- "radius": ['4%', '2%'],
- "hoverAnimation": false,
+ 'name': '鍐呭渾鐜�',
+ 'type': 'pie',
+ 'radius': ['4%', '2%'],
+ 'hoverAnimation': false,
tooltip: {
show: false
},
- cursor: "default",
- "labelLine": {
- "normal": {
- "show": false
+ cursor: 'default',
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#fff'
},
animation: false,
- "data": [1]
+ 'data': [1]
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�2',
- "type": 'pie',
- "radius": '2%',
- "hoverAnimation": false,
- cursor: "default",
+ 'name': '鍐呭渾鐜�2',
+ 'type': 'pie',
+ 'radius': '2%',
+ 'hoverAnimation': false,
+ cursor: 'default',
tooltip: {
show: false
},
- "labelLine": {
- "normal": {
- "show": false
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#31F3FF'
},
animation: false,
- "data": [1]
- },
+ 'data': [1]
+ }
]
- };
+ }
mdcEquiMoniGauge3.setOption(mdcEquiMoniGaugeOption3)
}
if (_this.rapidfeed) {
let mdcEquiMoniGauge4 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge4'), 'macarons')
let mdcEquiMoniGaugeOption4 = {
tooltip: {
- formatter: "{a} <br/>{b} : {c}%"
+ formatter: '{a} <br/>{b} : {c}%'
},
series: [{
- name: "澶栭儴绾�",
- type: "gauge",
+ name: '澶栭儴绾�',
+ type: 'gauge',
radius: '65%', // 鍔ㄦ��
startAngle: 225,
endAngle: -45,
@@ -1094,19 +966,19 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: { //鏍囬
- show: false,
+ show: false
}
},
{
@@ -1123,26 +995,26 @@
lineStyle: {
color: [
[1, 'rgba(0,0,0,0)']
- ],
+ ]
}
}, //浠〃鐩樿酱绾�
axisLabel: {
show: true,
color: '#31F3FF',
fontSize: 10, // 鍔ㄦ��
- distance: -20, // 鍔ㄦ��
+ distance: -20 // 鍔ㄦ��
}, //鍒诲害鏍囩銆�
axisTick: {
- show: false,
+ show: false
}, //鍒诲害鏍峰紡
splitLine: {
- show: false,
- },
+ show: false
+ }
},
{
- name: "鍐呴儴瀹界嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴瀹界嚎鏉�',
+ type: 'gauge',
radius: '55%',
startAngle: 225,
endAngle: -45,
@@ -1155,24 +1027,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鍐呴儴缁嗙嚎鏉�",
- type: "gauge",
+ name: '鍐呴儴缁嗙嚎鏉�',
+ type: 'gauge',
radius: '40%',
startAngle: 225,
endAngle: -45,
@@ -1185,24 +1057,24 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
- show: false,
+ show: false
},
detail: {
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "闂撮殧鏉″舰",
- type: "gauge",
+ name: '闂撮殧鏉″舰',
+ type: 'gauge',
radius: '52.5%',
z: 4,
splitNumber: 35,
@@ -1214,7 +1086,7 @@
}
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
show: false,
@@ -1232,12 +1104,12 @@
show: false
},
title: {
- show: false,
+ show: false
}
},
{
- name: "鏁版嵁",
- type: "gauge",
+ name: '鏁版嵁',
+ type: 'gauge',
radius: '52.5%',
z: 3,
startAngle: 225,
@@ -1256,10 +1128,10 @@
show: false
},
axisLabel: {
- show: false,
+ show: false
},
axisTick: {
- show: false,
+ show: false
},
splitLine: {
show: false
@@ -1273,8 +1145,8 @@
pointer: {
show: true,
width: 3,
- itemStyle:{
- color:'#fff'
+ itemStyle: {
+ color: '#fff'
}
},
data: [{
@@ -1284,131 +1156,99 @@
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�',
- "type": 'pie',
- "radius": ['4%', '2%'],
- "hoverAnimation": false,
+ 'name': '鍐呭渾鐜�',
+ 'type': 'pie',
+ 'radius': ['4%', '2%'],
+ 'hoverAnimation': false,
tooltip: {
show: false
},
- cursor: "default",
- "labelLine": {
- "normal": {
- "show": false
+ cursor: 'default',
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#fff'
},
animation: false,
- "data": [1]
+ 'data': [1]
},
// 鍐呭渾
{
- "name": '鍐呭渾鐜�2',
- "type": 'pie',
- "radius": '2%',
- "hoverAnimation": false,
- cursor: "default",
+ 'name': '鍐呭渾鐜�2',
+ 'type': 'pie',
+ 'radius': '2%',
+ 'hoverAnimation': false,
+ cursor: 'default',
tooltip: {
show: false
},
- "labelLine": {
- "normal": {
- "show": false
+ 'labelLine': {
+ 'normal': {
+ 'show': false
}
},
itemStyle: {
color: '#31F3FF'
},
animation: false,
- "data": [1]
- },
+ 'data': [1]
+ }
]
- };
+ }
mdcEquiMoniGauge4.setOption(mdcEquiMoniGaugeOption4)
}
},
close() {
this.$emit('close')
this.visible = false
- clearInterval(this.modalTimer);
+ clearInterval(this.modalTimer)
this.modalTimer = null
},
handleCancel() {
this.close()
- clearInterval(this.modalTimer);
+ clearInterval(this.modalTimer)
this.modalTimer = null
},
- // initDeviceType(deviceTypeId) {
- // let dictCode = 'mdc_equipmentType'
- // let items = []
- // items = getDictItemsFromCache(dictCode)
- // if (items && items.length > 0) {
- // for (let i = 0; i < items.length; i++) {
- // if (deviceTypeId == items[i].value) {
- // this.deviceTypeDict = items[i].title
- // }
- // }
- // } else {
- // ajaxGetDictItems(dictCode, null).then((res) => {
- // if (res.success) {
- // let items = res.result
- // for (let i = 0; i < items.length; i++) {
- // if (deviceTypeId == items[i].value) {
- // this.deviceTypeDict = items[i].title
- // }
- // }
- // }
- // })
- // }
- // },
- timerModel(id){
- this.ee = id
+ timerModel(id) {
this.modalTimer = setInterval(() => {
- setTimeout( this.initData(this.ee),0)
- },1000*4)
+ setTimeout(this.initData(id), 0)
+ }, 1000 * 4)
},
initData(id) {
let _this = this
this.visible = true
- // _this.drawLine()
getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
if (res.success) {
- _this.resultData = res.result
- _this.driverType = res.result.deviceType
+ _this.resultData = res.result.equipment
_this.spindlebeilv = res.result.spindlebeilv
_this.feedbeilv = res.result.feedbeilv
_this.spindleload = res.result.spindleload
- _this.rapidfeed = res.result.rapidfeed;
- _this.mdcDriveTypeParamConfigList = res.result.mdcDriveTypeParamConfigList;
- _this.xyzAliasesList = res.result.xyzAliasesList;
+ _this.rapidfeed = res.result.rapidfeed
+ _this.runData = res.result.runData
+ // _this.xyzAliasesList = res.result.xyzAliasesList
this.$nextTick(() => {
_this.drawLine()
})
- // _this.initDeviceType(_this.resultData.deviceType)
} else {
- // _this.$message.warn(res.message)
_this.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
})
},
- mouseEnterItem(e){
+ 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 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
}
- },
- beforeDestroy(){
- clearInterval(this.modalTimer);
- this.modalTimer = null
}
}
</script>
@@ -1417,6 +1257,7 @@
body {
overflow-y: hidden !important;
}
+
.full-modal {
.ant-modal {
top: 0;
@@ -1428,52 +1269,55 @@
/deep/ .ant-modal-content {
display: flex;
flex-direction: column;
- /*height: calc(100vh);*/
background-color: #4a4a48;
}
.ant-modal-body {
flex: 1;
}
}
+
/deep/ .ant-modal-content {
- /*background: -moz-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.27) 100%);*/
- /*background: -webkit-gradient(linear, left left, right right, color-stop(0%, rgba(0, 0, 0, 0.66)), color-stop(100%, rgba(0, 0, 0, 0.4)));*/
- /*background: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
- /*background: -o-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
- /*background: -ms-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
- /*background: linear-gradient(to right, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
background-color: #312c2c;
opacity: 0.9;
}
+
/deep/ .ant-modal-close {
color: #1191b0;
font-size: 24px;
}
+
/deep/ .ant-modal-close-x {
font-size: 24px;
}
+
/deep/ .ant-modal-footer {
border-top: none;
}
+
/deep/ .ant-descriptions {
border: 1px solid #16738d;
margin: 10px 0;
}
+
/deep/ .ant-descriptions-title {
color: #fff;
padding: 10px;
margin-bottom: 0;
}
+
/deep/ .ant-descriptions-view {
padding: 0 20px;
}
+
/deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
padding-bottom: 5px;
}
+
/deep/ .ant-descriptions-item-colon {
color: #fff;
width: 5.1vw;
}
+
/deep/ .ant-descriptions-item-content {
color: #fff;
border: 1px solid #4bcfc8;
@@ -1487,6 +1331,7 @@
.mdcEquipMon {
color: #fff;
}
+
fieldset {
border: 1px solid #16738d;
padding: 17px;
@@ -1529,19 +1374,18 @@
margin-bottom: 0px;
}
- /deep/ .ant-descriptions-item-label{
+ /deep/ .ant-descriptions-item-label {
width: 6.7vw;
text-align: right;
margin-right: 10px;
}
- /deep/ .operationData .ant-descriptions-item-content
- {
+ /deep/ .operationData .ant-descriptions-item-content {
width: 130px;
overflow: hidden;
}
- .description-item-class{
+ .description-item-class {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
--
Gitblit v1.9.3