diff --git a/.env.dev b/.env.dev
index 542371b..fa9c3c6 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: zhp
# @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-05-21 08:36:39
+ # @LastEditTime: 2024-05-29 11:03:03
# @LastEditors: zhp
# @Description:
###
@@ -14,7 +14,7 @@ VUE_APP_TITLE = 芋道管理系统
# 芋道管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.1.61:48080'
# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
-#
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js
index 4c6cabd..5637adc 100644
--- a/src/api/produceData/index.js
+++ b/src/api/produceData/index.js
@@ -1,8 +1,8 @@
/*
* @Author: zhp
* @Date: 2024-05-07 08:54:59
- * @LastEditTime: 2024-05-14 15:43:50
- * @LastEditors: zhp
+ * @LastEditTime: 2024-05-20 14:56:56
+ * @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
@@ -16,26 +16,99 @@ export function getProduceDataPage(data) {
})
}
-export function getProduceDataDetail(data){
+export function getProduceDataDetail(id){
return request({
- url: '/ip/prod-output/get=' + id,
- method: 'get',
- query: data
+ url: '/ip/prod-output/get?id=' + id,
+ method: 'get'
})
}
-// export function cockpitDataMonitor(data) {
-// return request({
-// url: '/ip/prod-output/cockpitDataMonitor',
-// method: 'post',
-// data: data
-// })
-// }
-
-export function cockpitDataMonitor(query) {
+// 导出生产数据
+export function exportOutPutExcel(data) {
return request({
- url: 'https://restapi.amap.com/v3/weather/weatherInfo?key=95bdbdc1c387a170105f84cd416c4c9f&city=110108',
- method: 'get',
- query: query
+ url: '/ip/prod-output/output-export-excel',
+ method: 'post',
+ data: data,
+ responseType: 'blob'
+ })
+}
+
+// 获取生产管理生产目标管理碲化镉工厂分页
+export function prodTargetDiPage(data) {
+ return request({
+ url: '/ip/prod-target/prodTargetDiPage',
+ method: 'post',
+ data: data
+ })
+}
+
+// 获取生产管理生产目标管理铜铟镓硒工厂分页
+export function prodTargetToPage(data) {
+ return request({
+ url: '/ip/prod-target/prodTargetToPage',
+ method: 'post',
+ data: data
+ })
+}
+
+// 创建生产目标
+export function createProduce(data) {
+ return request({
+ url: '/ip/prod-target/create',
+ method: 'post',
+ data: data
+ })
+}
+
+// 获得生产目标
+export function getProduceTargetDetail(id){
+ return request({
+ url: '/ip/prod-target/get?id=' + id,
+ method: 'get'
+ })
+}
+
+// 修改生产目标
+export function updateProduceTarget(data) {
+ return request({
+ url: '/ip/prod-target/update',
+ method: 'put',
+ data: data
+ })
+}
+
+// 导出碲化镉生产目标数据
+export function exportDiTargetExcel(data) {
+ return request({
+ url: '/ip/prod-target/di-target-export-excel',
+ method: 'post',
+ data: data,
+ responseType: 'blob'
+ })
+}
+
+// 导出铜铟镓硒生产目标数据
+export function exportToTargetExcel(data) {
+ return request({
+ url: '/ip/prod-target/to-target-export-excel',
+ method: 'post',
+ data: data,
+ responseType: 'blob'
+ })
+}
+
+// 删除生产目标
+export function delTarget(id) {
+ return request({
+ url: '/ip/prod-target/delete?id=' + id,
+ method: 'delete'
+ })
+}
+
+export function cockpitDataMonitor(data) {
+ return request({
+ url: '/ip/prod-output/cockpitDataMonitor',
+ method: 'post',
+ data: data
})
}
diff --git a/src/assets/icons/svg/orgTreeIcon.svg b/src/assets/icons/svg/orgTreeIcon.svg
new file mode 100644
index 0000000..247a5ae
--- /dev/null
+++ b/src/assets/icons/svg/orgTreeIcon.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/orgTreeIcon2.svg b/src/assets/icons/svg/orgTreeIcon2.svg
new file mode 100644
index 0000000..a43bd80
--- /dev/null
+++ b/src/assets/icons/svg/orgTreeIcon2.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/src/assets/images/homeindex/page-title-two.png b/src/assets/images/homeindex/page-title-two.png
new file mode 100644
index 0000000..76a121e
Binary files /dev/null and b/src/assets/images/homeindex/page-title-two.png differ
diff --git a/src/assets/images/homeindex/page-title.png b/src/assets/images/homeindex/page-title.png
new file mode 100644
index 0000000..f2e2024
Binary files /dev/null and b/src/assets/images/homeindex/page-title.png differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 11d9c3d..f3c0b35 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -123,7 +123,7 @@ aside {
//main-container全局样式
.app-container {
- padding: 16px;
+ // padding: 16px;
}
.components-container {
diff --git a/src/components/ButtonNav/index.vue b/src/components/ButtonNav/index.vue
index 7b6147f..feefbab 100644
--- a/src/components/ButtonNav/index.vue
+++ b/src/components/ButtonNav/index.vue
@@ -82,6 +82,8 @@ export default {
border: none;
background: #fff;
border-radius: 8px;
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
padding: 20px;
color: #888;
letter-spacing: 2px;
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 44fc12f..1845d89 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -17,20 +17,20 @@
diff --git a/src/views/copilot/components/FactoryDataHeader.vue b/src/views/copilot/components/FactoryDataHeader.vue
index cafa9bb..4d477d9 100644
--- a/src/views/copilot/components/FactoryDataHeader.vue
+++ b/src/views/copilot/components/FactoryDataHeader.vue
@@ -1,39 +1,30 @@
工厂名称
-{{ }}
+{{ dataForm.factory }}
时间维度
-{{ dataForm.code }}
+{{ date }}
时间
-{{ dataForm.productName }}
+{{ dataForm.reportDate.length > 0 ? dataForm.reportDate[0] + '年' + dataForm.reportDate[1] + '月' + dataForm.reportDate[2] + '日' : '' }}
芯片良率
-{{ dataForm.code }}
+{{ dataForm.yieldRate }}
芯片良率
-{{ dataForm.productName }}
+芯片BOM
+{{ dataForm.bom }}
芯片总功率
-{{ dataForm.productName }}
+{{ dataForm.totalPower }}
FTO投入量
-{{ }}
+{{ dataForm.chipInput }}
CSS稼动率
-{{ dataForm.code }}
+{{ dataForm.marriageRate }}
芯片段OEE
-{{ dataForm.productName }}
+{{ dataForm.oee }}
芯片平均功率
-{{ dataForm.productName }}
+{{ dataForm.averagePower }}
芯片人均产量
-{{ }}
+{{ dataForm.annualAverageProduction }}
芯片产能利用率
-{{ dataForm.code }}
+{{ dataForm.capacityUtilizationRate }}
封装BOM
-{{ }}
+ +封装线OEE
-{{ dataForm.code }}
+标准组件良率
-{{ dataForm.productName }}
+标准组件产量
-{{ dataForm.productName }}
+封装产能利用率
-{{ dataForm.code }}
+标准组件人均产量
-{{ dataForm.productName }}
+标准组件人均产量
-{{ dataForm.productName }}
+