diff --git a/.env.dev b/.env.dev index 2cefa71..f62007f 100644 --- a/.env.dev +++ b/.env.dev @@ -5,7 +5,8 @@ ENV = 'development' VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.61:48080' +# VUE_APP_BASE_API = 'http://192.168.1.61:48080' +VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/store/modules/home.js b/src/store/modules/home.js index 669f429..c0a68a8 100644 --- a/src/store/modules/home.js +++ b/src/store/modules/home.js @@ -103,9 +103,12 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) { ftoInvest.current[fId] = factory.chipInput; ftoInvest.previous[fId] = factory.previousYearChipInput; // 产出数据, 0 - (玻璃)芯片产出, 1 - 标准组件产出, 2 - BIPV产出 + // 因为后端写的垃圾数据,所以这里要做一下判断 + if (!([0, 1, 2].includes(factory.glassType))) continue; const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType]; _t.current[fId] = factory.outputNumber; _t.previous[fId] = factory.previousYearOutputNumber; + // debugger; } return { diff --git a/src/views/copilot/components/charts/ChipInvest.vue b/src/views/copilot/components/charts/ChipInvest.vue index f6ede7d..18af8e5 100644 --- a/src/views/copilot/components/charts/ChipInvest.vue +++ b/src/views/copilot/components/charts/ChipInvest.vue @@ -10,7 +10,8 @@ :legend="legend" :series="series" :xAxis="xAxis" - class="fto-chart" + in="ChipInvest" + class="chip-invest-chart" /> @@ -44,8 +45,8 @@ export default { const year = new Date().getFullYear(); const month = new Date().getMonth() + 1; return [ - { label: `${year}年${month}月`, color: "#12f7f1" }, - { label: `${year - 1}年${month}月`, color: "#58adfa" }, + { label: `${year - 1}年${month}月`, color: "#12f7f1" }, + { label: `${year}年${month}月`, color: "#58adfa" }, ]; } case "年": { @@ -63,59 +64,43 @@ export default { } }, series() { - const template = - this.period == "日" || this.period == "周" - ? [ - { - name: "样例数据--2023年", - data: Array.from({ length: 7 }, () => - Math.floor(Math.random() * 1000) - ), - }, - ] - : [ - { - name: "样例数据--2023年", - data: Array.from({ length: 7 }, () => - Math.floor(Math.random() * 1000) - ), - }, - { - name: "样例数据--2024年", - data: Array.from({ length: 7 }, () => - Math.floor(Math.random() * 1000) - ), - }, - ]; - const ftoInvest = this.$store.getters.home.ftoInvest; - if (!ftoInvest || !ftoInvest.current || !ftoInvest.previous) { - return [ - { - name: "样例数据--2023年", - data: Array.from({ length: 7 }, () => - Math.floor(Math.random() * 1000) - ), - }, - { - name: "样例数据--2024年", - data: Array.from({ length: 7 }, () => - Math.floor(Math.random() * 1000) - ), - }, - ]; + const { chipInvest } = this.$store.getters.copilot.yield; + let dataList = null; + switch (this.period) { + case "日": + case "周": + dataList = chipInvest?.current; + break; + default: + dataList = []; + dataList[0] = chipInvest?.pervious; + dataList[1] = chipInvest?.current; } + return getTemplate(this.period, dataList); + }, + }, +}; - return [ +function getTemplate(period, dataList) { + const year = new Date().getFullYear(); + const month = new Date().getMonth() + 1; + return period == "日" || period == "周" + ? [ + { + name: period == "日" ? "昨日" : "本周", + data: dataList ?? [], + }, + ] + : [ { - name: `${new Date().getFullYear() - 1}年`, - data: ftoInvest.previous, + name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`, + data: dataList ? dataList[0] : [], }, { - name: `${new Date().getFullYear()}年`, - data: ftoInvest.current, + name: period == "年" ? `${year}年` : `${year}年${month}月`, + data: dataList ? dataList[1] : [], + // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)), }, ]; - }, - }, -}; +} diff --git a/src/views/copilot/components/charts/FtoInvest.vue b/src/views/copilot/components/charts/FtoInvest.vue index 7971edc..a825691 100644 --- a/src/views/copilot/components/charts/FtoInvest.vue +++ b/src/views/copilot/components/charts/FtoInvest.vue @@ -10,6 +10,7 @@ :legend="legend" :series="series" :xAxis="xAxis" + in="ftoInvest" class="fto-chart" /> @@ -88,7 +89,7 @@ function getTemplate(period, dataList) { return period == "日" || period == "周" ? [ { - name: period == "日" ? "昨天" : "本周", + name: period == "日" ? "昨日" : "本周", data: dataList ?? [], }, ] diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/components/charts/base/BarChartBase.vue index 18d188a..f136dd3 100644 --- a/src/views/copilot/components/charts/base/BarChartBase.vue +++ b/src/views/copilot/components/charts/base/BarChartBase.vue @@ -52,6 +52,10 @@ export default { type: Array, required: true, }, + in: { + type: String, + default: "" + } }, data() { return { @@ -190,6 +194,8 @@ export default { this.initOptions(this.actualOptions); }, series(val) { + debugger; + console.log(`[BarChartBase] [${this.in}] should update component`, val); if (!val) { this.initOptions(this.options); return; @@ -198,7 +204,7 @@ export default { actualOptions.series[0].data = val[0].data; actualOptions.series[0].name = val[0].name; actualOptions.series[1].data = val?.[1]?.data || []; - actualOptions.series[1].name = val?.[1]?.name || ''; + actualOptions.series[1].name = val?.[1]?.name || ""; this.actualOptions = actualOptions; this.initOptions(actualOptions); },