diff --git a/.env.dev b/.env.dev index 7c7b6af3..7c750412 100644 --- a/.env.dev +++ b/.env.dev @@ -12,9 +12,9 @@ VUE_APP_TITLE = 洛玻集团驾驶舱 # 杨姗姗 # VUE_APP_BASE_API = 'http://172.16.20.218:7070' # 小田 -# VUE_APP_BASE_API = 'http://172.16.19.232:7070' +VUE_APP_BASE_API = 'http://172.16.19.232:7070' # 测试 -VUE_APP_BASE_API = 'http://192.168.0.35:8080' +# VUE_APP_BASE_API = 'http://192.168.0.35:8080' # 路由懒加载 diff --git a/src/views/home/components/budgetDetails.vue b/src/views/home/components/budgetDetails.vue index c26983d9..3b895579 100644 --- a/src/views/home/components/budgetDetails.vue +++ b/src/views/home/components/budgetDetails.vue @@ -90,7 +90,7 @@
@@ -512,6 +512,10 @@ export default { this.$message.error('上传失败!') } }, + cancelBtn() { + this.upload.open = false + this.$refs.upload.clearFiles(); + } } } diff --git a/src/views/home/components/indicatorDetails.vue b/src/views/home/components/indicatorDetails.vue index 563bda2d..c501ca4d 100644 --- a/src/views/home/components/indicatorDetails.vue +++ b/src/views/home/components/indicatorDetails.vue @@ -77,7 +77,7 @@ font-style: normal;">指标详情 @@ -387,6 +387,10 @@ export default { console.error('文件上传出错:', error) this.$message.error('上传失败!') } + }, + cancelBtn(){ + this.upload.open = false + this.$refs.upload.clearFiles(); } } } diff --git a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue index 81ee86a6..fb89ba91 100644 --- a/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue +++ b/src/views/home/productionCostAnalysis/SIMFRMCostAnalysis.vue @@ -189,23 +189,23 @@ export default { startTime: this.dateData.startTime, endTime: this.dateData.endTime, trendName: '原料' + this.meterialName + this.trendName, - analysisObject: ['原料' + this.meterialName], + analysisObject: [this.meterialName], levelId: this.factory, }; // 调用接口 getSingleMaterialAnalysis(requestParams).then((res) => { this.monData = res.data.currentMonthData.find(item => { - return item.name === '原料' + this.meterialName; + return item.name === this.meterialName + '成本'; }); this.totalData = res.data.totalMonthData.find(item => { - return item.name === '原料' + this.meterialName; + return item.name === this.meterialName + '成本'; }); this.relatedData = { relatedMon: res.data.currentMonthData.filter(item => { - return item.name !== '原料' + this.meterialName; + return item.name !== this.meterialName + '成本'; }), // 兜底月度数据 relatedTotal: res.data.totalMonthData.filter(item => { - return item.name !== '原料' + this.meterialName; + return item.name !== this.meterialName + '成本'; }) // 兜底累计数据 } this.trend = res.data.dataTrend diff --git a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue index ff3b4e91..271ab6de 100644 --- a/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue +++ b/src/views/home/productionCostAnalysis/fuelCostAnalysis.vue @@ -108,7 +108,7 @@ export default { totalData: {}, trend: [], relatedData: {}, - trendName: '原片原料成本', + trendName: '原片原料', // monthRelatedData: [], // totalRelatedData: [], }; diff --git a/src/views/home/productionCostAnalysis/singleCombustible.vue b/src/views/home/productionCostAnalysis/singleCombustible.vue index f7a76e7f..9aeceeb7 100644 --- a/src/views/home/productionCostAnalysis/singleCombustible.vue +++ b/src/views/home/productionCostAnalysis/singleCombustible.vue @@ -39,7 +39,7 @@ grid-template-columns: 1624px; "> -