diff --git a/.env.dev b/.env.dev
index 218fdc5..85829f4 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
###
# @Author: zhp
# @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-03 15:41:29
- # @LastEditors: zhp
+ # @LastEditTime: 2024-06-04 08:56:35
+ # @LastEditors: DY
# @Description:
###
# 开发环境配置
diff --git a/src/api/produceData/order.js b/src/api/produceData/order.js
index 138d8d6..d779df7 100644
--- a/src/api/produceData/order.js
+++ b/src/api/produceData/order.js
@@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2024-05-07 08:54:59
- * @LastEditTime: 2024-05-31 15:08:27
+ * @LastEditTime: 2024-06-03 14:25:02
* @LastEditors: DY
* @Description:
*/
@@ -50,3 +50,11 @@ export function exportExcel(data) {
responseType: 'blob'
})
}
+
+// 获得工单数据概览
+export function getOverView(){
+ return request({
+ url: '/ip/prod-work-order/getOverView',
+ method: 'get'
+ })
+}
diff --git a/src/views/produce/target/detail-or-updata.vue b/src/views/produce/target/detail-or-updata.vue
index d4d8046..f631c5c 100644
--- a/src/views/produce/target/detail-or-updata.vue
+++ b/src/views/produce/target/detail-or-updata.vue
@@ -1,7 +1,7 @@
@@ -18,11 +18,11 @@
时间维度
- {{ dataForm.targetType === 0 ? '月' : '年' }}
+ {{ ['日', '周', '月', '年'][dataForm.targetType] }}
时间
- {{ dataForm.targetType === 1 ? dataForm.targetYear + '年' : dataForm.targetYear + '年' + dataForm.targetMonth + '月'}}
+ {{ dataForm.targetTime}}
@@ -371,5 +371,8 @@ export default {
color: rgba(102,102,102,0.75);
padding-bottom: 20px;
}
+.detailBox {
+ width: 98%;
+}
diff --git a/src/views/produce/target/index.vue b/src/views/produce/target/index.vue
index a1a231b..a9984f9 100644
--- a/src/views/produce/target/index.vue
+++ b/src/views/produce/target/index.vue
@@ -1,15 +1,15 @@
-
+
-
+
@@ -42,9 +42,9 @@
-
+
{
- // console.log(res)
- // if (res.code !== 0) {
- // this.$modal.msgError(response.msg)
- // return;
- // }
- // this.upload.open = false;
- // this.upload.isUploading = false;
- // this.$refs.upload.clearFiles();
- // }).catch(() => {
- // this.upload.open = false
- // this.upload.isUploading = false
- // })
- // // 拼接提示语
- // // let data = response.data;
- // // let text = '创建成功数量：' + data.createUsernames.length;
- // // for (const username of data.createUsernames) {
- // // text += '
' + username;
- // // }
- // // text += '
更新成功数量：' + data.updateUsernames.length;
- // // for (const username of data.updateUsernames) {
- // // text += '
' + username;
- // // }
- // // text += '
更新失败数量：' + Object.keys(data.failureUsernames).length;
- // // for (const username in data.failureUsernames) {
- // // text += '
' + username + '：' + data.failureUsernames[username];
- // // }
- // this.$message.success('导入成功！');
- // this.getDataList();
- // },
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
if (response.code !== 0) {
@@ -529,11 +492,6 @@ export default {
changeFactory($event) {
this.currentMenu = $event
this.facType = this.currentMenu === '碲化镉工厂' ? 0 : 1
- // if (this.facType === 0) {
- // this.upload.url = process.env.VUE_APP_BASE_API + '/admin-api/ip/prod-target/di-target-import-excel'
- // } else {
- // this.upload.url = process.env.VUE_APP_BASE_API + '/admin-api/ip/prod-target/to-target-import-excel'
- // }
this.getDataList()
},
handleClick(val) {
@@ -544,7 +502,6 @@ export default {
this.$refs.addOrUpdate.init(val.data.id);
});
} else if (val.type === "delete") {
- console.log('啊啊', val)
this.deleteHandle(val.data.id, val.data.factory, val.data._pageIndex)
} else {
this.otherMethods(val)
@@ -600,6 +557,10 @@ export default {
this.listQuery.endTime = Number(this.end)
}
}
+ if (!this.start && !this.end) {
+ this.listQuery.beginTime = undefined
+ this.listQuery.endTime = undefined
+ }
// console.log(e);
},
changeTime() {
@@ -615,6 +576,9 @@ export default {
this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
this.listQuery.endTime = Number(this.listQuery.reportTime[1])
}
+ } else {
+ this.listQuery.beginTime = undefined
+ this.listQuery.endTime = undefined
}
},
onValueChange(picker, k) { // 选中近k周后触发的操作
@@ -633,6 +597,10 @@ export default {
this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
}
}
+ if (!this.start && !this.end) {
+ this.listQuery.beginTime = undefined
+ this.listQuery.endTime = undefined
+ }
},
changeDayTime() {
if (this.listQuery.reportTime) {
@@ -647,44 +615,12 @@ export default {
this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
this.listQuery.endTime = Number(this.listQuery.reportTime[1])
}
+ } else {
+ this.listQuery.beginTime = undefined
+ this.listQuery.endTime = undefined
}
},
- // 获取数据列表
- multipliedByHundred(str) {
- console.log(str);
- // console.log(str)
- if ( str != 0) {
- let floatVal = parseFloat(str);
- if (isNaN(floatVal)) {
- return 0;
- }
- floatVal = Math.round(str * 10000) / 100;
- let strVal = floatVal.toString();
- let searchVal = strVal.indexOf('.');
- if (searchVal < 0) {
- searchVal = strVal.length;
- strVal += '.';
- }
- while (strVal.length <= searchVal + 2) {
- strVal += '0';
- }
- return parseFloat(strVal);
- }
-
- },
async getDataList() {
- // if (this.listQuery.date === 3) {
- // if (this.listQuery.reportTime?.length > 0) {
- // this.listQuery.beginTime = this.listQuery.reportTime[0] ? Number(this.listQuery.reportTime[0]) : undefined
- // this.listQuery.endTime = this.listQuery.reportTime[1] ? this.listQuery.reportTime[1] : undefined
- // }
- // }
- // if (this.listQuery.date === 4) {
- // if (this.listQuery.reportTime?.length > 0) {
- // this.listQuery.beginTime = this.start ? this.start : undefined
- // this.listQuery.endTime = this.end ? this.end : undefined
- // }
- // }
if (this.currentMenu === '碲化镉工厂') {
await prodTargetDiPage(this.listQuery).then(res => {
if (res.code === 0) {
diff --git a/src/views/produce/workOrder/add-or-updata.vue b/src/views/produce/workOrder/add-or-updata.vue
index dbc784f..a24652e 100644
--- a/src/views/produce/workOrder/add-or-updata.vue
+++ b/src/views/produce/workOrder/add-or-updata.vue
@@ -1,7 +1,7 @@
@@ -134,14 +134,29 @@ export default {
exportDetail() {
// 导出
const pdf = new jsPDF('l', 'pt', 'a4');
- const options = {
- scale: 2
- };
+
+ const canvas = document.createElement('canvas')
+
const element = this.$refs['detail'];
+ const width = pdf.internal.pageSize.getWidth()
+ const height = pdf.internal.pageSize.getHeight()
+
+ canvas.width = width * 2
+ canvas.height = height * 2
+
+ canvas.style.width = width + 'px'
+ canvas.style.height = height + 'px'
+
+ const options = {
+ // scale: 2,
+ dpi: 300,
+ canvas: canvas,
+ useCORS: true
+ };
html2canvas(element, options).then((canvas) => {
- const imgData = canvas.toDataURL('image/png');
- pdf.addImage(imgData, 'PNG', 0, 0, pdf.internal.pageSize.getWidth(), pdf.internal.pageSize.getHeight());
+ const imgData = canvas.toDataURL('image/png', 1.0);
+ pdf.addImage(imgData, 'PNG', 0, 0, width, height);
pdf.save(this.dataForm.workOrderNumber + '详情.pdf');
});
},
diff --git a/src/views/produce/workOrder/index.vue b/src/views/produce/workOrder/index.vue
index a644555..f78f124 100644
--- a/src/views/produce/workOrder/index.vue
+++ b/src/views/produce/workOrder/index.vue
@@ -1,16 +1,25 @@
-
-
+
+
+
数据概览
+
+
+
{{ item }}
+
{{ index }}
+
+
+
+
-