From abdfb88215533add9ac1794a0069e30d42c85fae Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 10:53:07 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=82=B9=E6=A3=80=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/device/spotInspectionOrder/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 9334498..6b923f9 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -457,6 +457,12 @@
/>
+
Date: Mon, 11 Aug 2025 10:54:27 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=80=9A=E8=AE=AF?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/energy/WaterManagement/dianMeasurement/index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/energy/WaterManagement/dianMeasurement/index.vue b/src/views/energy/WaterManagement/dianMeasurement/index.vue
index bea449a..a0226fa 100644
--- a/src/views/energy/WaterManagement/dianMeasurement/index.vue
+++ b/src/views/energy/WaterManagement/dianMeasurement/index.vue
@@ -280,6 +280,9 @@
+
+
+
Date: Mon, 11 Aug 2025 11:00:32 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/quality/qcIncome/index.vue | 14 ++++++++++++++
src/views/quality/qcProduce/index.vue | 14 ++++++++++++++
src/views/quality/qcWarehousing/index.vue | 18 ++++++++++++++++--
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 9482727..c05ce79 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -75,6 +75,20 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
+
+
+
+
-->
-
+
-
+
+
+
+
+
+
搜索
重置
From d7eb7202e83cd40119403ba6834f1ae81dda248d Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 11:00:48 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?=
=?UTF-8?q?=E7=95=99=E6=A0=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/quality/sampleCheck/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/quality/sampleCheck/index.vue b/src/views/quality/sampleCheck/index.vue
index abbf8e3..8824ca2 100644
--- a/src/views/quality/sampleCheck/index.vue
+++ b/src/views/quality/sampleCheck/index.vue
@@ -53,7 +53,7 @@
-
+
{{ parseTime(scope.row.sampleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
From 3bd96f4ab7b25e6088e272ae0025b79a434f833f Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 11:01:02 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E106=E5=86=B2=E9=94=80?=
=?UTF-8?q?=E5=87=AD=E8=AF=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/wms/odsRawOrderIn/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 02b2bc4..a0a7601 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -181,7 +181,8 @@
-
+
+
From bfd7bef3de343b9ebbfe347bb1567f160d52ba59 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 11:01:16 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=87=BA=E5=8B=A4?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/AttendanceRecords.js | 9 ++
src/views/mes/postAttached/index.vue | 134 +++++++++++++++++++++++++++
2 files changed, 143 insertions(+)
create mode 100644 src/views/mes/postAttached/index.vue
diff --git a/src/api/mes/AttendanceRecords.js b/src/api/mes/AttendanceRecords.js
index 8fded8d..ac13a29 100644
--- a/src/api/mes/AttendanceRecords.js
+++ b/src/api/mes/AttendanceRecords.js
@@ -42,3 +42,12 @@ export function delAttendanceRecords(id) {
method: 'delete'
})
}
+
+// 查询MES打卡记录列表
+export function getPostAttendanceList(query) {
+ return request({
+ url: '/mes/AttendanceRecords/postAttendance/list',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/mes/postAttached/index.vue b/src/views/mes/postAttached/index.vue
new file mode 100644
index 0000000..dee7c74
--- /dev/null
+++ b/src/views/mes/postAttached/index.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From fe11277624c14636d096c941c5401b206922eec0 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 11:01:37 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E6=89=B9?=
=?UTF-8?q?=E9=87=8F=E8=BF=87=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/outorderfc.js | 8 +++++++
src/views/wms/returnorderzs/index.vue | 33 +++++++++++++++++++++++----
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index 3eff1f8..a1db855 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -240,3 +240,11 @@ export function addwmsFpStorageNewsTS(data) {
data: data
});
}
+
+export function batchSapTl(data) {
+ return request({
+ url: '/wms/outorder/batchSapTl',
+ method: 'post',
+ data: data
+ });
+}
diff --git a/src/views/wms/returnorderzs/index.vue b/src/views/wms/returnorderzs/index.vue
index 91afcfe..b2c28c6 100644
--- a/src/views/wms/returnorderzs/index.vue
+++ b/src/views/wms/returnorderzs/index.vue
@@ -45,6 +45,9 @@
过账
+
+ 批量过账
+
生成退货单
@@ -84,6 +87,7 @@
+
@@ -315,10 +319,11 @@
+
-
+
@@ -364,10 +369,11 @@ import {
removeReturn,
getIdCardListTH,
listReturnDY,
- listOutorderZU
+ listOutorderZU, batchSapTl
} from '@/api/wms/outorderfc'
import moment from "moment/moment";
import JsBarcode from "jsbarcode";
+import printJS from "print-js";
export default {
name: "Outorder",
@@ -1013,7 +1019,26 @@ export default {
this.download('wms/outorder/export', {
...this.queryParams
}, `outorder_${new Date().getTime()}.xlsx`)
- }
- }
+ },
+
+ /**
+ * 批量过账操作
+ * **/
+ handleBatchSAP(){
+ //取出对应的退货单号
+
+ if (this.selectabletrows.length <= 0){
+ this.$modal.msgError("请选择数据操作!");
+ return;
+ }
+
+ let postData = this.selectabletrows.map(item => (item.produceCode));
+ const params = [...new Set(postData)];
+ batchSapTl(params).then(response => {
+ this.$modal.msgSuccess("操作完成");
+ });
+ }
+ },
+
};
From 8790a9149305de191de7a1324ef2adf37776a7c2 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Mon, 11 Aug 2025 14:08:31 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=BC=E5=90=88?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E7=BA=BF?=
=?UTF-8?q?=E4=BD=93=E6=95=85=E9=9A=9C=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/kanban/equipment.js | 8 ++++
src/views/cs/index5/cards.vue | 73 +++++++++++++++++++++++++++++++----
2 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/src/api/kanban/equipment.js b/src/api/kanban/equipment.js
index 924d45e..49db052 100644
--- a/src/api/kanban/equipment.js
+++ b/src/api/kanban/equipment.js
@@ -100,3 +100,11 @@ export function getRepairWorkOrderCostTime(data) {
params: data,
});
}
+
+export function getFaultRateList(data) {
+ return request({
+ url: '/device/deviceInterface/getFaultRateList',
+ method: 'get',
+ params: data
+ });
+}
diff --git a/src/views/cs/index5/cards.vue b/src/views/cs/index5/cards.vue
index b0f6c21..fdfe0e2 100644
--- a/src/views/cs/index5/cards.vue
+++ b/src/views/cs/index5/cards.vue
@@ -25,6 +25,10 @@
+
@@ -33,6 +37,7 @@ import {
getCompletedRate,
} from "@/api/kanban/spectaculars";
+import {getFaultRateList, getworkFaultDesc} from "@/api/kanban/equipment";
export default {
name: 'Cards',
data () {
@@ -41,6 +46,12 @@ export default {
],
equipmentinfo: {},
+ config: {
+ data: [],
+ unit:"%",
+ sort:false,
+ rowNum: 13
+ }
}
},
methods: {
@@ -129,12 +140,31 @@ export default {
},
- randomExtend (minNum, maxNum) {
- if (arguments.length === 1) {
- return parseInt(Math.random() * minNum + 1, 10)
- } else {
- return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10)
- }
+
+ async getdatalist() {
+ getFaultRateList({ poolName: "ds_1000" }).then(res=>{
+ if (res.data){
+ let processedData = [];
+ for (const item of res.data){
+ processedData.push({
+ name: item.lineName || '未知分类', // 处理空名称
+ value: Number(item.faultRate).toFixed(2) || 0 // 确保数值类型
+ })
+ }
+ const asc = [...processedData].sort((a, b) => b.value - a.value);
+ this.config = {
+ ...this.config, // 保留其他配置项
+ data: asc
+ };
+ }else {
+ // 空数据兜底处理
+ this.config.data = [{ name: '暂无数据', value: 0 }];
+ }
+ }).catch((error)=>{
+ console.error('数据获取失败:', error);
+ // 错误状态显示(保持数据结构一致)
+ this.config.data = [{ name: '数据异常', value: 0 }];
+ })
}
},
mounted () {
@@ -142,9 +172,15 @@ export default {
createData()
+ this.getdatalist();
+ // 添加定时刷新(可选)
+ this.timer = setInterval(() => {
+ this.getdatalist();
+ }, 60000); // 60秒刷新
setInterval(this.createData, 30000)
- }
+ },
+
}
@@ -217,4 +253,27 @@ export default {
}
}
}
+#ranking-board {
+ width: 20%;
+ height: 100%;
+ box-shadow: 0 0 3px blue;
+ display: flex;
+ flex-direction: column;
+ background-color: rgba(6, 30, 93, 0.5);
+ border-top: 2px solid rgba(1, 153, 209, .5);
+ box-sizing: border-box;
+ padding: 0px 30px;
+
+ .ranking-board-title {
+ font-weight: bold;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ font-size: 20px;
+ }
+
+ .dv-scroll-ranking-board {
+ flex: 1;
+ }
+}