From b7ad54294da15dccc59f7b6c879af3e000024d9d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 19 六月 2025 17:51:30 +0800
Subject: [PATCH] 1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息（由于数据为定时刷新不能每次获取数据均清空） 3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题 4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中
---
src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue | 223 ---
src/views/mdc/base/EquipmentList.vue | 1
src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue | 2
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue | 2
src/views/mdc/base/AlarmManager.vue | 88 -
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 2453 ++++++++++++++++++++++----------------------
src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue | 3
src/views/system/modules/SelectDeviceDrawer.vue | 41
src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue | 205 --
src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 2
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue | 1
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 55
src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue | 4
src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue | 6
src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue | 79 -
src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue | 75
src/views/mdc/base/MdcEquipmentTypeList.vue | 29
17 files changed, 1,411 insertions(+), 1,858 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue b/src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue
index 02fe64d..4a490b6 100644
--- a/src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue
+++ b/src/views/dnc/base/modules/DeviceCustomTypeManagement/DeviceCustomTypeManagementModal.vue
@@ -43,7 +43,7 @@
<a-col :span="24">
<a-form-model-item label="璁惧缁勭紪鍙�" :labelCol="labelColLong" :wrapperCol="wrapperColLong"
prop="equipmentIds">
- <a-input-search v-model="model.equipmentIds" :disabled="!model.productionId" @search="deviceSearch"
+ <a-input-search v-model="model.equipmentIds" readOnly :disabled="!model.productionId" @search="deviceSearch"
enter-button :placeholder='!model.productionId?"璇烽�夋嫨杞﹂棿":"璇烽�夋嫨璁惧缁勭紪鍙�"'/>
</a-form-model-item>
</a-col>
@@ -98,7 +98,7 @@
],
equipmentIds: [
{
- required: true, message: '璇烽�夋嫨璁惧缂栧彿!'
+ required: true, message: '璇烽�夋嫨璁惧缂栧彿!',trigger:'change'
}
]
},
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
index bc4c54c..19a6537 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
@@ -67,7 +67,7 @@
<a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys,selectedRows:selectionRows, onChange: onSelectChange}"
@change="handleTableChange" :customRow="customRow"
- :scroll="{y:456}" :size="size" rowKey="docId">
+ :scroll="{y:52*7}" :size="size" rowKey="docId">
<!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span slot="docName" slot-scope="text">
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 04620a2..675f512 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -7,32 +7,6 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
- <!--<a-col-->
- <!--:xl="4"-->
- <!--:lg="4"-->
- <!--:md="4"-->
- <!--:sm="24"-->
- <!-->-->
- <!--<a-form-item label="璁惧缂栧彿">-->
- <!--<a-input-->
- <!--placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
- <!--v-model="queryParam.equipmentId"-->
- <!--></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col-->
- <!--:xl="4"-->
- <!--:lg="4"-->
- <!--:md="4"-->
- <!--:sm="24"-->
- <!-->-->
- <!--<a-form-item label="璁惧鍚嶇О">-->
- <!--<a-input-->
- <!--placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
- <!--v-model="queryParam.equipmentName"-->
- <!--></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
<a-col
:xl="6"
:lg="7"
@@ -40,11 +14,6 @@
:sm="24"
>
<a-form-item label="鎺у埗绯荤粺绫诲瀷">
- <!--<j-dict-select-tag-->
- <!--placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"-->
- <!--v-model="queryParam.driveType"-->
- <!--dictCode="mdc_driveType"-->
- <!--/>-->
<a-auto-complete
v-model="queryParam.driveType"
:data-source="driveTypeList"
@@ -102,13 +71,6 @@
icon="reload"
style="margin-left: 8px"
>閲嶇疆</a-button>
- <!--<a-->
- <!--@click="handleToggleSearch"-->
- <!--style="margin-left: 8px"-->
- <!-->-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
- <!--</a>-->
</span>
</a-col>
</a-row>
@@ -123,24 +85,6 @@
type="primary"
icon="plus"
>鏂板</a-button>
- <!--<a-button-->
- <!--@click="handleAdd"-->
- <!--type="primary"-->
- <!--icon="plus"-->
- <!-->璁惧鏂板</a-button>-->
- <!--<a-upload-->
- <!--name="file"-->
- <!--:showUploadList="false"-->
- <!--:multiple="false"-->
- <!--:headers="tokenHeader"-->
- <!--:action="importExcelUrl"-->
- <!--@change="handleImportExcel"-->
- <!-->-->
- <!--<a-button-->
- <!--type="primary"-->
- <!--icon="import"-->
- <!-->瀵煎叆</a-button>-->
- <!--</a-upload>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item
@@ -202,18 +146,15 @@
</a-table>
</div>
- <!--<alarm-manager-modal ref="modalForm" @ok="modalFormOk"></alarm-manager-modal>-->
<alarm-manager-form ref="modalFormType" @ok="modalFormOk" :driveTypeList="driveTypeList" :filterOption="filterOption"></alarm-manager-form>
<alarm-manager-edit ref="modalFormEdit" @ok="modalFormOk"></alarm-manager-edit>
</a-card>
</template>
<script>
-
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- // import MdcDriveTypeParamConfigModal from './modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigModal'
import AlarmManagerModal from './modules/alarmManager/alarmManagerModal'
import AlarmManagerForm from './modules/alarmManager/alarmManagerForm'
import AlarmManagerEdit from './modules/alarmManager/alarmManagerEdit'
@@ -255,29 +196,15 @@
return parseInt(index) + 1;
}
},
- // {
- // title: '璁惧缂栧彿',
- // align: "center",
- // // sorter: true,
- // dataIndex: 'equipmentId'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // align: "center",
- // // sorter: true,
- // dataIndex: 'equipmentName'
- // },
{
title: '鎶ヨ鍙�',
align: "center",
- // sorter: true,
dataIndex: 'alarmCode',
width:400
},
{
title: '鎶ヨ鍐呭',
align: "center",
- // sorter: true,
dataIndex: 'alarmContent',
width:400
},
@@ -285,22 +212,14 @@
{
title: '璁惧椹卞姩绫诲瀷',
align: "center",
- // sorter: true,
dataIndex: 'driveType',
width:400
},
- // {
- // title: '鏄惁杩囨护',
- // align: "center",
- // dataIndex: 'isUse',
- // customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
- // },
{
dataIndex:'isUse_dictText',
title: '鏄惁鍚敤',
align: "center",
width:380
- // dictCode:'alarm_is_use'
},
{
title: '鎿嶄綔',
@@ -328,11 +247,6 @@
this.getSuperFieldList();
this.getDriveTypeByApi()
},
- computed: {
- // importExcelUrl: function () {
- // return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
- // },
- },
methods: {
handleEdit: function (record) {
this.$refs.modalFormEdit.edit(record);
@@ -343,8 +257,6 @@
this.$refs.modalFormType.add();
this.$refs.modalFormType.title = "鏂板";
this.$refs.modalFormType.disableSubmit = false
- },
- initDictConfig() {
},
getSuperFieldList() {
let fieldList = [];
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index c3eddcd..2ed3a16 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -77,7 +77,6 @@
<a-table
ref="table"
bordered
- size="middle"
rowKey="id"
:scroll="{x:'max-content',y:465}"
:columns="columns"
diff --git a/src/views/mdc/base/MdcEquipmentTypeList.vue b/src/views/mdc/base/MdcEquipmentTypeList.vue
index 3f6577e..055aee8 100644
--- a/src/views/mdc/base/MdcEquipmentTypeList.vue
+++ b/src/views/mdc/base/MdcEquipmentTypeList.vue
@@ -13,10 +13,6 @@
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<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 @click="handleToggleSearch" style="margin-left: 8px">-->
- <!--{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
- <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
- <!--</a>-->
</span>
</a-col>
</a-row>
@@ -27,12 +23,6 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <!--<a-button type="primary" icon="download" @click="handleExportXls('璁惧绫诲瀷')">瀵煎嚭</a-button>-->
- <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
- <!--<a-button type="primary" icon="import">瀵煎叆</a-button>-->
- <!--</a-upload>-->
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <!--<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
@@ -62,25 +52,9 @@
@change="handleTableChange"
:scroll="{x:'max-content',y:465}"
>
-
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="20" alt="" style="max-width:80px;"/>
</template>
<span slot="action" slot-scope="text, record">
@@ -101,7 +75,6 @@
</a-menu>
</a-dropdown>
</span>
-
</a-table>
</div>
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index 3e1b58a..92c9192 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -99,8 +99,7 @@
<a-descriptions
title="杩愯鏁版嵁"
- v-show="runData"
- v-if="resultData.driveType != 'PLC'"
+ v-if="runData&&runData.length>0&&resultData.driveType != 'PLC'"
:column="4"
class="operationData"
>
@@ -155,1259 +154,1269 @@
</template>
<script>
-import {
- getAction,
- postAction
-} from '@/api/manage'
-import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import {
+ getAction,
+ postAction
+ } from '@/api/manage'
+ import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
-export default {
- name: 'EquipmentDetailModal',
- components: {},
- props: {},
- data() {
- return {
- runData: [],
- // xyzAliasesList: [],
- //涓昏酱鍊嶇巼
- spindlebeilv: 0,
- //杩涚粰鍊嶇巼
- feedbeilv: 0,
- // 涓昏酱璐熻嵎
- spindleload: 0,
- //蹇�熻繘缁欏�嶇巼
- rapidfeed: 0,
- visible: false,
- resultData: {},
- url: {
- mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
+ export default {
+ name: 'EquipmentDetailModal',
+ components: {},
+ props: {},
+ data() {
+ return {
+ runData: [],
+ // xyzAliasesList: [],
+ //涓昏酱鍊嶇巼
+ spindlebeilv: null,
+ //杩涚粰鍊嶇巼
+ feedbeilv: null,
+ // 涓昏酱璐熻嵎
+ spindleload: null,
+ //蹇�熻繘缁欏�嶇巼
+ rapidfeed: null,
+ visible: false,
+ resultData: {},
+ url: {
+ mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
+ },
+ modalTimer: null,
+ xyzList: null
+ }
+ },
+ beforeDestroy() {
+ clearInterval(this.modalTimer)
+ this.modalTimer = null
+ },
+ 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)
+ }
},
- modalTimer: null,
- xyzList: null
- }
- },
- beforeDestroy() {
- clearInterval(this.modalTimer)
- this.modalTimer = null
- },
- 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}%'
- },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ clearInterval(this.modalTimer)
+ this.modalTimer = null
+ },
+ handleCancel() {
+ this.close()
+ clearInterval(this.modalTimer)
+ this.modalTimer = null
+ },
+ timerModel(id) {
+ this.modalTimer = setInterval(() => {
+ setTimeout(this.initData(id), 0)
+ }, 1000 * 4)
+ },
- 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 // 鍔ㄦ��
+ initData(id) {
+ let _this = this
+ this.visible = true
+ getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
+ if (res.success) {
+ _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.runData = res.result.runData
+ _this.xyzList = res.result.xyzList
- }, //鍒诲害鏍囩銆�
- 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]
- }
- ]
+ // _this.xyzAliasesList = res.result.xyzAliasesList
+ this.$nextTick(() => {
+ _this.drawLine()
+ })
+ } else {
+ _this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+
+ },
+
+ resetData() {
+ this.resultData = {}
+ this.spindlebeilv = null
+ this.feedbeilv = null
+ this.spindleload = null
+ this.rapidfeed = null
+ this.runData = []
+ this.xyzList = null
+ },
+
+ 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 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
- 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)
- }
- },
- close() {
- this.$emit('close')
- this.visible = false
- clearInterval(this.modalTimer)
- this.modalTimer = null
- },
- handleCancel() {
- this.close()
- clearInterval(this.modalTimer)
- this.modalTimer = null
- },
- timerModel(id) {
- this.modalTimer = setInterval(() => {
- setTimeout(this.initData(id), 0)
- }, 1000 * 4)
- },
-
- initData(id) {
- let _this = this
- this.visible = true
- getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
- if (res.success) {
- _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.runData = res.result.runData
- _this.xyzList = res.result.xyzList
-
- // _this.xyzAliasesList = res.result.xyzAliasesList
- this.$nextTick(() => {
- _this.drawLine()
- })
- } else {
- _this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
-
- },
-
- 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 灞炴�х敤浜庤缃厓绱犳槸鍚﹀榧犳爣浜嬩欢鍋氬嚭鍙嶅簲銆�
}
}
}
-}
</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.5;
+ body {
+ overflow-y: hidden !important;
}
+
+ .full-modal {
+ .ant-modal {
+ top: 0;
+ padding-bottom: 0;
+ margin: 0;
+ background-color: #4a4a48 !important;
+ opacity: 0.5;
+ }
+ /deep/ .ant-modal-content {
+ display: flex;
+ flex-direction: column;
+ background-color: #4a4a48;
+ }
+ .ant-modal-body {
+ flex: 1;
+ }
+ }
+
/deep/ .ant-modal-content {
- display: flex;
- flex-direction: column;
- background-color: #4a4a48;
+ background-color: #312c2c;
+ opacity: 0.9;
}
- .ant-modal-body {
- flex: 1;
+
+ /deep/ .ant-modal-close {
+ color: #1191b0;
+ font-size: 24px;
}
-}
-/deep/ .ant-modal-content {
- background-color: #312c2c;
- opacity: 0.9;
-}
+ /deep/ .ant-modal-close-x {
+ font-size: 24px;
+ }
-/deep/ .ant-modal-close {
- color: #1191b0;
- font-size: 24px;
-}
+ /deep/ .ant-modal-footer {
+ border-top: none;
+ }
-/deep/ .ant-modal-close-x {
- font-size: 24px;
-}
+ /deep/ .ant-descriptions {
+ border: 1px solid #16738d;
+ margin: 10px 0;
+ }
-/deep/ .ant-modal-footer {
- border-top: none;
-}
+ /deep/ .ant-descriptions-title {
+ color: #fff;
+ padding: 10px;
+ margin-bottom: 0;
+ }
-/deep/ .ant-descriptions {
- border: 1px solid #16738d;
- margin: 10px 0;
-}
+ /deep/ .ant-descriptions-view {
+ padding: 0 20px;
+ }
-/deep/ .ant-descriptions-title {
- color: #fff;
- padding: 10px;
- margin-bottom: 0;
-}
+ /deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
+ padding-bottom: 5px;
+ }
-/deep/ .ant-descriptions-view {
- padding: 0 20px;
-}
+ /deep/ .ant-descriptions-item-colon {
+ color: #fff;
+ width: 5.1vw;
+ }
-/deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
- padding-bottom: 5px;
-}
+ /deep/ .ant-descriptions-item-content {
+ color: #fff;
+ border: 1px solid #4bcfc8;
+ padding: 0 10px;
+ width: auto;
+ min-width: 130px;
+ /*max-width: 300px;*/
+ height: 25px;
+ }
-/deep/ .ant-descriptions-item-colon {
- color: #fff;
- width: 5.1vw;
-}
+ .mdcEquipMon {
+ color: #fff;
+ }
-/deep/ .ant-descriptions-item-content {
- color: #fff;
- border: 1px solid #4bcfc8;
- padding: 0 10px;
- width: auto;
- min-width: 130px;
- /*max-width: 300px;*/
- height: 25px;
-}
+ fieldset {
+ border: 1px solid #16738d;
+ padding: 17px;
+ margin: 14px;
+ }
-.mdcEquipMon {
- color: #fff;
-}
+ fieldset legend {
+ display: inline;
+ width: 88px;
+ }
-fieldset {
- border: 1px solid #16738d;
- padding: 17px;
- margin: 14px;
-}
+ table tr td {
+ text-align: left;
+ color: #fff;
+ }
-fieldset legend {
- display: inline;
- width: 88px;
-}
+ table tr td input {
+ border: 1px solid #a6eff9;
+ }
-table tr td {
- text-align: left;
- color: #fff;
-}
+ .ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+ color: #fff !important;
+ background-color: #1191b0;
+ border: none;
+ }
-table tr td input {
- border: 1px solid #a6eff9;
-}
+ .ant-form-item-control {
+ line-height: 0px;
+ }
-.ant-btn {
- padding: 0 10px;
- margin-left: 3px;
- color: #fff !important;
- background-color: #1191b0;
- border: none;
-}
+ /** 涓昏〃鍗曡闂磋窛 */
+ .ant-form .ant-form-item {
+ margin-bottom: 10px;
+ }
-.ant-form-item-control {
- line-height: 0px;
-}
+ /** Tab椤甸潰琛岄棿璺� */
+ .ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+ }
-/** 涓昏〃鍗曡闂磋窛 */
-.ant-form .ant-form-item {
- margin-bottom: 10px;
-}
+ /deep/ .ant-descriptions-item-label {
+ width: 6.7vw;
+ text-align: right;
+ margin-right: 10px;
+ }
-/** Tab椤甸潰琛岄棿璺� */
-.ant-tabs-content .ant-form-item {
- margin-bottom: 0px;
-}
+ /deep/ .operationData .ant-descriptions-item-content {
+ width: 130px;
+ overflow: hidden;
+ }
-/deep/ .ant-descriptions-item-label {
- width: 6.7vw;
- text-align: right;
- margin-right: 10px;
-}
-
-/deep/ .operationData .ant-descriptions-item-content {
- width: 130px;
- overflow: hidden;
-}
-
-.description-item-class {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
+ .description-item-class {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
</style>
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
index 048b06a..08fee08 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentLayout.vue
@@ -71,6 +71,7 @@
})
return false
}
+ this.$refs.equipmentDetailModal.resetData()
this.$refs.equipmentDetailModal.initData(item.id)
this.$refs.equipmentDetailModal.timerModel(item.id)
}
diff --git a/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue b/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
index 73e9c7c..f0bd60b 100644
--- a/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
+++ b/src/views/mdc/base/modules/DeviceParamThresholdManagement/ParamThresholdModal.vue
@@ -144,7 +144,7 @@
minThreshold: '',
maxThreshold: ''
}
- console.log('driveType',this.driveTypeList)
+ console.log('driveType', this.driveTypeList)
this.handleDriveTypeChange(this.driveTypeList[0])
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'controlSystemType', 'chineseName', 'minThreshold', 'maxThreshold'))
@@ -226,6 +226,7 @@
* @param value 椹卞姩鍙傛暟绫诲瀷閫変腑椤�
*/
handleDriveTypeChange(value) {
+ this.paramList = []
api.getParamListByDriveTypeApi(value)
.then(res => {
if (res.success) {
diff --git a/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue b/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
index 33a362c..eaa447e 100644
--- a/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
@@ -18,14 +18,14 @@
</a-col>
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD" :allow-clear="false"/>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6" :xs="6">
<a-form-item label="鏃堕棿娈�">
- <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
+ <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allow-clear="false"/>
鑷�
- <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd"/>
+ <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allow-clear="false"/>
</a-form-item>
</a-col>
<a-col :md="2" :sm="3" :xs="3">
@@ -236,47 +236,40 @@
}
},
searchQuery() {
- if (this.queryParam.startTime && this.queryParam.endTime && this.dates && this.dates.length > 0) {
- this.loading = true
- this.spaceTime = []
- this.usingRates = []
- if (this.queryParams.typeTree == '1') {
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
+ this.loading = true
+ this.spaceTime = []
+ this.usingRates = []
+ if (this.queryParams.typeTree == '1') {
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- } else {
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = ""
- }
- this.AnalysisList = []
- //鑾峰彇鏌ヨ鏉′欢
- this.queryParam.parentId = this.queryParams.parentId
- this.queryParam.equipmentId = this.queryParams.equipmentId
- this.queryParam.typeTree = this.queryParams.typeTree
- getAction(this.url.dayUtilizationRateContrast, this.queryParam).then((res) => {
- if (res.success) {
- this.spaceTime = res.result.dateList
- for (let i = 0; i < res.result.dayRateDto.length; i++) {
- // res.result[i].useRateDayShift = this.numFilter(res.result[i].useRateDayShift)
- this.usingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
- }
- this.drawTu()
- } else {
- // this.$message.warning(res.message)
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
} else {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨鏃堕棿鎴栨椂闂存'
- })
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = ""
}
+ this.AnalysisList = []
+ //鑾峰彇鏌ヨ鏉′欢
+ this.queryParam.parentId = this.queryParams.parentId
+ this.queryParam.equipmentId = this.queryParams.equipmentId
+ this.queryParam.typeTree = this.queryParams.typeTree
+ getAction(this.url.dayUtilizationRateContrast, this.queryParam).then((res) => {
+ if (res.success) {
+ this.spaceTime = res.result.dateList
+ for (let i = 0; i < res.result.dayRateDto.length; i++) {
+ // res.result[i].useRateDayShift = this.numFilter(res.result[i].useRateDayShift)
+ this.usingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
+ }
+ this.drawTu()
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
},
searchReset() {
this.loading = true
diff --git a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
index d291654..e24d024 100644
--- a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
@@ -18,7 +18,7 @@
</a-col>
<a-col :md="4" :sm="4" :xs="4">
<a-form-item label="鏃ユ湡">
- <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD'
+ <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' :allow-clear="false"
@change="dataChange"/>
</a-form-item>
</a-col>
@@ -292,81 +292,6 @@
})
}
},
- searchReset() {
- this.spaceTime = []
- this.useingRates = []
- if (this.queryParams.typeTree == '1') {
- this.typeTree = this.queryParams.typeTree
- this.typeParent = this.queryParams.parentId
- this.typeEquipment = this.queryParams.equipmentId
- this.queryParams = {}
- this.queryParam = {}
- this.queryParams.typeTree = this.typeTree
- this.queryParams.parentId = this.typeParent
- if (this.queryParams.parentId != '') {
- this.queryParams.equipmentId = ''
- this.initEquipment()
- } else {
- if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
- this.queryParams.equipmentId = this.typeEquipment
- } else {
- this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- }
- }
- getAction(this.url.dayUtilizationRate, this.queryParams).then((res) => {
- if (res.success) {
- this.spaceTime = res.result.dateList
- for (var i = 0; i < res.result.dayRateDto.length; i++) {
- this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
- }
- this.drawTu()
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
- } else {
- this.typeTree = this.queryParams.typeTree
- this.typeParent = this.queryParams.parentId
- this.typeEquipment = this.queryParams.equipmentId
- this.queryParams = {}
- this.queryParam = {}
- this.dates = []
- this.queryParams.typeTree = this.typeTree
- this.queryParams.parentId = this.typeParent
- if (this.queryParams.parentId != '') {
- this.queryParams.equipmentId = ''
- this.initEquipment()
- } else {
- if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
- this.queryParams.equipmentId = this.typeEquipment
- } else {
- this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- }
- }
- getAction(this.url.dayUtilizationRate, this.queryParams).then((res) => {
- if (res.success) {
- this.spaceTime = res.result.dateList
- for (var i = 0; i < res.result.dayRateDto.length; i++) {
- this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
- }
- this.drawTu()
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
- }
-
- },
initEquipment(id) {
let _this = this
getAction(this.url.getEquipmentByPid, { pid: id }).then((res) => {
@@ -423,9 +348,7 @@
},
created() {
let collectTime = moment(moment().add(-1, 'd'), 'YYYY-MM-DD')
-
this.queryParams.collectTime = collectTime
-
this.queryParam.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
this.queryParams.typeTree = '1'
this.initEquipment()
diff --git a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
index f799bac..0e5a69c 100644
--- a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
@@ -6,13 +6,13 @@
<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-col :md="9" :sm="9">
<a-form-item label="缁熶竴缂栫爜">
<a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentid"></a-input>
</a-form-item>
</a-col>
- <a-col :md="7" :sm="7">
+ <a-col :md="9" :sm="9">
<a-form-item label="璁惧鍚嶇О">
<a-input placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�" v-model="queryParam.equipmentname"></a-input>
</a-form-item>
@@ -21,7 +21,7 @@
<a-col :md="3" :sm="3">
<a-space>
<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="searchReset" icon="reload">閲嶇疆</a-button>
</a-space>
</a-col>
</a-row>
@@ -30,8 +30,8 @@
<!-- table鍖哄煙-begin -->
<div>
- <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{聽 y: 300聽}" :columns="columns"
- :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+ <a-table bordered rowKey="equipmentid" :scroll="{聽 y: 300聽}" :columns="columns"
+ :dataSource="dataSource" :pagination="ipagination" :loading="loading" :customRow="customRow"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
@change="handleTableChange">
</a-table>
@@ -42,215 +42,106 @@
</template>
<script>
- import {
- ajaxGetSelectItems
- } from '@/api/api'
- import JDictSelectTag from '@/components/dict/JDictSelectTag'
- import {
- deleteAction,
- requestPut,
- getAction
- } from '@/api/manage'
- import {
- JeecgListMixin
- } from '@/mixins/JeecgListMixin'
- import JInput from '@/components/jeecg/JInput'
- import JEllipsis from '@/components/jeecg/JEllipsis'
- import Tooltip from 'ant-design-vue/es/tooltip'
- import JDate from '@/components/jeecg/JDate'
- import moment from 'moment'
- import { filterObj } from '@/utils/util';
+ import { getAction } from '@/api/manage'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'DeviceListModel',
mixins: [JeecgListMixin],
- components: {
- JDictSelectTag,
- JEllipsis,
- JInput,
- Tooltip,
- JDate
- },
- props: {
- status: {
- type: Number,
- default: 1
- }
- },
data() {
return {
- title:'',
+ title: '',
visible: false,
disableMixinCreated: true,
- queryParam: {},
- columns: [{
- title: '缁熶竴缂栫爜',
- align: 'center',
- dataIndex: 'equipmentid',
- },
+ columns: [
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentid'
+ },
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentname',
+ dataIndex: 'equipmentname'
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'equipmentmodel',
+ dataIndex: 'equipmentmodel'
},
- // {
- // title: '璁惧绫诲瀷',
- // align: 'center',
- // dataIndex: 'equipmentType',
- // },
{
title: '鏈哄簥IP',
align: 'center',
- dataIndex: 'equipmentip',
+ dataIndex: 'equipmentip'
},
{
title: '椹卞姩绫诲瀷',
align: 'center',
- dataIndex: 'drivetype',
+ dataIndex: 'drivetype'
},
{
title: '绔彛',
align: 'center',
- dataIndex: 'dataport',
+ dataIndex: 'dataport'
},
{
title: '鏁版帶绯荤粺',
align: 'center',
- dataIndex: 'controlsystem',
+ dataIndex: 'controlsystem'
}
],
- url: {
- list: '/mdc/equipment/list',
+ /* 鎺掑簭鍙傛暟 */
+ isorter: {
+ column: '',
+ order: ''
},
-
+ url: {
+ list: '/mdc/equipment/list'
+ }
}
- },
- created() {
-
},
methods: {
openPage() {
this.visible = true
this.onClearSelected()
- this.dataSource = [];
- // this.queryParam = {
- // status: this.status
- // };
- this.loadData();
+ this.dataSource = []
+ this.loadData()
},
- getQueryParams() {
- //鑾峰彇鏌ヨ鏉′欢
- let sqp = {}
- if(this.superQueryParams){
- sqp['superQueryParams']=encodeURI(this.superQueryParams)
- sqp['superQueryMatchType'] = this.superQueryMatchType
- }
- var param = Object.assign(sqp, this.queryParam);
- // param.field = this.getQueryField();
- param.pageNo = this.ipagination.current;
- param.pageSize = this.ipagination.pageSize;
- //鑾峰彇鐢ㄦ埛瀹氬埗鐨勫弬鏁板睘鎬�
- // if (this.getCustomQueryParams) {
- // param = this.getCustomQueryParams(param);
- // if(!param){
- // return false;
- // }
- // }
- return filterObj(param);
- },
- loadData(arg) {
- if(!this.url.list){
- this.$message.error("璇疯缃畊rl.list灞炴��!")
- return
- }
- //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- if (arg === 1) {
- this.ipagination.current = 1;
- }
- var params = this.getQueryParams();//鏌ヨ鏉′欢
-
- if(!params){
- return false;
- }
-
- this.loading = true;
- getAction(this.url.list, params).then((res) => {
- if (res.success) {
- // console.log(res)
- //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
- this.dataSource = res.result.records||res.result;
- if(res.result.total)
- {
- this.ipagination.total = res.result.total;
- }else{
- this.ipagination.total = 0;
+ /**
+ * 鑷畾涔夎〃鏍艰
+ * @param record 琛ㄦ牸琛屼俊鎭�
+ * @returns {{style: {cursor: string}, on: {click: on.click}}}
+ */
+ customRow(record) {
+ return {
+ style: {
+ cursor: 'pointer'
+ },
+ on: {
+ click: () => {
+ this.onSelectChange([record.equipmentid], [record])
}
- //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
- }else{
- // this.$message.warning(res.message)
- this.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
}
- }).finally(() => {
- this.loading = false
- })
+ }
},
- getQueryField() {
- //TODO 瀛楁鏉冮檺鎺у埗
- // var str = "";
- // this.columns.forEach(function (value) {
- // str += value.dataIndex +"," ;
- // });
- // return str;
- },
- modalFormOk(val) {
- // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
- this.loadData();
- this.selectedRowKeys = [val.id];
- },
- searchQuery() {
- this.loadData();
- this.onClearSelected()
- },
- searchReset() {
- this.queryParam = {}
- this.loadData();
- this.onClearSelected()
- },
+
close() {
this.$emit('close')
this.visible = false
},
+
handleCancel() {
this.close()
},
+
handleOk() {
this.$emit('sendSelectionRows', this.selectionRows[0])
this.close()
- },
- },
+ }
+ }
}
</script>
<style>
@import '~@assets/less/common.less';
-
- .frozenRowClass {
- color: #c9c9c9;
- }
-
- .success {
- color: green;
- }
-
- .error {
- color: red;
- }
</style>
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index aa7a7a5..b42763e 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -40,7 +40,7 @@
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷" allow-clear
:triggerChange="true"
v-model="model.equipmentType">
- <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
+ <a-select-option v-for='item in equipmentTypeList' :key='item.id' :value='item.equipmentTypeName'>
{{item.equipmentTypeName}}
</a-select-option>
</a-select>
@@ -49,9 +49,8 @@
<a-col :span="12">
<a-form-model-item label="杞﹂棿鍒嗛厤" v-show="!productionDisabled"
ref="selectedProduction" prop="selectedProduction">
- <!--<j-select-equipment-production v-decorator="['selectedProduction',{rules:[{required:true,message:'璇烽�夋嫨杞﹂棿!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
<j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
- @back="backProductionInfo" :backProduction="true"
+ @back="backProductionInfo" :backProduction="true" :allowClear="false"
:treeProductOpera="true"></j-select-equipment-production>
</a-form-model-item>
@@ -67,7 +66,7 @@
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
v-model="model.equipmentType">
- <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
+ <a-select-option v-for='item in equipmentTypeList' :key='item.id' :value='item.equipmentTypeName'>
{{item.equipmentTypeName}}
</a-select-option>
</a-select>
@@ -204,15 +203,9 @@
<script>
import pick from 'lodash.pick'
- import moment from 'moment'
- import Vue from 'vue'
- import { ACCESS_TOKEN } from '@/store/mutation-types'
import { getAction } from '@/api/manage'
import { addEquipment, editEquipment } from '@/api/api'
- import { disabledAuthFilter } from '@/utils/authFilter'
- import { duplicateCheck } from '@/api/api'
import JSelectEquipmentProduction from '../../../../../components/jeecgbiz/JSelectEquipmentProduction'
- import JSelectProduction from '../../../../../components/jeecgbiz/JSelectProduction'
import DeviceListModel from './DeviceListModal'
import JSelectEquipmentDepart from '../../../../../components/jeecgbiz/JSelectEquipmentDepart'
import { mapActions } from 'vuex'
@@ -220,7 +213,6 @@
export default {
name: 'UserModal',
components: {
- JSelectProduction,
JSelectEquipmentDepart,
JSelectEquipmentProduction,
DeviceListModel
@@ -231,13 +223,11 @@
productionDisabled: false, //鏄惁鏄垜鐨勮溅闂磋皟鐢ㄨ椤甸潰
roleDisabled: false, //鏄惁鏄鑹茬淮鎶よ皟鐢ㄨ椤甸潰
modalWidth: 900,
- confirmDirty: false,
userId: '', //淇濆瓨鐢ㄦ埛id
disableSubmit: true,
- dateFormat: 'YYYY-MM-DD',
form: this.$form.createForm(this),
validatorRules: {
- equipmentId: [{ required: true, message: '璇烽�夋嫨璁惧缂栧彿!' }],
+ equipmentId: [{ required: true, message: '璇烽�夋嫨璁惧缂栧彿!', trigger: 'change' }],
selectedProduction: [{ required: true, message: '璇烽�夋嫨杞﹂棿' }],
teamCode: [{ required: true, message: '璇烽�夋嫨閰嶉�佸皬缁�' }]
},
@@ -273,41 +263,27 @@
xs: { span: 24 },
sm: { span: 19 }
},
- uploadLoading: false,
confirmLoading: false,
- headers: {},
systemType: false,
systemValue: '3',
url: {
- fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // 寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬮儴闂ㄤ俊鎭渶瑕佺殑url
//寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬭溅闂翠俊鎭渶瑕佺殑url
userProductionList: '/mdc/mdcEquipment/equipmentProductionList',
- userId: '/sys/user/generateUserId', // 寮曞叆鐢熸垚娣诲姞鐢ㄦ埛鎯呭喌涓嬬殑url
syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//鍚屾鐢ㄦ埛鍒板伐浣滄祦
- queryTenantList: '/sys/tenant/queryList',
check: '/sys/duplicate/check',
queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
},
- tenantsOptions: [],
- rolesOptions: [],
nextDepartOptions: [],
nextProductionOptions: [],
- selectList: [],
+ equipmentTypeList: [],
isDepartType: ''
}
},
created() {
- const token = Vue.ls.get(ACCESS_TOKEN)
- this.headers = { 'X-Access-Token': token }
this.queryGroup()
this.queryTreeData()
this.getAppPlatformName()
- },
- computed: {
- uploadAction: function() {
- return this.url.fileUpload
- }
},
methods: {
...mapActions(['QueryDepartTree']),
@@ -316,13 +292,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- // this.$message.warn(res.message)
this.$notification.warning({
message: '娑堟伅',
description: res.message
})
}
- }).finally(() => {
})
},
getAppPlatformName() {
@@ -335,7 +309,7 @@
queryGroup() {
getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
- this.selectList = res.result
+ this.equipmentTypeList = res.result
} else {
this.$notification.warning({
message: '娑堟伅',
@@ -347,7 +321,6 @@
})
},
getDeviceRows(val) {
- console.log(val)
if (val.equipmentid) {
this.model.equipmentId = val.equipmentid
this.model.equipmentName = val.equipmentname
@@ -400,9 +373,6 @@
if (record.hasOwnProperty('id')) {
that.getUserDeparts(record.id)
}
- },
- isDisabledAuth(code) {
- return disabledAuthFilter(code)
},
// 鏍规嵁灞忓箷鍙樺寲,璁剧疆鎶藉眽灏哄
resetScreenSize() {
@@ -486,7 +456,6 @@
this.nextProductionOptions = []
this.departIdShow = false
},
- moment,
handleSubmit() {
const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
@@ -529,18 +498,6 @@
return false
}
})
- },
-
- handleConfirmBlur(e) {
- const value = e.target.value
- this.confirmDirty = this.confirmDirty || !!value
- },
- identityChange(e) {
- if (e.target.value === 1) {
- this.departIdShow = false
- } else {
- this.departIdShow = true
- }
},
/**
* 缂栬緫鎴栨煡鐪嬭鎯呮暟鎹椂娓呴櫎鎶藉眽琛ㄥ崟楠岃瘉
diff --git a/src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue b/src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue
index 444bae8..e1401a5 100644
--- a/src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue
+++ b/src/views/mdc/base/modules/PartsMatchingManagement/PartsMatchingForm.vue
@@ -40,7 +40,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="theDate">
- <a-date-picker v-model="model.theDate" :disabled="disabled" format="YYYY-MM-DD"
+ <a-date-picker v-model="model.theDate" :disabled="disabled" format="YYYY-MM-DD" :allow-clear="false"
value-format="YYYY-MM-DD" style="width: 100%"></a-date-picker>
</a-form-model-item>
</a-col>
@@ -87,7 +87,7 @@
confirmLoading: false,
validatorRules: {
equipmentIds: [
- { required: true, message: '璇烽�夋嫨璁惧!' }
+ { required: true, message: '璇烽�夋嫨璁惧!', trigger: 'change' }
],
partId: [
{ required: true, message: '璇疯緭鍏ラ浂浠跺彿!' }
@@ -126,7 +126,6 @@
},
edit(record) {
this.model = Object.assign({}, { equipmentIds: record.equipmentId }, record)
- console.log('model', this.model)
this.visible = true
},
inputNumberChange() {
@@ -179,7 +178,6 @@
*/
selectOK(data) {
this.$set(this.model, 'equipmentIds', data.join(','))
- if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
}
}
}
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
index 4955e2e..1726314 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
@@ -85,7 +85,7 @@
span: 24
},
sm: {
- span: 6
+ span: 4
}
},
wrapperCol: {
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
index 23245fd..64bae97 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
@@ -106,7 +106,7 @@
span: 24
},
sm: {
- span: 6
+ span: 4
}
},
wrapperCol: {
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue b/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue
index 32121ec..effe2c4 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue
@@ -5,11 +5,6 @@
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <!--<a-col :md="5" :sm="5">-->
- <!--<a-form-item label="鍚嶇О">-->
- <!--<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
<a-col :md="5" :sm="5">
<a-form-item label="璁惧">
<a-input-search :readOnly="true" v-model="queryParam.equipmentId" @search="deviceSearch"
@@ -19,9 +14,6 @@
<a-col :md="5" :sm="5">
<a-form-item label="椹卞姩绫诲瀷">
- <!--<j-dict-select-tag placeholder="璇烽�夋嫨椹卞姩绫诲瀷"-->
- <!--:triggerChange="true" dictCode="mdc_driveType"-->
- <!--v-model="queryParam.driveType" allow-clear/>-->
<a-auto-complete
v-model="queryParam.driveType"
:data-source="driveTypeList"
@@ -33,10 +25,10 @@
</a-col>
<a-col :md="6" :sm="6" :xs="6">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD" :allow-clear="false"/>
</a-form-item>
</a-col>
- <a-col>
+ <a-col :md="3" :sm="3" :xs="3">
<a-space>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
@@ -89,7 +81,6 @@
export default {
name: 'ComparativeAnalysisMain',
- // mixins: [JeecgListMixin],
components: {
Tooltip,
ComparativeAnalysisBar,
@@ -170,12 +161,14 @@
tabChange(val) {
this.activeKey = val
},
+
dateParamChange(v1, v2) {
// console.log(v1,v2)
this.queryParam.startTime = v2[0]
this.queryParam.endTime = v2[1]
console.log(v2[0], v2[1])
},
+
loadAnalysis() {
getAction(this.url.comparativeAnalysis, this.queryParam).then(res => {
if (res.success) {
@@ -190,48 +183,42 @@
this.loading = false
})
},
- searchQuery() {
- if (this.dates && this.dates.length > 0) {
- this.AnalysisList = []
- this.AnalysisBarList = []
- this.AnalysisGauge = []
- this.AnalysisPie = []
- if (this.queryParams.typeTree == '1') {
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- } else {
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = ""
- }
- this.AnalysisList = []
- //鑾峰彇鏌ヨ鏉′欢
- this.queryParam.parentId = this.queryParams.parentId
- // this.queryParam.equipmentId = this.queryParams.equipmentId
- this.queryParam.typeTree = this.queryParams.typeTree
- getAction(this.url.comparativeAnalysis, this.queryParam).then((res) => {
- if (res.success) {
- this.AnalysisList = res.result
- this.AnalysisBarList = res.result.graphics
- this.AnalysisGauge = res.result.meters
- this.AnalysisPie.push(res.result.pieCharts)
- } else {
- // this.$message.warning(res.message)
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
- } else {
- this.$notification.warning({
- message: '鎻愮ず',
- description: '璇烽�夋嫨鏃堕棿'
- })
- }
+ searchQuery() {
+ this.AnalysisList = []
+ this.AnalysisBarList = []
+ this.AnalysisGauge = []
+ this.AnalysisPie = []
+ if (this.queryParams.typeTree == '1') {
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
+ } else {
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = ""
+ }
+ this.AnalysisList = []
+ //鑾峰彇鏌ヨ鏉′欢
+ this.queryParam.parentId = this.queryParams.parentId
+ // this.queryParam.equipmentId = this.queryParams.equipmentId
+ this.queryParam.typeTree = this.queryParams.typeTree
+ getAction(this.url.comparativeAnalysis, this.queryParam).then((res) => {
+ if (res.success) {
+ this.AnalysisList = res.result
+ this.AnalysisBarList = res.result.graphics
+ this.AnalysisGauge = res.result.meters
+ this.AnalysisPie.push(res.result.pieCharts)
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
},
+
searchReset() {
this.AnalysisList = []
this.AnalysisBarList = []
@@ -243,7 +230,11 @@
this.typeEquipment = this.queryParams.equipmentId
this.queryParams = {}
this.queryParam = {}
- this.dates = []
+ this.dates = [moment().subtract('days', 7), moment().subtract('days', 0)]
+ this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParams.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
+ this.queryParams.endTime = moment(this.dates[1]).format('YYYYMMDD')
this.queryParams.typeTree = this.typeTree
this.queryParams.parentId = this.typeParent
if (this.queryParams.parentId != '') {
@@ -262,7 +253,6 @@
this.AnalysisGauge = res.result.meters
this.AnalysisPie.push(res.result.pieCharts)
} else {
- // this.$message.warning(res.message)
this.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -277,7 +267,11 @@
this.typeEquipment = this.queryParams.equipmentId
this.queryParams = {}
this.queryParam = {}
- this.dates = []
+ this.dates = [moment().subtract('days', 7), moment().subtract('days', 0)]
+ this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParams.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
+ this.queryParams.endTime = moment(this.dates[1]).format('YYYYMMDD')
this.queryParams.typeTree = this.typeTree
this.queryParams.parentId = this.typeParent
if (this.queryParams.parentId != '') {
@@ -296,7 +290,6 @@
this.AnalysisGauge = res.result.meters
this.AnalysisPie.push(res.result.pieCharts)
} else {
- // this.$message.warning(res.message)
this.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -307,6 +300,7 @@
})
}
},
+
/**
* 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
*/
@@ -315,6 +309,7 @@
this.driveTypeList = res.result.map(item => item.value)
})
},
+
/**
* 鑱旀兂杈撳叆妗嗙瓫閫夊姛鑳�
* @param input 杈撳叆鐨勫唴瀹�
@@ -326,119 +321,8 @@
option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
)
},
- // onChange(value, dateString) {
- // // console.log('Selected Time: ', value);
- // // console.log('Formatted Selected Time: ', dateString);
- // },
- // searchReset() {
- // if(this.queryParams.typeTree == "1"){
- // this.typeTree = this.queryParams.typeTree
- // this.typeParent = this.queryParams.parentId
- // this.typeEquipment = this.queryParams.equipmentId
- // this.queryParams = {}
- // this.queryParam = {}
- // this.dates = []
- // this.queryParams.typeTree = this.typeTree
- // this.queryParams.parentId = this.typeParent
- // if(this.queryParams.parentId != ""){
- // this.queryParams.equipmentId = ""
- // }else{
- // if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
- // this.queryParams.equipmentId = this.typeEquipment
- // }else{
- // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- // }
- //
- // }
- //
- // this.ipagination.current = 1
- // this.ResetloadData();
- // }else{
- // this.typeTree = this.queryParams.typeTree
- // this.typeParent = this.queryParams.parentId
- // // this.typeEquipment = this.queryParams.equipmentId
- // this.queryParams = {}
- // this.queryParam = {}
- // this.dates = []
- // this.queryParams.typeTree = this.typeTree
- // this.queryParams.parentId = this.typeParent
- // // this.queryParams.equipmentId = this.typeEquipment
- // this.ipagination.current = 1
- // this.ResetloadData();
- // }
- //
- // },
- // ResetloadData() {
- // if(!this.url.list){
- // this.$message.error("璇疯缃畊rl.list灞炴��!")
- // return
- // }
- // var params = {}
- // params.typeTree = this.queryParams.typeTree
- // params.parentId = this.queryParams.parentId
- // params.equipmentId = this.queryParams.equipmentId
- // this.loading = true;
- // getAction(this.url.list, params).then((res) => {
- // if (res.success) {
- // this.dataSource = res.result.records||res.result;
- // }else{
- // this.$message.warning(res.message)
- // }
- // }).finally(() => {
- // this.loading = false
- // })
- // },
- // searchQuery(){
- // if(this.queryParams.typeTree == "1"){
- // this.queryParams.parentId = this.queryParamEquip.parentId
- // // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- //
- // }else{
- // this.queryParams.parentId = this.queryParamPeople.parentId
- //
- // // this.queryParams.equipmentId = ""
- // }
- // this.dataSource = [];
- // //鑾峰彇鏌ヨ鏉′欢
- // let param = {}
- // param.parentId = this.queryParams.parentId;
- // param.equipmentId = this.queryParams.equipmentId;
- // param.startTime = this.queryParam.startTime;
- // param.driveType = this.queryParam.driveType;
- // param.endTime = this.queryParam.endTime;
- // getAction(this.url.list,param).then((res) => {
- // if(res.success){
- // this.dataSource = res.result.records||res.result;
- // }else{
- // this.$message.warning(res.message)
- // }
- // }).finally(() => {
- // this.loading = false
- // })
- // },
- // loadData() {
- // if(!this.url.list){
- // this.$message.error("璇疯缃畊rl.list灞炴��!")
- // return
- // }
- // //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- // var params = {}
- // this.loading = true;
- // params.startTime = this.queryParam.startTime;
- // params.endTime = this.queryParam.endTime;
- // params.typeTree = this.queryParams.typeTree
- // getAction(this.url.list, params).then((res) => {
- // if (res.success) {
- // this.dataSource = res.result.records||res.result;
- // }else{
- // this.$message.warning(res.message)
- // }
- // }).finally(() => {
- // this.loading = false
- // })
- // },
+
deviceSearch() {
- console.log('瑙﹀彂')
this.$refs.selectDeviceDrawer.visible = true
this.$refs.selectDeviceDrawer.selectedRowKeys = []
this.$refs.selectDeviceDrawer.selectedRows = []
@@ -450,11 +334,6 @@
* @param data 宸查�夋嫨鐨勮澶�
*/
selectOK(data) {
- // let params = {}
- // params.equipmentIdList = []
- // for (var a = 0; a < data.length; a++) {
- // params.equipmentIdList.push(data[a])
- // }
console.log('data=', data)
this.queryParam.equipmentId = data.join(',')
console.log('queryParam', this.queryParam.equipmentId)
diff --git a/src/views/system/modules/SelectDeviceDrawer.vue b/src/views/system/modules/SelectDeviceDrawer.vue
index cdd045b..ab5cc25 100644
--- a/src/views/system/modules/SelectDeviceDrawer.vue
+++ b/src/views/system/modules/SelectDeviceDrawer.vue
@@ -8,15 +8,24 @@
>
<a-spin :spinning="loading">
- <!-- showLine -->
- <a-form>
- <a-form-item>
- <a-input-search @search="handleSearch" style="width:100%;" placeholder="妫�绱� 绫诲埆缂栫爜/鍚嶇О" allowClear
- v-model="searchInput" @change="handleChange"/>
- </a-form-item>
- <a-form-item label="杞﹂棿灞傜骇锛�">
+ <div class="content-container">
+ <a-form>
+ <a-form-item>
+ <a-input-search @search="handleSearch" style="width:100%;" placeholder="妫�绱� 绫诲埆缂栫爜/鍚嶇О" allowClear
+ v-model="searchInput" @change="handleChange"/>
+ </a-form-item>
+
+ <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">{{
+ checkedKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="checkedKeys=[]">娓呯┖</a>
+ </div>
+ </a-form>
+
+ <div>
<a-tree showLine ref="tree" :expandedKeys.sync="expandedKeys" :autoExpandParent="autoExpandParent"
:treeData="treeDataSource" checkable @check="onCheck" v-model="checkedKeys"
+ @select="handleSelectChange"
@expand="onExpand">
<template slot="title" slot-scope="{ title, parentId, entity, key}">
<span v-if="title.indexOf(searchValue) > -1">{{ title.substr(0, title.indexOf(searchValue)) }}
@@ -26,9 +35,8 @@
<span v-else>{{ title }}</span>
</template>
</a-tree>
- </a-form-item>
- </a-form>
-
+ </div>
+ </div>
</a-spin>
@@ -227,11 +235,20 @@
refreshTree() {
this.queryTreeData()
},
+
+
+ /**
+ * 鑺傜偣琚�変腑鏃惰Е鍙戯紙鐐瑰嚮鍚嶇О锛�
+ * @param selectedKeys 閫変腑鐨勮妭鐐筴ey闆嗗悎
+ * @param event 浜嬩欢瀵硅薄
+ */
+ handleSelectChange(selectedKeys, event) {
+ event.node.$el.childNodes[1].click()
+ },
+
onCheck(value, obj) {
this.checkedKeys = value
- console.log('obj,', obj)
this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
- console.log(this.deviceNodes)
},
handleCancel() {
this.visible = false
--
Gitblit v1.9.3