diff --git a/src/api/smartScreen/OrderScreen/index.js b/src/api/smartScreen/OrderScreen/index.js
new file mode 100644
index 0000000..f6ccf04
--- /dev/null
+++ b/src/api/smartScreen/OrderScreen/index.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+/**
+ * 获取订单数字翻牌器数据
+ * @param {查询条件} data
+ */
+export function GetLargeScreenOrder(query) {
+ return request({
+ url: 'mes/orderManagement/OrderSmart/GetLargeScreenOrder',
+ method: 'get',
+ params: query
+ })
+}
+
+/**
+ * 获取订单进度列表
+ * @param {查询条件} data
+ */
+export function GetOrderProgressList(query) {
+ return request({
+ url: 'mes/orderManagement/OrderSmart/GetOrderProgress',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue b/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue
deleted file mode 100644
index 39f7105..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue b/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue
deleted file mode 100644
index 3172246..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue b/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue
deleted file mode 100644
index 19138a4..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoList.vue b/src/views/SmartScreen/OrderScreen/charts/DemoList.vue
deleted file mode 100644
index 252b288..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoList.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
今日工单进度
-
-
-
-
-
-
-
-
-
- 未开始
- 进行中
- 已完成
-
-
-
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue b/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue
deleted file mode 100644
index c1abee0..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart1.vue b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
index 17020b1..79af96c 100644
--- a/src/views/SmartScreen/OrderScreen/charts/chart1.vue
+++ b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
@@ -1,137 +1,141 @@
-
{{ title }}
-
-
-
+
+
+
+
+
+
+
- {{ ` ${scope.row.reportQuantity} / ${scope.row.planQuantity}` }}
+
+
+ {{ item.name }} :
+ {{ getProcessItemData(item, scope.row) }}
+
+
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart100.vue b/src/views/SmartScreen/OrderScreen/charts/chart100.vue
deleted file mode 100644
index ccd138c..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart100.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart2.vue b/src/views/SmartScreen/OrderScreen/charts/chart2.vue
deleted file mode 100644
index f8e8626..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart2.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
- 统计图1
- 统计图2
-
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart3.vue b/src/views/SmartScreen/OrderScreen/charts/chart3.vue
deleted file mode 100644
index 87207d7..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart3.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
- 统计图1
- 统计图2
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart4.vue b/src/views/SmartScreen/OrderScreen/charts/chart4.vue
deleted file mode 100644
index 1077384..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart4.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart40.vue b/src/views/SmartScreen/OrderScreen/charts/chart40.vue
deleted file mode 100644
index 0e60553..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart40.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart41.vue b/src/views/SmartScreen/OrderScreen/charts/chart41.vue
deleted file mode 100644
index 04807bd..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart41.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
今日异常工单
-
-
-
-
-
-
-
-
-
- 未开始
- 进行中
- 已完成
-
-
-
-
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart5.vue b/src/views/SmartScreen/OrderScreen/charts/chart5.vue
deleted file mode 100644
index 5c2d877..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart5.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart6.vue b/src/views/SmartScreen/OrderScreen/charts/chart6.vue
deleted file mode 100644
index fd8c227..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart6.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart7.vue b/src/views/SmartScreen/OrderScreen/charts/chart7.vue
deleted file mode 100644
index 1c77804..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart7.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart8.vue b/src/views/SmartScreen/OrderScreen/charts/chart8.vue
deleted file mode 100644
index aa69508..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart8.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
diff --git a/src/views/SmartScreen/OrderScreen/index.css b/src/views/SmartScreen/OrderScreen/index.css
index 6e3b731..e34bed7 100644
--- a/src/views/SmartScreen/OrderScreen/index.css
+++ b/src/views/SmartScreen/OrderScreen/index.css
@@ -26,7 +26,7 @@ body {
.screen {
padding: 0;
margin: 0;
- width: 99%;
+ width: 100%;
height: 100%;
color: #eeeeee;
background-color: rgba(32, 163, 250, 0.2);
@@ -58,3 +58,13 @@ body {
min-height: 350px;
padding: 20px;
}
+.top-box {
+ margin: 20px;
+ height: 80px;
+ background-color: rgba(60, 232, 248, 0.1);
+ border: 1px solid #a9aabc;
+}
+.main-box {
+ min-height: 60px;
+ padding: 40px;
+}
diff --git a/src/views/SmartScreen/OrderScreen/index.vue b/src/views/SmartScreen/OrderScreen/index.vue
index de351d3..b38d899 100644
--- a/src/views/SmartScreen/OrderScreen/index.vue
+++ b/src/views/SmartScreen/OrderScreen/index.vue
@@ -14,106 +14,51 @@
车间订单看板
-
-
-
-
-
-
总订单数
-
{{ orderData.todayGroupQuantity }} 组
-
-
-
-
-
未完成订单数
-
{{ orderData.todayLineQuantity }} 条
-
-
-
-
-
已完成订单数
-
{{ orderData.todayPlanQuantity }} 个
-
-
-
-
-
本月完成订单数
-
{{ orderData.todayActionProductionQuantity }} 个
-
-
-
-
-
本周完成订单数
-
{{ orderData.todayProductTypeQuantity }}种
-
-
-
-
-
今日完成订单数
-
{{ orderData.sevenDaysPriorPlanQuantity }} 次
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
订单总数
+
{{ cardData.orderTotalNum }} 个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
未完成订单总数
+
{{ cardData.incompleteOrderNum }} 个
+
+
+
+
+
已完成订单总数
+
{{ cardData.completedOrderNum }} 个
+
+
+
+
+
本月待交货订单数
+
{{ cardData.monthOrderTotalNum }} 个
+
+
+
+
+
本月已完成订单数
+
{{ cardData.monthIncompleteOrderNum }} 个
+
+
+
+
+
本月未完成订单数
+
{{ cardData.monthCompletedOrderNum }} 个
+
+
+
+
+
-
-
-
-
-
-
+
+
+
@@ -130,58 +75,29 @@ import logo from './components/logo.vue'
/// ================================================
function back() {
- console.log('123')
proxy.$router.push('/')
}
/// ================== 图表组件导入 ======================
-// import DemoBarChart1 from './charts/DemoBarChart.vue'
-// import chart1 from './charts/七日产量趋势图.vue'
-// import chart2 from './charts/七日工单数.vue'
-// import chart3 from './charts/报工超时占比.vue'
-// import chart4 from './charts/本月工单异常分布.vue'
-// import chart5 from './charts/今日工单.vue'
-// import chart6 from './charts/异常工单.vue'
-// import chart7 from './charts/昨日工单报工数.vue'
-// 模拟图表
-import DemoList from './charts/DemoList.vue'
-import DemoLine from './charts/DemoLine.vue'
-import DemoBar from './charts/DemoBar.vue'
-import DemoPie from './charts/DemoPie.vue'
-
// 实际图表
-
import chart1 from './charts/chart1.vue'
-import chart2 from './charts/chart2.vue'
-import chart3 from './charts/chart3.vue'
-import chart4 from './charts/chart4.vue'
-import chart5 from './charts/chart5.vue'
-import chart6 from './charts/chart6.vue'
-import chart7 from './charts/chart7.vue'
-// import chart8 from './charts/chart8.vue'
/// ====================================================
/// =================== 获取工单数据 ======================
-import { getMoudle01 } from '@/api/smartScreen/ProdScreen/index.js'
-const orderData = ref({
- // 今日生产组数量
- todayGroupQuantity: 0,
- // 今日生产线数量
- todayLineQuantity: 0,
- // 今日计划数量
- todayPlanQuantity: 0,
- // 今日行动生产数量
- todayActionProductionQuantity: 0,
- // 今日产品类型数量
- todayProductTypeQuantity: 0,
- // 七天前计划数量
- sevenDaysPriorPlanQuantity: 0
+import { GetLargeScreenOrder } from '@/api/smartScreen/OrderScreen/index.js'
+const cardData = ref({
+ orderTotalNum: 0,
+ incompleteOrderNum: 0,
+ completedOrderNum: 0,
+ monthOrderTotalNum: 0,
+ monthIncompleteOrderNum: 0,
+ monthCompletedOrderNum: 0
})
-function getMoudle01Data() {
- getMoudle01().then((res) => {
- orderData.value = res.data
+function getCardData() {
+ GetLargeScreenOrder().then((res) => {
+ cardData.value = res.data
})
}
-getMoudle01Data()
+getCardData()
let timer1 = null
const clearSearchTimer = () => {
clearInterval(timer1)
@@ -190,7 +106,7 @@ const clearSearchTimer = () => {
const createSearchTimer = () => {
clearSearchTimer()
timer1 = setInterval(() => {
- getMoudle01Data()
+ getCardData()
}, 1000 * 60 * 5)
}
onMounted(() => {
@@ -210,11 +126,6 @@ onUnmounted(() => {
margin-bottom: 10px;
}
-.top {
- height: 80px;
- background-color: rgba(60, 232, 248, 0.1);
-}
-
.num-item {
/* border: #0072ff 1px solid; */
padding: 10px;
diff --git a/src/views/SmartScreen/ReportScreen/index.css b/src/views/SmartScreen/ReportScreen/index.css
index 6f4ea55..ef4d9a5 100644
--- a/src/views/SmartScreen/ReportScreen/index.css
+++ b/src/views/SmartScreen/ReportScreen/index.css
@@ -1,6 +1,6 @@
-body{
- margin: 0;
- padding: 0;
+body {
+ margin: 0;
+ padding: 0;
}
.background {
padding: 0;
@@ -23,10 +23,10 @@ body{
.screen {
padding: 0;
margin: 0;
- width: 99%;
+ width: 100%;
height: 100%;
color: #eeeeee;
- background-color: rgba(32, 163, 250, 0.2);
+ background-color: rgba(32, 163, 250, 0.2);
}
.screen .header {
width: 100%;
@@ -47,12 +47,11 @@ body{
top: 10px;
color: #eeeeee;
}
-.body{
- display: flex;
- flex-direction: column;
+.body {
+ display: flex;
+ flex-direction: column;
}
-.box{
+.box {
min-height: 350px;
- padding: 20px;
+ padding: 20px;
}
-
diff --git a/src/views/SmartScreen/index.vue b/src/views/SmartScreen/index.vue
index 6663ec3..6ce44e6 100644
--- a/src/views/SmartScreen/index.vue
+++ b/src/views/SmartScreen/index.vue
@@ -3,14 +3,15 @@
-
-
-
+