diff --git a/src/api/kanban/equipment.js b/src/api/kanban/equipment.js index 72da110..e2d2e4f 100644 --- a/src/api/kanban/equipment.js +++ b/src/api/kanban/equipment.js @@ -69,4 +69,26 @@ export function getdictlist(data) { method: 'get', params: data }); -} \ No newline at end of file +} + +export function getworkFaultReason(data) { + return request({ + url: '/device/deviceInterface/getworkFaultReason', + method: 'get', + params: data + }); +} +export function getworkFaultDesc(data) { + return request({ + url: '/device/deviceInterface/getworkFaultDesc', + method: 'get', + params: data + }); +} +export function getWave(data) { + return request({ + url: '/device/deviceInterface/getWave', + method: 'get', + params: data + }); +} diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index e9d3b3b..fdead41 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -96,4 +96,10 @@ export function getBomList(query) { }); } - +// 删除生产报工物料消耗 +export function deleteConsume(workorderCode) { + return request({ + url: '/mes/reportWorkConsume/deleteConsume/' + workorderCode, + method: 'delete' + }); +} diff --git a/src/api/quality/checkType.js b/src/api/quality/checkType.js index d227eac..a7570ea 100644 --- a/src/api/quality/checkType.js +++ b/src/api/quality/checkType.js @@ -85,3 +85,18 @@ export function delFile(id) { method: 'delete' }); } + +// 查询检验节点维护详细 +export function listBelongToStandars() { + return request({ + url: '/quality/checkType/listBelongToStandars', + method: 'get' + }); +} +// 查询检验节点维护详细 +export function listBelongToLines() { + return request({ + url: '/quality/checkType/listBelongToLines', + method: 'get' + }); +} \ No newline at end of file diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index f9d8c6d..5e99d05 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -207,4 +207,93 @@ export function getTableCPKList(query) { method: 'get', params: query }); -} \ No newline at end of file +} + +//白坯质量报表头部 +export function getMonthOfDateTitle(query) { + return request({ + url: '/quality/staticTable/getMonthOfDateTitle', + method: 'get', + params: query + }); +} + +export function getMonthOfData(query) { + return request({ + url: '/quality/staticTable/getMonthOfData', + method: 'get', + params: query + }); +} + +export function getMonthOfLine(query) { + return request({ + url: '/quality/staticTable/getMonthOfLine', + method: 'get', + params: query + }); +} + +export function getMonthOfDataRework(query) { + return request({ + url: '/quality/staticTable/getMonthOfDataRework', + method: 'get', + params: query + }); +} + +export function getMonthOfLineRework(query) { + return request({ + url: '/quality/staticTable/getMonthOfLineRework', + method: 'get', + params: query + }); +} + +export function getMonthOfDataDefect(query) { + return request({ + url: '/quality/staticTable/getMonthOfDataDefect', + method: 'get', + params: query + }); +} + +export function getDefectItemTitle(query) { + return request({ + url: '/quality/staticTable/getDefectItemTitle', + method: 'get', + params: query + }); +} + +export function getDefectItemData(query) { + return request({ + url: '/quality/staticTable/getDefectItemData', + method: 'get', + params: query + }); +} + +export function getDefectItemLine(query) { + return request({ + url: '/quality/staticTable/getDefectItemLine', + method: 'get', + params: query + }); +} + +export function getDefectItemDataPC(query) { + return request({ + url: '/quality/staticTable/getDefectItemDataPC', + method: 'get', + params: query + }); +} + +export function getDefectItemLinePC(query) { + return request({ + url: '/quality/staticTable/getDefectItemLinePC', + method: 'get', + params: query + }); +} diff --git a/src/api/quality/userbind.js b/src/api/quality/userbind.js index 71c36a9..9900436 100644 --- a/src/api/quality/userbind.js +++ b/src/api/quality/userbind.js @@ -91,3 +91,12 @@ export function deleteByMaterialCode(data) { data: data }); } + +// 修改用户物料关联 +export function updateBelongTo(data) { + return request({ + url: '/quality/material/updateBelongTo', + method: 'put', + data: data + }); +} \ No newline at end of file diff --git a/src/assets/board/bg.png b/src/assets/board/bg.png new file mode 100644 index 0000000..54aa045 Binary files /dev/null and b/src/assets/board/bg.png differ diff --git a/src/router/index.js b/src/router/index.js index d280d2d..3a5d33c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,6 +33,7 @@ export const constantRoutes = [ {path: '/cs', component: () => import('@/views/cs/index.vue')}, {path: '/cs2', component: () => import('@/views/cs/index2.vue')}, {path: '/cs3', component: () => import('@/views/cs/index3.vue')}, + {path: '/cs5', component: () => import('@/views/cs/index5.vue')}, {path: '/cs6', component: () => import('@/views/cs/index4.vue')}, {path: '/cs3_1', component: () => import('@/views/cs/index3_1.vue')}, { diff --git a/src/views/cs/index.vue b/src/views/cs/index.vue index 983400b..bf39099 100644 --- a/src/views/cs/index.vue +++ b/src/views/cs/index.vue @@ -150,7 +150,8 @@
+ :style="`width: ${i.width}%; height: ${i.height}%;top: ${i.top}%;left: ${i.left}%;transform: rotate(${i.rotate}deg); + background: ${i.alpha};border-radius: ${i.radius}%; `">
{{ i.equipmentName }}
({ ...item, })) + const descList = receivedData.map(item => + `${item.params?.equipmentName || '未知'} ${item.orderDesc || '无故障描述'} 维修人：${item.orderRepairmanName}` + ); + this.scrollText = descList.join('★★★★★★★★'); // 用两个全角空格分隔 + + // 提取所有有效的设备名称 + const activeEquipmentNames = new Set( + receivedData + .map(item => item.params?.equipmentName) + .filter(name => name) + ); + + // 更新infoData的高亮状态 + this.infoData.forEach((item, index) => { + if (activeEquipmentNames.has(item.equipmentName)) { + // 响应式设置alpha + this.$set(this.infoData[index], 'alpha', '#CB4C4C80'); + } else { + // 移除alpha属性 + if (this.infoData[index].hasOwnProperty('alpha')) { + this.$delete(this.infoData[index], 'alpha'); + } + } + }); + } else { console.warn('收到非数组格式数据:', receivedData) } @@ -519,7 +519,7 @@ export default { console.error("JSON parsing failed:", error) this.$notify.error({ title: '数据错误', message: '接收数据格式异常' }) } - }; + }.bind(this);; this.ws.onclose = function (event) { self.text_content = self.text_content + "已经关闭连接!" + "\n"; }; diff --git a/src/views/cs/index5.vue b/src/views/cs/index5.vue new file mode 100644 index 0000000..106cbe4 --- /dev/null +++ b/src/views/cs/index5.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/views/cs/index5/cards.vue b/src/views/cs/index5/cards.vue new file mode 100644 index 0000000..c151d97 --- /dev/null +++ b/src/views/cs/index5/cards.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/src/views/cs/index5/digitalFlop.vue b/src/views/cs/index5/digitalFlop.vue new file mode 100644 index 0000000..f7c5269 --- /dev/null +++ b/src/views/cs/index5/digitalFlop.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/cs/index5/rankingBoard.vue b/src/views/cs/index5/rankingBoard.vue new file mode 100644 index 0000000..a70faa4 --- /dev/null +++ b/src/views/cs/index5/rankingBoard.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/views/cs/index5/roseChart.vue b/src/views/cs/index5/roseChart.vue new file mode 100644 index 0000000..4635dad --- /dev/null +++ b/src/views/cs/index5/roseChart.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/cs/index5/scrollBoard.vue b/src/views/cs/index5/scrollBoard.vue new file mode 100644 index 0000000..abb6cfc --- /dev/null +++ b/src/views/cs/index5/scrollBoard.vue @@ -0,0 +1,95 @@ + + + + + + diff --git a/src/views/cs/index5/topHeader.vue b/src/views/cs/index5/topHeader.vue new file mode 100644 index 0000000..7d0ec23 --- /dev/null +++ b/src/views/cs/index5/topHeader.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/views/cs/index5/waterLevelChart.vue b/src/views/cs/index5/waterLevelChart.vue new file mode 100644 index 0000000..67ebc1a --- /dev/null +++ b/src/views/cs/index5/waterLevelChart.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index ebf2b2d..3437a80 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -144,12 +144,13 @@ top: 28px; font-size: 5px; " - v-model="ymdArray" + v-model="ymdArray1" type="daterange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd" end-placeholder="结束日期" + @change="noOkTimeChange" >
@@ -173,7 +174,7 @@ {{ n.projectName }}
- {{ n.checkManName }} {{ n.checkTime }} + {{ n.checkManName }} {{ n.checkTime }}|{{ n.className }}|{{ n.defectSubclass }}
@@ -193,12 +194,13 @@ top: 28px; font-size: 5px; " - v-model="ymdArray" + v-model="ymdArray2" type="daterange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd" end-placeholder="结束日期" + @change="noOkRadioTimeChange" > @@ -220,7 +222,7 @@
-
本年各日产品异常趋势
+
本月每日线体异常趋势
产品不合格率同期对比
-
@@ -311,9 +312,12 @@ export default { yearShow: false, monthShow: true, dateShow: false, - ymdArray: [], - ymdStart: null, - ymdEnd: null, + ymdArray1: [], + ymdStart1: null, + ymdEnd1: null, + ymdArray2: [], + ymdStart2: null, + ymdEnd2: null, }; }, created() { @@ -333,17 +337,17 @@ export default { getDate() { let start = this.Fungetdate(0); let end = this.Fungetdate(0); - this.ymdArray.push(start, end); + this.ymdArray1.push(start, end); + this.ymdArray2.push(start, end); this.optionDatalist1 = []; this.optionDatalist2 = []; this.optionDatalist3 = []; this.optionDatalist4 = []; - this.ymdStart = moment(this.ymdArray[0]).format("YYYY-MM-DD"); - this.ymdEnd = moment(this.ymdArray[1]).format("YYYY-MM-DD"); - this.getdatalist( - moment(this.ymdArray[0]).format("YYYY-MM-DD"), - moment(this.ymdArray[1]).format("YYYY-MM-DD") - ); + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); + this.ymdStart2 = moment(this.ymdArray2[0]).format("YYYY-MM-DD"); + this.ymdEnd2 = moment(this.ymdArray2[1]).format("YYYY-MM-DD"); + this.getdatalist(); this.initChart1(); }, @@ -381,11 +385,12 @@ export default { getDeviceRefreshTime() { const _this = this; getDeviceRefreshTime().then((response) => { + if (response.data) { // console.log(response.data) this.RefreshTime = response.data; this.time1 = setInterval(() => { - _this.getdatalist(_this.ymdStart, _this.ymdEnd); + _this.getdatalist(); _this.initChart1(); }, 1000 * 60 * this.RefreshTime); } @@ -409,6 +414,45 @@ export default { // } // }); // }, + noOkTimeChange(){ + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); + //质量异常信息 + getProduceNoOkList({ + typeCode: "produce", + ymdType: this.selectxtclasses, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1, + factoryCode: "ds_" + this.selectxt, + }).then((response) => { + if (response) { + this.Qualitylist = response; + } + }); + }, + noOkRadioTimeChange(){ + this.ymdStart2 = moment(this.ymdArray2[0]).format("YYYY-MM-DD"); + this.ymdEnd2 = moment(this.ymdArray2[1]).format("YYYY-MM-DD"); + //不良类型占比 + getCheckProjectsPie({ + typeCode: "produce", + ymdType: this.selectxtclasses, + productDateStart: this.ymdStart2, + productDateEnd: this.ymdEnd2, + factoryCode: "ds_" + this.selectxt, + }).then((response) => { + if (response) { + this.optionDatalist2 = []; + response.forEach((item) => { + let a = {}; + a.name = item.projectName; + a.value = item.quality; + this.optionDatalist2.push(a); + }); + this.initChart3(); + } + }); + }, getdatalist() { const _this = this; @@ -428,8 +472,8 @@ export default { getProduceNoOkList({ typeCode: "produce", ymdType: _this.selectxtclasses, - productDateStart: this.ymdStart, - productDateEnd: this.ymdEnd, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1, factoryCode: "ds_" + _this.selectxt, }).then((response) => { if (response) { @@ -440,8 +484,8 @@ export default { getCheckProjectsPie({ typeCode: "produce", ymdType: _this.selectxtclasses, - productDateStart: this.ymdStart, - productDateEnd: this.ymdEnd, + productDateStart: this.ymdStart2, + productDateEnd: this.ymdEnd2, factoryCode: "ds_" + _this.selectxt, }).then((response) => { if (response) { @@ -549,7 +593,7 @@ export default { position: "right", distance: 10, // show: true, - }, + } }, data: [], // value鍊� tooltip: { @@ -662,6 +706,10 @@ export default { tooltip: { show: true, trigger: "item", + formatter: function(params) { + const value = parseInt(params.value) || params.value; + return `${params.seriesName}
${params.name}: ${value} PC`; + } }, legend: { show: true, @@ -802,7 +850,7 @@ export default { crossStyle: { color: "#999", }, - }, + } }, legend: { show: true, @@ -906,9 +954,9 @@ export default { ], series: [ { - name: "不合格比例", + name: "去年不合格率(%)", type: "line", - stack: "总量", + stack: "无", symbol: "circle", symbolSize: 8, yAxisIndex: 1, @@ -921,17 +969,17 @@ export default { }, }, }, - label: { - show: true, // 开启显示 - position: "top", // 显示位置，可以是'top', 'bottom', 'left', 'right'等 - formatter: "{c}", // {c} 表示系列中的当前数据值 - }, + //label: { + // show: true, // 开启显示 + // position: "top", // 显示位置，可以是'top', 'bottom', 'left', 'right'等 + // formatter: "{c}", // {c} 表示系列中的当前数据值 + //}, data: [], }, { - name: "本年", + name: "本年不合格率(%)", type: "line", - stack: "总量", + stack: "无", symbol: "circle", symbolSize: 8, yAxisIndex: 1, @@ -944,12 +992,25 @@ export default { }, }, }, + //label: { + // show: true, // 开启显示 + // position: "bottom", // 显示位置，可以是'top', 'bottom', 'left', 'right'等 + // formatter: "{c}", // {c} 表示系列中的当前数据值 + //}, data: [], }, { - name: "上年", + name: "去年不合格数量(PC)", data: [], type: "bar", + label: { // 在柱顶显示数值 + show: true, + position: 'top', // 位置在柱顶 + formatter: function(params) {// 显示数据值 + const value = parseInt(params.value) || params.value; + return `${value} PC`; + } + }, showBackground: true, backgroundStyle: { color: "rgba(180, 180, 180, 0.2)", @@ -965,9 +1026,17 @@ export default { }, }, { - name: "不合格数量", + name: "本年不合格数量(PC)", data: [], type: "bar", + label: { // 在柱顶显示数值 + show: true, + position: 'top', // 位置在柱顶 + formatter: function(params) {// 显示数据值 + const value = parseInt(params.value) || params.value; + return `${value} PC`; + } + }, showBackground: true, backgroundStyle: { color: "rgba(180, 180, 180, 0.2)", @@ -1001,8 +1070,10 @@ export default { let max4 = Math.max(...seriesdata4) + 5; let legenddata = []; - legenddata.push("上年"); - legenddata.push("本年"); + legenddata.push("去年不合格数量(PC)"); + legenddata.push("本年不合格数量(PC)"); + legenddata.push("去年不合格率(%)"); + legenddata.push("本年不合格率(%)"); let yAxismax1 = 0; let yAxismax2 = 0; if (max1 > max2) { @@ -1508,6 +1579,7 @@ export default { //提示框组件。开发实际中去掉了指针，提示框可以不用设置。 tooltip: { trigger: "item", + formatter: "{a}
{b} : {c}PC" }, grid: { top: "60", @@ -1520,7 +1592,7 @@ export default { rich: { a: { color: "#FFFFFF", - width: 30, + width: 70, fontSize: 13, }, b: { @@ -1542,7 +1614,7 @@ export default { var index; for (var i = 0, l = data.length; i < l; i++) { if (data[i].name == name) { - target = data[i].value; + target = data[i].value+"PC"; title = data[i].label; index = i < 6 ? i : 5; } @@ -1633,16 +1705,19 @@ export default { radius: ["44%", "63%"], center: ["50%", "40%"], roseType: "radius", - // itemStyle: { - // normal: { - // color: function (params) { - // return colorList[params.dataIndex] - // } - // } - // }, + //label: { + // formatter: function(params) { + // // params 包含数据项信息 + // return `${params.name}: ${params.value}PC (${params.percent}%)`; + // } + //}, label: { show: false, }, + tooltip: { + trigger: 'item', // 触发类型，饼图使用'item' + formatter: '{b}: {c}PC ({d}%)' // 默认格式 + }, emphasis: { label: { show: false, diff --git a/src/views/kanban/quality/kanban2.vue b/src/views/kanban/quality/kanban2.vue index 04d4e51..49bca2d 100644 --- a/src/views/kanban/quality/kanban2.vue +++ b/src/views/kanban/quality/kanban2.vue @@ -22,13 +22,14 @@
+
@@ -41,6 +42,26 @@
订单异常信息
+ +
@@ -96,6 +117,27 @@
异常原因分布
+
@@ -115,42 +157,70 @@
订单异常明细
+
- - + + + - + + + +
序号 物料名称订单号物料名称订单号 来料时间 质检确认时间 质检数量质检单位 检验人质检不合格质检不合格不良描述不良类型不良数量
- + - - - + + + + - + + + +
{{ index + 1 }} {{ n.materialName }}{{ n.orderNo }}{{ n.checkTime }}{{ n.materialName }}{{ n.orderNo }} {{ n.incomeTime }}{{ n.checkTime }} {{ n.quality }}{{ n.unit }} {{ n.checkManName }}{{ n.checkResult }}{{ n.checkResult }}{{ n.className }}{{ n.defectSubclass }}{{ n.noOkQuality }}
- +
@@ -244,9 +314,21 @@ export default { ], RefreshTime:null, dictDatatype:[], + classOption: { + direction: 1, + hoverstop: true, + step: 0.1, + openNatch: true, + limitMoveNum: 7, + }, + ymdArray1:[], + ymdStart1: null, + ymdEnd1: null }; }, - created() { }, + created() { + this.getDate(); + }, destroyed() { clearInterval(this.time1); this.time1 = null; @@ -260,6 +342,24 @@ export default { this.gettime(); }, methods: { + /**获取默认查询时间段**/ + getDate() { + let start = this.Fungetdate(0); + let end = this.Fungetdate(1); + this.ymdArray1.push(start, end); + + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); + }, + + Fungetdate(num) { + var dd = new Date(); + dd.setDate(dd.getDate()); + var y = dd.getFullYear(); + var m = dd.getMonth() + 1 + num; //获取当前月份的日期 + var d = dd.getDate(); + return y + "-" + m + "-" + d; + }, back() { this.$router.push({ path: "/index" }); }, @@ -293,6 +393,7 @@ export default { } }); }, + /** getDictData() { const _this = this; getDictData( @@ -308,13 +409,17 @@ export default { _this.getDeviceRefreshTime() } }); - }, + },**/ getdatalist() { const _this = this; + this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); + this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); getOverallInfo({ ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.ordermessage = response; @@ -324,6 +429,8 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.optionDatalist2 = [] @@ -340,6 +447,8 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { _this.optionDatalist3 = [] @@ -369,11 +478,14 @@ export default { ymdType: _this.selectxtclasses, typeCode: 'material', factoryCode: 'ds_' + _this.selectxt, + productDateStart: this.ymdStart1, + productDateEnd: this.ymdEnd1 }).then((response) => { if (response) { this.orderdetail = response this.orderdetail.forEach((item) => { - item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss') + item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD') + item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss') }); } }); @@ -1342,22 +1454,22 @@ export default { } .titlebox { - width: 431px; - height: 38px; - background: url("../../../assets/images/bg-title.png") no-repeat; - background-size: 100% 100%; - // text-align: center; - font-size: 20px; - font-weight: bold; - color: #ffffff; - line-height: 38px; - letter-spacing: 2px; - text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5); - padding-left: 60px; - // .titlename{ - // position: relative; - // left: 24px; - // } + width: 431px; + height: 38px; + background: url("../../../assets/images/bg-title.png") no-repeat; + background-size: 100% 100%; + // text-align: center; + font-size: 20px; + font-weight: bold; + color: #ffffff; + line-height: 38px; + letter-spacing: 2px; + text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5); + padding-left: 60px; + // .titlename{ + // position: relative; + // left: 24px; + // } } .titlebox2 { @@ -1392,7 +1504,7 @@ export default { display: flex; align-items: center; justify-content: space-around; - width: 350px; + width: 300px; margin-left: 50px; } diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue index 9417b16..044e027 100644 --- a/src/views/kanban/quality/kanban3.vue +++ b/src/views/kanban/quality/kanban3.vue @@ -50,8 +50,9 @@ +
- +
- +
+
@@ -87,12 +89,13 @@ 物料名称 检验人 检验时间 + 检验地点 检验状态
- + {{ n.materialName }} +
{{ n.checkManName }} {{ n.checkTime }}{{ n.checkLoc }} {{ n.checkStatus }}
- +
@@ -176,6 +180,13 @@ export default { equipmentinfo: [], RefreshTime: null, dictDatatype: [], + classOption: { + direction: 1, + hoverstop: true, + step: 0.1, + openNatch: true, + limitMoveNum: 7, + }, }; }, created() { }, @@ -251,7 +262,11 @@ export default { if (response) { this.Inspectiondetails = response this.Inspectiondetails.forEach((item) => { - item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss') + item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss'); + if(item.checkTime!=null){ + item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss') + } + }); } }); diff --git a/src/views/mes/AttendanceRecords/index.vue b/src/views/mes/AttendanceRecords/index.vue index 4d01756..88760ec 100644 --- a/src/views/mes/AttendanceRecords/index.vue +++ b/src/views/mes/AttendanceRecords/index.vue @@ -17,15 +17,30 @@ @keyup.enter.native="handleQuery" /> - - + - + type="daterange" + range-separator="-" + start-placeholder="开始日期" + end-placeholder="结束日期" + > + + + + + + + + + + + 搜索 重置 @@ -172,6 +187,7 @@ export default { loading: true, // 选中数组 ids: [], + dateRange: [], // 非单个禁用 single: true, // 非多个禁用 @@ -211,7 +227,7 @@ export default { /** 查询MES打卡记录列表 */ getList() { this.loading = true; - listAttendanceRecords(this.queryParams).then(response => { + listAttendanceRecords(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.AttendanceRecordsList = response.rows; this.total = response.total; this.loading = false; diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index ccb0532..af36288 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -518,7 +518,7 @@
- + 一键清理 返回 确 定 取 消 @@ -704,7 +704,7 @@ import { submitConsumePS, submitReportInfo, getBomList, - getAllLevelConsumeList, + getAllLevelConsumeList,deleteConsume } from "@/api/mes/reportWorkConsume"; import ReportWorkConsume from "./reportWorkConsume.vue"; import ItemSelectUser from "./selectUser.vue"; @@ -1434,9 +1434,7 @@ export default { }); this.mergedArray = newPConsumeRows; this.pConsumeRows = newPConsumeRows; - console.log("过滤后:", this.pConsumeRows); } - console.log(this.pConsumeRows, selection, "wwwwww"); }, // 多选框选中all数据(报工物料消耗专用特殊逻辑，不准改zxl) allConsumeSelection(selection, row) { @@ -1490,6 +1488,16 @@ export default { this.loading = false; // 关闭 loading 状态 }); }, + /**清理重复报工损耗**/ + clearConsume(){ + const workorderCode = this.selectRow[0].workorderCode; + this.$modal.confirm('是否确认清理工单号"' + workorderCode + '"的数据项？').then(function() { + return deleteConsume(workorderCode); + }).then(() => { + this.$modal.msgSuccess("清理成功"); + this.cancel(); + }).catch(() => {}); + }, /** 导出按钮操作 */ handleExport() { this.download( diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index 79be36b..0ce862e 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -154,34 +154,40 @@ - - - - - - diff --git a/src/views/quality/report/bpDefect/index.vue b/src/views/quality/report/bpDefect/index.vue new file mode 100644 index 0000000..48d6ef4 --- /dev/null +++ b/src/views/quality/report/bpDefect/index.vue @@ -0,0 +1,211 @@ + + + diff --git a/src/views/quality/report/bpDefectItem/index.vue b/src/views/quality/report/bpDefectItem/index.vue new file mode 100644 index 0000000..abf5451 --- /dev/null +++ b/src/views/quality/report/bpDefectItem/index.vue @@ -0,0 +1,342 @@ + + + + \ No newline at end of file diff --git a/src/views/quality/report/bpDefectItemPC/index.vue b/src/views/quality/report/bpDefectItemPC/index.vue new file mode 100644 index 0000000..a256178 --- /dev/null +++ b/src/views/quality/report/bpDefectItemPC/index.vue @@ -0,0 +1,342 @@ + + + + \ No newline at end of file diff --git a/src/views/quality/report/bpNookRate/index.vue b/src/views/quality/report/bpNookRate/index.vue new file mode 100644 index 0000000..12a91da --- /dev/null +++ b/src/views/quality/report/bpNookRate/index.vue @@ -0,0 +1,359 @@ + + + diff --git a/src/views/quality/report/bpReworkRate/index.vue b/src/views/quality/report/bpReworkRate/index.vue new file mode 100644 index 0000000..fcb9981 --- /dev/null +++ b/src/views/quality/report/bpReworkRate/index.vue @@ -0,0 +1,359 @@ + + +