diff --git a/locale/en.json b/locale/en.json
index a907a82..f5e4b1a 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -33,7 +33,8 @@
"OperationManagement": "Operation Management",
"PointUpdate": "Point Update",
"QueryMaterials": "Query Materials",
- "Outboundsorting": "Outbound sorting"
+ "Outboundsorting": "Outbound sorting",
+ "LargescreenData": "Large - screen Data"
},
"utils": {
"loading": "Loading...",
@@ -81,7 +82,9 @@
"OutboundPalletCode": "Outbound Pallet Code",
"OutboundPalletStorageLocation": "Outbound Pallet Storage Location",
"QtyReturnedWarehouse": "Quantity Returned to Warehouse",
- "OutboundQty": "Outbound Quantity"
+ "OutboundQty": "Outbound Quantity",
+ "NumJobsExecution": "Number of Jobs in Execution",
+ "NumJobsToday": "Number of Jobs Today"
},
"th": {
"MaterialBoxNumber": "Material Box Number",
diff --git a/locale/vi.json b/locale/vi.json
index 5e51ed5..256ebc7 100644
--- a/locale/vi.json
+++ b/locale/vi.json
@@ -33,7 +33,8 @@
"OperationManagement": "Quản lý hoạt động",
"PointUpdate": "Cập nhật điểm",
"QueryMaterials": "Tra cứu vật liệu",
- "Outboundsorting": "Phân loại xuất kho"
+ "Outboundsorting": "Phân loại xuất kho",
+ "LargescreenData": "Dữ liệu màn hình lớn"
},
"utils": {
"loading": "Đang tải...",
@@ -81,7 +82,9 @@
"OutboundPalletCode": "Mã thùng đựng xuất kho",
"OutboundPalletStorageLocation": "Vị trí lưu trữ thùng đựng xuất kho",
"QtyReturnedWarehouse": "Số lượng trả về kho",
- "OutboundQty": "Số lượng xuất kho"
+ "OutboundQty": "Số lượng xuất kho",
+ "NumJobsExecution": "Số lượng công việc đang thực thi",
+ "NumJobsToday": "Số lượng công việc hôm nay"
},
"th": {
"MaterialBoxNumber": "Số hộp vật liệu",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 37f1081..95e8e83 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -33,7 +33,8 @@
"OperationManagement": "作业管理",
"PointUpdate": "点位更新",
"QueryMaterials": "查询物料",
- "Outboundsorting": "出库分拣"
+ "Outboundsorting": "出库分拣",
+ "LargescreenData": "大屏数据"
},
"utils": {
"loading": "加载中...",
@@ -81,7 +82,9 @@
"OutboundPalletCode": "出库托盘码",
"OutboundPalletStorageLocation": "出库托盘库位",
"QtyReturnedWarehouse": "回库数量",
- "OutboundQty": "出库数量"
+ "OutboundQty": "出库数量",
+ "NumJobsExecution": "执行中作业数",
+ "NumJobsToday": "今日作业数"
},
"th": {
"MaterialBoxNumber": "料框号",
diff --git a/pages.json b/pages.json
index 1b7c4a1..2d1967b 100644
--- a/pages.json
+++ b/pages.json
@@ -102,6 +102,13 @@
{
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "pages/manage/dpsj",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
}
],
"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 06e73e7..4595459 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -39,7 +39,8 @@
{title: this.$t('home.ManualWarehouseTransfer'), icon: 'RF05', path: '/pages/manage/sgyk'},
{title: this.$t('home.OperationManagement'), icon: 'RF06', path: '/pages/manage/zygl'},
{title: this.$t('home.PointUpdate'), icon: 'RF07', path: '/pages/manage/dwgx'},
- {title: this.$t('home.Outboundsorting'), icon: 'RF08', path: '/pages/manage/ckfj'}
+ {title: this.$t('home.Outboundsorting'), icon: 'RF08', path: '/pages/manage/ckfj'},
+ {title: this.$t('home.LargescreenData'), icon: 'RF09', path: '/pages/manage/dpsj'}
],
show: false,
secM: []
diff --git a/pages/manage/dpsj.vue b/pages/manage/dpsj.vue
new file mode 100644
index 0000000..fa1a8f7
--- /dev/null
+++ b/pages/manage/dpsj.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+ {{$t('label.NumJobsExecution')}}
+ {{currentData.executingTasks}}
+
+
+
+
+
+
+
+ {{$t('label.NumJobsToday')}}
+ {{currentData.todayTasks}}
+
+
+
+
+
+
+
+
+ {{e.device_name}}
+ {{e.status_name}}
+
+
+
+
+ {{e.start_point}}
+
+ {{e.end_point}}
+
+ {{e.fault}}
+
+ {{e.vehicle_code}}
+
+
+
+ {{e.electricity}}%
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
new file mode 100644
index 0000000..fbb8cc4
Binary files /dev/null and b/static/image/menu/RF09.png differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000..5f06944
Binary files /dev/null and b/static/image/menu/RF10.png differ
diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
new file mode 100644
index 0000000..1c72599
Binary files /dev/null and b/static/image/menu/RF11.png differ
diff --git a/utils/getData.js b/utils/getData.js
index 34b2c05..5654990 100644
--- a/utils/getData.js
+++ b/utils/getData.js
@@ -144,4 +144,10 @@ export const getOutAndReturnNumByReturnVehicleCode = (code) => request({
export const outSortingSubmit = (code, vcode, ost) => request({
url:'api/pda/iosOut/outSortingSubmit',
data: {return_vehicle_code: code, out_vehicle_code: vcode, out_struct_code: ost}
+})
+
+// 大屏数据
+export const bigscreenGetData = () => request({
+ url:'api/pda/bigscreen/getData',
+ data: {}
})
\ No newline at end of file