制造成本分析接口+单位修改
This commit is contained in:
@@ -62,7 +62,7 @@ import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
import relateSingleFuelCostAnalysis from "../productionCostAnalysisComponents/relateSingleFuelCostAnalysis.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuel.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuelYL.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getSingleMaterialAnalysis } from '@/api/cockpit'
|
||||
import moment from "moment";
|
||||
@@ -94,11 +94,16 @@ export default {
|
||||
trendName: '采购单价',
|
||||
meterialName:'',
|
||||
materialOptions: [
|
||||
{value:'硅砂',label:'硅砂'},
|
||||
{value:'海砂',label:'海砂'},
|
||||
{value:'纯碱',label:'纯碱'},
|
||||
{value:'氢氧化铝',label:'氢氧化铝'},
|
||||
{value:'碎玻璃',label:'碎玻璃'},
|
||||
{value:'助熔剂',label:'助熔剂'},
|
||||
{value:'白云石',label:'白云石'},
|
||||
{value:'石灰石',label:'石灰石'}
|
||||
{value:'石灰石',label:'石灰石'},
|
||||
{value:'硅砂',label:'硅砂'},
|
||||
{value:'纯碱',label:'纯碱'},
|
||||
{value:'焦锑酸钠',label:'焦锑酸钠'},
|
||||
{value:'芒硝',label:'芒硝'},
|
||||
{value:'硝酸钠',label:'硝酸钠'}
|
||||
]
|
||||
};
|
||||
},
|
||||
@@ -169,7 +174,7 @@ export default {
|
||||
this.beilv = _this.clientWidth / 1920;
|
||||
})();
|
||||
};
|
||||
this.meterialName = this.$route.query.name ? this.$route.query.name : '硅砂'
|
||||
this.meterialName = this.$route.query.name ? this.$route.query.name : '氢氧化铝'
|
||||
if(this.$route.query.factory){
|
||||
this.factory =Number(this.$route.query.factory)
|
||||
}else if(this.$store.getters.levelList.length > 0 && this.$store.getters.levelList[0].id !== 1) {
|
||||
|
||||
@@ -52,7 +52,7 @@ import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendProcessingLabor.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendProcessingLabor2.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getSingleMaterialCostAnalysis } from '@/api/cockpit'
|
||||
import moment from "moment";
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<!-- <monthlyRelatedMetrics :itemData="renderList" :title="'月度·相关指标分析'" /> -->
|
||||
<relateSingleFuelCostAnalysis :dateData="dateData" :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
<relateSingleFuelCostAnalysis fuelName='电' :dateData="dateData" :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -47,18 +47,10 @@
|
||||
gap: 12px;
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<dataTrend @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
<dataTrend fuelName='电' @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="centerImg" style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1; /* 确保在 backp 之上、内容之下 */
|
||||
"></div> -->
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -68,21 +60,11 @@ import screenfull from "screenfull";
|
||||
import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
// import totalOverview from "../operatingComponents/totalOverview.vue";
|
||||
// import monthlyRelatedMetrics from "../procurementGainAnalysisComponents/monthlyRelatedMetrics.vue";
|
||||
import relateSingleFuelCostAnalysis from "../productionCostAnalysisComponents/relateSingleFuelCostAnalysisDian.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuel.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuelDian.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getCostAnalysisData } from '@/api/cockpit'
|
||||
// import PSDO from "./components/PSDO.vue";
|
||||
// import psiLineChart from "./components/psiLineChart.vue";
|
||||
|
||||
// import coreBottomLeft from "./components/coreBottomLeft.vue";
|
||||
// import orderProgress from "./components/orderProgress.vue";
|
||||
// import keyWork from "./components/keyWork.vue";
|
||||
import moment from "moment";
|
||||
// import html2canvas from 'html2canvas'
|
||||
// import JsPDF from 'jspdf'
|
||||
export default {
|
||||
name: "DayReport",
|
||||
components: {
|
||||
@@ -93,7 +75,6 @@ export default {
|
||||
totalOverview,
|
||||
relateSingleFuelCostAnalysis,
|
||||
dataTrend
|
||||
// psiLineChart
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
@@ -34,13 +34,9 @@
|
||||
<div class="left-three" style="
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
grid-template-columns: 804px 804px;
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<monthlyRelatedMetrics :dateData="dateData" :factory="factory" :relatedData="monthRelatedData"
|
||||
:title="'月度概览'" />
|
||||
<yearRelatedMetrics :dateData="dateData" :factory="factory" :relatedData="totalRelatedData" :title="'累计概览'" />
|
||||
|
||||
|
||||
<relateFuCostAnalysis :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="bottom" style="display: flex; gap: 16px;margin-top: 6px;">
|
||||
@@ -53,14 +49,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="centerImg" style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1; /* 确保在 backp 之上、内容之下 */
|
||||
"></div> -->
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -70,21 +58,11 @@ import screenfull from "screenfull";
|
||||
import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
// import totalOverview from "../operatingComponents/totalOverview.vue";
|
||||
import monthlyRelatedMetrics from "../productionCostAnalysisComponents/monthlyThreeRelatedMetrics.vue";
|
||||
import yearRelatedMetrics from "../productionCostAnalysisComponents/yearThreeRelatedMetrics.vue";
|
||||
import relateFuCostAnalysis from "../productionCostAnalysisComponents/relateFuCostAnalysis.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendProcAuxMat.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getCostAnalysisData } from '@/api/cockpit'
|
||||
// import PSDO from "./components/PSDO.vue";
|
||||
// import psiLineChart from "./components/psiLineChart.vue";
|
||||
|
||||
// import coreBottomLeft from "./components/coreBottomLeft.vue";
|
||||
// import orderProgress from "./components/orderProgress.vue";
|
||||
// import keyWork from "./components/keyWork.vue";
|
||||
import moment from "moment";
|
||||
// import html2canvas from 'html2canvas'
|
||||
// import JsPDF from 'jspdf'
|
||||
export default {
|
||||
name: "DayReport",
|
||||
components: {
|
||||
@@ -93,8 +71,7 @@ export default {
|
||||
monthlyOverview,
|
||||
Sidebar,
|
||||
totalOverview,
|
||||
monthlyRelatedMetrics,
|
||||
yearRelatedMetrics,
|
||||
relateFuCostAnalysis,
|
||||
dataTrend
|
||||
// psiLineChart
|
||||
},
|
||||
@@ -107,11 +84,10 @@ export default {
|
||||
factory: null,
|
||||
value: 100,
|
||||
dateData: {},
|
||||
trendName: '加工燃料成本',
|
||||
trendName: '加工辅料',
|
||||
monData: {},
|
||||
totalData: {},
|
||||
monthRelatedData: [],
|
||||
totalRelatedData: [],
|
||||
relatedData:{},
|
||||
trend: [],
|
||||
};
|
||||
},
|
||||
@@ -224,20 +200,17 @@ export default {
|
||||
return item.name === "加工辅料成本";
|
||||
});
|
||||
console.log('this.monData', this.monData);
|
||||
|
||||
this.totalData = res.data.totalMonthData.find(item => {
|
||||
return item.name === "加工辅料成本";
|
||||
});
|
||||
// this.relatedMon = res.data.relatedMon
|
||||
this.monthRelatedData = res.data.currentMonthData.filter(item => {
|
||||
this.relatedData = {
|
||||
relatedMon: res.data.currentMonthData.filter(item => {
|
||||
return item.name !== "加工辅料成本";
|
||||
}),
|
||||
relatedTotal: res.data.totalMonthData.filter(item => {
|
||||
return item.name !== "加工辅料成本";
|
||||
})
|
||||
this.totalRelatedData = res.data.totalMonthData.filter(item => {
|
||||
return item.name !== "加工辅料成本";
|
||||
}) // 兜底累
|
||||
|
||||
;
|
||||
|
||||
}
|
||||
this.trend = res.data.dataTrend
|
||||
});
|
||||
},
|
||||
|
||||
@@ -60,7 +60,7 @@ import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
// import totalOverview from "../operatingComponents/totalOverview.vue";
|
||||
// import monthlyRelatedMetrics from "../procurementGainAnalysisComponents/monthlyRelatedMetrics.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendProcessingLabor.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendProcessingLabor2.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getSingleMaterialCostAnalysis } from '@/api/cockpit'
|
||||
// import PSDO from "./components/PSDO.vue";
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
gap: 12px;
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<dataTrend @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
<dataTrend :fuelName='fuelName' @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
gap: 12px;
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<!-- <monthlyRelatedMetrics :itemData="renderList" :title="'月度·相关指标分析'" /> -->
|
||||
<relateSingleFuelCostAnalysis :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
|
||||
</div>
|
||||
@@ -53,14 +52,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="centerImg" style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1; /* 确保在 backp 之上、内容之下 */
|
||||
"></div> -->
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -70,21 +61,11 @@ import screenfull from "screenfull";
|
||||
import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
// import totalOverview from "../operatingComponents/totalOverview.vue";
|
||||
// import monthlyRelatedMetrics from "../procurementGainAnalysisComponents/monthlyRelatedMetrics.vue";
|
||||
import relateSingleFuelCostAnalysis from "../productionCostAnalysisComponents/relateSingleFuelCostAnalysisFu.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuel.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuelF.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getSingleMaterialAnalysis } from '@/api/cockpit'
|
||||
// import PSDO from "./components/PSDO.vue";
|
||||
// import psiLineChart from "./components/psiLineChart.vue";
|
||||
|
||||
// import coreBottomLeft from "./components/coreBottomLeft.vue";
|
||||
// import orderProgress from "./components/orderProgress.vue";
|
||||
// import keyWork from "./components/keyWork.vue";
|
||||
import moment from "moment";
|
||||
// import html2canvas from 'html2canvas'
|
||||
// import JsPDF from 'jspdf'
|
||||
export default {
|
||||
name: "DayReport",
|
||||
components: {
|
||||
@@ -95,7 +76,6 @@ export default {
|
||||
totalOverview,
|
||||
relateSingleFuelCostAnalysis,
|
||||
dataTrend
|
||||
// psiLineChart
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -115,7 +95,9 @@ export default {
|
||||
auxMatOptions: [
|
||||
{value:'镀膜液',label:'镀膜液'},
|
||||
{value:'油墨',label:'油墨'},
|
||||
{value:'釉料',label:'釉料'}
|
||||
{value:'釉料',label:'釉料'},
|
||||
{value:'无水乙醇',label:'无水乙醇'},
|
||||
{value:'异丙醇',label:'异丙醇'}
|
||||
]
|
||||
};
|
||||
},
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<!-- <monthlyRelatedMetrics :itemData="renderList" :title="'月度·相关指标分析'" /> -->
|
||||
<relateSingleFuelCostAnalysis :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
<relateSingleFuelCostAnalysis :fuelName='fuelName' :relatedData="relatedData" :title="'相关指标分析'" />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -49,18 +49,10 @@
|
||||
gap: 12px;
|
||||
grid-template-columns: 1624px;
|
||||
">
|
||||
<dataTrend @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
<dataTrend :fuelName='fuelName' @getData="changeItem" :trendData="trend" :title="'数据趋势'" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="centerImg" style="
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 1; /* 确保在 backp 之上、内容之下 */
|
||||
"></div> -->
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -70,21 +62,11 @@ import screenfull from "screenfull";
|
||||
import changeBase from "../components/changeBase.vue";
|
||||
import monthlyOverview from "../productionCostAnalysisComponents/monthlyOverview.vue";
|
||||
import totalOverview from "../productionCostAnalysisComponents/totalOverview.vue";
|
||||
// import totalOverview from "../operatingComponents/totalOverview.vue";
|
||||
// import monthlyRelatedMetrics from "../procurementGainAnalysisComponents/monthlyRelatedMetrics.vue";
|
||||
import relateSingleFuelCostAnalysis from "../productionCostAnalysisComponents/relateSingleFuelCostAnalysisDian.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuel.vue";
|
||||
import dataTrend from "../productionCostAnalysisComponents/dataTrendSingleFuelDian.vue";
|
||||
import { mapState } from "vuex";
|
||||
import { getSingleMaterialAnalysis } from '@/api/cockpit'
|
||||
// import PSDO from "./components/PSDO.vue";
|
||||
// import psiLineChart from "./components/psiLineChart.vue";
|
||||
|
||||
// import coreBottomLeft from "./components/coreBottomLeft.vue";
|
||||
// import orderProgress from "./components/orderProgress.vue";
|
||||
// import keyWork from "./components/keyWork.vue";
|
||||
import moment from "moment";
|
||||
// import html2canvas from 'html2canvas'
|
||||
// import JsPDF from 'jspdf'
|
||||
export default {
|
||||
name: "DayReport",
|
||||
components: {
|
||||
@@ -95,7 +77,6 @@ export default {
|
||||
totalOverview,
|
||||
relateSingleFuelCostAnalysis,
|
||||
dataTrend
|
||||
// psiLineChart
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user