diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js new file mode 100644 index 0000000..404ab96 --- /dev/null +++ b/src/api/kanban/quality.js @@ -0,0 +1,96 @@ +import request from '@/utils/request' +// 获取工厂下拉列表 +export function getBoardFactory(data) { + return request({ + url: '/mes/wcsInterface/getBoardFactory', + method: 'post', + data: data + }); +} +// 获取头部统计维度年月日 +export function getDictData(data) { + return request({ + url: '/quality/qcInterface/getDictData', + method: 'post', + data: data + }); +} +// 来料--订单异常信息 +export function getOverallInfo(data) { + return request({ + url: '/quality/qcInterface/getOverallInfo', + method: 'post', + data: data, + }); +} +// 来料--异常分布 过程检验--当日不良占比类型 +export function getCheckProjectsPie(data) { + return request({ + url: '/quality/qcInterface/getCheckProjectsPie', + method: 'post', + data: data + }); +} +// 来料--供应商产品数量不良TOP5来料--供应商产品批次不良TOP5 +export function getSupplierBadTOP5(data) { + return request({ + url: '/quality/qcInterface/getSupplierBadTOP5', + method: 'post', + data: data + }); +} +// 来料--订单异常详情 +export function getSupplierNoOkList(data) { + return request({ + url: '/quality/qcInterface/getSupplierNoOkList', + method: 'post', + data: data + }); +} +// 来料--供应商来料检验及时性详情 生产过程--检验实时详情 +export function getSupplierTaskList(data) { + return request({ + url: '/quality/qcInterface/getSupplierTaskList', + method: 'post', + data: data + }); +}// 过程检验-检验统计 +export function getProduceStaticInfo(data) { + return request({ + url: '/quality/qcInterface/getProduceStaticInfo', + method: 'post', + data: data + }); +} +// 过程检验--质量异常信息 +export function getProduceNoOkList(data) { + return request({ + url: '/quality/qcInterface/getProduceNoOkList', + method: 'post', + data: data + }); +} +// 过程检验--产品不合格数量对比 +export function getProMonthNoOk(data) { + return request({ + url: '/quality/qcInterface/getProMonthNoOk', + method: 'post', + data: data + }); +} +// 过程检验--产品异常趋势 +export function getLineDayNoOk(data) { + return request({ + url: '/quality/qcInterface/getLineDayNoOk', + method: 'post', + data: data + }); +} +// 过程检验--产品不合格率同期对比 +export function getMonthOfYearContrast(data) { + return request({ + url: '/quality/qcInterface/getMonthOfYearContrast', + method: 'post', + data: data + }); +} \ No newline at end of file diff --git a/src/assets/images/quality/bg-border2title.png b/src/assets/images/quality/bg-border2title.png new file mode 100644 index 0000000..6ff7ab4 Binary files /dev/null and b/src/assets/images/quality/bg-border2title.png differ diff --git a/src/assets/images/quality/bg-dingdan.png b/src/assets/images/quality/bg-dingdan.png new file mode 100644 index 0000000..a8ef6cc Binary files /dev/null and b/src/assets/images/quality/bg-dingdan.png differ diff --git a/src/assets/images/quality/bgicon.png b/src/assets/images/quality/bgicon.png new file mode 100644 index 0000000..278ddbe Binary files /dev/null and b/src/assets/images/quality/bgicon.png differ diff --git a/src/assets/images/quality/bgtable.png b/src/assets/images/quality/bgtable.png new file mode 100644 index 0000000..d20c441 Binary files /dev/null and b/src/assets/images/quality/bgtable.png differ diff --git a/src/assets/images/quality/icon-dingdan1.png b/src/assets/images/quality/icon-dingdan1.png new file mode 100644 index 0000000..b54055e Binary files /dev/null and b/src/assets/images/quality/icon-dingdan1.png differ diff --git a/src/assets/images/quality/icon-dingdan2.png b/src/assets/images/quality/icon-dingdan2.png new file mode 100644 index 0000000..1c120da Binary files /dev/null and b/src/assets/images/quality/icon-dingdan2.png differ diff --git a/src/assets/images/quality/icon-dingdan3.png b/src/assets/images/quality/icon-dingdan3.png new file mode 100644 index 0000000..922c552 Binary files /dev/null and b/src/assets/images/quality/icon-dingdan3.png differ diff --git a/src/assets/images/quality/icon-shibie.png b/src/assets/images/quality/icon-shibie.png new file mode 100644 index 0000000..86e8d8a Binary files /dev/null and b/src/assets/images/quality/icon-shibie.png differ diff --git a/src/assets/images/quality/icon-xiala.png b/src/assets/images/quality/icon-xiala.png new file mode 100644 index 0000000..3bfdbba Binary files /dev/null and b/src/assets/images/quality/icon-xiala.png differ diff --git a/src/assets/images/quality/编组 12.png b/src/assets/images/quality/icon2.png similarity index 100% rename from src/assets/images/quality/编组 12.png rename to src/assets/images/quality/icon2.png diff --git a/src/assets/images/quality/编组 12备份 14.png b/src/assets/images/quality/编组 12备份 14.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 14.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 15.png b/src/assets/images/quality/编组 12备份 15.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 15.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 16.png b/src/assets/images/quality/编组 12备份 16.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 16.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 17.png b/src/assets/images/quality/编组 12备份 17.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 17.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 18.png b/src/assets/images/quality/编组 12备份 18.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 18.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(1).png b/src/assets/images/quality/编组 12备份 19(1).png deleted file mode 100644 index 8ad27b9..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(1).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(2).png b/src/assets/images/quality/编组 12备份 19(2).png deleted file mode 100644 index 5dc38cd..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(2).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(3).png b/src/assets/images/quality/编组 12备份 19(3).png deleted file mode 100644 index 8437d52..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(3).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(4).png b/src/assets/images/quality/编组 12备份 19(4).png deleted file mode 100644 index c21ee30..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(4).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(5).png b/src/assets/images/quality/编组 12备份 19(5).png deleted file mode 100644 index 1c48746..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(5).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(6).png b/src/assets/images/quality/编组 12备份 19(6).png deleted file mode 100644 index 6584f29..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(6).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19(7).png b/src/assets/images/quality/编组 12备份 19(7).png deleted file mode 100644 index 6190526..0000000 Binary files a/src/assets/images/quality/编组 12备份 19(7).png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 19.png b/src/assets/images/quality/编组 12备份 19.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 19.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 20.png b/src/assets/images/quality/编组 12备份 20.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 20.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 21.png b/src/assets/images/quality/编组 12备份 21.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 21.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 22.png b/src/assets/images/quality/编组 12备份 22.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 22.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 23.png b/src/assets/images/quality/编组 12备份 23.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 23.png and /dev/null differ diff --git a/src/assets/images/quality/编组 12备份 24.png b/src/assets/images/quality/编组 12备份 24.png deleted file mode 100644 index 3d70560..0000000 Binary files a/src/assets/images/quality/编组 12备份 24.png and /dev/null differ diff --git a/src/utils/request.js b/src/utils/request.js index 59f0874..3624538 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,6 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, + // baseURL: 'http://192.168.202.34:30000/prod-api', // 超时 timeout: 10000 }) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 8623238..6e42cae 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -343,6 +343,12 @@ prop="workReason" width="300" /> + + + + + + + + @@ -1423,6 +1442,20 @@ + + + + + + + diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 5e2e34e..cf41854 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -46,7 +46,7 @@
- 15000 + {{ Statistics.todayPro }}
@@ -56,7 +56,7 @@
- 12000 + {{ Statistics.todaySample }}
@@ -66,7 +66,7 @@
- 3000 + {{ Statistics.todayNoOk }}
@@ -78,7 +78,7 @@
- 15000 + {{ Statistics.monthPro }}
@@ -88,7 +88,7 @@
- 3000 + {{ Statistics.monthNoOk }}
@@ -119,15 +119,16 @@
+ :key="index" v-for="(n, index) in Qualitylist">
- 产品1直径过大 + {{ n.projectName }} +
- 张三 2023.10.30 + {{ n.checkManName }} {{ n.checkTime }}
@@ -156,7 +157,7 @@
产品不同工序异常对比
-
+
@@ -169,14 +170,13 @@ + + \ No newline at end of file diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue index e69de29..c62c379 100644 --- a/src/views/kanban/quality/kanban3.vue +++ b/src/views/kanban/quality/kanban3.vue @@ -0,0 +1,614 @@ + + + + + \ No newline at end of file diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 866024f..a73391a 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -1112,6 +1112,11 @@ export default { pageNum: 1, pageSize: 10, }, + queryAuxiliaryEquipmentParams: { + pageNum: 1, + pageSize: 1000, + equipmentCategory : null, + }, options: [ { status: "1", @@ -1234,19 +1239,6 @@ export default { getList() { this.loading = true; listEquipment(this.queryParams).then((response) => { - this.auxiliaryEquipmentLeftList = []; - this.auxiliaryEquipmentRightList = []; - for (let i in response.rows) { - // 将返回的列表赋值于穿梭框左边列表 - this.auxiliaryEquipmentLeftList.push({ - key: response.rows[i].equipmentCode, - label: response.rows[i].equipmentName, - }); - } - for (let i in response.selected) { - this.auxiliaryEquipmentRightList.push(response.selected[i].key); - this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; - } this.equipmentList = response.rows; this.total = response.total; this.loading = false; @@ -1351,7 +1343,18 @@ export default { }); this.repairRecordSteps = 0; this.rightList = []; + this.auxiliaryEquipmentLeftList = []; this.auxiliaryEquipmentRightList = []; + this.queryAuxiliaryEquipmentParams.equipmentCategory = '0'; + listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => { + for (let i in response.rows) { + // 将返回的列表赋值于穿梭框左边列表 + this.auxiliaryEquipmentLeftList.push({ + key: response.rows[i].equipmentCode, + label: response.rows[i].equipmentName, + }); + } + }); this.open = true; this.title = "添加设备管理"; }, @@ -1363,6 +1366,22 @@ export default { getWorkCenterList().then((response) => { this.options1 = response.rows; }); + this.queryAuxiliaryEquipmentParams.equipmentCategory = '0'; + listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => { + this.auxiliaryEquipmentLeftList = []; + this.auxiliaryEquipmentRightList = []; + for (let i in response.rows) { + // 将返回的列表赋值于穿梭框左边列表 + this.auxiliaryEquipmentLeftList.push({ + key: response.rows[i].equipmentCode, + label: response.rows[i].equipmentName, + }); + } + for (let i in response.selected) { + this.auxiliaryEquipmentRightList.push(response.selected[i].key); + this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; + } + }); getEquipment(equipmentId).then((response) => { this.form = response.data; this.rightList = [];