From d0223045d2dd1cccc26c995c972e80e60bd19b26 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:45:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/OpenRateTrendAnalysis/OpenRateTrendAnalysisMain.vue | 74 --
src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue | 267 +-------
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 23
src/views/system/WorkshopSignageManagement.vue | 6
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 2
src/views/mdc/base/WorkshopSignageEntrance.vue | 38
src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue | 2
src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue | 2
src/views/dashboard/Analysis.vue | 29
src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue | 4
src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisBar.vue | 541 +++++--------------
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 2
src/components/layouts/TabLayout.vue | 2
src/components/page/GlobalLayout.vue | 6
src/views/mdc/base/modules/DeviceLog/LogInfo.vue | 2
src/views/mdc/base/modules/DeviceLog/WorkHistoryModel.vue | 4
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 4
src/views/mdc/base/EquipmentList.vue | 17
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 2
src/views/mdc/base/modules/GradeSignage/SectionSignage.vue | 268 ---------
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue | 10
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 2
src/views/mdc/base/AlarmManager.vue | 50 -
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 2
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue | 6
src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue | 8
src/assets/dashboard.png | 0
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 2
src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue | 2
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue | 22
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 92 +-
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 12
src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue | 4
src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue | 4
src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue | 2
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue | 4
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 2
src/views/system/modules/ProductionManager/ProductionEquipment.vue | 2
src/views/mdc/base/RepairWorkshopSignage.vue | 42 -
39 files changed, 373 insertions(+), 1,190 deletions(-)
diff --git a/src/assets/dashboard.png b/src/assets/dashboard.png
new file mode 100644
index 0000000..d6b9220
--- /dev/null
+++ b/src/assets/dashboard.png
Binary files differ
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index b70473d..1f15a45 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -18,7 +18,7 @@
<span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
</a-tab-pane>
</a-tabs>
- <div style="margin: 12px 12px 0;">
+ <div :style="{margin:$route.meta.title!=='棣栭〉'? '12px 12px 0':0,flex:1,display: 'flex',flexDirection: 'column'}">
<!-- update-begin-author:taoyan date:20201221 for:姝ゅ鍒犳帀transition鏍囩 涓嶇煡閬撲负浠�涔堝姞涓婂悗 椤甸潰璺敱鍒囨崲鐨勬椂鍊欏嵆1鍙婅彍鍗曞垏鍒�2鍙婅彍鍗曠殑鏃跺�� 涓や釜鑿滃崟椤甸潰浼氬悓鏃跺嚭鐜�300-500绉掑乏鍙� -->
<keep-alive v-if="multipage">
<router-view v-if="reloadFlag"/>
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 7b0aa51..82c3182 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -69,7 +69,7 @@
/>
<!-- layout content -->
- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+ <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0',display:'flex',flexDirection:'column' }">
<slot></slot>
</a-layout-content>
@@ -134,11 +134,11 @@
//--update-begin----author:scott---date:20190320------for:鏍规嵁鍚庡彴鑿滃崟閰嶇疆锛屽垽鏂槸鍚﹁矾鐢辫彍鍗曞瓧娈碉紝鍔ㄦ�侀�夋嫨鏄惁鐢熸垚璺敱锛堜负浜嗘敮鎸佸弬鏁癠RL鑿滃崟锛�------
//this.menus = this.mainRouters.find((item) => item.path === '/').children;
this.menus = this.permissionMenuList
-
+
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
this.collapsed=!this.sidebarOpened;
//--update-begin----author:liusq---date:20210223------for:鍏充簬娴嬭竟鑿滃崟閬尅鍐呭闂璇︾粏璇存槑 #2255
-
+
// 鏍规嵁鍚庡彴閰嶇疆鑿滃崟锛岄噸鏂版帓搴忓姞杞借矾鐢变俊鎭�
//console.log('----鍔犺浇鑿滃崟閫昏緫----')
//console.log(this.mainRouters)
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 1503277..df755a1 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,25 +1,28 @@
<template>
- <div>
-
+ <div class="container">
</div>
</template>
<script>
export default {
- name: "Analysis",
- components: {
-
- },
+ name: 'Analysis',
+ components: {},
data() {
- return {
-
- }
+ return {}
},
created() {
},
- methods: {
-
- }
+ methods: {}
}
-</script>
\ No newline at end of file
+</script>
+
+<style scoped lang="less">
+ .container {
+ flex: 1;
+ background-image: url("../../assets/dashboard.png");
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
+
+</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 04620a2..ea207ee 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>
@@ -255,18 +217,6 @@
return parseInt(index) + 1;
}
},
- // {
- // title: '璁惧缂栧彿',
- // align: "center",
- // // sorter: true,
- // dataIndex: 'equipmentId'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // align: "center",
- // // sorter: true,
- // dataIndex: 'equipmentName'
- // },
{
title: '鎶ヨ鍙�',
align: "center",
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 3d34ad3..44375e9 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -13,8 +13,8 @@
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
@@ -151,7 +151,7 @@
width: 200
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
width: 200,
dataIndex: 'equipmentName'
@@ -250,10 +250,17 @@
// sorter: true
},
{
+ title: '瀹夎浣嶇疆',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ // sorter: true
+ },
+ {
title: '璁惧鍚嶇О',
align: 'center',
width: 200,
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentAddress'
},
{
title: '杞﹂棿',
@@ -323,7 +330,7 @@
// sorter: true
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
width: 200,
dataIndex: 'equipmentName'
diff --git a/src/views/mdc/base/RepairWorkshopSignage.vue b/src/views/mdc/base/RepairWorkshopSignage.vue
index fe0c56c..4af3edc 100644
--- a/src/views/mdc/base/RepairWorkshopSignage.vue
+++ b/src/views/mdc/base/RepairWorkshopSignage.vue
@@ -45,28 +45,6 @@
<div>
<img src="@/assets/signage/repair/table-container.png"/>
<dv-scroll-board class="scroll-table-container" :config="scrollTableConfig"/>
- <!--<table>-->
- <!--<thead>-->
- <!--<tr>-->
- <!--<th>璁惧缂栧彿</th>-->
- <!--<th>璁惧鍚嶇О</th>-->
- <!--<th>鎵�灞炶溅闂�</th>-->
- <!--<th>瀹夎浣嶇疆</th>-->
- <!--<th>鎶ヤ慨浜�</th>-->
- <!--<th>鎶ヤ慨鏃堕棿</th>-->
- <!--<th>缁翠慨浜�</th>-->
- <!--<th>鎺ュ崟鏃堕棿</th>-->
- <!--<th>鏁呴殰鎸佺画鏃堕棿</th>-->
- <!--<th>鐘舵��</th>-->
- <!--</tr>-->
- <!--</thead>-->
-
- <!--<tbody>-->
- <!--<tr v-for="item in 8">-->
-
- <!--</tr>-->
- <!--</tbody>-->
- <!--</table>-->
</div>
<div>
<img src="@/assets/signage/repair/repaired-rank.png"/>
@@ -419,23 +397,6 @@
right: '10%',
containLabel: true
},
- legend: {
- top: 80,
- right: '10%',
- itemGap: 15,
- textStyle: {
- fontSize: 14,
- fontFamily: 'LanTing',
- color: '#eee',
- height: 10,
- rich: {
- a: {
- verticalAlign: 'bottom'
- }
- }
- },
- data: ['璁惧骞冲潎鏁呴殰鐜�']
- },
xAxis: {
type: 'category',
data: [],
@@ -477,9 +438,6 @@
color: '#eee',
fontWeight: 'bold',
margin: 14,
- formatter(value) {
- return value + '%'
- }
}
}
],
diff --git a/src/views/mdc/base/WorkshopSignageEntrance.vue b/src/views/mdc/base/WorkshopSignageEntrance.vue
index 9b698eb..4a8d2cc 100644
--- a/src/views/mdc/base/WorkshopSignageEntrance.vue
+++ b/src/views/mdc/base/WorkshopSignageEntrance.vue
@@ -1,24 +1,26 @@
<template>
<div class="page-container">
- <h1>杞﹂棿甯冨眬鐪嬫澘</h1>
- <a-list
- :grid="{gutter: 16, xs: 1, sm: 2, md: 4, lg: 4, xl: 6, xxl: 3 }"
- :data-source="workshopList">
- <a-list-item slot="renderItem" slot-scope="item, index">
- <div class="workshop-name" @click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}</div>
- </a-list-item>
- </a-list>
+ <a-row>
+ <h1>杞﹂棿甯冨眬鐪嬫澘</h1>
+ <a-list :grid="{gutter: 16, column:4}">
+ <a-list-item v-for="item in workshopList" :key="item.id">
+ <div class="workshop-name" @click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}</div>
+ </a-list-item>
+ </a-list>
+ </a-row>
- <h1>鍒嗙骇鐪嬫澘</h1>
- <a-list
- :grid="{gutter: 16, column:4}">
- <a-list-item>
- <div class="workshop-name" @click="navigateToWorkshopSignageByUrl('/GradeWorkshopSignage')">鍒嗙骇鐪嬫澘</div>
- </a-list-item>
- <a-list-item>
- <div class="workshop-name" @click="navigateToWorkshopSignageByUrl('/RepairWorkshopSignage')">缁翠慨鐪嬫澘</div>
- </a-list-item>
- </a-list>
+
+ <a-row>
+ <h1>鍒嗙骇鐪嬫澘</h1>
+ <a-list :grid="{gutter: 16, column:4}">
+ <a-list-item>
+ <div class="workshop-name" @click="navigateToWorkshopSignageByUrl('/GradeWorkshopSignage')">鍒嗙骇鐪嬫澘</div>
+ </a-list-item>
+ <a-list-item>
+ <div class="workshop-name" @click="navigateToWorkshopSignageByUrl('/RepairWorkshopSignage')">缁翠慨鐪嬫澘</div>
+ </a-list-item>
+ </a-list>
+ </a-row>
</div>
</template>
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index 980a5c5..3be0ca3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -81,7 +81,7 @@
:column="4"
>
<a-descriptions-item label="璁惧缂栧彿">{{resultData.equipmentId}}</a-descriptions-item>
- <a-descriptions-item label="璁惧鍚嶇О">{{resultData.equipmentName}}</a-descriptions-item>
+ <a-descriptions-item label="瀹夎浣嶇疆">{{resultData.equipmentName}}</a-descriptions-item>
<a-descriptions-item label="IP鍦板潃">{{resultData.equipmentIp}}</a-descriptions-item>
<a-descriptions-item label="绔彛鍙�">{{resultData.dataPort}}</a-descriptions-item>
<a-descriptions-item label="椹卞姩绫诲瀷">{{resultData.driveType}}</a-descriptions-item>
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 06eedd3..c9f70f3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -24,7 +24,7 @@
width:210
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: "center",
dataIndex: 'equipmentName',
width:300
diff --git a/src/views/mdc/base/modules/DeviceLog/LogInfo.vue b/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
index da70e00..e00ff2f 100644
--- a/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
@@ -10,7 +10,7 @@
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧鍚嶇О">
+ <a-form-item label="瀹夎浣嶇疆">
<a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
diff --git a/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
index a80086b..9779f63 100644
--- a/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/DeviceLog/WorkChartModel.vue
@@ -24,8 +24,8 @@
</a-row>
<a-row :gutter="24">
<a-col :span="6">
- <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input placeholder="杈撳叆瀹夎浣嶇疆鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
diff --git a/src/views/mdc/base/modules/DeviceLog/WorkHistoryModel.vue b/src/views/mdc/base/modules/DeviceLog/WorkHistoryModel.vue
index 44f7cef..982fc70 100644
--- a/src/views/mdc/base/modules/DeviceLog/WorkHistoryModel.vue
+++ b/src/views/mdc/base/modules/DeviceLog/WorkHistoryModel.vue
@@ -8,8 +8,8 @@
<a-form-item label="璁惧缂栧彿">
<a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" :readOnly="true" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="true" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="杈撳叆瀹夎浣嶇疆鏌ヨ" :readOnly="true" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
<a-form-item label="鏃ユ湡">
<a-range-picker v-model="dates" :disabledDate="disabledDate" @change="dateParamChange" format='YYYY-MM-DD'/>
diff --git a/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue b/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
index 33a362c..0f272c8 100644
--- a/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
@@ -12,8 +12,8 @@
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="杈撳叆瀹夎浣嶇疆鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
diff --git a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
index d291654..ba2c179 100644
--- a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
@@ -12,8 +12,8 @@
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="杈撳叆璁惧瀹夎浣嶇疆" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4" :xs="4">
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 01384b6..037b5fa 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -19,17 +19,19 @@
</template>
<a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :form="form" :model="model" :rules="validatorRules">
+ <a-form-model ref="form" :form="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
+ :wrapperCol="wrapperCol">
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
- <a-input-search v-model="model.equipmentId" :disabled="disableSubmit" @search="deviceSearch" enter-button
+ <a-form-model-item label="缁熶竴缂栫爜" prop="equipmentId">
+ <a-input-search v-model="model.equipmentId" readOnly :disabled="disableSubmit" @search="deviceSearch"
+ enter-button
placeholder='璇烽�夋嫨缁熶竴缂栫爜'/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ <a-form-model-item label="瀹夎浣嶇疆">
+ <a-input :disabled="disableSubmit || model.id" allow-clear placeholder="璇疯緭鍏ュ畨瑁呬綅缃�"
v-model="model.equipmentName"/>
</a-form-model-item>
</a-col>
@@ -37,14 +39,14 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol"
+ <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤"
v-show="!departDisabled">
<j-select-equipment-depart :disabled="disableSubmit" v-model="model.selectedDeparts" :multi="false"
@back="backDepartInfo" :backDepart="true"
:treeOpera="true"></j-select-equipment-depart>
</a-form-model-item>
- <a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷">
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
v-model="model.equipmentType">
@@ -55,7 +57,7 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled"
+ <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"
@@ -67,11 +69,11 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item v-if="isDepartType == -1" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == -1" label="绯荤粺鐗堟湰鍙�">
<a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
v-model="model.systemVersion"/>
</a-form-model-item>
- <a-form-model-item v-if="isDepartType == 0" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == 0" label="璁惧绫诲瀷">
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
v-model="model.equipmentType">
@@ -83,7 +85,7 @@
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍔熺巼(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="璁惧鍔熺巼(kw)">
<a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧姛鐜�"
v-model="model.devicePower"/>
</a-form-model-item>
@@ -92,13 +94,13 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="鏈哄簥IP" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴奍P"
+ <a-form-model-item label="鏈哄簥IP">
+ <a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴奍P"
v-model="model.equipmentIp"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鏈哄簥绔彛" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="鏈哄簥绔彛">
<a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴婄鍙�"
v-model="model.dataPort"/>
</a-form-model-item>
@@ -107,15 +109,15 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="椹卞姩绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="椹卞姩绫诲瀷">
<j-dict-select-tag :disabled="true" placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
:triggerChange="true" dictCode="mdc_driveType"
v-model="model.driveType" allow-clear/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍨嬪彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
+ <a-form-model-item label="璁惧鍨嬪彿">
+ <a-input :disabled="true" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
v-model="model.equipmentModel"/>
</a-form-model-item>
</a-col>
@@ -123,22 +125,23 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type" :disabled="disableSubmit"
+ <a-form-model-item label="绯荤粺绫诲瀷">
+ <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type"
+ :disabled="disableSubmit"
v-model="model.systemType" allow-clear/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="鎺掑簭">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24" v-if="systemType">
- <a-col :span='24'>
- <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-row :gutter="24">
+ <a-col :span='12' v-if="systemType">
+ <a-form-model-item label="绯荤粺绫诲瀷">
<a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">
<a-radio value="1">DNC</a-radio>
<a-radio value="2">MDC</a-radio>
@@ -146,12 +149,17 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ <a-col :span='12'>
+ <a-form-model-item label="璁惧鍚嶇О">
+ <a-input v-model="model.equipmentAddress" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span='12'>
- <a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
v-model="model.systemVersion"/>
</a-form-model-item>
@@ -224,7 +232,7 @@
equipmentId:
[
{
- required: true, message: '璇烽�夋嫨璁惧缂栧彿!'
+ required: true, message: '璇烽�夋嫨璁惧缂栧彿锛�', trigger: 'change'
}
// {
// validator: this.validatequipmentId
@@ -235,7 +243,7 @@
selectedProduction:
[
{
- required: true, message: '璇烽�夋嫨杞﹂棿'
+ required: true, message: '璇烽�夋嫨杞﹂棿锛�'
}
]
@@ -355,7 +363,7 @@
console.log(val)
if (val.equipmentid) {
this.model.equipmentId = val.equipmentid
- this.model.equipmentName = val.equipmentname
+ this.model.equipmentAddress = val.equipmentname
this.model.equipmentModel = val.equipmentmodel
this.model.equipmentIp = val.equipmentip
this.model.dataPort = val.dataport
@@ -405,7 +413,7 @@
this.$nextTick(() => {
this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
- 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue'))
+ 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue', 'equipmentAddress'))
})
if (record.hasOwnProperty('id')) {
// that.getUserRoles(record.id);
@@ -431,7 +439,7 @@
if (screenWidth < 500) {
this.drawerWidth = screenWidth
} else {
- this.drawerWidth = 700
+ this.drawerWidth = 800
}
},
getUserDeparts(userid) {
@@ -525,20 +533,20 @@
// if(this.model.userIdentity!==2){
// this.model.departIds="";
// }
- if (this.systemValue==null){
- this.$message.warning('璇烽�夋嫨绯荤粺绫诲瀷!');
- return false;
+ if (this.systemValue == null) {
+ this.$message.warning('璇烽�夋嫨绯荤粺绫诲瀷!')
+ return false
}
- let obj;
- if(!this.model.id){
- this.model.id = this.userId;
- this.model.systemValue=this.systemValue;
- obj=addEquipment(this.model);
- }else{
- this.model.systemValue=this.systemValue;
- obj=editEquipment(this.model,{
- id: this.model.id
- });
+ let obj
+ if (!this.model.id) {
+ this.model.id = this.userId
+ this.model.systemValue = this.systemValue
+ obj = addEquipment(this.model)
+ } else {
+ this.model.systemValue = this.systemValue
+ obj = editEquipment(this.model, {
+ id: this.model.id
+ })
}
obj.then((res) => {
if (res.success) {
diff --git a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
index bbbc17b..f3af2d2 100644
--- a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
+++ b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
@@ -89,7 +89,7 @@
width: 200
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
dataIndex: 'equipmentName',
width: 200
diff --git a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
index 957eafe..bcef3b4 100644
--- a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
+++ b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
@@ -142,7 +142,7 @@
},
edit(record) {
- this.model = Object.assign({}, record)
+ this.model = Object.assign({}, record, { equipmentIds: record.equipmentId })
this.getDowntimeDescriptionListByApi()
if (this.model.downtimeType === null) {
delete this.model.downtimeType
diff --git a/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue b/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
index 3bd6fe9..2764f0d 100644
--- a/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
+++ b/src/views/mdc/base/modules/GradeSignage/EquipmentSignage.vue
@@ -29,7 +29,7 @@
<thead>
<tr>
<th>璁惧缂栧彿</th>
- <th>璁惧鍚嶇О</th>
+ <th>瀹夎浣嶇疆</th>
</tr>
</thead>
@@ -64,9 +64,9 @@
<table>
<tr>
<td>璁惧鍚嶇О</td>
- <a-tooltip :title="setTooltipTittle(equipmentStatusAndInfoObj.equipmentName)">
- <td :style="{color:setNullValueFontColor(equipmentStatusAndInfoObj.equipmentName)}">
- {{equipmentStatusAndInfoObj.equipmentName|filterNullValue}}
+ <a-tooltip :title="setTooltipTittle(equipmentStatusAndInfoObj.equipmentAddress)">
+ <td :style="{color:setNullValueFontColor(equipmentStatusAndInfoObj.equipmentAddress)}">
+ {{equipmentStatusAndInfoObj.equipmentAddress|filterNullValue}}
</td>
</a-tooltip>
</tr>
diff --git a/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue b/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
index cffc7c0..88f4e97 100644
--- a/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
+++ b/src/views/mdc/base/modules/GradeSignage/SectionSignage.vue
@@ -25,8 +25,13 @@
<div class="equipment-search-container">
<img src="@/assets/signage/section/search-input.png"/>
<a-auto-complete @select="handleSelectChange" placeholder="鍥炶溅閿煡璇�" :filter-option="filterOption"
- :dataSource="equipmentList.map(item=>item.equipmentId)"
- style="position: absolute;width: 15vw;height: 2.24vw;"/>
+ style="position: absolute;width: 15vw;height: 2.24vw;">
+ <template slot="dataSource">
+ <a-select-option v-for="item in equipmentList" :key="item.equipmentId">
+ {{item.equipmentId+`[${item.equipmentName}]`}}
+ </a-select-option>
+ </template>
+ </a-auto-complete>
</div>
</div>
</div>
@@ -81,239 +86,7 @@
chartQuantity: 6,
hasLoadedChartDataQuantity: 0,
activeIndex: null,
- equipmentList: [
- {
- 'id': '1694181185660579842',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:54:05',
- 'updateBy': 'admin',
- 'updateTime': '2024-09-14 09:15:10',
- 'equipmentId': '2140342',
- 'equipmentName': '鏁版帶鍗ц溅',
- 'equipmentType': '澶嶅悎鏈哄簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.44',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'GLS-200',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2140342',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': 'A',
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694181274449801217',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:54:26',
- 'updateBy': 'admin',
- 'updateTime': '2024-09-12 13:27:27',
- 'equipmentId': '2140345',
- 'equipmentName': '鏁版帶鍗у紡杞﹀簥',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.45',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'FTC-350L',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2140345',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694182117068697602',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:57:47',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:30:00',
- 'equipmentId': '2640236',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'equipmentType': '鍔犲伐涓績',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.17',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'VNP-32A',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2640236',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1694182375483961346',
- 'createBy': 'admin',
- 'createTime': '2023-08-23 10:58:49',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:29:19',
- 'equipmentId': '2640263',
- 'equipmentName': '鏁版帶鍔犲伐涓績',
- 'equipmentType': '鍔犲伐涓績',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.74',
- 'dataPort': '8193',
- 'driveType': 'FANUC',
- 'equipmentModel': 'SW-850',
- 'controlSystem': 'FANUC',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'FANUC_2640263',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1701169612893388801',
- 'createBy': 'admin',
- 'createTime': '2023-09-11 17:43:36',
- 'updateBy': 'admin',
- 'updateTime': '2023-11-29 16:45:11',
- 'equipmentId': '2640315',
- 'equipmentName': '鍔犲伐涓績',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.90',
- 'dataPort': '19000',
- 'driveType': 'LSV2',
- 'equipmentModel': 'C32U',
- 'controlSystem': 'LSV2',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'LSV2_2640315',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1728950536953856002',
- 'createBy': 'admin',
- 'createTime': '2023-11-27 09:35:05',
- 'updateBy': 'admin',
- 'updateTime': '2024-01-31 11:29:01',
- 'equipmentId': '2140111',
- 'equipmentName': '鏁版帶杞﹀簥',
- 'equipmentType': '杞﹀簥',
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.167',
- 'dataPort': '502',
- 'driveType': 'ZUOLAN',
- 'equipmentModel': 'SSCKZ40-1000',
- 'controlSystem': 'ZUOLAN',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'ZUOLAN_2140111',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': null,
- 'selectedDeparts': null,
- 'selectedProduction': null
- },
- {
- 'id': '1753259512871624705',
- 'createBy': 'admin',
- 'createTime': '2024-02-02 11:30:16',
- 'updateBy': null,
- 'updateTime': null,
- 'equipmentId': '3102038',
- 'equipmentName': '鐢电伀鑺辨垚鍨嬫満',
- 'equipmentType': null,
- 'productionName': null,
- 'orgCodeTxt': null,
- 'systemVersion': null,
- 'devicePower': null,
- 'equipmentIp': '192.168.86.23',
- 'dataPort': '502',
- 'driveType': 'ZUOLAN',
- 'equipmentModel': 'DM7150',
- 'controlSystem': 'ZUOLAN',
- 'systemType': null,
- 'deviceCategory': null,
- 'alarm': null,
- 'collectTime': null,
- 'oporation': null,
- 'saveTableName': 'ZUOLAN_3102038',
- 'deviceAbnormalStatus': 1,
- 'equipmentStatus': 0,
- 'deviceLevel': null,
- 'deviceImportanceLevel': null,
- 'sortNo': null,
- 'remark': '222333',
- 'selectedDeparts': null,
- 'selectedProduction': null
- }
- ],
+ equipmentList: []
}
},
watch: {
@@ -356,9 +129,9 @@
signageApi.getEquipmentStatusAnalysisApi(this.currentProductionId)
.then(res => {
if (res.success) {
- this.leftChart1Data = res.result.equipmentStatus
+ that.leftChart1Data = res.result.equipmentStatus
}
- this.initLeftChart1()
+ that.initLeftChart1()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -370,14 +143,14 @@
signageApi.getRepairAndMaintenanceStatusApi(this.currentProductionId)
.then(res => {
if (res.success) {
- this.leftChart2Data = res.result.map(item => {
+ that.leftChart2Data = res.result.map(item => {
return {
name: item.statusText,
value: item.totalNumber
}
})
}
- this.initLeftChart2()
+ that.initLeftChart2()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -388,8 +161,8 @@
const that = this
signageApi.getRateAnalysisTrendApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightTopChartData = res.result
- this.initRightTopChart()
+ if (res.success) that.rightTopChartData = res.result
+ that.initRightTopChart()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -400,8 +173,8 @@
const that = this
signageApi.getRepairAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart1Data = res.result
- this.initRightBottomChart1()
+ if (res.success) that.rightBottomChart1Data = res.result
+ that.initRightBottomChart1()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -412,8 +185,8 @@
const that = this
signageApi.getInspectionAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart2Data = res.result
- this.initRightBottomChart2()
+ if (res.success) that.rightBottomChart2Data = res.result
+ that.initRightBottomChart2()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -424,8 +197,8 @@
const that = this
signageApi.getMaintenanceAnalysisApi(this.currentProductionId)
.then(res => {
- if (res.success) this.rightBottomChart3Data = res.result
- this.initRightBottomChart3()
+ if (res.success) that.rightBottomChart3Data = res.result
+ that.initRightBottomChart3()
})
.finally(() => {
that.hasLoadedChartDataQuantity++
@@ -1217,7 +990,6 @@
* @param equipmentId 璁惧缂栧彿
*/
handleSelectChange(equipmentId) {
- // this.equipmentId = value
console.log('equipment', equipmentId)
this.$emit('nextSignage', { id: equipmentId })
},
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 442375e..7b7a69d 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -158,18 +158,6 @@
scopedSlots: { customRender: 'percent' }
},
{
- title: '鍔犲伐闆朵欢鏁伴噺',
- align: 'center',
- dataIndex: 'processCount',
- width: 150
- },
- {
- title: '鍚堟牸闆朵欢鏁伴噺',
- align: 'center',
- dataIndex: 'passCount',
- width: 150
- },
- {
title: '涓�娆″悎鏍肩巼',
align: 'center',
dataIndex: 'passRate',
diff --git a/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue b/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
index 6972c4b..e3f0a42 100644
--- a/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
+++ b/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
@@ -36,7 +36,7 @@
璁惧缂栧彿
</th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">
- 璁惧鍚嶇О
+ 瀹夎浣嶇疆
</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
璁惧绫诲瀷
diff --git a/src/views/mdc/base/modules/OpenRateTrendAnalysis/OpenRateTrendAnalysisMain.vue b/src/views/mdc/base/modules/OpenRateTrendAnalysis/OpenRateTrendAnalysisMain.vue
index 8b4bcfd..cd46f99 100644
--- a/src/views/mdc/base/modules/OpenRateTrendAnalysis/OpenRateTrendAnalysisMain.vue
+++ b/src/views/mdc/base/modules/OpenRateTrendAnalysis/OpenRateTrendAnalysisMain.vue
@@ -32,7 +32,7 @@
璁惧缂栧彿
</th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">
- 璁惧鍚嶇О
+ 瀹夎浣嶇疆
</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
璁惧绫诲瀷
@@ -194,9 +194,6 @@
}
this.XData = Xarr
this.YData = Yarr
- // if(this.openRateTrendAnalysisChart !=null && this.openRateTrendAnalysisChart != '' && this.openRateTrendAnalysisChart != undefined){
- // this.openRateTrendAnalysisChart.dispose()
- // }
this.draw()
},
@@ -251,75 +248,6 @@
this.requestAlldataSize = moment.duration(moment(this.queryParam.endDate) - moment(this.queryParam.startDate), 'millisecond').asDays() + 1
this.loadData1()
},
- // searchReset() {
- // this.typeTree = this.queryParam.typeTree
- // this.typeParent = this.queryParam.parentId
- // this.typeEquipment = this.queryParam.equipmentId
- // this.queryParam = {}
- // this.dates = []
- // this.queryParam.typeTree = this.typeTree
- // this.queryParam.parentId = this.typeParent
- // this.queryParam.equipmentId = this.typeEquipment
- // // this.ipagination.current = 1
- // this.loadData1();
- // // this.queryParam = {}
- // // this.dates = []
- // // this.loadData()
- // // this.onClearSelected()
- // },
- // loadData1() {
- // let that = this
- // that.columns=[
- // {
- // title: '璁惧缂栧彿',
- // align: 'center',
- // dataIndex: 'equipmentId',
- // width:'150px'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // align: 'center',
- // dataIndex: 'equipmentName',
- // width:'150px'
- // },
- // ]
- // that.tableHeads = []
- // that.dataList = []
- // getAction(this.url.efficiencyList, that.queryParam).then(res => {
- // var tmp = {}
- // console.log(res)
- // if (res.success)
- //
- // that.dataSource = res.result.mdcEfficiencyList
- // for(var k = 0;k<that.dataSource[0].dataList.length;k++){
- // that.columns.push(
- // {
- // title:that.dataSource[0].dataList.theDate,
- // align: 'center',
- // width:'120px',
- // // dataIndex:'utilizationRate',
- // }
- // )
- // }
- // for(var i = 0;i<that.dataSource.length;i++){
- // for (var j = 0; j < that.dataSource[i].dataList.length;j++){
- // // that.columns.push(
- // // {
- // // title:that.dataSource[0].dataList[j].theDate,
- // // align: 'center',
- // // width:'120px',
- // // dataIndex:'utilizationRate',
- // // }
- // // )
- // }
- //
- // }
- // console.log(that.columns)
- // console.log(that.dataSource)
- // // this.initDeviceType(this.dataList)
- // this.draw()
- // }
- // }
loadData1() {
this.loading = true
this.tableHeads = []
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index 6185aa3..2a3ad68 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>
+ <a-input placeholder="璇烽�夋嫨鏍戣妭鐐�" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4" :xs="4">
diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index 7cb1658..fef7505 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>
+ <a-input placeholder="璇烽�夋嫨鏍戣妭鐐�" :readOnly="readOnly" v-model="queryParam.tierName"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4" :xs="4">
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
index e9f6724..5686d05 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
@@ -15,8 +15,8 @@
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="杈撳叆瀹夎浣嶇疆鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="2" :sm="2" :xs="2">
@@ -165,7 +165,7 @@
width:200
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
dataIndex: 'equipmentName',
width:250
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
index ba239b5..6f29473 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
@@ -12,8 +12,8 @@
</a-col>
<a-col :span="12">
- <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ <a-form-item label="瀹夎浣嶇疆" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ュ畨瑁呬綅缃�"
v-decorator="['equipmentName',validatorRules.equipmentName]"/>
</a-form-item>
</a-col>
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index 8ee1144..66f1ecb 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -85,7 +85,7 @@
}
},
{ title: '璁惧缂栧彿', dataIndex: 'equipmentId', key: 'equipmentId', align: 'center' },
- { title: '璁惧鍚嶇О', dataIndex: 'equipmentName', key: 'equipmentName', align: 'center' },
+ { title: '瀹夎浣嶇疆', dataIndex: 'equipmentName', key: 'equipmentName', align: 'center' },
{ title: '鎶ヨ鏃堕棿', dataIndex: 'startTime', key: 'startTime', align: 'center' },
{ title: '缁撴潫鏃堕棿', dataIndex: 'endTime', key: 'endTime', align: 'center' },
{
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisBar.vue b/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisBar.vue
index 2cedc86..7ac1639 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisBar.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisBar.vue
@@ -1,51 +1,46 @@
<template>
- <div class="comparative_Bar" style="width: 100%;height: 900px;display: flex;flex-direction: column;overflow: scroll">
- <div id="compAnalBar1" style="flex: 1;"></div>
- <div id="compAnalBar2" style="flex: 1;"></div>
- </div>
+ <div class="comparative_Bar" style="width: 100%;height: 900px;display: flex;flex-direction: column;overflow: scroll">
+ <div id="compAnalBar1" style="flex: 1;"></div>
+ <div id="compAnalBar2" style="flex: 1;"></div>
+ </div>
</template>
<script>
import * as echarts from 'echarts'
+
export default {
name: 'comparativeAnalysisBar',
- props:{
- dataList:''
-
- },
- data(){
- return{
- OpenCloseList:[],
- openRate:[],
- utilizationRate:[],
- openLong:[],
- closeLong:[],
- equipmentList:[]
+ props: {
+ dataList: {
+ type: Array
}
},
- created(){
-
+ data() {
+ return {
+ compAnalBar1: null,
+ compAnalBar2: null
+ }
},
- watch:{
- dataList(val){
- this.OpenCloseList = val
+ watch: {
+ dataList(val) {
this.drawTu()
- },
+ }
},
mounted() {
this.drawTu()
+ window.addEventListener('resize', this.handleWindowResize)
},
- methods:{
- drawTu(){
- let compAnalBar1 = this.$echarts.init(document.getElementById('compAnalBar1'), 'macarons');
- let compAnalBar2 = this.$echarts.init(document.getElementById('compAnalBar2'), 'macarons');
- let compAnalBarOption1 = {
+ methods: {
+ drawTu() {
+ this.compAnalBar1 = this.$echarts.init(document.getElementById('compAnalBar1'), 'macarons')
+ this.compAnalBar2 = this.$echarts.init(document.getElementById('compAnalBar2'), 'macarons')
+ let compAnalBarOption1 = {
tooltip: {
trigger: 'axis',
axisPointer: {
- type: "shadow",
+ type: 'shadow',
textStyle: {
- color: "#fff"
+ color: '#fff'
}
}
@@ -60,12 +55,12 @@
data: ['寮�鏈虹巼', '鍒╃敤鐜�']
},
toolbox: {
- show : true,
- feature : {
- mark : {show: true},
- magicType : {show: true, type: ['line', 'bar']},
- restore : {show: true},
- saveAsImage : {show: true,name:'璁惧杩愯鏁堢巼瀵规瘮鍒嗘瀽鍥�'}
+ show: true,
+ feature: {
+ mark: { show: true },
+ magicType: { show: true, type: ['line', 'bar'] },
+ restore: { show: true },
+ saveAsImage: { show: true, name: '璁惧杩愯鏁堢巼瀵规瘮鍒嗘瀽鍥�' }
}
},
calculable: true,
@@ -74,34 +69,34 @@
top: 110,
bottom: 95,
textStyle: {
- color: "#fff"
+ color: '#fff'
}
},
xAxis: [
{
type: 'category',
splitLine: {
- "show": false
+ 'show': false
},
axisTick: {
- "show": false
+ 'show': false
},
splitArea: {
show: false
},
- boundaryGap : true,
- axisLabel : {
- interval : 0,
- rotate : 0,
+ boundaryGap: true,
+ axisLabel: {
+ interval: 0,
+ rotate: 0,
show: true,
- wigth:20,
+ wigth: 20,
splitNumber: 8,
textStyle: {
- fontFamily: "寰蒋闆呴粦",
+ fontFamily: '寰蒋闆呴粦',
fontSize: 12
}
},
- data : [0]
+ data: [0]
}
],
yAxis: [
@@ -137,14 +132,14 @@
handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
handleSize: '110%',
handleStyle: {
- color: "#d3dee5"
+ color: '#d3dee5'
},
textStyle: {
- color: "#fff"
+ color: '#fff'
},
- borderColor: "#90979c"
+ borderColor: '#90979c'
}, {
- type: "inside",
+ type: 'inside',
show: true,
height: 15,
start: 1,
@@ -160,276 +155,80 @@
normal: {
color: function(params) {
let colorList = [
- ["#6496e9","#6bded3"],
- // ["#849db8","#b4b8cc"],
- // ["#4fe1c5","#4ecee1"],
- // // ["#9978fa","#88a1fa"],
- // ["#ffbb65","#fdc68b"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:'#6496e9'
+ ['#6496e9', '#6bded3']
+ ]
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#6496e9'
},
{
- offset:1,
- color:"#6bded3"
- }],false)
+ offset: 1,
+ color: '#6bded3'
+ }], false)
},
- barBorderRadius: [5, 5, 0, 0],
+ barBorderRadius: [5, 5, 0, 0]
}
},
data: [0],
- // barCategoryGap: '20%',
- // barGap : '-10%',
- markPoint : {
- data : [
- {type : 'max', name: '鏈�澶у��',symbolSize:70},
- {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ markPoint: {
+ data: [
+ { type: 'max', name: '鏈�澶у��', symbolSize: 70 },
+ { type: 'min', name: '鏈�灏忓��', symbolSize: 70 }
]
},
- markLine : {
- data : [
- {type : 'average', name: '骞冲潎鍊�'}
+ markLine: {
+ data: [
+ { type: 'average', name: '骞冲潎鍊�' }
]
}
},
{
name: '鍒╃敤鐜�',
type: 'bar',
- //barWidth: 30,
barWidth: 25,
- // barCategoryGap: '20%',
- // barGap : '-10%',
itemStyle: {
normal: {
color: function(params) {
let colorList = [
- // ["#6496e9","#6bded3"],
- // ["#849db8","#b4b8cc"],
- ["#4fe1c5","#4ecee1"],
- // ["#9978fa","#88a1fa"],
- // ["#ffbb65","#fdc68b"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:"#4fe1c5"
+ ['#4fe1c5', '#4ecee1']
+ ]
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#4fe1c5'
},
{
- offset:1,
- color:"#4ecee1"
- }],false)
+ offset: 1,
+ color: '#4ecee1'
+ }], false)
},
- barBorderRadius: [5, 5, 0, 0],
+ barBorderRadius: [5, 5, 0, 0]
}
},
data: [0],
- markPoint : {
- data : [
- {type : 'max', name: '鏈�澶у��',symbolSize:70},
- {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ markPoint: {
+ data: [
+ { type: 'max', name: '鏈�澶у��', symbolSize: 70 },
+ { type: 'min', name: '鏈�灏忓��', symbolSize: 70 }
]
},
- markLine : {
- data : [
- {type : 'average', name: '骞冲潎鍊�'}
+ markLine: {
+ data: [
+ { type: 'average', name: '骞冲潎鍊�' }
]
}
}
]
- };
- // let compAnalBarOption2 = {
- // tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: "shadow",
- // textStyle: {
- // color: "#fff"
- // }
- //
- // }
- // },
- // legend: {
- // x: '4%',
- // top: '11%',
- // textStyle: {
- // color: '#90979c'
- // },
- // data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿'],
- // color:['#6496e9','#b4b8cc']
- // },
- // toolbox: {
- // show : true,
- // feature : {
- // mark : {show: true},
- // magicType : {show: true, type: ['line', 'bar']},
- // restore : {show: true},
- // saveAsImage : {show: true,name:'璁惧杩愯鏃堕棿瀵规瘮鍒嗘瀽鍥�'}
- // }
- // },
- // calculable: true,
- // grid: {
- // borderWidth: 0,
- // top: 110,
- // bottom: 95,
- // textStyle: {
- // color: "#fff"
- // }
- // },
- // xAxis: [
- // {
- // type: 'category',
- // splitLine: {
- // "show": false
- // },
- // axisTick: {
- // "show": false
- // },
- // splitArea: {
- // show: false
- // },
- // boundaryGap : true,
- // axisLabel : {
- // interval : 0,
- // rotate : 0,
- // show: true,
- // wigth:20,
- // splitNumber: 8,
- // textStyle: {
- // fontFamily: "寰蒋闆呴粦",
- // fontSize: 12
- // }
- // },
- // data : [0]
- // }
- // ],
- // yAxis: [
- // {
- // type: 'value',
- // splitLine: {
- // show: false
- // },
- // axisLine: {
- // lineStyle: {
- // color: '#90979c'
- // }
- // },
- // axisTick: {
- // show: false
- // },
- // axisLabel: {
- // interval: 0
- //
- // },
- // splitArea: {
- // show: false
- // }
- // }
- // ],
- // dataZoom: [{
- // show: true,
- // height: 30,
- // xAxisIndex: [0],
- // bottom: 30,
- // start: 0,
- // end: 100,
- // handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
- // handleSize: '110%',
- // handleStyle: {
- // color: "#d3dee5"
- // },
- // textStyle: {
- // color: "#fff"
- // },
- // borderColor: "#90979c"
- // }, {
- // type: "inside",
- // show: true,
- // height: 15,
- // start: 1,
- // end: 35
- // }],
- // series: [
- // {
- // name: '寮�鏈烘椂闂�',
- // type: 'bar',
- // //barWidth: 30,
- // barWidth: 25,
- // // stack: 'sum',
- // // barCategoryGap: '20%',
- // itemStyle: {
- // normal: {
- // color: function(params) {
- // let colorList = [
- // ["#6496e9","#6bded3"],
- // // ["#849db8","#b4b8cc"],
- // // ["#4fe1c5","#4ecee1"],
- // // // ["#9978fa","#88a1fa"],
- // // ["#ffbb65","#fdc68b"],
- // ];
- // // return colorList[params.dataIndex];
- // let colorItem = colorList[params.dataIndex];
- // return new echarts.graphic.LinearGradient(0,0,0,1,[{
- // offset:0,
- // color:'#6496e9'
- // },
- // {
- // offset:1,
- // color:"#6bded3"
- // }],false)
- // },
- // barBorderRadius: [5, 5, 0, 0],
- // }
- // },
- // data: [0]
- // },
- // {
- // name: '鍏虫満鏃堕棿',
- // type: 'bar',
- // //barWidth: 30,
- // barWidth: 25,
- // // stack: 'sum',
- // // barCategoryGap: '20%',
- // itemStyle: {
- // normal: {
- // color: function(params) {
- // let colorList = [
- // // ["#6496e9","#6bded3"],
- // ["#849db8","#b4b8cc"],
- // // ["#4fe1c5","#4ecee1"],
- // // // ["#9978fa","#88a1fa"],
- // // ["#ffbb65","#fdc68b"],
- // ];
- // // return colorList[params.dataIndex];
- // let colorItem = colorList[params.dataIndex];
- // return new echarts.graphic.LinearGradient(0,0,0,1,[{
- // offset:0,
- // color:'#849db8'
- // },
- // {
- // offset:1,
- // color:"#b4b8cc"
- // }],false)
- // },
- // barBorderRadius: [5, 5, 0, 0],
- // }
- // },
- // data: [0]
- // }
- // ]
- // };
+ }
let compAnalBarOption2 = {
tooltip: {
trigger: 'axis',
axisPointer: {
- type: "shadow",
+ type: 'shadow',
textStyle: {
- color: "#fff"
+ color: '#fff'
}
-
}
},
legend: {
@@ -438,16 +237,16 @@
textStyle: {
color: '#90979c'
},
- color:['#6496e9','#b4b8cc'],
+ color: ['#6496e9', '#b4b8cc'],
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
toolbox: {
- show : true,
- feature : {
- mark : {show: true},
- magicType : {show: true, type: ['line', 'bar']},
- restore : {show: true},
- saveAsImage : {show: true,name:'璁惧杩愯鏁堢巼瀵规瘮鍒嗘瀽鍥�'}
+ show: true,
+ feature: {
+ mark: { show: true },
+ magicType: { show: true, type: ['line', 'bar'] },
+ restore: { show: true },
+ saveAsImage: { show: true, name: '璁惧杩愯鏁堢巼瀵规瘮鍒嗘瀽鍥�' }
}
},
calculable: true,
@@ -456,34 +255,34 @@
top: 110,
bottom: 95,
textStyle: {
- color: "#fff"
+ color: '#fff'
}
},
xAxis: [
{
type: 'category',
splitLine: {
- "show": false
+ 'show': false
},
axisTick: {
- "show": false
+ 'show': false
},
splitArea: {
show: false
},
- boundaryGap : true,
- axisLabel : {
- interval : 0,
- rotate : 0,
+ boundaryGap: true,
+ axisLabel: {
+ interval: 0,
+ rotate: 0,
show: true,
- wigth:20,
+ wigth: 20,
splitNumber: 8,
textStyle: {
- fontFamily: "寰蒋闆呴粦",
+ fontFamily: '寰蒋闆呴粦',
fontSize: 12
}
},
- data : [0]
+ data: [0]
}
],
yAxis: [
@@ -519,14 +318,14 @@
handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
handleSize: '110%',
handleStyle: {
- color: "#d3dee5"
+ color: '#d3dee5'
},
textStyle: {
- color: "#fff"
+ color: '#fff'
},
- borderColor: "#90979c"
+ borderColor: '#90979c'
}, {
- type: "inside",
+ type: 'inside',
show: true,
height: 15,
start: 1,
@@ -542,117 +341,95 @@
normal: {
color: function(params) {
let colorList = [
- ["#6496e9","#6bded3"],
- // ["#849db8","#b4b8cc"],
- // ["#4fe1c5","#4ecee1"],
- // // ["#9978fa","#88a1fa"],
- // ["#ffbb65","#fdc68b"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:'#6496e9'
+ ['#6496e9', '#6bded3']
+ ]
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#6496e9'
},
{
- offset:1,
- color:"#6bded3"
- }],false)
+ offset: 1,
+ color: '#6bded3'
+ }], false)
},
- barBorderRadius: [5, 5, 0, 0],
+ barBorderRadius: [5, 5, 0, 0]
}
},
data: [0],
- // barCategoryGap: '20%',
- // barGap : '-10%',
- markPoint : {
- data : [
- {type : 'max', name: '鏈�澶у��',symbolSize:70},
- {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ markPoint: {
+ data: [
+ { type: 'max', name: '鏈�澶у��', symbolSize: 70 },
+ { type: 'min', name: '鏈�灏忓��', symbolSize: 70 }
]
},
- markLine : {
- data : [
- {type : 'average', name: '骞冲潎鍊�'}
+ markLine: {
+ data: [
+ { type: 'average', name: '骞冲潎鍊�' }
]
}
},
{
name: '鍏虫満鏃堕棿',
type: 'bar',
- //barWidth: 30,
barWidth: 25,
- // barCategoryGap: '20%',
- // barGap : '-10%',
itemStyle: {
normal: {
color: function(params) {
let colorList = [
- // ["#6496e9","#6bded3"],
- ["#849db8","#b4b8cc"],
- // ["#4fe1c5","#4ecee1"],
- // ["#9978fa","#88a1fa"],
- // ["#ffbb65","#fdc68b"],
- ];
- // return colorList[params.dataIndex];
- let colorItem = colorList[params.dataIndex];
- return new echarts.graphic.LinearGradient(0,0,0,1,[{
- offset:0,
- color:"#849db8"
+ ['#849db8', '#b4b8cc']
+ ]
+ let colorItem = colorList[params.dataIndex]
+ return new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#849db8'
},
{
- offset:1,
- color:"#b4b8cc"
- }],false)
+ offset: 1,
+ color: '#b4b8cc'
+ }], false)
},
- barBorderRadius: [5, 5, 0, 0],
+ barBorderRadius: [5, 5, 0, 0]
}
},
data: [0],
- markPoint : {
- data : [
- {type : 'max', name: '鏈�澶у��',symbolSize:70},
- {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ markPoint: {
+ data: [
+ { type: 'max', name: '鏈�澶у��', symbolSize: 70 },
+ { type: 'min', name: '鏈�灏忓��', symbolSize: 70 }
]
},
- markLine : {
- data : [
- {type : 'average', name: '骞冲潎鍊�'}
+ markLine: {
+ data: [
+ { type: 'average', name: '骞冲潎鍊�' }
]
}
}
]
- };
- if(this.OpenCloseList != null){
- this.equipmentList = []
- this.openRate =[]
- this.utilizationRate =[]
- this.openLong = []
- this.closeLong = []
- for(var i = 0;i<this.OpenCloseList.length;i++){
- this.equipmentList.push(this.OpenCloseList[i].equipmentId)
- this.openRate.push((this.OpenCloseList[i].openRate*100).toFixed(2))
- // (this.openRate * 100).toFixed(2)
- this.utilizationRate.push((this.OpenCloseList[i].utilizationRate*100).toFixed(2))
- this.openLong.push(this.OpenCloseList[i].openLong)
- this.closeLong.push(this.OpenCloseList[i].closeLong)
- }
- compAnalBarOption1.xAxis[0].data = this.equipmentList
- compAnalBarOption1.series[0].data = this.openRate
- compAnalBarOption1.series[1].data = this.utilizationRate
- compAnalBarOption2.xAxis[0].data = this.equipmentList
- compAnalBarOption2.series[0].data = this.openLong
- compAnalBarOption2.series[1].data = this.closeLong
- compAnalBar1.setOption(compAnalBarOption1);
- compAnalBar2.setOption(compAnalBarOption2);
- }else{
- compAnalBar1.setOption(compAnalBarOption1);
- compAnalBar2.setOption(compAnalBarOption2);
}
- window.addEventListener('resize', function() {
- compAnalBar1.resize()
- compAnalBar2.resize()
- })
+ console.log('dataList', this.dataList)
+ if (this.dataList != null) {
+ const equipmentList = this.dataList.map(item => item.equipmentId)
+ const openRate = this.dataList.map(item => (item.openRate * 100).toFixed(2))
+ const utilizationRate = this.dataList.map(item => (item.utilizationRate * 100).toFixed(2))
+ const openLong = this.dataList.map(item => item.openLong)
+ const closeLong = this.dataList.map(item => item.closeLong)
+
+ compAnalBarOption1.xAxis[0].data = equipmentList
+ compAnalBarOption1.series[0].data = openRate
+ compAnalBarOption1.series[1].data = utilizationRate
+
+ compAnalBarOption2.xAxis[0].data = equipmentList
+ compAnalBarOption2.series[0].data = openLong
+ compAnalBarOption2.series[1].data = closeLong
+ }
+ this.compAnalBar1.setOption(compAnalBarOption1,true)
+ this.compAnalBar2.setOption(compAnalBarOption2,true)
+ },
+
+ handleWindowResize() {
+ this.compAnalBar1.resize()
+ this.compAnalBar2.resize()
}
}
}
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue b/src/views/mdc/base/modules/comparativeAnalysis/ComparativeAnalysisMain.vue
index 32121ec..c6f8d44 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="5" :sm="5">
<a-space>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
@@ -47,7 +39,7 @@
</div>
<!-- table鍖哄煙-begin -->
<div id="DeviceList">
- <a-tabs :activeKey="activeKey" @change="tabChange" tabPosition="top">
+ <a-tabs>
<a-tab-pane key="1" tab="鍥惧舰">
<ComparativeAnalysisBar ref="AnalysisBar" :dataList='AnalysisBarList'></ComparativeAnalysisBar>
</a-tab-pane>
@@ -68,43 +60,24 @@
<script>
import moment from 'moment'
- import $ from 'jquery'
- import JDictSelectTag from '@/components/dict/JDictSelectTag'
- import JDate from '../../../../../components/jeecg/JDate'
- import {
- requestPut,
- deleteAction,
- getAction
- } from '@/api/manage'
+ import { getAction } from '@/api/manage'
import ComparativeAnalysisBar from './ComparativeAnalysisBar'
import ComparativeAnalysisGauge from './ComparativeAnalysisGauge'
import ComparativeAnalysisPie from './ComparativeAnalysisPie'
- import '@/components/table2excel/table2excel'
- import JInput from '@/components/jeecg/JInput'
- import JEllipsis from '@/components/jeecg/JEllipsis'
- import Tooltip from 'ant-design-vue/es/tooltip'
- import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import api from '@/api/mdc'
import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer.vue'
export default {
name: 'ComparativeAnalysisMain',
- // mixins: [JeecgListMixin],
components: {
- Tooltip,
ComparativeAnalysisBar,
ComparativeAnalysisGauge,
ComparativeAnalysisPie,
- JDictSelectTag,
- JInput,
- JDate,
- JEllipsis,
SelectDeviceDrawer
},
props: { nodeTree: '', Type: '', nodePeople: '' },
data() {
return {
- activeKey: '1',
typeTree: '',
typeParent: 1,
typeEquipment: 1,
@@ -112,15 +85,12 @@
AnalysisGauge: [],
AnalysisPie: [],
dates: [],
- xianshi: '',
- readOnly: true,
queryParam: {
equipmentId: ''
},
queryParams: {},
queryParamEquip: {},
queryParamPeople: {},
- dataStartsoucre: [],
url: {
comparativeAnalysis: '/mdc/efficiencyReport/comparativeAnalysis'
},
@@ -132,19 +102,16 @@
Type(valmath) {
this.dataList = []
this.queryParams.typeTree = valmath
- // console.log(this.queryParams.typeTree)
},
nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
if (JSON.stringify(val) != '{}') {
if (val.equipmentId) {
- // this.$set(this.queryParam, 'tierName', val.title)
this.queryParamEquip.parentId = ''
- // this.queryParams.equipmentId = val.equipmentId
this.queryParam.equipmentId = val.equipmentId
this.queryParamEquip.equipmentId = val.equipmentId
} else {
- // this.$set(this.queryParam, 'tierName', val.title)
this.queryParamEquip.parentId = val.key
+ this.queryParam.equipmentId = ''
this.queryParams.equipmentId = ''
}
this.searchQuery()
@@ -167,71 +134,63 @@
}
},
methods: {
- 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) {
- 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)
- }
- }).finally(() => {
- 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) => {
+ 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
- })
+ this.$message.warning(res.message)
}
- }).finally(() => {
+ })
+ .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 = []
@@ -277,7 +236,9 @@
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.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
this.queryParams.typeTree = this.typeTree
this.queryParams.parentId = this.typeParent
if (this.queryParams.parentId != '') {
@@ -307,6 +268,7 @@
})
}
},
+
/**
* 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
*/
@@ -315,6 +277,7 @@
this.driveTypeList = res.result.map(item => item.value)
})
},
+
/**
* 鑱旀兂杈撳叆妗嗙瓫閫夊姛鑳�
* @param input 杈撳叆鐨勫唴瀹�
@@ -326,119 +289,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 +302,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)
@@ -472,8 +319,6 @@
</script>
<style lang="less" scoped>
- /*@import '~@assets/less/common.less';*/
-
@media screen and (min-width: 1920px) {
.device_list {
height: 811px !important;
@@ -509,12 +354,6 @@
}
}
- /*.device_list{*/
- /*display: flex;*/
- /*}*/
- /*.device_list .table-page-search-wrapper{*/
- /**/
- /*}*/
/deep/ .ant-card-body {
height: 100% !important;
}
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
index 250d167..3c1820f 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
@@ -62,15 +62,11 @@
import { filterObj } from '@/utils/util'
import { putAction, getAction } from '@/api/manage'
import DeviceCalendarModel from './DeviceCalendarModel'
- import DeviceCalendarAdd from './DeviceCalendarAdd'
- import DeviceCalendarListModel from './DeviceCalendarListModel'
- import {
- JeecgListMixin
- } from '@/mixins/JeecgListMixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'DeviceCalendarList',
- components: { DeviceCalendarModel, DeviceCalendarAdd, DeviceCalendarListModel },
+ components: { DeviceCalendarModel },
mixins: [JeecgListMixin],
data() {
return {
@@ -106,7 +102,7 @@
width: 150
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
dataIndex: 'equipmentName',
width: 150
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index 2a5c4e1..2453376 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -15,8 +15,8 @@
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="瀹夎浣嶇疆">
+ <a-input placeholder="杈撳叆瀹夎浣嶇疆鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="2" :sm="2" :xs="2">
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 64f0cbd..02e671e 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -5,23 +5,9 @@
<a-form :form="form">
<a-row :gutter="24">
<a-col :span="24">
- <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"-->
- <!--@search="deviceSearch" enter-button/>-->
- <!--<!–<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"–>-->
- <!--<!–v-decorator="['equipmentId',validatorRules.equipmentId]"/>–>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
- <!--v-decorator="['equipmentName',validatorRules.equipmentName]"/>-->
- <!--</a-form-item>-->
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
@search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
- <!--<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
- <!--v-decorator="['equipmentId',validatorRules.equipmentId]"/>-->
</a-form-item>
</a-col>
</a-row>
@@ -63,15 +49,6 @@
</a-form-item>
</a-col>
</a-row>
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item v-show="this.mesag == 1" label="缁翠慨绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="璇烽�夋嫨璁惧绫诲瀷"-->
- <!--:triggerChange="true"-->
- <!--v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
</a-form>
</a-spin>
<select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
index e1ac1e5..aa46215 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
@@ -5,34 +5,12 @@
<a-form :form="form">
<a-row :gutter="24">
<a-col :span="24">
- <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"-->
- <!--@search="deviceSearch" enter-button/>-->
- <!--<!–<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"–>-->
- <!--<!–v-decorator="['equipmentId',validatorRules.equipmentId]"/>–>-->
- <!--</a-form-item>-->
<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
@search="deviceSearch" enter-button/>
- <!--<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
- <!--v-decorator="['equipmentId',validatorRules.equipmentId]"/>-->
</a-form-item>
</a-col>
- <!--<a-col :span="12">-->
- <!--<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
- <!--v-decorator="['equipmentName',validatorRules.equipmentName]"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
</a-row>
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="24">-->
- <!--<a-form-item label="璁惧鍚嶇О" :labelCol="labelColLong" :wrapperCol="wrapperColLong">-->
- <!--<a-input :readOnly="true" v-decorator="['equipmentName', validatorRules.equipmentName]"-->
- <!--enter-button/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 71275b7..cb17612 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -82,7 +82,7 @@
<th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</th>
- <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О</th>
+ <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">瀹夎浣嶇疆</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 08ebed5..a114324 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -93,7 +93,7 @@
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
</th>
- <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
+ <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">瀹夎浣嶇疆
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</th>
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index fdc245e..484ba64 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -108,7 +108,7 @@
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
</th>
- <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
+ <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">瀹夎浣嶇疆
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</th>
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 1c02197..6a1deca 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -9,7 +9,7 @@
<a-row :gutter="24">
<a-col :md="8" :sm="8">
<a-form-item label="杞﹂棿鍚嶇О" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19}">
- <a-input placeholder="" v-model="queryParam.workshopName"></a-input>
+ <a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.workshopName"></a-input>
</a-form-item>
</a-col>
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -85,7 +85,7 @@
<a-row :gutter="24">
<a-col :md="12" :sm="12">
<a-form-item label="缁熶竴缂栫爜">
- <a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam2.equipmentId"></a-input>
</a-form-item>
</a-col>
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -252,7 +252,7 @@
width: 120,
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
width: 100,
dataIndex: 'equipmentName',
diff --git a/src/views/system/modules/ProductionManager/ProductionEquipment.vue b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
index 6227bb9..116555e 100644
--- a/src/views/system/modules/ProductionManager/ProductionEquipment.vue
+++ b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
@@ -96,7 +96,7 @@
// sorter: true
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: "center",
width: 150,
dataIndex: 'equipmentName',
--
Gitblit v1.9.3