diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue index b44d906..ab110ba 100644 --- a/src/views/basicData/warehouseMaintenance.vue +++ b/src/views/basicData/warehouseMaintenance.vue @@ -529,6 +529,8 @@ export default { this.option.column = warehouseMain[this.tabPosition]; this.getLocation() }else if(this.tabPosition == "inventorySetup"){ + this.chooseWare = [] + this.noChooseWare = [] this.checkUser = '' getUserByRoleAlias({ roleAlias:"保管员", diff --git a/src/views/orderManagement/components/exception/deliveryDate.vue b/src/views/orderManagement/components/exception/deliveryDate.vue index 5f7659f..8bbfd16 100644 --- a/src/views/orderManagement/components/exception/deliveryDate.vue +++ b/src/views/orderManagement/components/exception/deliveryDate.vue @@ -99,7 +99,7 @@ export default { viewBtn: false, delBtn: false, addBtn: false, - editBtn: true, + editBtn: false, editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, @@ -117,6 +117,7 @@ export default { delBtnIcon: ' ', editBtnIcon: ' ', menuAlign: 'center', + menu:false, gridBtn: false, searchLabelPosition: 'left', searchLabelPosition: 'left', diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index 5c97d07..0dbd72a 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -100,7 +100,7 @@ export default { viewBtn: false, delBtn: false, addBtn: false, - editBtn: true, + editBtn: false, editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, @@ -117,12 +117,12 @@ export default { viewBtnIcon: ' ', delBtnIcon: ' ', editBtnIcon: ' ', - menuAlign: 'left', gridBtn: false, searchLabelPosition: 'left', searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, + menu:false, menuAlign: 'center', gridBtn: false, searchMenuPosition: 'right', @@ -339,7 +339,57 @@ export default { }, ], }, - + { + label: '工艺异常原因', + prop: 'ypQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入工艺异常原因', + trigger: 'blur', + }, + ], + }, + { + label: '工艺任务编号', + prop: 'ypQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入工艺任务编号', + trigger: 'blur', + }, + ], + }, + { + label: '工艺任务状态', + prop: 'ypQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入工艺任务状态', + trigger: 'blur', + }, + ], + }, { label: '需求交期', prop: 'demandDate', diff --git a/src/views/orderManagement/components/exception/resourceMissing.vue b/src/views/orderManagement/components/exception/resourceMissing.vue index 19a6339..cf35836 100644 --- a/src/views/orderManagement/components/exception/resourceMissing.vue +++ b/src/views/orderManagement/components/exception/resourceMissing.vue @@ -109,11 +109,11 @@ export default { viewBtn: false, delBtn: false, addBtn: false, - editBtn: true, + editBtn: false, editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 140, + menuWidth: 100, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -348,7 +348,23 @@ export default { }, ], }, - + { + label: '缺失资源', + prop: 'ypQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入缺失资源', + trigger: 'blur', + }, + ], + }, { label: '需求交期', prop: 'demandDate', diff --git a/src/views/productionSchedulingPlan/basic/qualityGrade.vue b/src/views/productionSchedulingPlan/basic/qualityGrade.vue index e1f92d2..7d16824 100644 --- a/src/views/productionSchedulingPlan/basic/qualityGrade.vue +++ b/src/views/productionSchedulingPlan/basic/qualityGrade.vue @@ -60,7 +60,7 @@ export default { calcHeight: 32, simplePage: false, searchShow: true, - searchMenuSpan: 18, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, @@ -98,7 +98,7 @@ export default { { label: '质量等级', prop: 'qualityGrade', - search: false, + search: true, sortable: true, span: 12, rules: [ diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue b/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue index e51e2fa..c030f18 100644 --- a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue +++ b/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue @@ -85,7 +85,7 @@ 检测曲线
-
+
@@ -279,9 +279,152 @@ export default { const chartDom = document.getElementById(chartId); console.log('chartDom----------',chartDom) if (!chartDom) return; + + let chart = this.$echarts.getInstanceByDom(chartDom); + + if(chart){ + chart.dispose(); + } + // 初始化ECharts实例 + chart = this.$echarts.init(chartDom); + console.log('chart----------',chart) + if(chart){ + chart.clear(); + } + + const option = { + title: { + text: item.workTankName + item.testElement, + left: "center", + }, + legend: { + show: true, + orient: "horizontal", + right: '0' + }, + grid: { + containLabel: true, + left: 20, + right: 20, + bottom: '1%', + top: '15%' + }, + tooltip: { + // 提示框组件 + trigger: 'axis', // 触发类型 柱状图 + axisPointer: { type: 'shadow' } // 触发效果 移动上去 背景效果 + }, + xAxis: { + axisLabel: { + color: '#000', + fontSize: 14, + interval: 0 + }, + axisTick: { + show: false + }, + splitLine: { + show: false + }, + axisLine: { + show: true + }, + data: item.testDateList, + type: 'category' + }, + yAxis: { + axisLabel: { + color: '#000', + fontSize: 14 + }, + // max: globalMax + 10, + axisTick: { + show: false + }, + splitLine: { + show: true + }, + axisLine: { + show: true + }, + name: '' + }, + series: [ + { + name: '上限', // 名称 + data: item.maxList, + type: 'line', + itemStyle: { + color: '#6480e1' + }, + label: { + show: false, + position: 'top', + color: '#000' + } + }, + { + name: '下限', // 名称 + data: item.minList, + type: 'line', + smooth: true, + itemStyle: { + color: '#c0db50' + }, + label: { + show: false, + color: '#fff' + } + }, + { + name: '检测值', // 名称 + data: item.targetList, + type: 'line', + itemStyle: { + color: '#6a6d87' + }, + label: { + show: false, + color: '#fff' + } + } + ] + }; + + chart.setOption(option); + }) + }, + + createChart1(){ + console.log('this.lineData',this.lineData) + let globalMax = -Infinity; // 初始化一个极小值 + this.lineData.forEach((item, index) => { + if (item.maxList && item.maxList.length > 0) { + // 找出当前对象 max 数组里的最大值 + const currentMax = Math.max(...item.maxList); + + // 如果比全局最大值大，则更新 + if (currentMax > globalMax) { + globalMax = currentMax; + } + } + console.log('item-----------',item) + const chartId = `chartview-${item.id || index}`; + const chartDom = document.getElementById(chartId); + console.log('chartDom----------',chartDom) + if (!chartDom) return; + + let chart = this.$echarts.getInstanceByDom(chartDom); + + if(chart){ + chart.dispose(); + } // 初始化ECharts实例 - const chart = this.$echarts.init(chartDom); + chart = this.$echarts.init(chartDom); console.log('chart----------',chart) + if(chart){ + chart.clear(); + } const option = { title: { @@ -381,7 +524,7 @@ export default { } ] }; - chart.clear(); + chart.setOption(option); }) }, @@ -492,7 +635,7 @@ export default { this.lineData = res.data.data.taskCopys this.detailBox = true this.$nextTick(() =>{ - this.createChart() + this.createChart1() }) }) // this.detailForm = {