From a251b673b7fdfec5eff1322d0a25d067f702b882 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 03 六月 2025 09:11:16 +0800
Subject: [PATCH] 1、批次管理新增申城数控加工程序确认表功能并实现打印功能 2、调整批次管理新增/修改信息弹窗样式 3、删除设备监控页面异常反馈功能 4、车间看板详情弹窗与设备监控页面详情弹窗保持一致
---
src/views/mdc/base/MdcWorkshopSignage.vue | 2
/dev/null | 1542 ----------------------------------------------
src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchEditForm.vue | 2
src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue | 11
src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue | 3
src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardPrintModal.vue | 123 +++
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 235 +++---
src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchModal.Style#Drawer.vue | 15
8 files changed, 260 insertions(+), 1,673 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue b/src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue
index 0389769..5619cec 100644
--- a/src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue
@@ -1,6 +1,6 @@
<template>
<div style="flex: 0.25;margin-right: 10px">
- <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false"
+ <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :loading="loading"
:scroll="{y:265}" :customRow="customRow" :size="size" rowKey="id" @change="handleTableChange">
</a-table>
@@ -70,6 +70,7 @@
console.log('currentLevelInfo', this.currentTreeNodeInfo)
const { id, type } = this.currentTreeNodeInfo
this.queryParam = Object.assign({}, { attributionId: id, attributionType: type })
+ this.dataSource = []
this.loadData()
},
diff --git a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchEditForm.vue b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchEditForm.vue
index 5004198..905db06 100644
--- a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchEditForm.vue
+++ b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchEditForm.vue
@@ -10,7 +10,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="鍥剧墖" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picture">
- <j-image-upload isMultiple :number="1" v-model="model.picture" ></j-image-upload>
+ <j-image-upload :number="1" v-model="model.picture" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue
index 1057724..bb6f69f 100644
--- a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue
@@ -71,7 +71,7 @@
<a-divider type="vertical" />
- <a @click="handleDetail(record)">鐢熸垚鏁版帶鍔犲伐绋嬪簭纭琛�</a>
+ <a @click="handleOpenPrintModal(record)">鐢熸垚鏁版帶鍔犲伐绋嬪簭纭琛�</a>
<a-divider type="vertical" />
@@ -89,6 +89,8 @@
<guide-card-batch-modal ref="modalForm" @ok="modalFormOk"></guide-card-batch-modal>
<GuideCardBatchModalDrawer ref="modalEditForm" @ok="modalFormOk"></GuideCardBatchModalDrawer>
+
+ <guide-card-print-modal ref="guideCardPrintModal"/>
</a-card>
</template>
@@ -100,6 +102,7 @@
import GuideCardBatchModal from './GuideCardBatchModal'
import GuideCardBatchModalDrawer from './GuideCardBatchModal.Style#Drawer.vue'
import { getAction } from '@api/manage'
+ import GuideCardPrintModal from './GuideCardPrintModal'
export default {
name: 'GuideCardBatchList',
@@ -113,6 +116,7 @@
}
},
components: {
+ GuideCardPrintModal,
GuideCardBatchModal,
GuideCardBatchModalDrawer
},
@@ -242,6 +246,11 @@
this.$refs.modalEditForm.title = "涓婁紶/淇敼淇℃伅";
this.$refs.modalEditForm.disableSubmit = false;
},
+
+ handleOpenPrintModal(record){
+ this.$refs.guideCardPrintModal.visible = true
+ this.$refs.guideCardPrintModal.detail = Object.assign({},record)
+ }
}
}
</script>
diff --git "a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchModal.Style\043Drawer.vue" "b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchModal.Style\043Drawer.vue"
index da04747..6dd9d50 100644
--- "a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchModal.Style\043Drawer.vue"
+++ "b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchModal.Style\043Drawer.vue"
@@ -9,8 +9,10 @@
:visible="visible">
<GuideCardBatchEditForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></GuideCardBatchEditForm>
<div class="drawer-footer">
- <a-button @click="handleCancel" style="margin-bottom: 0;">鍏抽棴</a-button>
- <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">鎻愪氦</a-button>
+ <a-space>
+ <a-button @click="handleCancel">鍏抽棴</a-button>
+ <a-button v-if="!disableSubmit" @click="handleOk" type="primary">鎻愪氦</a-button>
+ </a-space>
</div>
</a-drawer>
</template>
@@ -64,21 +66,14 @@
</script>
<style lang="less" scoped>
-/** Button鎸夐挳闂磋窛 */
- .ant-btn {
- margin-left: 30px;
- margin-bottom: 30px;
- float: right;
- }
.drawer-footer{
position: absolute;
- bottom: -8px;
+ bottom: 0;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
- border-radius: 0 0 2px 2px;
}
</style>
\ No newline at end of file
diff --git a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardPrintModal.vue b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardPrintModal.vue
new file mode 100644
index 0000000..023ea3d
--- /dev/null
+++ b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardPrintModal.vue
@@ -0,0 +1,123 @@
+<template>
+ <a-modal title="鏁版帶鍔犲伐鍔犲伐绋嬪簭纭琛�" :width="1000" :visible="visible" @cancel="handleCancel" centered>
+
+ <div id="table">
+ <div class="table-header">
+ <h3>鏁版帶鍔犲伐绋嬪簭纭琛�</h3>
+ <div>
+ <div>鍗曚綅锛�<span>鏈哄姞涓績</span></div>
+ <div>缂栧彿锛�<span>25-C140-PST-293</span></div>
+ </div>
+ </div>
+
+ <table border="1">
+ <tr>
+ <th colspan="2">绋嬪簭鏂囦欢鍚�</th>
+ <td colspan="9">TY9F-11-2507-002-TY9F1W0130-30-3</td>
+ </tr>
+
+ <tr>
+ <th colspan="2">闆朵欢鍥惧彿</th>
+ <td colspan="4">TY9F-11-2507-002-TY9F1W0130</td>
+ <th>闆朵欢鍚嶇О</th>
+ <td colspan="4">杞帴澶�</td>
+ </tr>
+
+ <tr>
+ <th colspan="2">闆朵欢鏉愭枡</th>
+ <td colspan="4">閽㈡</td>
+ <th>澶瑰叿</th>
+ <td colspan="4">{{detail.fixtureInformation}}</td>
+ </tr>
+
+ <tr>
+ <th colspan="2">宸ュ簭锛堝伐姝ュ彿锛�</th>
+ <td colspan="2">30-3</td>
+ <th>鍔犲伐鎵规</th>
+ <td>S2501</td>
+ <th>鍔犲伐鏁伴噺</th>
+ <td colspan="2">20</td>
+ <th>鍔犲伐璁惧</th>
+ <td>3140123</td>
+ </tr>
+
+ <tr style="height: 500px">
+ <td colspan="11">
+ <img :src="getImageUrl(detail.picture)" width="300" height="300"/>
+ </td>
+ </tr>
+
+ <tr style="height: 100px;">
+ <th colspan="2" style="text-align: left">璇存槑</th>
+ <td colspan="9" style="text-align: left;white-space: pre-wrap" v-html="detail.remake"></td>
+ </tr>
+
+ <tr>
+ <th colspan="2">缂栧啓鏃ユ湡</th>
+ <td colspan="2">寮犱笁/2025-4-16</td>
+ <th>鍔犲伐鎵规</th>
+ <td colspan="2">鏉庡洓/2025-4-18</td>
+ <th colspan="2">鎿嶄綔鑰�/棣栨鏃ユ湡</th>
+ <td colspan="2">璧典簲/2025-4-18</td>
+ </tr>
+
+ <tr style="height: 70px">
+ <th colspan="7">鏍规嵁棣栦欢妫�楠屾儏鍐碉紝鍚屾剰璇ョ▼搴忕敤浜庢湰鎵规鐢熶骇锛�</th>
+ <th colspan="2">瀹℃壒/鏃ユ湡</th>
+ <td colspan="2">鐜嬪叚/2025-4-20</td>
+ </tr>
+ </table>
+ </div>
+
+ <template slot="footer">
+ <a-button type="primary" v-print="'#table'">鎵撳嵃</a-button>
+ </template>
+ </a-modal>
+</template>
+
+<script>
+ export default {
+ name: 'GuideCardPrintModal',
+ data() {
+ return {
+ visible: false,
+ detail: {}
+ }
+ },
+ methods: {
+ getImageUrl(imgSrcSuffix) {
+ return `${window._CONFIG['domianURL']}/${imgSrcSuffix}`
+ },
+
+ handleCancel() {
+ this.visible = false
+ }
+ }
+ }
+</script>
+
+<style scopedl lang="less">
+ .table-header {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ > div {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ padding: 10px 5px;
+ }
+ }
+
+ table {
+ width: 100%;
+ table-layout: fixed;
+ text-align: center;
+ font-size: 12px;
+
+ th, td {
+ padding: 10px 5px;
+ }
+ }
+</style>
\ No newline at end of file
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/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 07795c1..727cdb6 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -3,80 +3,80 @@
<!-- 鏌ヨ鍖哄煙 -->
<!--<div class="table-page-search-wrapper">-->
- <!--<a-form layout="inline" @keyup.enter.native="searchQuery">-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :md="7" :sm="7">-->
- <!--<a-form-item label="璁惧鍚嶇О">-->
- <!--<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParam.equipmentName"></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="7" :sm="7">-->
- <!--<a-form-item label="鐘舵��">-->
- <!--<a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">-->
- <!--<a-select-option value="">璇烽�夋嫨</a-select-option>-->
- <!--<a-select-option value="0">鍏虫満</a-select-option>-->
- <!--<a-select-option value="2">寰呮満</a-select-option>-->
- <!--<a-select-option value="3">杩愯</a-select-option>-->
- <!--<a-select-option value="22">鎶ヨ</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="3" :sm="3">-->
- <!--<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
- <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
- <!--</a>-->
- <!--</span>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<template v-if="toggleSearchStatus">-->
- <!--<a-col :md="12" :sm="12">-->
- <!--<a-form-item label="閲囬泦鏃堕棿">-->
- <!--<a-range-picker @change="dateParamChange" v-model="dates"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</template>-->
+ <!--<a-form layout="inline" @keyup.enter.native="searchQuery">-->
+ <!--<a-row :gutter="24">-->
+ <!--<a-col :md="7" :sm="7">-->
+ <!--<a-form-item label="璁惧鍚嶇О">-->
+ <!--<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParam.equipmentName"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col :md="7" :sm="7">-->
+ <!--<a-form-item label="鐘舵��">-->
+ <!--<a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">-->
+ <!--<a-select-option value="">璇烽�夋嫨</a-select-option>-->
+ <!--<a-select-option value="0">鍏虫満</a-select-option>-->
+ <!--<a-select-option value="2">寰呮満</a-select-option>-->
+ <!--<a-select-option value="3">杩愯</a-select-option>-->
+ <!--<a-select-option value="22">鎶ヨ</a-select-option>-->
+ <!--</a-select>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col :md="3" :sm="3">-->
+ <!--<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+ <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
+ <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
+ <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+ <!--</a>-->
+ <!--</span>-->
+ <!--</a-col>-->
+ <!--</a-row>-->
+ <!--<a-row :gutter="24">-->
+ <!--<template v-if="toggleSearchStatus">-->
+ <!--<a-col :md="12" :sm="12">-->
+ <!--<a-form-item label="閲囬泦鏃堕棿">-->
+ <!--<a-range-picker @change="dateParamChange" v-model="dates"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--</template>-->
- <!--</a-row>-->
- <!--</a-form>-->
+ <!--</a-row>-->
+ <!--</a-form>-->
<!--</div>-->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<!--<div class="table-operator" style="border-top: 5px">-->
- <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
- <!--<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>-->
<!--</div>-->
<div class="equipmentList" id="DeviceList">
<!--<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
- <!--<i class="anticon anticon-info-circle ant-alert-icon"></i>宸查�夋嫨 <a style="font-weight: 600">{{-->
- <!--selectedRowKeys.length }}</a>椤� -->
- <!--<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>-->
+ <!--<i class="anticon anticon-info-circle ant-alert-icon"></i>宸查�夋嫨 <a style="font-weight: 600">{{-->
+ <!--selectedRowKeys.length }}</a>椤� -->
+ <!--<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>-->
<!--</div>-->
<a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
:pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
- <template slot="equipmentId" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="equipmentName" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="oporationDict" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
+ <!--<template slot="equipmentId" slot-scope="text, record">-->
+ <!--<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>-->
+ <!--</template>-->
+ <!--<template slot="equipmentName" slot-scope="text, record">-->
+ <!--<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>-->
+ <!--</template>-->
+ <!--<template slot="oporationDict" slot-scope="text, record">-->
+ <!--<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>-->
+ <!--</template>-->
<template slot="equipmentStatus" slot-scope="text">
- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
+ <div>{{text===0?'姝ｅ父':'寮傚父'}}</div>
</template>
- <template slot="collecttime" slot-scope="text, record">
- <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
- </template>
- <template slot="action" slot-scope="text, record">
- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
- <a>鐘舵�佸弽棣�</a>
- </a-popconfirm>
- </template>
+ <!--<template slot="collecttime" slot-scope="text, record">-->
+ <!--<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>-->
+ <!--</template>-->
+ <!--<template slot="action" slot-scope="text, record">-->
+ <!--<a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">-->
+ <!--<a>鐘舵�佸弽棣�</a>-->
+ <!--</a-popconfirm>-->
+ <!--</template>-->
</a-table>
</div>
@@ -88,112 +88,113 @@
export default {
name: 'EquipmentLayout',
- components: { },
+ components: {},
data() {
return {
- loading:false,
- url: {
-
- },
+ loading: false,
+ url: {},
columns: [
{
title: '璁惧ID',
- align: "center",
+ align: 'center',
dataIndex: 'equipmentId',
- scopedSlots: {customRender: 'equipmentId'},
- width:210
+ width: 210
},
{
title: '璁惧鍚嶇О',
- align: "center",
+ align: 'center',
dataIndex: 'equipmentName',
- scopedSlots: {customRender: 'equipmentName'},
- width:300
+ width: 300
},
{
title: '鐘舵��',
- align: "center",
+ align: 'center',
dataIndex: 'oporationDict',
- scopedSlots: {customRender: 'oporationDict'},
- width:200
+ width: 200
},
{
title: '璁惧寮傚父',
- align: "center",
+ align: 'center',
dataIndex: 'equipmentStatus',
- scopedSlots: {customRender: 'equipmentStatus'},
- width:200
+ scopedSlots: { customRender: 'equipmentStatus' },
+ width: 200
},
{
title: '閲囬泦鏃堕棿',
- align: "center",
+ align: 'center',
dataIndex: 'collecttime',
- defaultSortOrder:'descend',
- sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
- scopedSlots: {customRender: 'collecttime'},
- width:350
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150,
- fixed:'right'
+ defaultSortOrder: 'descend',
+ sorter: (a, b) => {
+ return a.collecttime > b.collecttime ? 1 : -1
+ },
+ width: 350
}
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // scopedSlots: {customRender: 'action'},
+ // align: "center",
+ // width: 150,
+ // fixed:'right'
+ // }
],
- scrollY:465,
+ scrollY: 465
}
},
- props: { dataSource: {
+ props: {
+ dataSource: {
type: Array,
required: true,
default: []
- } },
- watch: {
+ }
},
+ watch: {},
methods: {
- handleWindowResize(){
- const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0,-2)
- const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0,-2)
+ handleWindowResize() {
+ const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
this.scrollY = boxHeight - tableHeadHeight
- },
+ }
},
- mounted(){
- window.addEventListener('resize',this.handleWindowResize)
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
this.handleWindowResize()
- },
+ }
}
</script>
<style scoped>
- .equipmentList{
+ .equipmentList {
flex: 1;
overflow: hidden;
}
- @media screen and (min-width: 1920px){
- .equipmentList{
- height: 640px!important;
+ @media screen and (min-width: 1920px) {
+ .equipmentList {
+ height: 640px !important;
}
}
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- .equipmentList{
- height: 640px!important;
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .equipmentList {
+ height: 640px !important;
}
}
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- .equipmentList{
- height: 493px!important;
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .equipmentList {
+ height: 493px !important;
}
}
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- .equipmentList{
- height: 493px!important;
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .equipmentList {
+ height: 493px !important;
}
}
- @media screen and (max-width: 1280px){
- .equipmentList{
- height: 394px!important;
+
+ @media screen and (max-width: 1280px) {
+ .equipmentList {
+ height: 394px !important;
}
}
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 8f038ea..0000000
--- a/src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
+++ /dev/null
@@ -1,1542 +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.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
- 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>
-
- <!--<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>
- </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