diff --git a/dist.zip b/dist.zip index 25121089..041b729a 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index a2a56cde..d971ac72 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "bpmn-js-token-simulation": "0.10.0", "chinese-lunar": "^0.1.4", "clipboard": "2.0.8", - "code-brick-zj": "^1.0.2", + "code-brick-zj": "^1.1.1", "core-js": "^3.26.0", "crypto-js": "^4.0.0", "diagram-js": "^12.3.0", diff --git a/src/api/core/monitoring/auto.js b/src/api/core/monitoring/auto.js index 07acbe6e..922b6b29 100644 --- a/src/api/core/monitoring/auto.js +++ b/src/api/core/monitoring/auto.js @@ -102,3 +102,17 @@ export function getProcessAutoReportNew(data) { data: data, }); } +export function getPLlistByFactory(data) { + return request({ + url: 'base/production-line/listByFactory', + method: 'post', + data: data, + }); +} +export function getProcessAutoReportLastGroup(data) { + return request({ + url: '/monitoring/production-monitor/getProcessAutoReportLastGroup', + method: 'post', + data: data, + }); +} diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index 1ca92fc4..83b352f3 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -141,7 +141,8 @@ export default { type: 'select', label: '产线', selectOptions: [], - param: 'lineId', + param: 'lineId', + collapseTags: true, multiple: true, }, { diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue index fe0c8f5c..5929375e 100644 --- a/src/views/core/analysis/yieldAnalysis/index.vue +++ b/src/views/core/analysis/yieldAnalysis/index.vue @@ -1,274 +1,261 @@ diff --git a/src/views/core/base/product/add-or-updata.vue b/src/views/core/base/product/add-or-updata.vue index acead6fb..9e32ecd6 100644 --- a/src/views/core/base/product/add-or-updata.vue +++ b/src/views/core/base/product/add-or-updata.vue @@ -80,7 +80,7 @@ - + diff --git a/src/views/core/monitoring/lineAuto/index.vue b/src/views/core/monitoring/lineAuto/index.vue index 49203005..68cf54d0 100644 --- a/src/views/core/monitoring/lineAuto/index.vue +++ b/src/views/core/monitoring/lineAuto/index.vue @@ -34,9 +34,9 @@ + :page="1" :limit="100" :table-props="tableProps" :table-data="tableData" :max-height="220" /> - +
@@ -59,7 +59,7 @@ - +
@@ -72,50 +72,30 @@
-
- 上一班数据 - - - - - - - -
- -
-
-
-
-
-
+ + {{ reportTypeMap[listQuery.reportType] }} + + {{ parseTime(listQuery.startTime) }} 至{{ + parseTime(listQuery.endTime) }} + + + 生产数据 +
+ +
-
- 当天数据 - - - - - - - -
- -
-
-
-
-
-
+ 生产折线图 +
+ +
+
@@ -126,10 +106,10 @@ {{ reportTypeMap[listQuery.reportType] }} {{ parseTime(listQuery.startTime) }} 至{{ - parseTime(listQuery.endTime) }} + parseTime(listQuery.endTime) }} - 生产表格数据 + 生产数据
@@ -183,10 +163,10 @@ {{ reportTypeMap[listQuery.reportType] }} {{ parseTime(listQuery.startTime) }} 至{{ - parseTime(listQuery.endTime) }} + parseTime(listQuery.endTime) }} - 生产表格数据 + 生产数据
@@ -199,7 +179,7 @@