From 3629dde86000f6412b35aea04399983921df7099 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 17:50:08 +0800
Subject: [PATCH] 1、OEE报表计算功能 选择时间添加限制,禁止选择选今天及未来日期 2、解决车间布局图点击设备详细弹窗展示异常问题(删除车间看板页面独立的详情弹窗组件,沿用设备监控页面详情弹窗组件)

---
 src/views/mdc/base/MdcWorkshopSignage.vue                  |    2 
 /dev/null                                                  | 1384 ---------------------------------------------------------
 src/views/mdc/base/modules/OEEAnalysis/ComputeOeeModal.vue |    8 
 3 files changed, 8 insertions(+), 1,386 deletions(-)

diff --git a/src/views/mdc/base/MdcWorkshopSignage.vue b/src/views/mdc/base/MdcWorkshopSignage.vue
index 3a90188..57586b7 100644
--- a/src/views/mdc/base/MdcWorkshopSignage.vue
+++ b/src/views/mdc/base/MdcWorkshopSignage.vue
@@ -108,7 +108,7 @@
   import VueDragResize from 'vue-drag-resize'
   import api from '@/api/mdc'
   import { getFileAccessHttpUrl } from '@/api/manage'
-  import EquipmentDetailModal from './modules/WorkshopSignage/EquipmentDetailModal'
+  import EquipmentDetailModal from './modules/DeviceBaseInfo/EquipmentDetailModal.vue'
   import { message } from 'ant-design-vue'
 
   message.config({
diff --git a/src/views/mdc/base/modules/OEEAnalysis/ComputeOeeModal.vue b/src/views/mdc/base/modules/OEEAnalysis/ComputeOeeModal.vue
index 030dba9..680178f 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/ComputeOeeModal.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/ComputeOeeModal.vue
@@ -6,7 +6,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="鏃ユ湡">
-              <a-range-picker v-model="dates" style="width: 100%" value-format="YYYY-MM-DD"
+              <a-range-picker v-model="dates" :disabledDate="disabledDate" style="width: 100%" value-format="YYYY-MM-DD"
                               @change="dateParamChange"></a-range-picker>
             </a-form-model-item>
           </a-col>
@@ -18,6 +18,7 @@
 
 <script>
   import mdcApi from '@/api/mdc'
+  import moment from 'moment'
 
   export default {
     name: 'ComputeOeeModal',
@@ -82,6 +83,11 @@
         this.model.endTime = value2[1]
       },
 
+      disabledDate(current) {
+        // 涓嶈兘閫夋嫨褰撳ぉ鍙婂綋澶╀互鍚庣殑鏃ユ湡
+        return current && current > moment().startOf('days')
+      },
+
       handleModalClose() {
         this.visible = false
         this.model = {}
diff --git a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue b/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
deleted file mode 100644
index 92abd30..0000000
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ /dev/null
@@ -1,1384 +0,0 @@
-<template>
-  <div ref="wrap" @mouseenter="getModalNode">
-    <a-modal
-      :title="title"
-      width="70%"
-      :visible="visible"
-      :getContainer="() => this.$refs.wrap"
-      @cancel="handleCancel"
-      cancelText="鍏抽棴"
-      wrap-class-name="full-modal"
-      centered
-      :footer="null"
-    >
-      <div
-        id="mdcEquiInfo"
-        style="padding:1px;"
-      >
-        <table
-          width="100%"
-          style="border-collapse: separate;border-spacing:0px; color: #fff"
-        >
-          <tr>
-            <td v-if="this.spindlebeilv != null">
-              <div
-                class="mdcEquipMon"
-                style="width: 250px; height: 200px;margin : 0 auto;padding: 0;"
-                align="center"
-              >
-                涓昏酱鍊嶇巼
-                <div
-                  id="mdcEquiMoniGauge1"
-                  ref="chart1"
-                  style="width: 100%; height: 95%;"
-                ></div>
-              </div>
-            </td>
-            <td v-if="this.feedbeilv != null">
-              <div
-                class="mdcEquipMon"
-                style="width: 210px; height: 180px;margin : 0 auto;"
-                align="center"
-              >
-                杩涚粰鍊嶇巼
-                <div
-                  id="mdcEquiMoniGauge2"
-                  ref="chart2"
-                  style="width: 100%; height: 95%;"
-                ></div>
-              </div>
-            </td>
-            <td v-if="this.spindleload != null">
-              <div
-                class="mdcEquipMon"
-                style="width: 210px; height: 180px;margin : 0 auto;"
-                align="center"
-              >涓昏酱璐熻嵎
-                <div
-                  id="mdcEquiMoniGauge3"
-                  ref="mdcEquiMoniGauge3"
-                  style="width: 100%; height: 95%;"
-                ></div>
-              </div>
-            </td>
-            <td v-if="this.rapidfeed != null">
-              <div
-                class="mdcEquipMon"
-                style="width: 210px; height: 180px;margin : 0 auto;"
-                align="center"
-              >蹇�熻繘缁欏�嶇巼
-                <div
-                  id="mdcEquiMoniGauge4"
-                  ref="mdcEquiMoniGauge4"
-                  style="width: 100%; height: 95%;"
-                ></div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="5">
-              <a-descriptions
-                title="鍩虹淇℃伅"
-                :column="4"
-              >
-                <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.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.remark|formatDescriptionsItem}}</a-descriptions-item>
-              </a-descriptions>
-              <!---鏁版嵁婧愯皟鏁�  鍔ㄦ�佸睍绀� 杩愯鏁版嵁---->
-
-              <a-descriptions
-                title="杩愯鏁版嵁"
-                v-show="mdcDriveTypeParamConfigList != null"
-                v-if="driverType != 'PLC'"
-                :column="4"
-                class="operationData"
-              >
-
-                <a-descriptions-item
-                  v-for="(item,id) in mdcDriveTypeParamConfigList  "
-                  :key="item.id"
-                  :label="item.chineseName"
-                >
-                  <a-tooltip @mouseenter="mouseEnterItem">
-                    <template slot="title">
-                      {{item.value|formatDescriptionsItem}}
-                    </template>
-                    <div class="description-item-class">{{item.value|formatDescriptionsItem}}</div>
-                  </a-tooltip>
-
-                </a-descriptions-item>
-
-              </a-descriptions>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <template slot="footer">
-        <a-button
-          :style="{ marginRight: '8px' }"
-          @click="handleCancel"
-          style="color: #1191b0;"
-        >鍏抽棴
-        </a-button>
-      </template>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-  import {
-    getAction,
-    postAction
-  } from '@/api/manage'
-  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
-  import Template1 from '../../../../jeecg/JVxeDemo/layout-demo/Template1'
-
-  export default {
-    name: 'EqumentDetaiModal',
-    components: { Template1 },
-    props: {},
-    data() {
-      return {
-        mdcDriveTypeParamConfigList: [],
-        xyzAliasesList: [],
-        title: '',
-        //涓昏酱鍊嶇巼
-        spindlebeilv: 1,
-        //杩涚粰鍊嶇巼
-        feedbeilv: 1,
-        // 涓昏酱璐熻嵎
-        spindleload: 1,
-        //蹇�熻繘缁欏�嶇巼
-        rapidfeed: 1,
-        visible: false,
-        resultData: {},
-        driverType: '',
-        deviceTypeDict: '',
-        url: {
-          mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
-        },
-        modalTimer: null,
-        ee: ' ',
-        modalNode: null,
-        timeout: null
-      }
-    },
-    mounted() {
-
-    },
-    watch: {},
-    filters:{
-      formatDescriptionsItem(value){
-        return value?value:'鏃�'
-      }
-    },
-    methods: {
-      drawLine() {
-        let _this = this
-        if (_this.spindlebeilv) {
-          //鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
-          let mdcEquiMoniGauge1 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge1'), 'macarons')
-          let mdcEquiMoniGaugeOption1 = {
-            tooltip: {
-              formatter: '{a} <br/>{b} : {c}%'
-            },
-
-            series: [{
-              name: '澶栭儴绾�',
-              type: 'gauge',
-              radius: '65%', // 鍔ㄦ��
-              startAngle: 225,
-              endAngle: -45,
-              axisLine: {
-                lineStyle: {
-                  color: [
-                    [1, '#31F3FF'] // 鍔ㄦ��
-                  ],
-                  width: 1
-                }
-              },
-              axisLabel: {
-                show: false
-              },
-              axisTick: {
-                show: false
-              },
-              splitLine: {
-                show: false
-              },
-              detail: {
-                show: false
-              },
-              title: { //鏍囬
-                show: false
-              }
-            },
-              {
-                name: '澶栭儴鍒诲害',
-                type: 'gauge',
-                radius: '80%',
-                min: 0, //鏈�灏忓埢搴�
-                max: 300, //鏈�澶у埢搴�
-                splitNumber: 10, //鍒诲害鏁伴噺
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  show: false,
-                  lineStyle: {
-                    color: [
-                      [1, 'rgba(0,0,0,0)']
-                    ]
-                  }
-                }, //浠〃鐩樿酱绾�
-                axisLabel: {
-                  show: true,
-                  color: '#31F3FF',
-                  fontSize: 10, // 鍔ㄦ��
-                  distance: -20 // 鍔ㄦ��
-
-                }, //鍒诲害鏍囩銆�
-                axisTick: {
-                  show: false
-                }, //鍒诲害鏍峰紡
-                splitLine: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴瀹界嚎鏉�',
-                type: 'gauge',
-                radius: '55%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 4
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴缁嗙嚎鏉�',
-                type: 'gauge',
-                radius: '40%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 3
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '闂撮殧鏉″舰',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 4,
-                splitNumber: 35,
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    opacity: 0
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false,
-                  length: 20,
-                  splitNumber: 1,
-                  lineStyle: {
-                    color: '#122B3C',
-                    width: 1
-                  }
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鏁版嵁',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 3,
-                startAngle: 225,
-                max: 300,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [_this.spindlebeilv / 300, '#31F3FF'], // 鍔ㄦ��
-                      [1, '#185363']
-                    ],
-                    width: 4
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: true,
-                  fontWeight: 'bold',
-                  fontSize: 12,
-                  color: '#fff'
-                },
-                pointer: {
-                  show: true,
-                  width: 3,
-                  itemStyle:{
-                    color:'#fff'
-                  }
-                },
-                data: [{
-                  name: '',
-                  value: _this.spindlebeilv
-                }]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�',
-                'type': 'pie',
-                'radius': ['4%', '2%'],
-                'hoverAnimation': false,
-                tooltip: {
-                  show: false
-                },
-                cursor: 'default',
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#fff'
-                },
-                animation: false,
-                'data': [1]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�2',
-                'type': 'pie',
-                'radius': '2%',
-                'hoverAnimation': false,
-                cursor: 'default',
-                tooltip: {
-                  show: false
-                },
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#31F3FF'
-                },
-                animation: false,
-                '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}%'
-            },
-
-            series: [{
-              name: '澶栭儴绾�',
-              type: 'gauge',
-              radius: '65%', // 鍔ㄦ��
-              startAngle: 225,
-              endAngle: -45,
-              axisLine: {
-                lineStyle: {
-                  color: [
-                    [1, '#31F3FF'] // 鍔ㄦ��
-                  ],
-                  width: 1
-                }
-              },
-              axisLabel: {
-                show: false
-              },
-              axisTick: {
-                show: false
-              },
-              splitLine: {
-                show: false
-              },
-              detail: {
-                show: false
-              },
-              title: { //鏍囬
-                show: false
-              }
-            },
-              {
-                name: '澶栭儴鍒诲害',
-                type: 'gauge',
-                radius: '80%',
-                min: 0, //鏈�灏忓埢搴�
-                max: 300, //鏈�澶у埢搴�
-                splitNumber: 10, //鍒诲害鏁伴噺
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  show: false,
-                  lineStyle: {
-                    color: [
-                      [1, 'rgba(0,0,0,0)']
-                    ]
-                  }
-                }, //浠〃鐩樿酱绾�
-                axisLabel: {
-                  show: true,
-                  color: '#31F3FF',
-                  fontSize: 10, // 鍔ㄦ��
-                  distance: -20 // 鍔ㄦ��
-
-                }, //鍒诲害鏍囩銆�
-                axisTick: {
-                  show: false
-                }, //鍒诲害鏍峰紡
-                splitLine: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴瀹界嚎鏉�',
-                type: 'gauge',
-                radius: '55%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 4
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴缁嗙嚎鏉�',
-                type: 'gauge',
-                radius: '40%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 3
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '闂撮殧鏉″舰',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 4,
-                splitNumber: 35,
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    opacity: 0
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false,
-                  length: 20,
-                  splitNumber: 1,
-                  lineStyle: {
-                    color: '#122B3C',
-                    width: 1
-                  }
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鏁版嵁',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 3,
-                startAngle: 225,
-                max: 300,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [_this.feedbeilv / 300, '#31F3FF'], // 鍔ㄦ��
-                      [1, '#185363']
-                    ],
-                    width: 4
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: true,
-                  fontWeight: 'bold',
-                  fontSize: 12,
-                  color: '#fff'
-                },
-                pointer: {
-                  show: true,
-                  width: 3,
-                  itemStyle:{
-                    color:'#fff'
-                  }
-                },
-                data: [{
-                  name: '',
-                  value: _this.feedbeilv
-                }]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�',
-                'type': 'pie',
-                'radius': ['4%', '2%'],
-                'hoverAnimation': false,
-                tooltip: {
-                  show: false
-                },
-                cursor: 'default',
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#fff'
-                },
-                animation: false,
-                'data': [1]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�2',
-                'type': 'pie',
-                'radius': '2%',
-                'hoverAnimation': false,
-                cursor: 'default',
-                tooltip: {
-                  show: false
-                },
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#31F3FF'
-                },
-                animation: false,
-                '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}%'
-            },
-
-            series: [{
-              name: '澶栭儴绾�',
-              type: 'gauge',
-              radius: '65%', // 鍔ㄦ��
-              startAngle: 225,
-              endAngle: -45,
-              axisLine: {
-                lineStyle: {
-                  color: [
-                    [1, '#31F3FF'] // 鍔ㄦ��
-                  ],
-                  width: 1
-                }
-              },
-              axisLabel: {
-                show: false
-              },
-              axisTick: {
-                show: false
-              },
-              splitLine: {
-                show: false
-              },
-              detail: {
-                show: false
-              },
-              title: { //鏍囬
-                show: false
-              }
-            },
-              {
-                name: '澶栭儴鍒诲害',
-                type: 'gauge',
-                radius: '80%',
-                min: 0, //鏈�灏忓埢搴�
-                max: 100, //鏈�澶у埢搴�
-                splitNumber: 10, //鍒诲害鏁伴噺
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  show: false,
-                  lineStyle: {
-                    color: [
-                      [1, 'rgba(0,0,0,0)']
-                    ]
-                  }
-                }, //浠〃鐩樿酱绾�
-                axisLabel: {
-                  show: true,
-                  color: '#31F3FF',
-                  fontSize: 10, // 鍔ㄦ��
-                  distance: -20 // 鍔ㄦ��
-
-                }, //鍒诲害鏍囩銆�
-                axisTick: {
-                  show: false
-                }, //鍒诲害鏍峰紡
-                splitLine: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴瀹界嚎鏉�',
-                type: 'gauge',
-                radius: '55%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 4
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴缁嗙嚎鏉�',
-                type: 'gauge',
-                radius: '40%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 3
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '闂撮殧鏉″舰',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 4,
-                splitNumber: 35,
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    opacity: 0
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false,
-                  length: 20,
-                  splitNumber: 1,
-                  lineStyle: {
-                    color: '#122B3C',
-                    width: 1
-                  }
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鏁版嵁',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 3,
-                startAngle: 225,
-                max: 100,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [_this.spindleload / 100, '#31F3FF'], // 鍔ㄦ��
-                      [1, '#185363']
-                    ],
-                    width: 4
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: true,
-                  fontWeight: 'bold',
-                  fontSize: 12,
-                  color: '#fff'
-                },
-                pointer: {
-                  show: true,
-                  width: 3,
-                  itemStyle:{
-                    color:'#fff'
-                  }
-                },
-                data: [{
-                  name: '',
-                  value: _this.spindleload
-                }]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�',
-                'type': 'pie',
-                'radius': ['4%', '2%'],
-                'hoverAnimation': false,
-                tooltip: {
-                  show: false
-                },
-                cursor: 'default',
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#fff'
-                },
-                animation: false,
-                'data': [1]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�2',
-                'type': 'pie',
-                'radius': '2%',
-                'hoverAnimation': false,
-                cursor: 'default',
-                tooltip: {
-                  show: false
-                },
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#31F3FF'
-                },
-                animation: false,
-                '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}%'
-            },
-
-            series: [{
-              name: '澶栭儴绾�',
-              type: 'gauge',
-              radius: '65%', // 鍔ㄦ��
-              startAngle: 225,
-              endAngle: -45,
-              axisLine: {
-                lineStyle: {
-                  color: [
-                    [1, '#31F3FF'] // 鍔ㄦ��
-                  ],
-                  width: 1
-                }
-              },
-              axisLabel: {
-                show: false
-              },
-              axisTick: {
-                show: false
-              },
-              splitLine: {
-                show: false
-              },
-              detail: {
-                show: false
-              },
-              title: { //鏍囬
-                show: false
-              }
-            },
-              {
-                name: '澶栭儴鍒诲害',
-                type: 'gauge',
-                radius: '80%',
-                min: 0, //鏈�灏忓埢搴�
-                max: 300, //鏈�澶у埢搴�
-                splitNumber: 10, //鍒诲害鏁伴噺
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  show: false,
-                  lineStyle: {
-                    color: [
-                      [1, 'rgba(0,0,0,0)']
-                    ]
-                  }
-                }, //浠〃鐩樿酱绾�
-                axisLabel: {
-                  show: true,
-                  color: '#31F3FF',
-                  fontSize: 10, // 鍔ㄦ��
-                  distance: -20 // 鍔ㄦ��
-
-                }, //鍒诲害鏍囩銆�
-                axisTick: {
-                  show: false
-                }, //鍒诲害鏍峰紡
-                splitLine: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴瀹界嚎鏉�',
-                type: 'gauge',
-                radius: '55%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 4
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鍐呴儴缁嗙嚎鏉�',
-                type: 'gauge',
-                radius: '40%',
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [1, '#122B3C']
-                    ],
-                    width: 3
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '闂撮殧鏉″舰',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 4,
-                splitNumber: 35,
-                startAngle: 225,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    opacity: 0
-                  }
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false,
-                  length: 20,
-                  splitNumber: 1,
-                  lineStyle: {
-                    color: '#122B3C',
-                    width: 1
-                  }
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: false
-                },
-                title: {
-                  show: false
-                }
-              },
-              {
-                name: '鏁版嵁',
-                type: 'gauge',
-                radius: '52.5%',
-                z: 3,
-                startAngle: 225,
-                max: 300,
-                endAngle: -45,
-                axisLine: {
-                  lineStyle: {
-                    color: [
-                      [_this.rapidfeed / 300, '#31F3FF'], // 鍔ㄦ��
-                      [1, '#185363']
-                    ],
-                    width: 4
-                  }
-                },
-                tooltip: {
-                  show: false
-                },
-                axisLabel: {
-                  show: false
-                },
-                axisTick: {
-                  show: false
-                },
-                splitLine: {
-                  show: false
-                },
-                detail: {
-                  show: true,
-                  fontWeight: 'bold',
-                  fontSize: 12,
-                  color: '#fff'
-                },
-                pointer: {
-                  show: true,
-                  width: 3,
-                  itemStyle:{
-                    color:'#fff'
-                  }
-                },
-                data: [{
-                  name: '',
-                  value: _this.rapidfeed
-                }]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�',
-                'type': 'pie',
-                'radius': ['4%', '2%'],
-                'hoverAnimation': false,
-                tooltip: {
-                  show: false
-                },
-                cursor: 'default',
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#fff'
-                },
-                animation: false,
-                'data': [1]
-              },
-              // 鍐呭渾
-              {
-                'name': '鍐呭渾鐜�2',
-                'type': 'pie',
-                'radius': '2%',
-                'hoverAnimation': false,
-                cursor: 'default',
-                tooltip: {
-                  show: false
-                },
-                'labelLine': {
-                  'normal': {
-                    'show': false
-                  }
-                },
-                itemStyle: {
-                  color: '#31F3FF'
-                },
-                animation: false,
-                'data': [1]
-              }
-            ]
-          }
-          mdcEquiMoniGauge4.setOption(mdcEquiMoniGaugeOption4)
-        }
-      },
-
-      handleCancel() {
-        this.$emit('close')
-        this.visible = false
-        // this.modalNode.removeEventListener('mouseleave', this.closeModal)
-        if(this.modalTimer){
-          clearInterval(this.modalTimer)
-          this.modalTimer = null
-        }
-        if (this.timeout) {
-          clearTimeout(this.timeout)
-          this.timeout = null
-        }
-      },
-
-      timerModel(id) {
-        this.ee = id
-        this.modalTimer = setInterval(() => {
-          setTimeout(this.initData(this.ee), 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.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.$nextTick(() => {
-              _this.drawLine()
-            })
-            // _this.initDeviceType(_this.resultData.deviceType)
-          } else {
-            // _this.$message.warn(res.message)
-            _this.$notification.warning({
-              message: '娑堟伅',
-              description: res.message
-            })
-          }
-        })
-      },
-
-      getModalNode() {
-        // console.log(document.querySelector('.ant-modal-content'))
-        // this.modalNode = document.querySelector('.ant-modal-content')
-        // this.timeout = setTimeout(() => {
-        //   this.modalNode.addEventListener('mouseleave', this.closeModal)
-        // }, 100)
-      },
-
-      closeModal() {
-        this.handleCancel()
-      },
-
-      mouseEnterItem(e){
-        if (e.target.clientWidth >= e.target.scrollWidth)  e.target.style.pointerEvents = 'none' // 闃绘榧犳爣浜嬩欢    pointer-events 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
-      }
-    },
-    beforeDestroy() {
-      clearInterval(this.modalTimer)
-      this.modalTimer = null
-    }
-  }
-</script>
-
-<style scoped lang="less">
-  body {
-    overflow-y: hidden !important;
-  }
-
-  .full-modal {
-    .ant-modal {
-      top: 0;
-      padding-bottom: 0;
-      margin: 0;
-      background-color: #4a4a48 !important;
-      opacity: 0.9;
-    }
-    /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: 1;
-  }
-
-  /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;
-    padding: 0 10px;
-    min-width: 130px;
-  }
-
-  .mdcEquipMon {
-    color: #fff;
-  }
-
-  /deep/ .ant-descriptions-item-label{
-    width: 6.7vw;
-    text-align: right;
-    margin-right: 10px;
-  }
-
-  /deep/ .operationData .ant-descriptions-item-content,
-  .lsv2Data .ant-descriptions-item-content
-  {
-    width: 130px;
-    vertical-align: bottom;
-  }
-
-  .description-item-class{
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-</style>

--
Gitblit v1.9.3