diff --git a/.env.dev b/.env.dev index 43076e63..e5856184 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,10 @@ +### + # @Author: Do not edit + # @Date: 2023-08-29 09:40:39 + # @LastEditTime: 2023-09-11 15:55:29 + # @LastEditors: DY + # @Description: +### # 开发环境配置 ENV = 'development' diff --git a/package.json b/package.json index 447d0973..090e7f14 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "crypto-js": "^4.0.0", "echarts": "5.4.0", "element-ui": "2.15.12", - "file-saver": "2.0.5", + "file-saver": "^2.0.5", "fuse.js": "6.6.2", "highlight.js": "9.18.5", "js-beautify": "1.13.0", diff --git a/src/api/core/base/workshopSection.js b/src/api/core/base/workshopSection.js index b460590f..b864282d 100644 --- a/src/api/core/base/workshopSection.js +++ b/src/api/core/base/workshopSection.js @@ -1,3 +1,10 @@ +/* + * @Author: zhp + * @Date: 2023-08-28 14:29:51 + * @LastEditTime: 2023-08-31 14:33:46 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建产线工段 diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue new file mode 100644 index 00000000..e0de210b --- /dev/null +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -0,0 +1,159 @@ + + + + diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue new file mode 100644 index 00000000..ee6a5ce5 --- /dev/null +++ b/src/views/core/analysis/yieldAnalysis/index.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/core/base/productionLine/index.vue b/src/views/core/base/productionLine/index.vue index a3e27792..29ac73d2 100644 --- a/src/views/core/base/productionLine/index.vue +++ b/src/views/core/base/productionLine/index.vue @@ -195,7 +195,7 @@ export default { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; - this.listQuery.pageSize = 10; + this.listQuery.pageSize = 10;.7 this.listQuery.name = val.name; this.getDataList(); break; diff --git a/src/views/core/monitoring/auto/index.vue b/src/views/core/monitoring/auto/index.vue new file mode 100644 index 00000000..6b90674a --- /dev/null +++ b/src/views/core/monitoring/auto/index.vue @@ -0,0 +1,296 @@ + + + + diff --git a/src/views/core/monitoring/data/index.vue b/src/views/core/monitoring/data/index.vue new file mode 100644 index 00000000..5ca3f08e --- /dev/null +++ b/src/views/core/monitoring/data/index.vue @@ -0,0 +1,205 @@ + + + + diff --git a/src/views/core/monitoring/sectionStatistics/index.vue b/src/views/core/monitoring/sectionStatistics/index.vue new file mode 100644 index 00000000..0aeaf6ad --- /dev/null +++ b/src/views/core/monitoring/sectionStatistics/index.vue @@ -0,0 +1,240 @@ + + + + diff --git a/src/views/core/monitoring/sectionStatisticsSearch/index.vue b/src/views/core/monitoring/sectionStatisticsSearch/index.vue new file mode 100644 index 00000000..e09e0ea3 --- /dev/null +++ b/src/views/core/monitoring/sectionStatisticsSearch/index.vue @@ -0,0 +1,160 @@ + + +