From be590d48f66806716c990bdce18d0ed90bf18797 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 04 三月 2025 15:52:28 +0800
Subject: [PATCH] 420项目： 1、大屏车间管理页面新增及编辑时随意输入车间名称调整为选择已有车间 2、增加车间看板拖拽及缩放功能权限功能 3、实现车间看板设备状态数量及图表数据由后台驱动 4、车间看板页面月、周、日利用率图表数据由后台驱动 5、车间看板页面报警信息列表数据由后台驱动 6、车间看板页面调整右侧设备状态判定，同时加入异常状态展示（设备编号背景色变为红色）
---
src/views/system/WorkshopSignageManagement.vue | 15
src/views/mdc/base/WorkshopSignageEntrance.vue | 8
src/views/mdc/base/modules/WorkshopSignage/MonthUtilizationRateTrend.vue | 598 -----
src/views/mdc/base/modules/WorkshopSignage/DayUtilizationRateTrend.vue | 367 ---
src/views/mdc/base/modules/WorkshopSignage/WeekUtilizationRateTrend.vue | 540 -----
src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue | 128
src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue | 217 -
/dev/null | 0
src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue | 25
src/views/mdc/base/WorkshopSignage.vue | 4037 ---------------------------------------
src/api/mdc.js | 27
src/config/router.config.js | 2
src/views/system/modules/WorkshopModal.vue | 61
src/api/signage.js | 30
14 files changed, 322 insertions(+), 5,733 deletions(-)
diff --git a/src/api/mdc.js b/src/api/mdc.js
index c4d8c62..5d8f855 100644
--- a/src/api/mdc.js
+++ b/src/api/mdc.js
@@ -3,33 +3,6 @@
export default {
// 鑾峰彇鎺у埗绯荤粺绫诲瀷
getDriveTypeApi: () => getAction('/mdc/mdcDriveTypeParamConfig/getDriveParamOptions'),
- // -------------------------------------杞﹂棿鐪嬫澘椤甸潰--------------------------------------------
- // 棣栭〉鑾峰彇澶у睆鍏ュ彛杞﹂棿鍒楄〃
- getWorkshopListInHomePageApi: () => getAction('/mdc/mdcWorkshopInfo/getWorkshopList'),
- // 鏍规嵁杞﹂棿id鏌ヨ璁惧鍒楄〃
- getDeviceListByWorkshopIdApi: params => getAction('/mdc/mdcWorkshopInfo/workshopEquipmentList', params),
- // 鏍规嵁杞﹂棿id鏌ヨ杞﹂棿璇︾粏淇℃伅
- getWorkshopDetailByWorkshopIdApi: id => getAction('/mdc/mdcWorkshopInfo/queryById', { id }),
- // 鏍规嵁杞﹂棿id鏌ヨ澶у睆淇℃伅
- getDeviceListInWorkshopSignagePageApi: workshopId => getAction('/mdc/mdcWorkshopInfo/getBigScreenInfo', { workshopId }),
- // 淇濆瓨澶у睆杞﹂棿璁惧鍧愭爣澶у皬淇℃伅
- saveDevicePositionAndSizeApi: params => putAction('/mdc/mdcWorkshopInfo/saveEquipmentCoordinate', params),
- // 鏌ヨ杞﹂棿鍒楄〃
- getWorkshopListApi: params => getAction('/mdc/mdcWorkshopInfo/list', params),
- // 鏂板杞﹂棿淇℃伅
- addWorkshopApi: params => postAction('/mdc/mdcWorkshopInfo/add', params),
- // 缂栬緫杞﹂棿淇℃伅
- editWorkshopApi: params => putAction('/mdc/mdcWorkshopInfo/edit', params),
- // 鍒犻櫎鍗曚釜杞﹂棿淇℃伅
- deleteSingleWorkshopApi: id => deleteAction('/mdc/mdcWorkshopInfo/delete', { id }),
- // 鎵归噺鍒犻櫎杞﹂棿淇℃伅
- deleteBatchWorkshopApi: ids => deleteAction('/mdc/mdcWorkshopInfo/deleteBatch', { ids }),
- // 鏂板澶у睆杞﹂棿鍜岃澶囧叧绯�
- addDeviceInWorkshopApi: params => postAction('/mdc/mdcWorkshopInfo/addWorkshopEquipment', params),
- // 鍒犻櫎鍗曚釜澶у睆杞﹂棿鍜岃澶囧叧绯�
- deleteSingleDeviceInWorkshopApi: params => deleteAction('/mdc/mdcWorkshopInfo/deleteWorkshopEquipment', params),
- // 鎵归噺鍒犻櫎澶у睆杞﹂棿鍜岃澶囧叧绯�
- deleteBatchDeviceInWorkshopApi: params => deleteAction('/mdc/mdcWorkshopInfo/deleteWorkshopEquipmentBatch', params),
// -------------------------------------璁惧鍙傛暟闃堝�肩鐞嗛〉闈�--------------------------------------------
// 鏍规嵁椹卞姩绫诲瀷鑾峰彇鍙傛暟
getParamListByDriveTypeApi: controlSystemType => getAction(`/mdc/mdcDriveTypeParamConfig/getDriveParamOptionsByType?controlSystemType=${controlSystemType}`),
diff --git a/src/api/signage.js b/src/api/signage.js
index 9c59662..b67808a 100644
--- a/src/api/signage.js
+++ b/src/api/signage.js
@@ -3,28 +3,26 @@
export default {
// 棣栭〉鑾峰彇澶у睆鍏ュ彛杞﹂棿鍒楄〃
getWorkshopListInHomePageApi: () => getAction('/mdc/mdcWorkshopInfo/getWorkshopList'),
- // 鏍规嵁杞﹂棿id鏌ヨ璁惧鍒楄〃
- getDeviceListByWorkshopIdApi: params => getAction('/mdc/mdcWorkshopInfo/workshopEquipmentList', params),
// 鏍规嵁杞﹂棿id鏌ヨ杞﹂棿璇︾粏淇℃伅
- getWorkshopDetailByWorkshopIdApi: id => getAction('/mdc/mdcWorkshopInfo/queryById', { id }),
+ getWorkshopDetailByWorkshopIdApi: productionId => getAction('/mdc/mdcWorkshopInfo/queryByProductionId', { productionId }),
// 鏍规嵁杞﹂棿id鏌ヨ澶у睆淇℃伅
- getDeviceListInWorkshopSignagePageApi: workshopId => getAction('/mdc/mdcWorkshopInfo/getBigScreenInfo', { workshopId }),
+ getDeviceListInWorkshopSignagePageApi: productionId => getAction('/mdc/mdcWorkshopInfo/getBigScreenInfo', { productionId }),
+ // 鏍规嵁杞﹂棿id鏌ヨ褰撳墠杞﹂棿鎵�鏈夎澶囩殑鐘舵�佹暟閲�
+ getDeviceStatusCountApi: productionId => getAction('/mdc/largeScreen/equipmentStatusOverview', { productionId }),
+ // 鏍规嵁杞﹂棿id鏌ヨ褰撳墠杞﹂棿 鏈� 鍒╃敤鐜囪秼鍔�
+ getMonthUtilizationRateApi: productionId => getAction('/mdc/largeScreen/monthUtilizationTendency', { productionId }),
+ // 鏍规嵁杞﹂棿id鏌ヨ褰撳墠杞﹂棿 鍛� 鍒╃敤鐜囪秼鍔�
+ getWeekUtilizationRateApi: productionId => getAction('/mdc/largeScreen/weekUtilizationTendency', { productionId }),
+ // 鏍规嵁杞﹂棿id鏌ヨ褰撳墠杞﹂棿 鏃� 鍒╃敤鐜囪秼鍔�
+ getDayUtilizationRateApi: productionId => getAction('/mdc/largeScreen/dayUtilizationTendency', { productionId }),
+ // 鏍规嵁杞﹂棿id鏌ヨ褰撳墠杞﹂棿璁惧鎶ヨ淇℃伅
+ getWorkshopAlarmInfoApi: productionId => getAction('/mdc/largeScreen/getAlarmInfo', { productionId }),
// 淇濆瓨澶у睆杞﹂棿璁惧鍧愭爣澶у皬淇℃伅
saveDevicePositionAndSizeApi: params => putAction('/mdc/mdcWorkshopInfo/saveEquipmentCoordinate', params),
- // 鏌ヨ杞﹂棿鍒楄〃
- getWorkshopListApi: params => getAction('/mdc/mdcWorkshopInfo/list', params),
// 鏂板杞﹂棿淇℃伅
addWorkshopApi: params => postAction('/mdc/mdcWorkshopInfo/add', params),
// 缂栬緫杞﹂棿淇℃伅
editWorkshopApi: params => putAction('/mdc/mdcWorkshopInfo/edit', params),
- // 鍒犻櫎鍗曚釜杞﹂棿淇℃伅
- deleteSingleWorkshopApi: id => deleteAction('/mdc/mdcWorkshopInfo/delete', { id }),
- // 鎵归噺鍒犻櫎杞﹂棿淇℃伅
- deleteBatchWorkshopApi: ids => deleteAction('/mdc/mdcWorkshopInfo/deleteBatch', { ids }),
- // 鏂板澶у睆杞﹂棿鍜岃澶囧叧绯�
- addDeviceInWorkshopApi: params => postAction('/mdc/mdcWorkshopInfo/addWorkshopEquipment', params),
- // 鍒犻櫎鍗曚釜澶у睆杞﹂棿鍜岃澶囧叧绯�
- deleteSingleDeviceInWorkshopApi: params => deleteAction('/mdc/mdcWorkshopInfo/deleteWorkshopEquipment', params),
- // 鎵归噺鍒犻櫎澶у睆杞﹂棿鍜岃澶囧叧绯�
- deleteBatchDeviceInWorkshopApi: params => deleteAction('/mdc/mdcWorkshopInfo/deleteWorkshopEquipmentBatch', params),
+ // 鑾峰彇浜岀骇杞﹂棿淇℃伅
+ getWorkshopListApi: () => getAction('/mdc/mdcWorkshopInfo/getProductionList')
}
\ No newline at end of file
diff --git a/src/assets/WorskhopSignage/workshop_bg.png b/src/assets/WorskhopSignage/workshop_bg.png
deleted file mode 100644
index b076814..0000000
--- a/src/assets/WorskhopSignage/workshop_bg.png
+++ /dev/null
Binary files differ
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 08b7015..a062932 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -80,7 +80,7 @@
]
},
{
- path: '/WorkshopSignage/:id',
+ path: '/WorkshopSignage/:productionId',
component: () => import('@/views/mdc/base/WorkshopSignage.vue')
},
{
diff --git a/src/views/mdc/base/WorkshopSignage.vue b/src/views/mdc/base/WorkshopSignage.vue
index 2714e16..6db29b2 100644
--- a/src/views/mdc/base/WorkshopSignage.vue
+++ b/src/views/mdc/base/WorkshopSignage.vue
@@ -5,19 +5,21 @@
<div class="left-col">
<div class="col-content">
<div class="content-title">{{workshopDetails.workshopName}}#璁惧鎯呭喌</div>
- <workshop-device-overview :equipmentList="equipmentList" :toDecimal2NoZero="toDecimal2NoZero"/>
+ <workshop-device-overview :currentProductionId="currentProductionId"
+ :equipmentStatusList="equipmentStatusList" :toDecimal2NoZero="toDecimal2NoZero"/>
</div>
<div class="col-content">
<div class="content-title">璁惧鏈堝埄鐢ㄧ巼瓒嬪娍</div>
- <month-utilization-rate-trend :toDecimal2NoZero="toDecimal2NoZero"/>
+ <month-utilization-rate-trend :currentProductionId="currentProductionId"
+ :toDecimal2NoZero="toDecimal2NoZero"/>
</div>
<div class="col-content">
<div class="content-title">璁惧鍛ㄥ埄鐢ㄧ巼瓒嬪娍</div>
- <week-utilization-rate-trend :toDecimal2NoZero="toDecimal2NoZero"/>
+ <week-utilization-rate-trend :currentProductionId="currentProductionId" :toDecimal2NoZero="toDecimal2NoZero"/>
</div>
<div class="col-content">
<div class="content-title">璁惧鏃ュ埄鐢ㄧ巼瓒嬪娍</div>
- <day-utilization-rate-trend :toDecimal2NoZero="toDecimal2NoZero"/>
+ <day-utilization-rate-trend :currentProductionId="currentProductionId" :toDecimal2NoZero="toDecimal2NoZero"/>
</div>
<div class="col-content">
<div class="content-title">璁惧鎶ヨ淇℃伅</div>
@@ -27,68 +29,14 @@
<!--鍙充晶鎷栨嫿鍖哄煙-->
<div class="right-col">
- <VueDragResize
- v-for="(item, index) in deviceList"
- :key="item.equipmentId"
- :w="item.vw"
- :h="item.vh"
- :x="item.coordinateLeft"
- :y="item.coordinateTop"
- v-on:resizing="resize($event, index)"
- v-on:dragging="resize($event, index)"
- :parentLimitation="true"
- :parentH="1065"
- :parentW="1500"
- :minw="70"
- :minh="70"
- :isDraggable="isSwitchChecked"
- :isResizable="isSwitchChecked"
- :stickSize="6"
- @deactivated="isShowGuideline = false"
- >
- <div class="single-device" :style="{ width: item.vw + 'px', height: item.vh + 'px' }">
- <div class="device-status">
- <div
- :style="{ backgroundImage: `url(${getImgView(item.equipmentImage) || require('@/assets/WorskhopSignage/default.png')})` }"
- class="device-image"
- >
- <div
- :style="{ backgroundImage: `url(${getCurrentDeviceStatusImage(item.equipmentStatus)})` }"
- class="status-image"
- ></div>
- </div>
- </div>
- <div
- :style="{ color:workshopDetails.equipmentIdColor?workshopDetails.equipmentIdColor:'#fff',fontWeight:'bold'}">
- {{ item.equipmentId }}
- </div>
- </div>
- </VueDragResize>
-
- <template v-if="isShowGuideline">
- <div class="guideline guidelineX" :style="{top:guidelineXTop+'px'}"></div>
- <div class="guideline guidelineY" :style="{left:guidelineYLeft+'px'}"></div>
- </template>
-
- <a-form layout="inline">
- <a-form-item label="鍔熻兘寮�鍏�">
- <a-switch checked-children="寮�" un-checked-children="鍏�" v-model="isSwitchChecked"
- :disabled="isHasResizeOrDragDevice"/>
- </a-form-item>
-
- <a-form-item label="淇濆瓨鍧愭爣">
- <a-button type="primary" icon="save" @click="saveDevicePositionAndSizeByApi"
- :disabled="!isHasResizeOrDragDevice">淇濆瓨
- </a-button>
- </a-form-item>
- </a-form>
+ <device-drag-layout :currentProductionId="currentProductionId" :equipmentStatusList="equipmentStatusList"
+ :getImgView="getImgView"/>
</div>
</div>
</div>
</template>
<script>
- import VueDragResize from 'vue-drag-resize'
import { getFileAccessHttpUrl } from '@/api/manage'
import signageApi from '@/api/signage'
import WorkshopDeviceOverview from './modules/WorkshopSignage/WorkshopDeviceOverview'
@@ -96,3849 +44,22 @@
import DayUtilizationRateTrend from './modules/WorkshopSignage/DayUtilizationRateTrend'
import MonthUtilizationRateTrend from './modules/WorkshopSignage/MonthUtilizationRateTrend'
import DeviceAlarmInfo from './modules/WorkshopSignage/DeviceAlarmInfo'
+ import DeviceDragLayout from './modules/WorkshopSignage/DeviceDragLayout'
export default {
name: 'WorkshopSignage',
components: {
+ DeviceDragLayout,
DeviceAlarmInfo,
MonthUtilizationRateTrend,
DayUtilizationRateTrend,
WeekUtilizationRateTrend,
WorkshopDeviceOverview,
- VueDragResize
},
data() {
return {
+ currentProductionId: '',
workshopDetails: {}, // 杞﹂棿璇︾粏淇℃伅,
- equipmentList: [
- {
- 'equipmentID': '04ZX001',
- 'equipmentName': '闀楅摚鍔犲伐涓績鍗庝腑鏁版帶',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': null,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'HNC848鍗庝腑鏁版帶',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.195',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_HNC848',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '04ZX002',
- 'equipmentName': 'KHC250-5A',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:22:11',
- 'oporation': 3,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'KHC250-5A',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.96',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_LX_CODE_11',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2103006',
- 'equipmentName': 'CW61100GZ',
- 'factoryID': 'A',
- 'collectTime': '2022-03-02 15:36:15',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CW61100GZ',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.151',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2103013',
- 'equipmentName': 'CW6100GZ',
- 'factoryID': 'A',
- 'collectTime': '2022-03-02 15:36:15',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CW6100GZ',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.152',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2111005',
- 'equipmentName': '鏁版帶钀藉湴杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2022-03-02 15:36:15',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'MK163',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.153',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2111006',
- 'equipmentName': '鏁版帶钀藉湴杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2022-03-02 15:36:15',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'MK163',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.154',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2111019',
- 'equipmentName': '鏁版帶钀藉湴杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2021-04-25 14:32:11',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'MK163',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.155',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2112004',
- 'equipmentName': '鏁版帶绔嬪紡杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2021-04-25 14:32:11',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CK5112',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.156',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2112039',
- 'equipmentName': '鏁版帶绔嬪紡杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2021-04-25 14:32:11',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'C5112',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.157',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_8',
- 'name': '8-D绉戠爺宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '8-D绉戠爺宸ユ',
- 'sortType': 8
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '8-D绉戠爺宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2112044',
- 'equipmentName': '鏁版帶绔嬪紡杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-04-22 15:44:50',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'C5120C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.158',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 1,
- 'maintainType': 2,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2112051',
- 'equipmentName': '鏁版帶钀藉湴杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2021-04-25 14:32:11',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'C5112A',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.159',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140005',
- 'equipmentName': '鍙屾煴鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-07 17:31:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5225F',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.160',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140006',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-07 17:31:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CK5120A',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.161',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_2140006',
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140024',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-07 17:31:04',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'SVT160*10/8-NC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.164',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140026',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:21:59',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.165',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140027',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:22:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.166',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140035',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:22:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.167',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140036',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:22:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.168',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140039',
- 'equipmentName': '鍗曟煴鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:30:55',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5116B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.169',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140044',
- 'equipmentName': '鏁版帶鍗曟煴绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:22:29',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CK5116B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.171',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140069',
- 'equipmentName': '鏁版帶绔嬪紡杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:38:56',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'GTC315125',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.172',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_8',
- 'name': '8-D绉戠爺宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '8-D绉戠爺宸ユ',
- 'sortType': 8
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '8-D绉戠爺宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140072',
- 'equipmentName': '鍗曟煴鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:38:47',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CK5120B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.173',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140079',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 15:13:39',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CK5125B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.174',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_8',
- 'name': '8-D绉戠爺宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '8-D绉戠爺宸ユ',
- 'sortType': 8
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '8-D绉戠爺宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140085',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'YV-1200ATC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.35',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140085',
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140099',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VTL-1600ATC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.37',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140099',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 2,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140100',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VTL-1600ATC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.38',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140100',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140101',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VTL-1600ATC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.39',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140101',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140102',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VTL-1600ATC',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.40',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140102',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2140110',
- 'equipmentName': '鏁版帶杞﹀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'HTC100140',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.204',
- 'driveType': 'SIEMENS828D',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS828D',
- 'saveTableName': 'SIEMENS828D_2140110',
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240004',
- 'equipmentName': '榫欓棬闀楅摚搴�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:39:18',
- 'oporation': 1,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'XKAD2420/1',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.175',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240058',
- 'equipmentName': '鏁版帶閾ｅ墛涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:01:53',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'DMC125U',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.199',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_2240058',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240064',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 3,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VMC1500',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.47',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_2240064',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240070',
- 'equipmentName': '绔嬪紡杞﹀墛鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 10:06:50',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5120B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.177',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240071',
- 'equipmentName': '绔嬪紡杞﹀墛鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:28:43',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5120B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.178',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2240078',
- 'equipmentName': '浠垮舰闀楅摚搴�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:12:22',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'WF2/10G50-K',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.179',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 2,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2603011',
- 'equipmentName': '鏁版帶鍧愭爣闀楀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 15:47:57',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'TK4163',
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.180',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_9',
- 'name': '鐢熶骇瀹�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '鐢熶骇瀹�',
- 'sortType': 9
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '鐢熶骇瀹�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2640002',
- 'equipmentName': '鏁版帶鍧愭爣闀楀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '10621',
- 'fixLocation': null,
- 'equipmentModel': 'TGK42100',
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.53',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_2640002',
- 'beltline': {
- 'number': 'A_9',
- 'name': '鐢熶骇瀹�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '鐢熶骇瀹�',
- 'sortType': 9
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '鐢熶骇瀹�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2640004',
- 'equipmentName': '鏁版帶闀楀簥',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'TK42100/2',
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.54',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_2640004',
- 'beltline': {
- 'number': 'A_9',
- 'name': '鐢熶骇瀹�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '鐢熶骇瀹�',
- 'sortType': 9
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '鐢熶骇瀹�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2640006',
- 'equipmentName': 'CF63',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'CF63',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.55',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_2640006',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '2740010',
- 'equipmentName': '鏁版帶鍐呭渾绔嬪紡纾ㄥ簥',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:39:36',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'MK2880L',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.181',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_9',
- 'name': '鐢熶骇瀹�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '鐢熶骇瀹�',
- 'sortType': 9
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '鐢熶骇瀹�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140018',
- 'equipmentName': '绾垮垏鍓�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-26 00:00:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'HCKX630C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.182',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_3140018',
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 2,
- 'maintainType': 2,
- 'operator': 'admin',
- 'operatingTime': '2020-03-30 17:04:38',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140019',
- 'equipmentName': '鐢电伀鑺辨垚鍨嬫満',
- 'factoryID': 'A',
- 'collectTime': '2019-11-04 17:39:17',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'NX8-AM',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140023',
- 'equipmentName': '绾垮垏鍓�',
- 'factoryID': 'A',
- 'collectTime': '2019-04-24 00:12:05',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'DK77100',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.183',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_3140023',
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140027',
- 'equipmentName': '鏀剧數閾ｅ墛鏈�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:13:13',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'ZT-029',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.184',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140032',
- 'equipmentName': '鏀剧數閾ｅ墛鏈�',
- 'factoryID': 'A',
- 'collectTime': '2018-11-28 09:50:17',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'ZT-029',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.185',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140039',
- 'equipmentName': '鐢电伀鑺变笓鏈�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:13:13',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'SE-HC001',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.186',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140044',
- 'equipmentName': '鐢电伀鑺卞皬瀛旀満搴�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:13:14',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'ZT-018C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.188',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140045',
- 'equipmentName': '鐢电伀鑺辫渹绐濈（搴�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 12:13:14',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'ZT-021C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.189',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140046',
- 'equipmentName': '鐢电伀鑺辨満搴�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 15:28:50',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'SE-HC001',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.190',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140052',
- 'equipmentName': '鐢电伀鑺变笓鏈�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:37:48',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CT900FX',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.192',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_3140052',
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140054',
- 'equipmentName': '鐢电伀鑺变笓鏈�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-15 18:39:34',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'NX8-AM',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.193',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_3140054',
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140055',
- 'equipmentName': '鐢电伀鑺变笓鏈�',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 14:59:46',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'NX8-AM',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.194',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': 'ZUOLAN_3140055',
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140059',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': null,
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140066',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': null,
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3140070',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': null,
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650001',
- 'equipmentName': '鏁版帶鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'H6C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.66',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650001',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650005',
- 'equipmentName': '鍗曚綇绔嬪紡杞﹀墛涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:34:14',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.191',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650014',
- 'equipmentName': 'TH65100',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 16:36:28',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'TH65100',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.200',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': '',
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650031',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-05-16 13:03:52',
- 'oporation': 2,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'V850',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.198',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': '',
- 'saveTableName': '',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650032',
- 'equipmentName': 'THM63100',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '10621',
- 'fixLocation': null,
- 'equipmentModel': 'THM63100',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.70',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650032',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650035',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VMC1250',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.71',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650035',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650041',
- 'equipmentName': '鍗у紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'TH65125',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.72',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650041',
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650064',
- 'equipmentName': '浜斿潗鏍囧姞宸ヤ腑蹇�',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'TRT314HS',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.74',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650064',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650087',
- 'equipmentName': '浜斿潗鏍囧姞宸ヤ腑蹇�',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU125P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.76',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650087',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650114',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-04 17:37:17',
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'STC1250/130',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650115',
- 'equipmentName': '绮惧瘑鍗у紡浜旇酱鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'THM63120IV',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.78',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650115',
- 'beltline': {
- 'number': 'A_8',
- 'name': '8-D绉戠爺宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '8-D绉戠爺宸ユ',
- 'sortType': 8
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '8-D绉戠爺宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650116',
- 'equipmentName': '鏁版帶浜斿潗鏍囧姞宸ヤ腑蹇�',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '25040',
- 'fixLocation': null,
- 'equipmentModel': 'TRT314HS',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.79',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650116',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650117',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VMC1250',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.80',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840D',
- 'saveTableName': 'SIEMENS840D_3650117',
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650125',
- 'equipmentName': '鍗у紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'TH65140',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.81',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650125',
- 'beltline': {
- 'number': 'A_10',
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': 'JD-2鍐涘搧鏈哄姞',
- 'sortType': 10
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': 'JD-2鍐涘搧鏈哄姞',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650127',
- 'equipmentName': '绔嬪紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'VMC1250',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.82',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650127',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650135',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU 100 monoBLOCK',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.84',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650135',
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650168',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU 160P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.85',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650168',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650169',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU 160P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.86',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650169',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650170',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU 125P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.87',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650170',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650175',
- 'equipmentName': '鍥涜酱鍗у紡鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:01',
- 'oporation': 0,
- 'alarm': '454',
- 'fixLocation': null,
- 'equipmentModel': 'HM635',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.88',
- 'driveType': 'FANUC',
- 'dataPort': '8193',
- 'controlSystem': 'FANUC',
- 'saveTableName': 'FANUC_3650175',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650177',
- 'equipmentName': '鏁版帶绔嬭溅',
- 'factoryID': 'A',
- 'collectTime': '2021-06-23 10:22:02',
- 'oporation': 0,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': 'CH5112B',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.168',
- 'driveType': 'ZUOLAN',
- 'dataPort': '502',
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650184',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU125P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.89',
- 'driveType': 'SIEMENS840D',
- 'dataPort': '8899',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840D_3650184',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650207',
- 'equipmentName': 'CHIRON',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'CHIRON',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.90',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650207',
- 'beltline': {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '5-D CRIC鍗曞厓',
- 'sortType': 5
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '5-D CRIC鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650212',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'SPK1300X',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.91',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650212',
- 'beltline': {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'sortType': 3
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650214',
- 'equipmentName': '榫欓棬寮忓姞宸ヤ腑蹇�',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'DMU270P',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.92',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650214',
- 'beltline': {
- 'number': 'A_6',
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '6-D椋庢墖鍗曞厓',
- 'sortType': 6
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '6-D椋庢墖鍗曞厓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650215',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'MX10',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.93',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650215',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650216',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'THS-120-TILT',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.94',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650216',
- 'beltline': {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'sortType': 2
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '2-D鏁翠綋鏈哄專',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650217',
- 'equipmentName': '闀楅摚鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'MX12',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.95',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650217',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650218',
- 'equipmentName': 'SPARK2100',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'SPARK2100',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.97',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650218',
- 'beltline': {
- 'number': 'A_8',
- 'name': '8-D绉戠爺宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '8-D绉戠爺宸ユ',
- 'sortType': 8
- },
- 'isImportant': 2,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '8-D绉戠爺宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650228',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 22,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': null,
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'B_2',
- 'name': '鍥涘伐娈�',
- 'factoryInfo': {
- 'factoryId': 'B',
- 'factoryName': '鍥涘巶'
- },
- 'fullName': '鍥涘伐娈�',
- 'sortType': null
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '鍥涘伐娈�',
- 'factoryName': '鍥涘巶',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '3650234',
- 'equipmentName': '鏁版帶鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': '2019-11-01 10:30:30',
- 'oporation': 0,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': 'H6C',
- 'equipmentClassify': null,
- 'remark': 'A',
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': '10.103.30.66',
- 'driveType': 'SIEMENS840DSL',
- 'dataPort': '8888',
- 'controlSystem': 'SIEMENS840DSL',
- 'saveTableName': 'SIEMENS840DSL_3650001',
- 'beltline': {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'sortType': 4
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': '4340020',
- 'equipmentName': '鍔犲伐涓績',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': null,
- 'alarm': '',
- 'fixLocation': null,
- 'equipmentModel': '',
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': 'machine',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': 'ZL0001',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': '',
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- },
- {
- 'equipmentID': 'ZL0011',
- 'equipmentName': '璁惧',
- 'factoryID': 'A',
- 'collectTime': null,
- 'oporation': 3,
- 'alarm': null,
- 'fixLocation': null,
- 'equipmentModel': null,
- 'equipmentClassify': null,
- 'remark': null,
- 'equipmentType': null,
- 'equipmentLocation': null,
- 'equipmentData': null,
- 'equipmentIP': null,
- 'driveType': null,
- 'dataPort': null,
- 'controlSystem': null,
- 'saveTableName': null,
- 'beltline': {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryInfo': {
- 'factoryId': 'A',
- 'factoryName': '涓�鍘�'
- },
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'sortType': 1
- },
- 'isImportant': 1,
- 'maintainType': 1,
- 'operator': null,
- 'operatingTime': null,
- 'name': '1-D鐗圭宸ヨ壓',
- 'factoryName': '涓�鍘�',
- 'number': null,
- 'beltlineID': null,
- 'idlingType': null,
- 'idleType': null,
- 'alarmNo': null,
- 'alarmContent': null,
- 'productCount': null
- }
- ],
equipmentStatusList: [
{
label: '姝ｅ父杩愯',
@@ -3961,44 +82,7 @@
statusImage: require('@/assets/WorskhopSignage/stateImg_gray.gif')
}
],
- deviceList: [
- {
- equipmentId: '105843145',
- equipmentStatus: 3,
- equipmentImage: '',
- vw: 112,
- vh: 142,
- coordinateLeft: 500,
- coordinateTop: 800
- },
- {
- equipmentId: '42342152',
- equipmentStatus: 2,
- equipmentImage: '',
- vw: 112,
- vh: 232,
- coordinateLeft: 400,
- coordinateTop: 100
- },
- {
- equipmentId: '5646434',
- equipmentStatus: 22,
- equipmentImage: '',
- vw: 231,
- vh: 121,
- coordinateLeft: 200,
- coordinateTop: 500
- },
- {
- equipmentId: '213125643',
- equipmentStatus: 0,
- equipmentImage: '',
- vw: 233,
- vh: 213,
- coordinateLeft: 600,
- coordinateTop: 300
- }
- ],
+ deviceList: [],
isShowGuideline: false,
guidelineXTop: 0,
guidelineYLeft: 0,
@@ -4006,78 +90,26 @@
isHasResizeOrDragDevice: false
}
},
+ created() {
+ if (!this.$route.params.productionId) return
+ this.currentProductionId = this.$route.params.productionId
+ },
mounted() {
- if (this.$route.params.id) {
- this.getDeviceListByApi(this.$route.params.id)
- this.getWorkshopDetailsByApi(this.$route.params.id)
- }
+ this.getWorkshopDetailsByApi()
},
methods: {
- /**
- * 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇璁惧淇℃伅鍒楄〃
- * @param id 杞﹂棿Id
- */
- getDeviceListByApi(id) {
- signageApi.getDeviceListInWorkshopSignagePageApi(id).then((res) => {
- if (res.result && res.result.length > 0) {
- this.deviceList = res.result
- }
- })
- },
-
- /**
- * 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇杞﹂棿璇︾粏淇℃伅
- * @param id 杞﹂棿Id
- */
- getWorkshopDetailsByApi(id) {
- signageApi.getWorkshopDetailByWorkshopIdApi(id).then((res) => {
+ // 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇杞﹂棿璇︾粏淇℃伅
+ getWorkshopDetailsByApi() {
+ const that = this
+ signageApi.getWorkshopDetailByWorkshopIdApi(that.currentProductionId).then((res) => {
if (!res.success) return
- this.workshopDetails = res.result ? res.result : {}
+ that.workshopDetails = res.result ? res.result : {}
let workshopDrawingArea = document.querySelector('.right-col')
- workshopDrawingArea.style.backgroundImage = `url(${this.getImgView(this.workshopDetails.backgroundImage)})`
+ workshopDrawingArea.style.backgroundImage = `url(${this.getImgView(that.workshopDetails.backgroundImage)})`
})
},
- /**
- * 璁惧鎷栨嫿鎴栫缉鏀炬椂瑙﹀彂浜嬩欢
- * @param newRect 鎷栨嫿鎴栫缉鏀惧悗鐨勫昂瀵稿強璺濈
- * @param index 鎷栨嫿璁惧鍦ㄦ暟缁勪腑鐨勪笅鏍�
- */
- resize(newRect, index) {
- this.isShowGuideline = true
- // 褰撹澶囩缉鏀炬垨鎷栨嫿鍚庣鐢╯witch缁勪欢骞跺紑鏀句繚瀛樻寜閽姛鑳斤紙閬垮厤鏃犳晥璇锋眰锛�
- if (!this.isHasResizeOrDragDevice) {
- if (this.deviceList[index].vw !== newRect.width || this.deviceList[index].vh !== newRect.height || this.deviceList[index].coordinateTop !== newRect.top || this.deviceList[index].coordinateLeft !== newRect.left) {
- this.isHasResizeOrDragDevice = true
- console.log('newRect------', newRect)
- }
- }
- // this.isHasResizeOrDragDevice = true
- this.deviceList[index].vw = newRect.width
- this.deviceList[index].vh = newRect.height
- this.deviceList[index].coordinateTop = newRect.top
- this.deviceList[index].coordinateLeft = newRect.left
- this.guidelineXTop = newRect.top + newRect.height / 2
- this.guidelineYLeft = newRect.left + newRect.width / 2
- },
-
- /**
- * 鐐瑰嚮淇濆瓨鎸夐挳璋冪敤鎺ュ彛淇濆瓨鎷栨嫿鍚庣殑浣嶇疆涓庤澶囧浘鏍囧昂瀵�
- */
- saveDevicePositionAndSizeByApi() {
- signageApi.saveDevicePositionAndSizeApi(this.deviceList).then((res) => {
- if (res.code === 200) {
- this.$notification.success({
- message: '娑堟伅',
- description: res.message
- })
- this.isSwitchChecked = this.isHasResizeOrDragDevice = false
- this.getDeviceListByApi(this.$route.params.id)
- }
- })
- },
-
- //淇濈暀涓や綅灏忔暟
+ // 淇濈暀涓や綅灏忔暟
toDecimal2NoZero(x) {
const f = Math.round(x * 100) / 100
return f.toString()
@@ -4092,11 +124,6 @@
text = text.substring(0, text.indexOf(','))
}
return getFileAccessHttpUrl(text)
- },
-
- getCurrentDeviceStatusImage(status) {
- const currentStatus = this.equipmentStatusList.find(item => item.value.includes(status))
- return currentStatus.statusImage
}
}
}
@@ -4113,8 +140,8 @@
font-family: '寰蒋闆呴粦';
.container {
- width: 99%;
- height: 99%;
+ width: 100%;
+ height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
@@ -4124,6 +151,7 @@
flex: 1;
height: 100%;
display: flex;
+ padding: 0.5%;
flex-direction: column;
justify-content: space-between;
@@ -4169,8 +197,7 @@
.right-col {
position: relative;
width: 1500px;
- height: 1065px;
- margin-left: 0.5%;
+ height: 1080px;
/*background-image: url("../../../assets/WorskhopSignage/103.png");*/
background-color: #000;
background-size: 100% 100%;
@@ -4218,6 +245,12 @@
}
}
}
+
+ & > div:last-child {
+ color: #fff;
+ font-weight: bold;
+ font-size: 0.6vw;
+ }
}
.guideline {
@@ -4238,7 +271,7 @@
form {
position: absolute;
right: 0;
- bottom: 0;
+ bottom: 0.5%;
label {
color: #fff;
diff --git a/src/views/mdc/base/WorkshopSignageEntrance.vue b/src/views/mdc/base/WorkshopSignageEntrance.vue
index 75a402b..dc4d39f 100644
--- a/src/views/mdc/base/WorkshopSignageEntrance.vue
+++ b/src/views/mdc/base/WorkshopSignageEntrance.vue
@@ -4,7 +4,7 @@
:grid="{ gutter: [{xs: 0, sm: 24, md: 24, lg: 56, xl: 64, xxl: 80},20], xs: 1, sm: 2, md: 2, lg: 3, xl: 4, xxl: 4 }"
:data-source="workshopList">
<a-list-item slot="renderItem" slot-scope="item, index">
- <div class="workshop-name" @click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}</div>
+ <div class="workshop-name" @click="navigateToWorkshopSignage(item.productionId)">{{item.workshopName}}</div>
</a-list-item>
</a-list>
</div>
@@ -27,10 +27,10 @@
methods: {
/**
* 閫氳繃杞﹂棿Id璺宠浆鑷崇浉搴旇溅闂村ぇ灞忕湅鏉�
- * @param id 杞﹂棿Id
+ * @param productionId 杞﹂棿Id
*/
- navigateToWorkshopSignage(id) {
- const url = this.$router.resolve(`/WorkshopSignage/${id}`).href
+ navigateToWorkshopSignage(productionId) {
+ const url = this.$router.resolve(`/WorkshopSignage/${productionId}`).href
window.open(url, '_blank')
},
/**
diff --git a/src/views/mdc/base/modules/WorkshopSignage/DayUtilizationRateTrend.vue b/src/views/mdc/base/modules/WorkshopSignage/DayUtilizationRateTrend.vue
index bc95202..30ddbc4 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/DayUtilizationRateTrend.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/DayUtilizationRateTrend.vue
@@ -4,11 +4,15 @@
<script>
import * as echarts from 'echarts'
+ import signageApi from '@/api/signage'
export default {
name: 'DayUtilizationRateTrend',
components: {},
props: {
+ currentProductionId: {
+ type: String
+ },
toDecimal2NoZero: {
type: Function
}
@@ -20,57 +24,26 @@
}
},
mounted() {
- this.getChartDataByApi()
window.addEventListener('resize', this.handleWindowResize)
+ if (!this.currentProductionId) return
+ this.getChartDataByApi()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
},
methods: {
getChartDataByApi() {
+ const that = this
this.chartContainer = this.$echarts.init(document.getElementById(this.chartContainerId))
- this.initChart()
+ signageApi.getDayUtilizationRateApi(this.currentProductionId)
+ .then(res => {
+ console.log('res==========', res)
+ if (!res.success) return
+ that.initChart(res.result)
+ })
},
- initChart() {
- const data = [
- {
- 'number': 'A_1',
- 'name': '1-D鐗圭宸ヨ壓',
- 'count': 0.4452,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_2',
- 'name': '2-D鏁翠綋鏈哄專',
- 'count': 0.7642,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_3',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'count': 0.4523,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_4',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'count': 0.6987,
- 'planCount': null,
- 'rateCount': null
- },
- {
- 'number': 'A_5',
- 'name': '5-D CRIC鍗曞厓',
- 'count': 0.8924,
- 'planCount': null,
- 'rateCount': null
- },
- ]
- const xAxisData = []
+ initChart(dataObj) {
const seriesData = []
const option = {
tooltip: {
@@ -164,306 +137,9 @@
},
//barCategoryGap:'180%',
itemStyle: {
- normal: {
- barBorderRadius: '',
- color: function(params) {
- const colorList = [
- //1-D鐗圭宸ヨ壓鍗曞厓
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#9cc4f6' },
- { offset: 1, color: '#538dd6' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffffa2' },
- { offset: 1, color: '#ffff01' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#97fcc5' },
- { offset: 1, color: '#0bae8d' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffbc85' },
- { offset: 1, color: '#e26c0a' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#fb78ba' },
- { offset: 1, color: '#8f0149' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //鐜欢鍗曞厓
- { offset: 0, color: '#d297ff' },
- { offset: 1, color: '#7030a0' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffe491' },
- { offset: 1, color: '#8f6c00' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffb6b9' },
- { offset: 1, color: '#fd4c53' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#92cbba' },
- { offset: 1, color: '#18a387' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ff5b62' },
- { offset: 1, color: '#a02100' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#b5d5e3' },
- { offset: 1, color: '#1b8bd0' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //涓皬鏈哄專鍗曞厓
- { offset: 0, color: '#ebd3ff' },
- { offset: 1, color: '#e889ff' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#D69123' },
- { offset: 1, color: '#a16900' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //浣庡帇瀵煎悜
- { offset: 0, color: '#d588c8' },
- { offset: 1, color: '#9545AE' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //浣庡帇鍙剁墖 1 4
- { offset: 0, color: '#97abd6' },
- { offset: 1, color: '#6268b2' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#d7dab2' },
- { offset: 1, color: '#b8aa15' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#e9c9b0' },
- { offset: 1, color: '#D9646A' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#a4e3d6' },
- { offset: 1, color: '#01A55E' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
-
- { offset: 0, color: '#2052b1' },
- { offset: 1, color: '#002b73' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //鐩樹欢鍗曞厓
- { offset: 0, color: '#3e71e2' },
- { offset: 1, color: '#0042c8' }
- ]
- ), new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- //缁撴瀯浠跺崟鍏�
- { offset: 0, color: '#99d6cf' },
- { offset: 1, color: '#21bf90' }
- ]
- )
- , new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- // 7-D
- { offset: 0, color: '#99d6cf' },
- { offset: 1, color: '#0ad0bb' }
- ]
- )
- , new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#FF9297' },
- { offset: 1, color: '#FF9297' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#fb78ba' },
- { offset: 1, color: '#ff77dc' }
- ]
- ),
- //涓�鍘�
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#9cc4f6' },
- { offset: 1, color: '#538dd6' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffffa2' },
- { offset: 1, color: '#ffff01' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#0bae8d' },
- { offset: 1, color: '#0bae8d' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#ffbc85' },
- { offset: 1, color: '#e26c0a' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#97abd6' },
- { offset: 1, color: '#842cb2' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#99d6cf' },
- { offset: 1, color: '#0ad0bb' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#FF9297' },
- { offset: 1, color: '#FF9297' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#fb78ba' },
- { offset: 1, color: '#ff77dc' }
- ]
- )
- ]
- if (params.name == '1-D鐗圭宸ヨ壓' || params.name == '鍘嬫皵鏈轰竴' || params.name == '1-D鐗圭宸ヨ壓鍗曞厓') {
- return colorList[24]
- }
- if (params.name == '2-D鏁翠綋鏈哄專' || params.name == '2-D鏁翠綋鏈哄專鍗曞厓') {
- return colorList[25]
- }
- if (params.name == '3-D鐕冪儳瀹ゆ満鍖�' || params.name == '鐕冪儳瀹ゆ満鍖�' || params.name == '3-D鍘嬫皵鏈烘満鍖ｅ崟鍏�' || params.name == '3-D鍘嬫皵鏈烘満鍖�') {
- return colorList[26]
- }
- if (params.name == '4-D鐒婃帴鏈哄專宸ユ' || params.name == '涓夊伐娈�' || params.name == '鏀灦灏忕幆浠跺崟鍏�' || params.name == '4-D鐒婃帴鏈哄專鍗曞厓') {
- return colorList[27]
- }
- if (params.name == '5-D CRIC鍗曞厓' || params.name == '10-D閮ㄤ欢瑁呴厤鍗曞厓') {
- return colorList[4]
- }
- if (params.name == '6-D椋庢墖鍗曞厓' || params.name == '6-D椋庢墖鏈哄專鍗曞厓') {
- return colorList[28]
- }
- if (params.name == '7-D娑¤疆鏈哄專' || params.name == '7-D娑¤疆鏈哄專鍗曞厓') {
- return colorList[29]
- }
- if (params.name == '8-D绉戠爺宸ユ' || params.name == '绉戠爺宸ユ' || params.name == '8-D绉戠爺鍗曞厓') {
- return colorList[30]
- }
- if (params.name == '10-D閮ㄤ欢瑁呴厤' || params.name == '10-D閮ㄤ欢瑁呴厤鍗曞厓') {
- return colorList[31]
- }
- if (params.name == 'JD-2鍐涘搧鏈哄姞' || params.name == '鍐涘搧鏈哄姞宸ユ' || params.name == '鍥涘伐娈�') {
- return colorList[8]
- }
- if (params.name == '10-D鐢熶骇瀹�' || params.name == 'IGV鍙剁墖') {
- return colorList[9]
- }
-
- if (params.name == '浜斿伐娈�') {
- return colorList[10]
- }
- if (params.name == '鍏伐娈�' || params.name == '涓皬鏈哄專鍗曞厓') {
- return colorList[11]
- }
- if (params.name == '娑¤疆鍙剁墖') {
- return colorList[12]
- }
- if (params.name == '浣庡帇瀵煎悜') {
- return colorList[13]
- }
- if (params.name == '浣庡帇鍙剁墖') {
- return colorList[14]
- }
- if (params.name == '瀵煎悜鍙剁墖') {
- return colorList[15]
- }
- if (params.name == '鍘嬫皵鏈轰簩') {
- return colorList[16]
- }
- if (params.name == '鏁存祦涓�') {
- return colorList[17]
- }
- if (params.name == '鏁存祦浜�') {
- return colorList[19]
- }
- if (params.name == '涓�宸ユ' || params.name == '鐩樹欢鍗曞厓') {
- return colorList[19]
- }
- if (params.name == '浜屽伐娈�' || params.name == '缁撴瀯浠跺崟鍏�') {
- return colorList[20]
- }
- if (params.name == '涓冨伐娈�' || params.name == '鐜欢鍗曞厓') {
- return colorList[5]
- }
- // build a color map as your need.
-
- //return colorList[params.dataIndex]
- }
+ color: params => {
+ const colorList = ['#538dd6', '#ffff01', '#0bae8d', '#e26c0a', '#F6E1BE', '#7030a0', '#0ad0bb', '#FF9297', '#A40035']
+ return colorList[params.dataIndex]
},
emphasis: {
barBorderRadius: 13,
@@ -474,14 +150,13 @@
}
]
}
- data.forEach(item => {
- xAxisData.push(item.name == null ? '' : item.name)
+ dataObj.dataList.forEach(item => {
seriesData.push({
- value: this.toDecimal2NoZero(((item.count == null ? '' : item.count) * 100) > 100 ? 100 : (((item.count == null ? '' : item.count) * 100))),
- hostType: (item.number == null ? '' : item.number)
+ value: item.utilizationRate,
+ hostType: (item.productionName ? item.productionName : '')
})
})
- option.xAxis[0].data = xAxisData
+ option.xAxis[0].data = dataObj.productionList
option.series[0].data = seriesData
this.chartContainer.setOption(option, true)
},
diff --git a/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue b/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
index 40af646..a3cfc86 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
@@ -10,8 +10,7 @@
components: {},
data() {
return {
- config: {},
- dataSource: []
+ config: {}
}
},
mounted() {
@@ -21,26 +20,24 @@
getDeviceAlarmInfoByApi() {
const that = this
that.initChart()
- // signageApi.getWorkshopAlarmInfoApi()
- // .then(res => {
- // if (res.success) {
- // that.dataSource = res.result
- // that.initChart()
- // }
- // })
+ signageApi.getWorkshopAlarmInfoApi()
+ .then(res => {
+ if (!res.success) return
+ that.initChart(res.result)
+ })
},
- initChart() {
+ initChart(dataSource = []) {
this.config = {
// indexHeader: '搴忓彿',
header: ['璁惧缂栧彿', '鎶ヨ鏃堕棿', '鎶ヨ鍙�'],
headerBGC: '#333',
oddRowBGC: 'transparent',
evenRowBGC: 'transparent',
- // data: this.dataSource.map(item => {
- // return [item.equipmentId, item.collectTime, item.alarm]
- // }),
- data: [['516313', 'AASDASD', 'ASDADA'], ['ASDSA', '213ASD', '1651ZS'], ['DSXC42', 'SD5846', '2316SD'], ['dasd13', '213asd', '21558xc'], ['dasads522', 'dsa4812', 'asd233'], ['123124', 'zxc32695', '42352s']],
+ data: dataSource.map(item => {
+ return [item.equipmentId, item.collectTime, item.alarmNo]
+ }),
+ // data: [['516313', 'AASDASD', 'ASDADA'], ['ASDSA', '213ASD', '1651ZS'], ['DSXC42', 'SD5846', '2316SD'], ['dasd13', '213asd', '21558xc'], ['dasads522', 'dsa4812', 'asd233'], ['123124', 'zxc32695', '42352s']],
rowNum: 2,
index: false,
// columnWidth: [300, 300],
diff --git a/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue b/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
index bce41c4..be81fb1 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/DeviceDragLayout.vue
@@ -1,7 +1,5 @@
<template>
<div>
- <div class="guideline guidelineX" :style="{top:guidelineXTop+'px',display:showGuideline}"></div>
- <div class="guideline guidelineY" :style="{left:guidelineYLeft+'px',display:showGuideline}"></div>
<VueDragResize
v-for="(item, index) in deviceList"
:key="item.equipmentId"
@@ -16,77 +14,135 @@
:parentW="1500"
:minw="70"
:minh="70"
- :isDraggable="true"
- :isResizable="true"
+ :isDraggable="isSwitchChecked"
+ :isResizable="isSwitchChecked"
:stickSize="6"
- @deactivated="showGuideline = 'none'"
+ @deactivated="isShowGuideline = false"
>
<div class="single-device" :style="{ width: item.vw + 'px', height: item.vh + 'px' }">
<div class="device-status">
<div
- v-if="item.equipmentStatus == 2 || item.equipmentStatus == 1"
- :style="{ backgroundImage: `url(${require('@/assets/yellow.png')})` }"
- class="status-image"
- ></div>
- <div
- v-if="item.equipmentStatus == 22"
- :style="{ backgroundImage: `url(${require('@/assets/red.png')})` }"
- class="status-image"
- ></div>
- <div
- v-if="item.equipmentStatus == 0"
- :style="{ backgroundImage: `url(${require('@/assets/gray.png')})` }"
- class="status-image"
- ></div>
- <div
- v-if="item.equipmentStatus == 3"
- :style="{ backgroundImage: `url(${require('@/assets/green.png')})` }"
- class="status-image"
- ></div>
- <div
- :style="{ backgroundImage: `url(${getImgView(item.equipmentImage) || require('@/assets/default.png')})` }"
+ :style="{ backgroundImage: `url(${getImgView(item.equipmentImage) || require('@/assets/WorskhopSignage/default.png')})` }"
class="device-image"
- ></div>
+ >
+ <div
+ :style="{ backgroundImage: `url(${getCurrentDeviceStatusImage(item.oporation)})` }"
+ class="status-image"
+ ></div>
+ </div>
</div>
- <div
- :style="{ color:workshopDetails.equipmentIdColor?workshopDetails.equipmentIdColor:'#fff',marginTop:'10px' }">
- {{ item.equipmentId }}
- </div>
+ <div :style="{backgroundColor:item.equipmentStatus!==0?'#f00':''}">{{ item.equipmentId }}</div>
</div>
</VueDragResize>
+
+ <template v-if="isShowGuideline">
+ <div class="guideline guidelineX" :style="{top:guidelineXTop+'px'}"></div>
+ <div class="guideline guidelineY" :style="{left:guidelineYLeft+'px'}"></div>
+ </template>
+
+ <a-form layout="inline" v-has="'isCanDragAndResize'">
+ <a-form-item label="鍔熻兘寮�鍏�">
+ <a-switch checked-children="寮�" un-checked-children="鍏�" v-model="isSwitchChecked"
+ :disabled="isHasResizeOrDragDevice"/>
+ </a-form-item>
+
+ <a-form-item label="淇濆瓨鍧愭爣">
+ <a-button type="primary" icon="save" @click="saveDevicePositionAndSizeByApi"
+ :disabled="!isHasResizeOrDragDevice">淇濆瓨
+ </a-button>
+ </a-form-item>
+ </a-form>
</div>
</template>
<script>
+ import signageApi from '@/api/signage'
+ import VueDragResize from 'vue-drag-resize'
+
export default {
name: 'DeviceDragLayout',
- components: {},
+ components: {
+ VueDragResize
+ },
props: {
- deviceList: {
+ currentProductionId: {
+ type: String
+ },
+ getImgView: {
+ type: Function
+ },
+ equipmentStatusList: {
type: Array
}
},
data() {
return {
- showGuideline: 'none',
+ deviceList: [],
+ isShowGuideline: false,
guidelineXTop: 0,
- guidelineYLeft: 0
+ guidelineYLeft: 0,
+ isSwitchChecked: false,
+ isHasResizeOrDragDevice: false
}
},
+ created() {
+ if (!this.currentProductionId) return
+ this.getDeviceListByApi()
+ },
methods: {
+ // 閫氳繃杞﹂棿Id璋冪敤鎺ュ彛鑾峰彇璁惧淇℃伅鍒楄〃
+ getDeviceListByApi() {
+ const that = this
+ signageApi.getDeviceListInWorkshopSignagePageApi(that.currentProductionId).then((res) => {
+ if (res.success && res.result && res.result.length > 0) that.deviceList = res.result
+ })
+ },
+
/**
* 璁惧鎷栨嫿鎴栫缉鏀炬椂瑙﹀彂浜嬩欢
* @param newRect 鎷栨嫿鎴栫缉鏀惧悗鐨勫昂瀵稿強璺濈
* @param index 鎷栨嫿璁惧鍦ㄦ暟缁勪腑鐨勪笅鏍�
*/
resize(newRect, index) {
- this.showGuideline = 'block'
+ this.isShowGuideline = true
+ // 褰撹澶囩缉鏀炬垨鎷栨嫿鍚庣鐢╯witch缁勪欢骞跺紑鏀句繚瀛樻寜閽姛鑳斤紙閬垮厤鏃犳晥璇锋眰锛�
+ if (!this.isHasResizeOrDragDevice) {
+ if (this.deviceList[index].vw !== newRect.width || this.deviceList[index].vh !== newRect.height || this.deviceList[index].coordinateTop !== newRect.top || this.deviceList[index].coordinateLeft !== newRect.left) {
+ this.isHasResizeOrDragDevice = true
+ }
+ }
+ // this.isHasResizeOrDragDevice = true
this.deviceList[index].vw = newRect.width
this.deviceList[index].vh = newRect.height
this.deviceList[index].coordinateTop = newRect.top
this.deviceList[index].coordinateLeft = newRect.left
this.guidelineXTop = newRect.top + newRect.height / 2
this.guidelineYLeft = newRect.left + newRect.width / 2
+ },
+
+ // 鐐瑰嚮淇濆瓨鎸夐挳璋冪敤鎺ュ彛淇濆瓨鎷栨嫿鍚庣殑浣嶇疆涓庤澶囧浘鏍囧昂瀵�
+ saveDevicePositionAndSizeByApi() {
+ const that = this
+ signageApi.saveDevicePositionAndSizeApi(that.deviceList)
+ .then((res) => {
+ if (!res.success) return
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.isSwitchChecked = that.isHasResizeOrDragDevice = false
+ that.getDeviceListByApi(that.currentProductionId)
+ })
+ },
+
+ /**
+ * 鑾峰彇褰撳墠璁惧鐘舵�佸浘鐗�
+ * @param oporation 鐘舵�佺爜
+ * @returns {any} 璁惧鐘舵�佸浘鐗囪祫婧�
+ */
+ getCurrentDeviceStatusImage(oporation) {
+ const currentStatus = this.equipmentStatusList.find(item => item.value.includes(oporation))
+ return currentStatus.statusImage
}
}
}
diff --git a/src/views/mdc/base/modules/WorkshopSignage/MonthUtilizationRateTrend.vue b/src/views/mdc/base/modules/WorkshopSignage/MonthUtilizationRateTrend.vue
index 463a090..220259b 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/MonthUtilizationRateTrend.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/MonthUtilizationRateTrend.vue
@@ -3,10 +3,15 @@
</template>
<script>
+ import signageApi from '@/api/signage'
+
export default {
name: 'MonthUtilizationRateTrend',
components: {},
props: {
+ currentProductionId: {
+ type: String
+ },
toDecimal2NoZero: {
type: Function
}
@@ -18,582 +23,26 @@
}
},
mounted() {
- this.getChartDataByApi()
window.addEventListener('resize', this.handleWindowResize)
+ if (!this.currentProductionId) return
+ this.getChartDataByApi()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
},
methods: {
getChartDataByApi() {
+ const that = this
this.chartContainer = this.$echarts.init(document.getElementById(this.chartContainerId))
- this.initChart()
+ signageApi.getMonthUtilizationRateApi(this.currentProductionId)
+ .then(res => {
+ if (!res.success) return
+ that.initChart(res.result)
+ })
},
- initChart() {
- const data = [
- {
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'list': [
- {
- 'code': '000000014831',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '1鏈�',
- 'lineRate': 0.2456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014820',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2鏈�',
- 'lineRate': 0.3452,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014809',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '3鏈�',
- 'lineRate': 0.2453,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014798',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '4鏈�',
- 'lineRate': 0.5623,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014787',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '5鏈�',
- 'lineRate': 0.3254,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014776',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '6鏈�',
- 'lineRate': 0.7456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014765',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '7鏈�',
- 'lineRate': 0.5389,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:00'
- },
- {
- 'code': '000000014809',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '8鏈�',
- 'lineRate': 0.2453,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014798',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '9鏈�',
- 'lineRate': 0.5623,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014787',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '10鏈�',
- 'lineRate': 0.3254,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014776',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '11鏈�',
- 'lineRate': 0.7456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014765',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '12鏈�',
- 'lineRate': 0.5389,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:00'
- }
- ]
- },
- {
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'list': [
- {
- 'code': '000000014833',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '1鏈�',
- 'lineRate': 0.5234,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014822',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2鏈�',
- 'lineRate': 0.63465,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014811',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '3鏈�',
- 'lineRate': 0.6747,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014800',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '4鏈�',
- 'lineRate': 0.8675,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014789',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '5鏈�',
- 'lineRate': 0.9774,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014778',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '6鏈�',
- 'lineRate': 0.5637,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014767',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '7鏈�',
- 'lineRate': 0.8565,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'list': [
- {
- 'code': '000000014834',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '1鏈�',
- 'lineRate': 0.6573,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014823',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2鏈�',
- 'lineRate': 0.7567,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014812',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '3鏈�',
- 'lineRate': 0.8532,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014801',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '4鏈�',
- 'lineRate': 0.4352,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014790',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '5鏈�',
- 'lineRate': 0.3456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014779',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '6鏈�',
- 'lineRate': 0.1356,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014768',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '7鏈�',
- 'lineRate': 0.5346,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'list': [
- {
- 'code': '000000014835',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '1鏈�',
- 'lineRate': 0.1333,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014824',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2鏈�',
- 'lineRate': 0.5234,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014813',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '3鏈�',
- 'lineRate': 0.5631,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014802',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '4鏈�',
- 'lineRate': 0.2345,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014791',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '5鏈�',
- 'lineRate': 0.1333,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014780',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '6鏈�',
- 'lineRate': 0.3215,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014769',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '7鏈�',
- 'lineRate': 0.4122,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'fullName': '5-D CRIC鍗曞厓',
- 'list': [
- {
- 'code': '000000014836',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '1鏈�',
- 'lineRate': 0.4234,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014825',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2鏈�',
- 'lineRate': 0.1213,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014814',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '3鏈�',
- 'lineRate': 0.1245,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014803',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '4鏈�',
- 'lineRate': 0.2467,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014792',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '5鏈�',
- 'lineRate': 0.1579,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014781',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '6鏈�',
- 'lineRate': 0.6757,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014770',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '7鏈�',
- 'lineRate': 0.4563,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'fullName': null,
- 'list': [
- {
- 'code': '000000014841',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '1鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014830',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014819',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '3鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014808',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '4鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014797',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '5鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014786',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '6鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014775',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '7鏈�',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- }
- ]
+ initChart(dataObj) {
const seriesArr = []
- const xAxisData = []
const option = {
color: ['#538dd6', '#ffff01', '#0bae8d', '#e26c0a', '#F6E1BE', '#7030a0', '#0ad0bb', '#FF9297', '#A40035'],
tooltip: {
@@ -671,18 +120,17 @@
},
series: []
}
- data.forEach(item1 => {
+ dataObj.dataList.forEach(item1 => {
const dataArr = []
- item1.list.forEach(item2 => {
+ item1.utilizationRateList.forEach(item2 => {
dataArr.push({
- value: this.toDecimal2NoZero(item2.lineRate * 100),
- hostType: (item2.dayTime == null ? '' : item2.dayTime)
+ value: item2.utilizationRate,
+ hostType: (item2.date ? item2.date : '')
})
- xAxisData.push(item2.dayTime == null ? '' : item2.dayTime)
})
- if (item1.beltlineName == '鎬诲巶') {
+ if (item1.productionName == '鎬诲巶') {
seriesArr.push({
- name: item1.beltlineName,
+ name: item1.productionName,
type: 'line',
lineStyle: { width: 4, color: '#9cff45' },
itemStyle: { color: '#50ff45' },
@@ -691,7 +139,7 @@
})
} else {
seriesArr.push({
- name: item1.fullName,
+ name: item1.productionName,
type: 'line',
lineStyle: { width: 2 },
symbol: 'circle',
@@ -699,10 +147,8 @@
})
}
})
- option.xAxis.data = Array.from(new Set(xAxisData))
+ option.xAxis.data = dataObj.dateList
option.series = seriesArr
- console.log(Array.from(new Set(xAxisData)))
- console.log(seriesArr)
this.chartContainer.setOption(option, true)
},
diff --git a/src/views/mdc/base/modules/WorkshopSignage/WeekUtilizationRateTrend.vue b/src/views/mdc/base/modules/WorkshopSignage/WeekUtilizationRateTrend.vue
index 85dba23..4fbe249 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/WeekUtilizationRateTrend.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/WeekUtilizationRateTrend.vue
@@ -3,10 +3,15 @@
</template>
<script>
+ import signageApi from '@/api/signage'
+
export default {
name: 'WeekUtilizationRateTrend',
components: {},
props: {
+ currentProductionId: {
+ type: String
+ },
toDecimal2NoZero: {
type: Function
}
@@ -18,525 +23,25 @@
}
},
mounted() {
- this.getChartDataByApi()
window.addEventListener('resize', this.handleWindowResize)
+ if (!this.currentProductionId) return
+ this.getChartDataByApi()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
},
methods: {
getChartDataByApi() {
+ const that = this
this.chartContainer = this.$echarts.init(document.getElementById(this.chartContainerId))
- this.initChart()
+ signageApi.getWeekUtilizationRateApi(this.currentProductionId)
+ .then(res => {
+ if (!res.success) return
+ that.initChart(res.result)
+ })
},
- initChart() {
- const data = [
- {
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'fullName': '1-D鐗圭宸ヨ壓鍗曞厓',
- 'list': [
- {
- 'code': '000000014831',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.2456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014820',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.3452,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014809',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.2453,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014798',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.5623,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014787',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.3254,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014776',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.7456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014765',
- 'factoryID': 'A',
- 'beltlineID': 'A_1',
- 'beltlineName': '1-D鐗圭宸ヨ壓',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.5389,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:00'
- }
- ]
- },
- {
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'fullName': '2-D鏁翠綋鏈哄專鍗曞厓',
- 'list': [
- {
- 'code': '000000014833',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.5234,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014822',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.63465,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014811',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.6747,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014800',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.8675,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014789',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.9774,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014778',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.5637,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014767',
- 'factoryID': 'A',
- 'beltlineID': 'A_2',
- 'beltlineName': '2-D鏁翠綋鏈哄專',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.8565,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'fullName': '3-D鐕冪儳瀹ゆ満鍖ｅ崟鍏�',
- 'list': [
- {
- 'code': '000000014834',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.6573,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014823',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.7567,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014812',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.8532,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014801',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.4352,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014790',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.3456,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014779',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.1356,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014768',
- 'factoryID': 'A',
- 'beltlineID': 'A_3',
- 'beltlineName': '3-D鐕冪儳瀹ゆ満鍖�',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.5346,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'fullName': '4-D鐒婃帴鏈哄專宸ユ',
- 'list': [
- {
- 'code': '000000014835',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.1333,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014824',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.5234,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014813',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.5631,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014802',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.2345,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014791',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.1333,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014780',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.3215,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014769',
- 'factoryID': 'A',
- 'beltlineID': 'A_4',
- 'beltlineName': '4-D鐒婃帴鏈哄專宸ユ',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.4122,
- 'processingLong': 11520.0000,
- 'openingLong': 11520.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'fullName': '5-D CRIC鍗曞厓',
- 'list': [
- {
- 'code': '000000014836',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.4234,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014825',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.1213,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014814',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.1245,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014803',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.2467,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014792',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.1579,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014781',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.6757,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014770',
- 'factoryID': 'A',
- 'beltlineID': 'A_5',
- 'beltlineName': '5-D CRIC鍗曞厓',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.4563,
- 'processingLong': 0.0000,
- 'openingLong': 0.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- },
- {
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'fullName': null,
- 'list': [
- {
- 'code': '000000014841',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-09-28',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014830',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-09-29',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014819',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-09-30',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014808',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-10-01',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014797',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-10-02',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014786',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-10-03',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- },
- {
- 'code': '000000014775',
- 'factoryID': 'A',
- 'beltlineID': '鎬诲巶',
- 'beltlineName': '鎬诲巶',
- 'dayTime': '2023-10-04',
- 'lineRate': 0.0400,
- 'processingLong': 3456.0000,
- 'openingLong': 3456.0000,
- 'collectDate': '2023-10-05 00:25:01'
- }
- ]
- }
- ]
+ initChart(dataObj) {
const seriesArr = []
const xAxisData = []
const option = {
@@ -616,18 +121,17 @@
},
series: []
}
- data.forEach(item1 => {
+ dataObj.dataList.forEach(item1 => {
const dataArr = []
- item1.list.forEach(item2 => {
+ item1.utilizationRateList.forEach(item2 => {
dataArr.push({
- value: this.toDecimal2NoZero(item2.lineRate * 100),
- hostType: (item2.dayTime == null ? '' : item2.dayTime)
+ value: item2.utilizationRate,
+ hostType: (item2.date ? item2.date : '')
})
- xAxisData.push(item2.dayTime == null ? '' : item2.dayTime.slice(5))
})
- if (item1.beltlineName == '鎬诲巶') {
+ if (item1.productionName == '鎬诲巶') {
seriesArr.push({
- name: item1.beltlineName,
+ name: item1.productionName,
type: 'line',
lineStyle: { width: 4, color: '#9cff45' },
itemStyle: { color: '#50ff45' },
@@ -636,7 +140,7 @@
})
} else {
seriesArr.push({
- name: item1.fullName,
+ name: item1.productionName,
type: 'line',
lineStyle: { width: 2 },
symbol: 'circle',
@@ -644,7 +148,7 @@
})
}
})
- option.xAxis.data = Array.from(new Set(xAxisData))
+ option.xAxis.data = dataObj.dateList
option.series = seriesArr
this.chartContainer.setOption(option, true)
},
diff --git a/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue b/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
index cc5d449..4bf22e8 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
@@ -2,21 +2,36 @@
<div style="flex:1;display: flex;">
<div class="chart-container" :id="chartContainerId"></div>
<div class="equipment-state-container">
- <div>璁惧鎬绘暟锛歿{equipmentList.length}}鍙�</div>
- <div>澶т慨銆侀」淇暟閲忥細{{getEquipmentMaintainCount}}鍙�</div>
- <div v-for="(item,index) in equipmentStateList" :key="index">
- <img :src="item.imageColor"><span>{{item.label}}锛歿{getEquipmentStateCount(item.value)}}鍙�</span>
+ <div>璁惧鎬绘暟锛歿{equipmentStatusCountObj.equipmentCount}}鍙�</div>
+ <div>澶т慨銆侀」淇暟閲忥細{{equipmentStatusCountObj.repairCount}}鍙�</div>
+ <div>
+ <img :src="getStatusImageAndLabel('姝ｅ父杩愯','statusImage')"><span>{{getStatusImageAndLabel('姝ｅ父杩愯','label')}}锛歿{equipmentStatusCountObj.runCount}}鍙�</span>
+ </div>
+ <div>
+ <img :src="getStatusImageAndLabel('寰呮満','statusImage')"><span>{{getStatusImageAndLabel('寰呮満','label')}}锛歿{equipmentStatusCountObj.waitCount}}鍙�</span>
+ </div>
+ <div>
+ <img :src="getStatusImageAndLabel('鎶ヨ','statusImage')"><span>{{getStatusImageAndLabel('鎶ヨ','label')}}锛歿{equipmentStatusCountObj.errorCount}}鍙�</span>
+ </div>
+ <div>
+ <img :src="getStatusImageAndLabel('鍏虫満','statusImage')"><span>{{getStatusImageAndLabel('鍏虫満','label')}}锛歿{equipmentStatusCountObj.closeCount}}鍙�</span>
+
</div>
</div>
</div>
</template>
<script>
+ import signageApi from '@/api/signage'
+
export default {
name: 'WorkshopDeviceOverview',
components: {},
props: {
- equipmentList: {
+ currentProductionId: {
+ type: String
+ },
+ equipmentStatusList: {
type: Array
},
toDecimal2NoZero: {
@@ -27,153 +42,40 @@
return {
chartContainer: null,
chartContainerId: 'left-col-chart1',
- equipmentStateList: [
- {
- label: '姝ｅ父杩愯',
- value: [3, 23],
- imageColor: require('@/assets/WorskhopSignage/stateImg_green.gif')
- },
- {
- label: '寰呮満',
- value: [1, 2],
- imageColor: require('@/assets/WorskhopSignage/stateImg_yellow.gif')
- },
- {
- label: '鎶ヨ',
- value: [22],
- imageColor: require('@/assets/WorskhopSignage/stateImg_red.gif')
- },
- {
- label: '鍏虫満',
- value: [null, 0],
- imageColor: require('@/assets/WorskhopSignage/stateImg_gray.gif')
- }
- ]
- }
- },
- computed: {
- /* 鑾峰彇璁惧澶т慨銆侀」淇暟閲� */
- getEquipmentMaintainCount() {
- return this.equipmentList.filter(item => item.maintainType === 2).length
+ equipmentStatusCountObj: {}
}
},
mounted() {
- this.getChartDataByApi()
window.addEventListener('resize', this.handleWindowResize)
+ if (!this.currentProductionId) return
+ this.getDeviceStatusCountByApi()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
},
methods: {
+ getDeviceStatusCountByApi() {
+ const that = this
+ signageApi.getDeviceStatusCountApi(that.currentProductionId)
+ .then(res => {
+ if (!res.success) return
+ that.equipmentStatusCountObj = res.result
+ this.getChartDataByApi()
+ })
+ },
+
getChartDataByApi() {
this.chartContainer = this.$echarts.init(document.getElementById(this.chartContainerId))
this.initChart()
},
initChart() {
- const data = [
- {
- 'number': '20102',
- 'name': '2-D鏁翠綋鏈哄專',
- 'count': 7,
- 'planCount': 14,
- 'rateCount': 0.5000
- },
- {
- 'number': '20103',
- 'name': '3-D鐕冪儳瀹ゆ満鍖�',
- 'count': 3,
- 'planCount': 9,
- 'rateCount': 0.3333
- },
- {
- 'number': '20104',
- 'name': '4-D鐒婃帴鏈哄專宸ユ',
- 'count': 11,
- 'planCount': 28,
- 'rateCount': 0.3929
- },
- {
- 'number': '20105',
- 'name': '5-D CRIC鍗曞厓',
- 'count': 2,
- 'planCount': 15,
- 'rateCount': 0.1333
- },
- {
- 'number': '20106',
- 'name': '6-D椋庢墖鍗曞厓',
- 'count': 6,
- 'planCount': 15,
- 'rateCount': 0.4000
- },
- {
- 'number': '20107',
- 'name': '7-D娑¤疆鏈哄專',
- 'count': 6,
- 'planCount': 17,
- 'rateCount': 0.3529
- },
- {
- 'number': '20109',
- 'name': '9-D閽冲伐鍗曞厓',
- 'count': 2,
- 'planCount': 18,
- 'rateCount': 0.1111
- },
- {
- 'number': null,
- 'name': '鎬讳换鍔�',
- 'count': 37,
- 'planCount': 116,
- 'rateCount': 0.3190
- }
- ]
- let yAxisData1, yAxisData2, completionNum
- const formatterData = [
- {
- value: '', name: '瀹屾垚閲�', itemStyle: { normal: { color: '#00923f' } },
- label: {
- normal: {
- show: true,
- fontSize: '70%',
- position: 'inside',
- formatter: function() {
- return completionNum + '%'
- }
- }
- }
- },
- {
- value: '', name: '浠诲姟閲�',
- itemStyle: { normal: { color: '#e67817' } },
- label: {
- normal: {
- show: false
- }
- }
- }
- ]
+ const yAxisData1 = this.toDecimal2NoZero((this.equipmentStatusCountObj.runCount / this.equipmentStatusCountObj.equipmentCount) * 100)
+ const yAxisData2 = 100 - yAxisData1
+ const runNum = yAxisData1
const option = {
legend: {
- show: false,
- bottom: 5,
- textStyle: {
- color: '#fff',
- fontSize: '70%'
- },
- itemWidth: 12,
- itemHeight: 8,
- selectedMode: false,
- formatter: function(name) {
- var target
- for (var i = 0, l = formatterData.length; i < l; i++) {
- if (formatterData[i].name == name) {
- target = formatterData[i].value
- }
- }
- return name + ' ' + target
- }
+ show: false
},
series: [
{
@@ -184,33 +86,31 @@
hoverAnimation: false,
data: [
{
- value: 0, name: '瀹屾垚閲�', itemStyle: { normal: { color: '#00923f' } },
+ value: 0,
+ name: '杩愯閲�',
+ itemStyle: { color: '#00923f' },
label: {
- normal: {
- show: true,
- fontSize: '70%',
- position: 'inside',
- textBorderWidth: 0,
- formatter: function() {
- return completionNum + '%'
- }
+ show: true,
+ fontSize: '70%',
+ color: '#fff',
+ position: 'inside',
+ textBorderWidth: 0,
+ formatter: function() {
+ return runNum + '%'
}
}
},
{
- value: 100, name: '浠诲姟閲�',
- itemStyle: { normal: { color: '#e67817' } },
+ value: 100,
+ name: '璁惧閲�',
+ itemStyle: { color: '#e67817' },
label: {
- normal: {
- show: false
- }
+ show: false
}
}
],
labelLine: {
- normal: {
- show: false
- }
+ show: false
},
itemStyle: {
emphasis: {
@@ -222,15 +122,6 @@
}
]
}
- data.forEach(item => {
- if (item.name === '鎬讳换鍔�' && item.rateCount !== null) {
- yAxisData1 = this.toDecimal2NoZero(item.rateCount * 100)
- yAxisData2 = 100 - this.toDecimal2NoZero(item.rateCount * 100)
- completionNum = yAxisData1
- formatterData[0].value = item.count
- formatterData[1].value = item.planCount
- }
- })
option.series[0].data[0].value = yAxisData1
option.series[0].data[1].value = yAxisData2
this.chartContainer.setOption(option, true)
@@ -248,6 +139,10 @@
return stateCount
},
+ getStatusImageAndLabel(label, property) {
+ return this.equipmentStatusList.find(item => item.label === label)[property]
+ },
+
/**
* 绐楀彛灏哄鍙樺寲鏃惰Е鍙�
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index fb1ec8e..1c23229 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -148,7 +148,7 @@
</a-card>
</a-col>
<!-- 琛ㄥ崟鍖哄煙 -->
- <workshop-modal ref="modalForm" @ok="modalFormOk"></workshop-modal>
+ <workshop-modal ref="modalForm" @ok="modalFormOk" :workshopList="workshopList"></workshop-modal>
<!--鏂板杞﹂棿-->
<select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'娣诲姞宸叉湁璁惧'"></select-device-drawer>
<!--宸叉湁璁惧-->
@@ -161,6 +161,7 @@
import WorkshopModal from './modules/WorkshopModal'
import { filterObj } from '@/utils/util'
import moment from 'moment'
+import signageApi from '@/api/signage'
export default {
name: 'WorkshopSignageManagement',
@@ -179,6 +180,7 @@
queryParam1: {},
queryParam2: {},
dataSource1: [],
+ workshopList:[],
dataSource2: [],
ipagination1: {
current: 1,
@@ -294,7 +296,18 @@
return this.selectedRowKeys1.length === 0 ? 0 : 12
},
},
+ created(){
+ this.getWorkshopListByApi()
+ },
methods: {
+ getWorkshopListByApi(){
+ const that=this
+ signageApi.getWorkshopListApi()
+ .then(res=>{
+ if(res.success)that.workshopList = res.result
+ })
+ },
+
onSelectChange2(selectedRowKeys, selectionRows) {
this.selectedRowKeys2 = selectedRowKeys
this.selectionRows2 = selectionRows
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 8e886b0..22a0f81 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -12,14 +12,19 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
- <a-form-model-item label="杞﹂棿鍚嶇О" required prop="workshopName">
- <a-input v-model="model.workshopName" placeholder="璇疯緭鍏ヨ溅闂村悕绉�"/>
+ <a-form-model-item label="杞﹂棿鍚嶇О" required prop="productionId">
+ <!--<a-input v-model="model.workshopName" placeholder="璇疯緭鍏ヨ溅闂村悕绉�"/>-->
+ <a-select v-model="model.productionId" placeholder="璇烽�夋嫨杞﹂棿" @change="handleSelectChange">
+ <a-select-option v-for="item in workshopList" :key="item.id">
+ {{item.productionName}}
+ </a-select-option>
+ </a-select>
</a-form-model-item>
<a-form-model-item label="杞﹂棿鑳屾櫙鍥�" required prop="backgroundImage">
<j-image-upload class="avatar-uploader" text="涓婁紶" v-model="model.backgroundImage"></j-image-upload>
</a-form-model-item>
<!--<a-form-model-item label="璁惧缂栧彿棰滆壊">-->
- <!--<a-input type="color" v-model="model.equipmentIdColor"></a-input>-->
+ <!--<a-input type="color" v-model="model.equipmentIdColor"></a-input>-->
<!--</a-form-model-item>-->
<a-form-model-item label="鎺堟潈鏍囪瘑">
<a-input placeholder="璇疯緭鍏ユ巿鏉冩爣璇�" v-model="model.perms"/>
@@ -30,11 +35,16 @@
</template>
<script>
- import api from '@/api/mdc'
+ import signageApi from '@/api/signage'
export default {
name: 'WorkshopModal',
components: {},
+ props: {
+ workshopList: {
+ type: Array
+ }
+ },
data() {
return {
title: '鎿嶄綔',
@@ -47,15 +57,7 @@
},
confirmLoading: false,
validatorRules: {
- workshopName: [
- { required: true, message: '璇疯緭鍏ヨ溅闂村悕绉�!' },
- { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' }
- ],
- id: [
- { required: true, message: '璇疯緭鍏ヨ溅闂寸紪鍙�!' },
- { min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
- { validator: this.validateRoleCode }
- ],
+ workshopName: [{ required: true, message: '璇烽�夋嫨杞﹂棿!' }],
backgroundImage: [
{ required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
]
@@ -80,10 +82,9 @@
this.isEdit = false
}
},
- close() {
- this.$refs.form.clearValidate()
- this.$emit('close')
- this.visible = false
+ handleSelectChange(value) {
+ const workshopItem = this.workshopList.find(item => item.id === value)
+ this.model.workshopName = workshopItem.productionName
},
handleOk() {
const that = this
@@ -95,23 +96,23 @@
let obj
if (!this.isEdit) {
console.log('瑙﹀彂鏂板')
- obj = api.addWorkshopApi(this.model)
+ obj = signageApi.addWorkshopApi(this.model)
} else {
console.log('瑙﹀彂淇敼')
- obj = api.editWorkshopApi(this.model)
+ obj = signageApi.editWorkshopApi(this.model)
}
obj.then((res) => {
if (res.success) {
that.$notification.success({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
that.$emit('ok')
} else {
that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
that.confirmLoading = false
@@ -125,12 +126,10 @@
handleCancel() {
this.close()
},
- validateRoleCode(rule, value, callback) {
- if (/[\u4E00-\u9FA5]/g.test(value)) {
- callback('杞﹂棿缂栧彿涓嶅彲杈撳叆姹夊瓧!')
- } else {
- callback()
- }
+ close() {
+ this.$refs.form.clearValidate()
+ this.$emit('close')
+ this.visible = false
}
}
}
--
Gitblit v1.9.3