From 2088822f2bca6d93ad3e550a166a9b18332747fd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 二月 2026 10:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/index.vue | 1572 ++++++++++++++++++++++++++++++++--------------------
src/views/reportAnalysis/productionAnalysis/components/right-top.vue | 60 +
src/views/reportAnalysis/qualityAnalysis/index.vue | 2
src/api/viewIndex.js | 49 +
src/views/reportAnalysis/productionAnalysis/components/left-top.vue | 12
src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue | 84 --
src/views/reportAnalysis/productionAnalysis/components/center-center.vue | 8
src/views/reportAnalysis/productionAnalysis/components/center-top.vue | 6
8 files changed, 1,075 insertions(+), 718 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 980e4b0..3caced7 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -91,11 +91,30 @@
method: "get",
});
};
-// 璐ㄦ鍒嗘瀽
-export const qualityStatistics = () => {
+// 璐ㄦ鍒嗘瀽锛堝彲浼� dateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const qualityStatistics = (params) => {
return request({
url: "/home/qualityStatistics",
method: "get",
+ params,
+ });
+};
+
+// 宸ュ崟鎵ц鏁堢巼鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const workOrderEfficiencyAnalysis = (params) => {
+ return request({
+ url: "/home/workOrderEfficiencyAnalysis",
+ method: "get",
+ params,
+ });
+};
+
+// 鐢熶骇鏍哥畻鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const productionAccountingAnalysis = (params) => {
+ return request({
+ url: "/home/productionAccountingAnalysis",
+ method: "get",
+ params,
});
};
// 鐢熶骇鏍哥畻鍒嗘瀽
@@ -135,6 +154,14 @@
export const getProgressStatistics = () => {
return request({
url: "/home/progressStatistics",
+ method: "get",
+ });
+};
+
+// 璁㈠崟鏁伴噺缁熻锛堢敓浜ц鍗曟暟銆佸凡瀹屾垚璁㈠崟鏁般�佸緟鐢熶骇璁㈠崟鏁帮級
+export const orderCount = () => {
+ return request({
+ url: "/home/orderCount",
method: "get",
});
};
@@ -207,6 +234,15 @@
});
};
+// 宸ュ簭浜у嚭鍒嗘瀽锛坉ateType: 1鍛� 2鏈� 3瀛ｅ害锛�
+export const processOutputAnalysis = (params) => {
+ return request({
+ url: "/home/processOutputAnalysis",
+ method: "get",
+ params,
+ });
+};
+
// 鍘熸潗鏂欓噰璐噾棰濆崰姣�
export const rawMaterialPurchaseAmountRatio = () => {
return request({
@@ -241,6 +277,15 @@
});
};
+// 鎶曞叆浜у嚭鍒嗘瀽
+export const inputOutputAnalysis = (params) => {
+ return request({
+ url: "/home/inputOutputAnalysis",
+ method: "get",
+ params,
+ });
+};
+
// 浜у搧鍛ㄨ浆澶╂暟
export const productTurnoverDays = () => {
return request({
diff --git a/src/views/index.vue b/src/views/index.vue
index 401f30a..7968b2e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,340 +1,417 @@
<template>
- <div class="dashboard">
- <!-- 椤堕儴妯悜涓ゆ爮 -->
- <div class="dashboard-top">
- <!-- 宸︼細浼佷笟淇℃伅+涓夊ぇ鏁版嵁鍗＄墖锛堜笂涓嬫帓鍒楋級 -->
- <div class="top-left">
- <div class="company-info">
- <div class="section-title">鐧婚檰淇℃伅</div>
- <div style="display: flex;align-items: center;gap: 20px">
- <img :src="userStore.avatar" class="avatar" alt=""/>
- <div class="company-card">
- <div class="company-name">{{userStore.name}}</div>
- <div class="company-meta">{{userStore.roleName}}</div>
- </div>
- <div style="display: flex;align-items: center;gap: 8px">
- <el-icon color="#5053B5" size="22"><Clock /></el-icon>
- <span>鐧婚檰鏃ユ湡锛歿{userStore.currentLoginTime}}</span>
- </div>
- </div>
- </div>
- <div class="data-cards">
- <div class="data-card sales">
- <div class="data-title">閿�鍞暟鎹�</div>
- <div class="data-num">
- <div>
- <div class="data-desc">鏈湀閿�鍞/鍏�</div>
- <div class="data-value">{{businessInfo.monthSaleMoney}}</div>
- </div>
- <div>
- <div class="data-desc">鏈紑绁ㄩ噾棰�/鍏�</div>
- <div class="data-value">{{businessInfo.monthSaleHaveMoney}}</div>
- </div>
- </div>
-
- </div>
- <div class="data-card purchase">
- <div class="data-title">閲囪喘鏁版嵁</div>
- <div class="data-num">
- <div>
- <div class="data-desc">鏈湀閲囪喘棰�/鍏�</div>
- <div class="data-value">{{businessInfo.monthPurchaseMoney}}</div>
- </div>
- <div>
- <div class="data-desc">寰呬粯娆鹃噾棰�/鍏�</div>
- <div class="data-value">{{businessInfo.monthPurchaseHaveMoney}}</div>
- </div>
- </div>
- </div>
- <div class="data-card inventory">
- <div class="data-title">搴撳瓨鏁版嵁</div>
- <div class="data-num">
- <div>
- <div class="data-desc">褰撳墠搴撳瓨鎬婚噺/浠�</div>
- <div class="data-value">{{businessInfo.inventoryNum}}</div>
- </div>
- <div>
- <div class="data-desc">浠婃棩鍏ュ簱/浠�</div>
- <div class="data-value">{{businessInfo.todayInventoryNum}}</div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- 鍙筹細寰呭姙浜嬮」 -->
- <div class="todo-panel">
- <div class="section-title">寰呭姙浜嬮」</div>
- <ul class="todo-list" v-if="todoList.length > 0">
- <li v-for="item in todoList" :key="item.id">
- <div style="display: flex;flex-direction: column;justify-content: space-between;width: 100%;gap: 20px">
- <div style="display: flex;justify-content: space-between;align-items: center;">
- <div class="todo-title">寰呭姙缂栧彿锛歿{item.approveId}}</div>
- <div class="todo-division">閮ㄩ棬锛歿{item.approveDeptName}}</div>
- <div class="todo-time">{{item.approveTime}}</div>
- </div>
- <div class="todo-division">寰呭姙浜嬬敱锛歿{item.approveReason}}</div>
- </div>
- </li>
- </ul>
- <div v-else style="text-align: center">
- 鏆傛棤鏁版嵁
- </div>
- </div>
- </div>
-
- <!-- 涓儴妯悜涓ゆ爮 -->
- <div class="dashboard-row">
- <div class="main-panel">
- <div class="section-title">瀹㈡埛鍚堝悓閲戦鍒嗘瀽</div>
- <div class="contract-summary">
- <div class="contract-info">
- <img src="../assets/images/khtitle.png" alt="" style="width: 42px"/>
- <div class="contract-card">
- <div class="contract-name">鎬诲悎鍚岄噾棰�(鍏�)</div>
- <div class="contract-meta">
- <div class="main-amount">{{sum}}</div>
- <div>鍛ㄥ悓姣�: <span class="up">{{yny}}% </span> 鏃ョ幆姣�: <span class="up">{{chain}}% </span></div>
- </div>
- </div>
- </div>
- </div>
- <div style="display: flex;align-items: center;gap: 20px;justify-content: space-evenly;height: 180px;margin-top: 20px">
- <div>
- <Echarts ref="chart" :legend="pieLegend" :chartStyle="chartStylePie"
- :series="materialPieSeries"
- :tooltip="pieTooltip"></Echarts>
- </div>
- <ul class="contract-list">
- <li v-for="item in materialPieSeries[0].data" :key="item.name">
- <div style="display: flex;align-items: center;justify-content: space-between;width: 100%">
- <div class="line" :style="{color: item.itemStyle.color}">鈼弡{item.name}}</div>
- <div style="width: 70px">{{item.rate}}%</div>
- <div>锟{item.value}}</div>
- </div>
- </li>
- </ul>
- </div>
- </div>
- <div class="main-panel">
- <div style="display: flex;justify-content: space-between;">
- <div class="section-title">搴旀敹搴斾粯缁熻</div>
-<!-- <el-radio-group v-model="radio1" size="large" @change="statisticsReceivable">-->
-<!-- <el-radio-button label="鎸夊懆" :value="1" />-->
-<!-- <el-radio-button label="鎸夋湀" :value="2" />-->
-<!-- <el-radio-button label="鎸夊搴�" :value="3" />-->
-<!-- </el-radio-group>-->
- </div>
- <Echarts ref="chart"
- :color="barColors2"
- :chartStyle="chartStyle"
- :grid="grid"
- :series="barSeries"
- :tooltip="tooltip"
- :xAxis="xAxis"
- :yAxis="yAxis"
- style="height: 260px"></Echarts>
- </div>
- </div>
-
- <!-- 搴曢儴妯悜涓ゆ爮 -->
- <div class="dashboard-row">
-<!-- <div class="main-panel">-->
-<!-- <div class="section-title">璐ㄩ噺缁熻</div>-->
-<!-- <div class="quality-cards">-->
-<!-- <div class="quality-card one">鍘熸潗鏂欏凡妫�娴嬫暟 <span>{{qualityStatisticsObject.supplierNum}}浠�</span></div>-->
-<!-- <div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{qualityStatisticsObject.processNum}}浠�</span></div>-->
-<!-- <div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{qualityStatisticsObject.factoryNum}}浠�</span></div>-->
-<!-- </div>-->
-<!-- <Echarts ref="chart"-->
-<!-- :chartStyle="chartStyle"-->
-<!-- :grid="grid"-->
-<!-- :legend="barLegend"-->
-<!-- :series="barSeries1"-->
-<!-- :tooltip="tooltip"-->
-<!-- :xAxis="xAxis1"-->
-<!-- :yAxis="yAxis1"-->
-<!-- style="height: 260px"></Echarts>-->
-<!-- </div>-->
- <div class="main-panel">
- <div class="section-title">鍥炴涓庡紑绁ㄥ垎鏋�</div>
- <Echarts ref="chart" :chartStyle="chartStyle" :grid="grid" :legend="lineLegend" :series="lineSeries"
- :tooltip="tooltipLine" :xAxis="xAxis2" :yAxis="yAxis2" style="height: 270px;"></Echarts>
- </div>
- </div>
- </div>
+ <div class="dashboard">
+ <!-- 椤堕儴妯悜涓ゆ爮 -->
+ <div class="dashboard-top">
+ <!-- 宸︼細浼佷笟淇℃伅+涓夊ぇ鏁版嵁鍗＄墖锛堜笂涓嬫帓鍒楋級 -->
+ <div class="top-left">
+ <div class="company-info">
+ <!-- 椤堕儴闂�欐潯 -->
+ <div class="welcome-banner">
+ <div class="welcome-title">
+ <span class="welcome-user">{{ userStore.roleName || '绯荤粺绠＄悊鍛�' }}</span>
+ <span> 鎮ㄥソ锛佺鎮ㄥ紑蹇冩瘡涓�澶�</span>
+ </div>
+ <div class="welcome-time">鐧诲綍浜�: {{ userStore.currentLoginTime }}</div>
+ </div>
+
+ <!-- 鐢ㄦ埛淇℃伅鍗＄墖 -->
+ <div class="user-card">
+ <img :src="userStore.avatar" class="avatar" alt="" />
+ <div class="user-card-main">
+ <div class="user-name">{{ userStore.name }}</div>
+ <div class="user-role">{{ userStore.roleName }}</div>
+ <div class="user-meta">
+ <span>{{ userStore.phoneNumber || '123456789' }}</span>
+ <span class="sep">|</span>
+ <span>{{ userStore.deptName || '缁勭粐鏋舵瀯' }}</span>
+ <span class="sep">|</span>
+ <span>{{ userStore.postName || '宀椾綅鍚�' }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="data-cards">
+ <div class="data-card sales">
+ <div class="data-title">閿�鍞暟鎹�</div>
+ <div class="data-num">
+ <div>
+ <div class="data-desc">鏈湀閿�鍞/鍏�</div>
+ <div class="data-value">{{businessInfo.monthSaleMoney}}</div>
+ </div>
+ <div>
+ <div class="data-desc">鏈紑绁ㄩ噾棰�/鍏�</div>
+ <div class="data-value">{{businessInfo.monthSaleHaveMoney}}</div>
+ </div>
+ </div>
+
+ </div>
+ <div class="data-card purchase">
+ <div class="data-title">閲囪喘鏁版嵁</div>
+ <div class="data-num">
+ <div>
+ <div class="data-desc">鏈湀閲囪喘棰�/鍏�</div>
+ <div class="data-value">{{businessInfo.monthPurchaseMoney}}</div>
+ </div>
+ <div>
+ <div class="data-desc">寰呬粯娆鹃噾棰�/鍏�</div>
+ <div class="data-value">{{businessInfo.monthPurchaseHaveMoney}}</div>
+ </div>
+ </div>
+ </div>
+ <div class="data-card inventory">
+ <div class="data-title">搴撳瓨鏁版嵁</div>
+ <div class="data-num">
+ <div>
+ <div class="data-desc">褰撳墠搴撳瓨鎬婚噺/浠�</div>
+ <div class="data-value">{{businessInfo.inventoryNum}}</div>
+ </div>
+ <div>
+ <div class="data-desc">浠婃棩鍏ュ簱/浠�</div>
+ <div class="data-value">{{businessInfo.todayInventoryNum}}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鍙筹細寰呭姙浜嬮」 -->
+ <div class="todo-panel">
+ <div class="section-title">寰呭姙浜嬮」</div>
+ <ul class="todo-list" v-if="todoList.length > 0">
+ <li v-for="item in todoList" :key="item.id">
+ <div style="display: flex;flex-direction: column;justify-content: space-between;width: 100%;gap: 20px">
+ <div style="display: flex;justify-content: space-between;align-items: center;">
+ <div class="todo-title">寰呭姙缂栧彿锛歿{item.approveId}}</div>
+ <div class="todo-division">閮ㄩ棬锛歿{item.approveDeptName}}</div>
+ <div class="todo-time">{{item.approveTime}}</div>
+ </div>
+ <div class="todo-division">寰呭姙浜嬬敱锛歿{item.approveReason}}</div>
+ </div>
+ </li>
+ </ul>
+ <div v-else style="text-align: center">
+ 鏆傛棤鏁版嵁
+ </div>
+ </div>
+ </div>
+ <div class="dashboard-row">
+ <div class="main-panel process-panel">
+ <div class="process-panel__header">
+ <div class="section-title">宸ュ簭鏁版嵁鐢熶骇缁熻鏄庣粏</div>
+ <el-radio-group v-model="processRange" size="small" @change="refreshProcessStats">
+ <el-radio-button :value="'week'">鎸夊懆</el-radio-button>
+ <el-radio-button :value="'month'">鎸夋湀</el-radio-button>
+ <el-radio-button :value="'quarter'">鎸夊搴�</el-radio-button>
+ </el-radio-group>
+ </div>
+
+ <div class="process-panel__body">
+ <div class="process-panel__chart">
+ <Echarts
+ :chartStyle="{ width: '100%', height: '100%' }"
+ :grid="processGrid"
+ :series="processSeries"
+ :tooltip="processTooltip"
+ :xAxis="processXAxis"
+ :yAxis="processYAxis"
+ style="height: 100%"
+ />
+ </div>
+
+ <div class="process-panel__aside">
+ <div class="process-legend">
+ <div class="process-legend__item">
+ <span class="dot dot-blue"></span><span>鎶曞叆閲�</span>
+ </div>
+ <div class="process-legend__item">
+ <span class="dot dot-yellow"></span><span>鎶ュ簾閲�</span>
+ </div>
+ <div class="process-legend__item">
+ <span class="dot dot-teal"></span><span>浜у嚭閲�</span>
+ </div>
+ </div>
+
+ <div class="process-card process-card--name">{{ processAside.processName }}</div>
+
+ <div class="process-card">
+ <div class="process-card__label">绱鎬绘姇鍏�</div>
+ <div class="process-card__value">{{ formatAmount(processAside.totalInput) }}<span class="unit">涓囧厓</span></div>
+ </div>
+ <div class="process-card">
+ <div class="process-card__label">绱鎬绘姤搴�</div>
+ <div class="process-card__value">{{ formatAmount(processAside.totalScrap) }}<span class="unit">涓囧厓</span></div>
+ </div>
+ <div class="process-card">
+ <div class="process-card__label">绱鎬讳骇鍑�</div>
+ <div class="process-card__value">{{ formatAmount(processAside.totalOutput) }}<span class="unit">涓囧厓</span></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 涓儴妯悜涓ゆ爮 -->
+ <div class="dashboard-row">
+ <div class="main-panel">
+ <div class="section-title">瀹㈡埛鍚堝悓閲戦鍒嗘瀽</div>
+ <div class="contract-summary">
+ <div class="contract-info">
+ <img src="../assets/images/khtitle.png" alt="" style="width: 42px"/>
+ <div class="contract-card">
+ <div class="contract-name">鎬诲悎鍚岄噾棰�(鍏�)</div>
+ <div class="contract-meta">
+ <div class="main-amount">{{sum}}</div>
+ <div>鍛ㄥ悓姣�: <span class="up">{{yny}}% </span> 鏃ョ幆姣�: <span class="up">{{chain}}% </span></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="display: flex;align-items: center;gap: 20px;justify-content: space-evenly;height: 180px;margin-top: 20px">
+ <div>
+ <Echarts ref="chart" :legend="pieLegend" :chartStyle="chartStylePie"
+ :series="materialPieSeries"
+ :tooltip="pieTooltip"></Echarts>
+ </div>
+ <ul class="contract-list">
+ <li v-for="item in materialPieSeries[0].data" :key="item.name">
+ <div style="display: flex;align-items: center;justify-content: space-between;width: 100%">
+ <div class="line" :style="{color: item.itemStyle.color}">鈼弡{item.name}}</div>
+ <div style="width: 70px">{{item.rate}}%</div>
+ <div>锟{item.value}}</div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="main-panel">
+ <div style="display: flex;justify-content: space-between;">
+ <div class="section-title">搴旀敹搴斾粯缁熻</div>
+ <!-- <el-radio-group v-model="radio1" size="large" @change="statisticsReceivable">-->
+ <!-- <el-radio-button label="鎸夊懆" :value="1" />-->
+ <!-- <el-radio-button label="鎸夋湀" :value="2" />-->
+ <!-- <el-radio-button label="鎸夊搴�" :value="3" />-->
+ <!-- </el-radio-group>-->
+ </div>
+ <Echarts ref="chart"
+ :color="barColors2"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :series="barSeries"
+ :tooltip="tooltip"
+ :xAxis="xAxis"
+ :yAxis="yAxis"
+ style="height: 260px"></Echarts>
+ </div>
+ </div>
+
+ <!-- 搴曢儴妯悜涓ゆ爮 -->
+ <div class="dashboard-row">
+ <div class="main-panel">
+ <div class="section-title">璐ㄩ噺缁熻</div>
+ <div class="quality-cards">
+ <div class="quality-card one">鍘熸潗鏂欏凡妫�娴嬫暟 <span>{{qualityStatisticsObject.supplierNum}}浠�</span></div>
+ <div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{qualityStatisticsObject.processNum}}浠�</span></div>
+ <div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{qualityStatisticsObject.factoryNum}}浠�</span></div>
+ </div>
+ <Echarts ref="chart"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :legend="barLegend"
+ :series="barSeries1"
+ :tooltip="tooltip"
+ :xAxis="xAxis1"
+ :yAxis="yAxis1"
+ style="height: 260px"></Echarts>
+ </div>
+
+ <div class="main-panel">
+ <div class="section-title">鍥炴涓庡紑绁ㄥ垎鏋�</div>
+ <Echarts
+ ref="invoiceChart"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :legend="lineLegend"
+ :series="lineSeries"
+ :tooltip="tooltipLine"
+ :xAxis="xAxis2"
+ :yAxis="yAxis2"
+ style="height: 270px;"
+ />
+ </div>
+ </div>
+ </div>
</template>
<script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed, reactive } from 'vue'
import Echarts from "@/components/Echarts/echarts.vue";
import * as echarts from 'echarts';
import useUserStore from "@/store/modules/user.js";
import {
- analysisCustomerContractAmounts, getAmountHalfYear,
- getBusiness,
- homeTodos,
- qualityStatistics,
- statisticsReceivablePayable
+ analysisCustomerContractAmounts, getAmountHalfYear,
+ getBusiness,
+ homeTodos,
+ qualityStatistics,
+ statisticsReceivablePayable
} from "@/api/viewIndex.js";
const userStore = useUserStore()
const businessInfo = ref({
- inventoryNum: 0,
- monthPurchaseHaveMoney: 0,
- monthPurchaseMoney: 0,
- monthSaleHaveMoney: 0,
- monthSaleMoney: 0,
- todayInventoryNum: 0,
+ inventoryNum: 0,
+ monthPurchaseHaveMoney: 0,
+ monthPurchaseMoney: 0,
+ monthSaleHaveMoney: 0,
+ monthSaleMoney: 0,
+ todayInventoryNum: 0,
})
const qualityStatisticsObject = ref({
- supplierNum: 0,
- processNum: 0,
- factoryNum: 0,
+ supplierNum: 0,
+ processNum: 0,
+ factoryNum: 0,
})
const sum = ref(0)
const yny = ref(0)
const chain = ref(0)
const pieLegend = reactive({
- show: false,
+ show: false,
})
const barSeries = ref([
- {
- type: 'bar',
- data: [],
- label: {
- show: true,
- }
- },
+ {
+ type: 'bar',
+ data: [],
+ label: {
+ show: true,
+ }
+ },
])
+
const barSeries1 = ref([
- {
- name: '鍘熸潗鏂欎笉鍚堟牸鏁�',
- type: 'bar',
- barGap: 0,
- emphasis: {
- focus: 'series'
- },
- data: []
- },
- {
- name: '杩囩▼涓嶅悎鏍兼暟',
- type: 'bar',
- emphasis: {
- focus: 'series'
- },
- data: []
- },
- {
- name: '鍑哄巶涓嶅悎鏍兼暟',
- type: 'bar',
- emphasis: {
- focus: 'series'
- },
- data: []
- },
+ {
+ name: '鍘熸潗鏂欎笉鍚堟牸鏁�',
+ type: 'bar',
+ barGap: 0,
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+ {
+ name: '杩囩▼涓嶅悎鏍兼暟',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+ {
+ name: '鍑哄巶涓嶅悎鏍兼暟',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
])
const chartStyle = {
- width: '100%',
- height: '100%' // 璁剧疆鍥捐〃瀹瑰櫒鐨勯珮搴�
+ width: '100%',
+ height: '100%' // 璁剧疆鍥捐〃瀹瑰櫒鐨勯珮搴�
}
const chartStylePie = {
- width: '140%',
- height: '140%' // 璁剧疆鍥捐〃瀹瑰櫒鐨勯珮搴�
+ width: '140%',
+ height: '140%' // 璁剧疆鍥捐〃瀹瑰櫒鐨勯珮搴�
}
const grid = {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
}
const barLegend = {
- show: true,
- data: ['鍘熸潗鏂欎笉鍚堟牸鏁�', '杩囩▼涓嶅悎鏍兼暟', '鍑哄巶涓嶅悎鏍兼暟']
+ show: true,
+ data: ['鍘熸潗鏂欎笉鍚堟牸鏁�', '杩囩▼涓嶅悎鏍兼暟', '鍑哄巶涓嶅悎鏍兼暟']
}
const barLegend1 = {
- show: true,
- data: ['棰勪粯璐︽', '搴斾粯璐︽', '棰勬敹璐︽', '搴旀敹璐︽']
+ show: true,
+ data: ['棰勪粯璐︽', '搴斾粯璐︽', '棰勬敹璐︽', '搴旀敹璐︽']
}
const lineLegend = {
- show: true,
- data: ['寮�绁�', '鍥炴']
+ show: true,
+ data: ['寮�绁�', '鍥炴']
}
const tooltip = {
- trigger: 'axis',
- axisPointer: {
- type: 'shadow'
- }
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
}
const xAxis = [{
- type: 'value',
+ type: 'value',
}]
const xAxis1 = ref([{
- type: 'category',
- axisTick: { show: false },
- data: []
+ type: 'category',
+ axisTick: { show: false },
+ data: []
}])
const yAxis = [{
- type: 'category',
- data: [ '搴斾粯璐︽', '搴旀敹璐︽',]
+ type: 'category',
+ data: [ '搴斾粯璐︽', '搴旀敹璐︽',]
}]
const yAxis1 = [{
- type: 'value'
+ type: 'value'
}]
const pieTooltip = reactive({
- trigger: 'item',
- formatter: function (params) {
- // 鍔ㄦ�佺敓鎴愭彁绀轰俊鎭紝鍩轰簬鏁版嵁椤圭殑 name 灞炴��
- const description = params.name === '鏈湀鍥炴閲戦' ? '鏈湀鍥炴閲戦' : '搴旀敹娆鹃噾棰�';
- return `${description} ${formatNumber(params.value)}鍏� ${params.percent}%`;
- },
- position: 'right'
+ trigger: 'item',
+ formatter: function (params) {
+ // 鍔ㄦ�佺敓鎴愭彁绀轰俊鎭紝鍩轰簬鏁版嵁椤圭殑 name 灞炴��
+ const description = params.name === '鏈湀鍥炴閲戦' ? '鏈湀鍥炴閲戦' : '搴旀敹娆鹃噾棰�';
+ return `${description} ${formatNumber(params.value)}鍏� ${params.percent}%`;
+ },
+ position: 'right'
})
const materialPieSeries = ref([
- {
- type: 'pie',
- radius: ['66%', '90%'],
- avoidLabelOverlap: false,
- itemStyle: {
- borderColor: '#fff',
- borderWidth: 2
- },
- label: {
- show: false
- },
- data: []
- }
+ {
+ type: 'pie',
+ radius: ['66%', '90%'],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderColor: '#fff',
+ borderWidth: 2
+ },
+ label: {
+ show: false
+ },
+ data: []
+ }
])
const lineSeries = ref([
- {
- type: 'line',
- data: [],
- label: {
- show: true
- },
+ {
+ type: 'line',
+ data: [],
+ label: {
+ show: true
+ },
showSymbol: true, // 鏄剧ず鍦嗙偣
- },
+ },
])
const tooltipLine = {
- trigger: 'axis',
+ trigger: 'axis',
}
const yAxis2 = ref([
- {
- type: 'value',
- }
+ {
+ type: 'value',
+ }
])
const xAxis2 = ref([
- {
- type: 'category',
- data: [],
- axisLabel: {
- interval: 0,
- formatter: function(value) {
- return value.replace(/~/g, '\n');
- },
- }
- }
+ {
+ type: 'category',
+ data: [],
+ axisLabel: {
+ interval: 0,
+ formatter: function(value) {
+ return value.replace(/~/g, '\n');
+ },
+ }
+ }
])
// 寰呭姙浜嬮」
@@ -352,453 +429,726 @@
}
onMounted(() => {
- getBusinessData()
- analysisCustomer()
- todoInfoS()
- statisticsReceivable()
- qualityStatisticsInfo()
- getAmountHalfYearNum()
+ getBusinessData()
+ analysisCustomer()
+ todoInfoS()
+ statisticsReceivable()
+ qualityStatisticsInfo()
+ getAmountHalfYearNum()
})
// 鏁版嵁缁熻
const getBusinessData = () => {
- getBusiness().then((res) => {
- businessInfo.value = {...res.data}
- })
+ getBusiness().then((res) => {
+ businessInfo.value = {...res.data}
+ })
}
// 鍚堝悓閲戦
const analysisCustomer = () => {
- analysisCustomerContractAmounts().then((res) => {
- sum.value = res.data.sum
- yny.value = res.data.yny
- chain.value = res.data.chain
+ analysisCustomerContractAmounts().then((res) => {
+ sum.value = res.data.sum
+ yny.value = res.data.yny
+ chain.value = res.data.chain
// 涓烘瘡涓暟鎹」鍒嗛厤闅忔満棰滆壊
materialPieSeries.value[0].data = res.data.item.map(item => ({
...item,
itemStyle: { color: getRandomColor() }
}))
- })
+ })
}
// 寰呭姙浜嬮」
const todoInfoS = () => {
- homeTodos().then((res) => {
- todoList.value = res.data
- })
+ homeTodos().then((res) => {
+ todoList.value = res.data
+ })
}
// 搴斾粯搴旀敹缁熻
-const statisticsReceivable = (type) => {
- statisticsReceivablePayable({type: radio1.value}).then((res) => {
- barSeries.value[0].data = [
- // { value: res.data.prepayMoney, itemStyle: { color: barColors2[0] } },
- { value: res.data.payableMoney, itemStyle: { color: barColors2[0] } },
- // { value: res.data.advanceMoney, itemStyle: { color: barColors2[2] } },
- { value: res.data.receivableMoney, itemStyle: { color: barColors2[1] } }
- ]
- })
+const statisticsReceivable = () => {
+ statisticsReceivablePayable({type: radio1.value}).then((res) => {
+ barSeries.value[0].data = [
+ // { value: res.data.prepayMoney, itemStyle: { color: barColors2[0] } },
+ { value: res.data.payableMoney, itemStyle: { color: barColors2[0] } },
+ // { value: res.data.advanceMoney, itemStyle: { color: barColors2[2] } },
+ { value: res.data.receivableMoney, itemStyle: { color: barColors2[1] } }
+ ]
+ })
}
// 璐ㄦ缁熻
const qualityStatisticsInfo = () => {
- qualityStatistics().then((res) => {
- res.data.item.forEach(item => {
- xAxis1.value[0].data.push(item.date)
- barSeries1.value[0].data.push(item.supplierNum)
- barSeries1.value[1].data.push(item.processNum)
- barSeries1.value[2].data.push(item.factoryNum)
- })
- qualityStatisticsObject.value.supplierNum = res.data.supplierNum
- qualityStatisticsObject.value.processNum = res.data.processNum
- qualityStatisticsObject.value.factoryNum = res.data.factoryNum
- })
+ qualityStatistics().then((res) => {
+ res.data.item.forEach(item => {
+ xAxis1.value[0].data.push(item.date)
+ barSeries1.value[0].data.push(item.supplierNum)
+ barSeries1.value[1].data.push(item.processNum)
+ barSeries1.value[2].data.push(item.factoryNum)
+ })
+ qualityStatisticsObject.value.supplierNum = res.data.supplierNum
+ qualityStatisticsObject.value.processNum = res.data.processNum
+ qualityStatisticsObject.value.factoryNum = res.data.factoryNum
+ })
}
const getAmountHalfYearNum = async () => {
- const res = await getAmountHalfYear()
- console.log(res)
- const monthName = []
- const receiptAmount = []
- const invoiceAmount = []
- res.data.forEach(item => {
- monthName.push(item.month)
- receiptAmount.push(item.receiptAmount)
- invoiceAmount.push(item.invoiceAmount)
- })
- // 姝ｇ‘鍝嶅簲寮忚祴鍊硷細鍒涘缓鏂扮殑 xAxis 鍜� series 瀵硅薄
- xAxis2.value[0].data = monthName
- xAxis2.value[0].data = monthName.map(item => item.replace(/~/g, '\n~'));
- lineSeries.value = [
- {
- name: '寮�绁�',
- type: 'line',
- data: receiptAmount,
- stack: 'Total',
- areaStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: 'rgba(131, 207, 255, 1)'
- },
- {
- offset: 1,
- color: 'rgba(186, 228, 255, 1)'
- }
- ])
- },
- itemStyle: {
- color: '#2D99FF',
- borderColor: '#2D99FF'
- },
- emphasis: {
- focus: 'series'
- },
- lineStyle: {
- width: 0
- },
- showSymbol: true,
- },
- {
- name: '鍥炴',
- type: 'line',
- data: invoiceAmount,
- stack: 'Total',
- lineStyle: {
- width: 0
- },
- itemStyle: {
- color: '#83CFFF',
- borderColor: '#83CFFF'
- },
- showSymbol: true,
- areaStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: 'rgba(54, 153, 255, 1)'
- },
- {
- offset: 1,
- color: 'rgba(89, 169, 254, 1)'
- }
- ])
- },
- emphasis: {
- focus: 'series'
- },
- }
- ]
+ const res = await getAmountHalfYear()
+ console.log(res)
+ const monthName = []
+ const receiptAmount = []
+ const invoiceAmount = []
+ res.data.forEach(item => {
+ monthName.push(item.month)
+ receiptAmount.push(item.receiptAmount)
+ invoiceAmount.push(item.invoiceAmount)
+ })
+ // 姝ｇ‘鍝嶅簲寮忚祴鍊硷細鍒涘缓鏂扮殑 xAxis 鍜� series 瀵硅薄
+ xAxis2.value[0].data = monthName
+ xAxis2.value[0].data = monthName.map(item => item.replace(/~/g, '\n~'));
+ lineSeries.value = [
+ {
+ name: '寮�绁�',
+ type: 'line',
+ data: receiptAmount,
+ stack: 'Total',
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgba(131, 207, 255, 1)'
+ },
+ {
+ offset: 1,
+ color: 'rgba(186, 228, 255, 1)'
+ }
+ ])
+ },
+ itemStyle: {
+ color: '#2D99FF',
+ borderColor: '#2D99FF'
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ lineStyle: {
+ width: 0
+ },
+ showSymbol: true,
+ },
+ {
+ name: '鍥炴',
+ type: 'line',
+ data: invoiceAmount,
+ stack: 'Total',
+ lineStyle: {
+ width: 0
+ },
+ itemStyle: {
+ color: '#83CFFF',
+ borderColor: '#83CFFF'
+ },
+ showSymbol: true,
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgba(54, 153, 255, 1)'
+ },
+ {
+ offset: 1,
+ color: 'rgba(89, 169, 254, 1)'
+ }
+ ])
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ }
+ ]
}
+
+// 宸ュ簭鏁版嵁鐢熶骇缁熻鏄庣粏锛堝亣鏁版嵁 + 鍥捐〃锛�
+const processRange = ref('week')
+const processChartData = ref([])
+
+const processXAxis = ref([
+ {
+ nameTextStyle: { color: 'rgba(0,0,0,0.35)', fontSize: 12 },
+ axisLabel: { color: 'rgba(0,0,0,0.35)' },
+ splitLine: { lineStyle: { color: 'rgba(0,0,0,0.06)', type: 'dashed' } },
+ },
+])
+
+const processYAxis = ref([
+ {
+ type: 'category',
+ axisTick: { show: false },
+ axisLine: { show: false },
+ axisLabel: { color: 'rgba(0,0,0,0.45)' },
+ data: [],
+ },
+])
+
+const processGrid = reactive({ left: 0, right: 100, top: 30, bottom: 20, containLabel: true })
+
+const processTooltip = reactive({
+ trigger: 'axis',
+ axisPointer: { type: 'shadow' },
+ formatter: (params) => {
+ const name = params?.[0]?.name ?? ''
+ const list = Array.isArray(params) ? params : []
+ const lines = list
+ .map((p) => {
+ const colorBox = `<span style="display:inline-block;margin-right:6px;border-radius:2px;width:10px;height:10px;background:${p.color}"></span>`
+ return `${colorBox}${p.seriesName} <b style="float:right;">${Number(p.value || 0).toFixed(2)}</b>`
+ })
+ .join('<br/>')
+ return `<div style="min-width:140px;"><div style="font-weight:700;margin-bottom:6px;">${name}</div>${lines}</div>`
+ },
+})
+
+const processSeries = computed(() => {
+ const input = processChartData.value.map((i) => i.input)
+ const scrap = processChartData.value.map((i) => i.scrap)
+ const output = processChartData.value.map((i) => i.output)
+
+ return [
+ {
+ name: '鎶曞叆閲�',
+ type: 'bar',
+ stack: 'total',
+ barWidth: 22,
+ itemStyle: { color: '#1E5BFF', borderRadius: [6, 0, 0, 6] },
+ data: input,
+ },
+ {
+ name: '鎶ュ簾閲�',
+ type: 'bar',
+ stack: 'total',
+ barWidth: 22,
+ itemStyle: { color: '#F7B500' },
+ data: scrap,
+ },
+ {
+ name: '浜у嚭閲�',
+ type: 'bar',
+ stack: 'total',
+ barWidth: 22,
+ itemStyle: { color: '#19C6C6', borderRadius: [0, 6, 6, 0] },
+ data: output,
+ },
+ ]
+})
+
+const processAside = computed(() => {
+ const list = processChartData.value
+ const totalInput = list.reduce((s, i) => s + Number(i.input || 0), 0)
+ const totalScrap = list.reduce((s, i) => s + Number(i.scrap || 0), 0)
+ const totalOutput = list.reduce((s, i) => s + Number(i.output || 0), 0)
+ return {
+ processName: '宸ュ簭鍚嶇О',
+ totalInput,
+ totalScrap,
+ totalOutput,
+ }
+})
+
+const formatAmount = (n) => {
+ const num = Number(n || 0)
+ return num.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+}
+
+const buildProcessFake = (range) => {
+ // 璁╀笉鍚屽垏鎹㈡湁鐐瑰樊寮�
+ const factor = range === 'week' ? 1 : range === 'month' ? 1.4 : 1.9
+ const baseNames = ['宸ュ簭1', '宸ュ簭2', '宸ュ簭3', '宸ュ簭4', '宸ュ簭5', '宸ュ簭6', '宸ュ簭7']
+ return baseNames.map((name, idx) => {
+ const seed = (idx + 1) * 120 * factor
+ const input = seed + (idx % 2 === 0 ? 80 : 40)
+ const scrap = Math.max(20, seed * 0.15)
+ const output = Math.max(30, seed * 0.35)
+ return {
+ name,
+ input: Number(input.toFixed(2)),
+ scrap: Number(scrap.toFixed(2)),
+ output: Number(output.toFixed(2)),
+ }
+ })
+}
+
+const refreshProcessStats = () => {
+ processChartData.value = buildProcessFake(processRange.value)
+ processYAxis.value[0].data = processChartData.value.map((i) => i.name)
+}
+
+onMounted(() => {
+ getBusinessData()
+ analysisCustomer()
+ todoInfoS()
+ statisticsReceivable()
+ qualityStatisticsInfo()
+ getAmountHalfYearNum()
+ refreshProcessStats()
+})
</script>
<style scoped>
.dashboard {
- background: #f5f7fa;
- min-height: 100vh;
- padding: 20px;
- box-sizing: border-box;
+ background: #f5f7fa;
+ min-height: 100vh;
+ padding: 20px;
+ box-sizing: border-box;
}
.dashboard-top {
- display: flex;
- gap: 20px;
- margin-bottom: 20px;
+ display: flex;
+ gap: 20px;
+ margin-bottom: 20px;
+ align-items: flex-start;
+ justify-content: space-evenly;
}
.company-info {
- display: flex;
- flex-direction: column;
- gap: 8px;
- padding: 20px;
- min-width: 0;
- background-color: #EFF2FB; /* 浣跨敤鎸囧畾鐨勮儗鏅鑹� */
- background-image: url("../assets/images/denglu.png");
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
- border-radius: 12px;
- height: 138px;
-}
-.avatar {
- width: 60px;
- height: 60px;
- border-radius: 50%;
- object-fit: contain;
- background: #fff;
- border: 1px solid #eee;
-}
-.company-card {
- display: flex;
- flex-direction: column;
- gap: 10px;
- position: relative;
- padding-right: 15px;
+ padding: 0;
+ overflow: hidden;
+ border-radius: 12px;
+ background: #fff;
+ height: 100%;
}
-.company-card::after {
- content: '';
- position: absolute;
- right: 0;
- top: 0;
- bottom: 0;
- width: 1px;
- background-color: #C9C5C5;
- border-radius: 2px;
+.welcome-banner {
+ padding: 10px 10px;
+ background: linear-gradient(135deg, rgba(229, 240, 255, 0.9), rgba(214, 232, 255, 0.7), rgba(207, 236, 255, 0.9));
}
-.company-name {
- font-weight: 400;
- font-size: 16px;
- color: #161A9A;
+
+.welcome-title {
+ font-size: 18px;
+ font-weight: 700;
+ color: #222;
+ line-height: 1.3;
}
-.company-meta {
- font-weight: 400;
- font-size: 12px;
- color: #818185;
+
+.welcome-user {
+ margin-right: 6px;
+}
+
+.welcome-time {
+ margin-top: 10px;
+ font-size: 16px;
+ color: rgba(0, 0, 0, 0.55);
+}
+
+.user-card {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ padding: 18px 22px;
+}
+
+.user-card-main {
+ display: flex;
+ flex-direction: column;
+ gap: 5px;
+ min-width: 0;
+}
+
+.user-name {
+ font-size: 16px;
+ font-weight: bold;
+ color: #111;
+ letter-spacing: 1px;
+}
+
+.user-role {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ height: 20px;
+ padding: 5px 10px;
+ background: rgba(245, 246, 248, 1);
+ color: #333;
+ width: fit-content;
+ font-weight: 600;
+}
+
+.user-meta {
+ font-size: 12px;
+ color: rgba(0, 0, 0, 0.55);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.user-meta .sep {
+ margin: 0 10px;
+ color: rgba(0, 0, 0, 0.25);
+}
+
+.avatar {
+ width: 90px;
+ height: 90px;
+ border-radius: 50%;
+ object-fit: cover;
+ flex: 0 0 auto;
}
.data-cards {
- display: flex;
- gap: 16px;
- justify-content: flex-start;
- background: #ffffff;
- border-radius: 12px;
- padding: 20px;
+ width: 50%;
+ display: flex;
+ gap: 16px;
+ justify-content: flex-start;
+ background: #ffffff;
+ border-radius: 12px;
+ padding: 20px;
}
.data-title {
- font-weight: 700;
- font-size: 26px;
- color: #FFFFFF;
+ font-weight: 700;
+ font-size: 26px;
+ color: #FFFFFF;
}
.data-num {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 20px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-top: 20px;
}
.data-card {
- background: #fff;
- border-radius: 12px;
- padding: 14px 10px 10px 10px;
- min-width: 160px;
- box-shadow: 0 2px 8px #eee;
- display: flex;
- flex-direction: column;
- width: 32%;
- height: 140px;
+ background: #fff;
+ border-radius: 12px;
+ padding: 14px 10px 10px 10px;
+ min-width: 160px;
+ box-shadow: 0 2px 8px #eee;
+ display: flex;
+ flex-direction: column;
+ width: 32%;
+ height: 140px;
}
.data-card.sales {
- background-image: url("../assets/images/xioashoushuju.png");
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
+ background-image: url("../assets/images/xioashoushuju.png");
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
}
.data-card.purchase {
- background-image: url("../assets/images/caigou.png");
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
+ background-image: url("../assets/images/caigou.png");
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
}
.data-card.inventory {
- background-image: url("../assets/images/kucun.png");
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
+ background-image: url("../assets/images/kucun.png");
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
}
.data-desc {
- font-weight: 500;
- font-size: 13px;
- color: #FFFFFF;
+ font-weight: 500;
+ font-size: 13px;
+ color: #FFFFFF;
}
.data-value {
- font-size: 18px;
- font-weight: 500;
- margin: 10px 0;
- color: #FFFFFF;
+ font-size: 18px;
+ font-weight: 500;
+ margin: 10px 0;
+ color: #FFFFFF;
}
.top-left {
- display: flex;
- flex-direction: column;
- gap: 20px;
- width: 50%;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+ height: 180px;
+ width: 20%;
}
.todo-panel {
- background: #fff;
- border-radius: 12px;
- padding: 20px;
- width: 50%;
+ background: #fff;
+ border-radius: 12px;
+ padding: 20px;
+ height: 180px;
+ width: 30%;
}
.todo-list {
- list-style: none;
- padding: 0;
- margin: 0;
- font-size: 15px;
- overflow-y: auto;
- height: 260px;
+ height: 100px;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ font-size: 15px;
+ overflow-y: auto;
}
.todo-list li {
- border-radius: 8px;
- margin-bottom: 12px;
- padding: 8px 20px;
- height: 74px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- background: rgba(225,227,250,0.62);
+ border-radius: 8px;
+ margin-bottom: 12px;
+ padding: 8px 20px;
+ height: 74px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ background: rgba(225,227,250,0.62);
}
.todo-title {
- font-weight: 400;
- font-size: 12px;
- color: #000000;
- position: relative;
+ font-weight: 400;
+ font-size: 12px;
+ color: #000000;
+ position: relative;
}
.todo-title::before {
- content: ''; /* 蹇呴渶锛岃〃绀鸿繖閲屾湁涓�涓唴瀹� */
- position: absolute;
- left: -10px; /* 瀹氫綅鍒板乏渚� */
- top: 50%; /* 鍨傜洿灞呬腑 */
- transform: translateY(-50%); /* 寰皟鍨傜洿灞呬腑 */
- width: 6px; /* 鍦嗙殑鐩村緞 */
- height: 6px; /* 鍦嗙殑鐩村緞 */
- background: #498CEB;
- border-radius: 50%; /* 璁╁叾鍙樻垚鍦嗗舰 */
+ content: ''; /* 蹇呴渶锛岃〃绀鸿繖閲屾湁涓�涓唴瀹� */
+ position: absolute;
+ left: -10px; /* 瀹氫綅鍒板乏渚� */
+ top: 50%; /* 鍨傜洿灞呬腑 */
+ transform: translateY(-50%); /* 寰皟鍨傜洿灞呬腑 */
+ width: 6px; /* 鍦嗙殑鐩村緞 */
+ height: 6px; /* 鍦嗙殑鐩村緞 */
+ background: #498CEB;
+ border-radius: 50%; /* 璁╁叾鍙樻垚鍦嗗舰 */
}
.todo-division {
- font-weight: 400;
- font-size: 12px;
- color: #000000;
+ font-weight: 400;
+ font-size: 12px;
+ color: #000000;
}
.todo-time {
- font-weight: 400;
- font-size: 12px;
- color: #000000;
+ font-weight: 400;
+ font-size: 12px;
+ color: #000000;
}
.todo-meta {
- color: #888;
- font-size: 13px;
+ color: #888;
+ font-size: 13px;
}
.dashboard-row {
- display: flex;
- gap: 20px;
- margin-bottom: 20px;
+ display: flex;
+ gap: 20px;
+ margin-bottom: 20px;
}
.main-panel {
- background: #fff;
- border-radius: 12px;
- padding: 20px;
- flex: 1;
- min-width: 0;
- display: flex;
- flex-direction: column;
+ background: #fff;
+ border-radius: 12px;
+ padding: 20px;
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
}
.section-title {
- position: relative;
- font-size: 18px;
- color: #333;
- padding-left: 10px;
- margin-bottom: 10px;
- font-weight: 700;
+ position: relative;
+ font-size: 18px;
+ color: #333;
+ padding-left: 10px;
+ margin-bottom: 10px;
+ font-weight: 700;
}
.section-title::before {
- position: absolute;
- left: 0;
- top: 4px;
- content: '';
- width: 4px;
- height: 18px;
- background-color: #002FA7;
- border-radius: 2px;
+ position: absolute;
+ left: 0;
+ top: 4px;
+ content: '';
+ width: 4px;
+ height: 18px;
+ background-color: #002FA7;
+ border-radius: 2px;
}
.contract-info {
- display: flex;
- align-items: center;
- gap: 20px;
- height: 90px;
- background: rgba(245,245,245,0.59);
- width: 100%;
- border-radius: 10px;
- padding: 10px 30px;
+ display: flex;
+ align-items: center;
+ gap: 20px;
+ height: 90px;
+ background: rgba(245,245,245,0.59);
+ width: 100%;
+ border-radius: 10px;
+ padding: 10px 30px;
}
.contract-summary {
- display: flex;
- align-items: center;
- gap: 30px;
+ display: flex;
+ align-items: center;
+ gap: 30px;
}
.contract-card {
- display: flex;
- flex-direction: column;
- gap: 10px;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
}
.contract-name {
- font-weight: 400;
- font-size: 14px;
- color: #050505;
+ font-weight: 400;
+ font-size: 14px;
+ color: #050505;
}
.contract-meta {
- display: flex;
- align-items: center;
- width: 100%;
- gap: 80px;
+ display: flex;
+ align-items: center;
+ width: 100%;
+ gap: 80px;
}
.main-amount {
- font-size: 24px;
- color: rgba(51,50,50,0.85);
+ font-size: 24px;
+ color: rgba(51,50,50,0.85);
}
.up { color: #e57373; }
.contract-list {
- margin-top: 16px;
- font-size: 14px;
- color: #666;
- list-style: none;
- padding: 0;
- height: 190px;
- overflow-y: auto;
- width: 460px;
+ margin-top: 16px;
+ font-size: 14px;
+ color: #666;
+ list-style: none;
+ padding: 0;
+ height: 190px;
+ overflow-y: auto;
+ width: 460px;
}
.line {
- position: relative;
- width: 230px;
+ position: relative;
+ width: 230px;
}
.line::after {
- content: '';
- position: absolute;
- right: 2px;
- top: 0;
- bottom: 0;
- width: 1px;
- background-color: #C9C5C5;
- border-radius: 2px;
+ content: '';
+ position: absolute;
+ right: 2px;
+ top: 0;
+ bottom: 0;
+ width: 1px;
+ background-color: #C9C5C5;
+ border-radius: 2px;
}
.contract-list li {
- margin-top: 10px;
+ margin-top: 10px;
}
.quality-cards {
- display: flex;
- gap: 12px;
- margin-bottom: 12px;
+ display: flex;
+ gap: 12px;
+ margin-bottom: 12px;
}
.quality-card {
- border-radius: 8px;
- padding: 15px 10px 10px 50px;
- font-weight: 400;
- font-size: 12px;
- color: rgba(0,0,0,0.67);
- width: 236px;
- height: 49px;
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
+ border-radius: 8px;
+ padding: 15px 10px 10px 50px;
+ font-weight: 400;
+ font-size: 12px;
+ color: rgba(0,0,0,0.67);
+ width: 236px;
+ height: 49px;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
}
.quality-card.one {
- background-image: url("../assets/images/yuancailiao.png");
+ background-image: url("../assets/images/yuancailiao.png");
}
.quality-card.two {
- background-image: url("../assets/images/guocheng.png");
+ background-image: url("../assets/images/guocheng.png");
}
.quality-card.three {
- background-image: url("../assets/images/chuchang.png");
-
+ background-image: url("../assets/images/chuchang.png");
+
}
.quality-card span {
- color: #4fc3f7;
- font-weight: bold;
- margin-left: 6px;
+ color: #4fc3f7;
+ font-weight: bold;
+ margin-left: 6px;
}
.chart {
- width: 100%;
- height: 220px;
- margin-top: 10px;
+ width: 100%;
+ height: 220px;
+ margin-top: 10px;
+}
+.process-panel {
+ padding-bottom: 10px;
+}
+
+.process-panel__header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.process-panel__body {
+ display: flex;
+ gap: 24px;
+ align-items: stretch;
+ margin-top: 10px;
+}
+
+.process-panel__chart {
+ flex: 1;
+ min-width: 0;
+ padding: 6px 0;
+}
+
+.process-panel__aside {
+ width: 260px;
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+}
+
+.process-legend {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ align-items: flex-start;
+ padding: 8px 6px;
+}
+
+.process-legend__item {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ font-size: 13px;
+ color: rgba(0, 0, 0, 0.55);
+}
+
+.dot {
+ width: 10px;
+ height: 10px;
+ border-radius: 2px;
+ display: inline-block;
+}
+
+.dot-blue {
+ background: #1E5BFF;
+}
+
+.dot-yellow {
+ background: #F7B500;
+}
+
+.dot-teal {
+ background: #19C6C6;
+}
+
+.process-card {
+ background: rgba(245, 247, 250, 0.9);
+ border-radius: 10px;
+ padding: 16px 16px;
+}
+
+.process-card--name {
+ background: rgba(235, 242, 255, 1);
+ color: #1E5BFF;
+ font-weight: 800;
+ font-size: 14px;
+}
+
+.process-card__label {
+ font-size: 13px;
+ color: rgba(0, 0, 0, 0.55);
+ margin-bottom: 10px;
+}
+
+.process-card__value {
+ font-size: 24px;
+ font-weight: 800;
+ color: rgba(0, 0, 0, 0.8);
+}
+
+.process-card__value .unit {
+ font-size: 12px;
+ font-weight: 600;
+ color: rgba(0, 0, 0, 0.45);
+ margin-left: 6px;
+}
+
+@media (max-width: 1200px) {
+ .process-panel__body {
+ flex-direction: column;
+ }
+ .process-panel__aside {
+ width: 100%;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
+ .process-card {
+ flex: 1;
+ min-width: 220px;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
index cd6a6b5..973c68d 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/center-center.vue
@@ -30,7 +30,7 @@
import { ref, onMounted } from 'vue'
import * as echarts from 'echarts'
import Echarts from '@/components/Echarts/echarts.vue'
-import { productInOutAnalysis } from '@/api/viewIndex.js'
+import { inputOutputAnalysis } from '@/api/viewIndex.js'
const chartStyle = { width: '100%', height: '100%' }
const grid = {
@@ -132,13 +132,13 @@
}
const fetchData = () => {
- productInOutAnalysis({ type: 1 })
+ inputOutputAnalysis()
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
const list = res.data
xAxis1.value[0].data = list.map((d) => d.date)
- lineSeries.value[0].data = list.map((d) => Number(d.outCount) || 0)
- lineSeries.value[1].data = list.map((d) => Number(d.inCount) || 0)
+ lineSeries.value[0].data = list.map((d) => Number(d.outputSum) || 0)
+ lineSeries.value[1].data = list.map((d) => Number(d.inputSum) || 0)
}
})
.catch((err) => {
diff --git a/src/views/reportAnalysis/productionAnalysis/components/center-top.vue b/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
index 0937b32..ad9e41a 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/center-top.vue
@@ -25,7 +25,7 @@
<script setup>
import { ref, onMounted } from 'vue'
-import { salesPurchaseStorageProductCount } from '@/api/viewIndex.js'
+import { orderCount } from '@/api/viewIndex.js'
const statItems = ref([])
@@ -37,7 +37,7 @@
const compareClass = (val) => (val >= 0 ? 'compare-up' : 'compare-down')
const fetchData = () => {
- salesPurchaseStorageProductCount()
+ orderCount()
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
statItems.value = res.data.map((item) => ({
@@ -48,7 +48,7 @@
}
})
.catch((err) => {
- console.error('鑾峰彇閿�鍞�/閲囪喘/鍌ㄥ瓨浜у搧鏁板け璐�:', err)
+ console.error('鑾峰彇璁㈠崟鏁伴噺缁熻澶辫触:', err)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
index 0cce7d6..932def8 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
@@ -24,7 +24,7 @@
<script setup>
import { ref, onMounted, onBeforeUnmount, computed } from 'vue'
-import { productSalesAnalysis } from '@/api/viewIndex.js'
+import { processOutputAnalysis } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import Echarts from '@/components/Echarts/echarts.vue'
import DateTypeSwitch from '@/views/reportAnalysis/financialAnalysis/components/DateTypeSwitch.vue'
@@ -73,7 +73,7 @@
formatter: function (name) {
const item = pieObjData.value[name]
if (!item) return name
- return `{title|${name}}{value|${item.value}}{unit|鍏儅{percent|${item.rate}}{unit|%}`
+ return `{title|${name}}{value|${item.value}}{unit|浠秨{percent|${item.rate}}{unit|%}`
},
textStyle: {
rich: {
@@ -106,12 +106,12 @@
const pieTooltip = {
trigger: 'item',
- formatter: '{a} <br/>{b} : {c}鍏� ({d}%)',
+ formatter: '{a} <br/>{b} : {c}浠� ({d}%)',
}
const pieSeries = computed(() => [
{
- name: '浜у搧閿�鍞噾棰濆垎鏋�',
+ name: '宸ュ簭浜у嚭鍒嗘瀽',
type: 'pie',
radius: '60%',
center: ['25%', '50%'],
@@ -150,7 +150,7 @@
})
const fetchData = () => {
- productSalesAnalysis()
+ processOutputAnalysis({ dateType: dateType.value })
.then((res) => {
if (res.code === 200 && Array.isArray(res.data)) {
const items = res.data
@@ -162,7 +162,7 @@
}
})
.catch((err) => {
- console.error('鑾峰彇浜у搧閿�鍞噾棰濆垎鏋愬け璐�:', err)
+ console.error('鑾峰彇宸ュ簭浜у嚭鍒嗘瀽澶辫触:', err)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
index 95a4907..8ecd507 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue
@@ -40,17 +40,15 @@
const barLegend = {
show: true,
textStyle: { color: '#B8C8E0' },
- data: ['浜ч噺', '宸ヨ祫', '鍚堟牸鐜�'],
+ data: ['鐢熶骇鏍哥畻'],
}
-// 鏌辩姸鍥撅細浜ч噺銆佸伐璧勶紱鎶樼嚎鍥撅細鍚堟牸鐜囷紙缁胯壊锛�
+// 鏌辩姸鍥撅細鐢熶骇鏍哥畻
const chartSeries = ref([
{
- name: '浜ч噺',
+ name: '鐢熶骇鏍哥畻',
type: 'bar',
- barWidth: 20,
- barGap: '40%',
- yAxisIndex: 0,
+ barWidth: 30,
emphasis: { focus: 'series' },
itemStyle: {
color: {
@@ -67,40 +65,6 @@
},
data: [],
},
- {
- name: '宸ヨ祫',
- type: 'bar',
- barGap: '40%',
- barWidth: 20,
- yAxisIndex: 1,
- emphasis: { focus: 'series' },
- itemStyle: {
- color: {
- type: 'linear',
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [
- { offset: 1, color: 'rgba(83, 126, 245, 0.19)' },
- { offset: 0, color: 'rgba(144, 97, 248, 1)' },
- ],
- },
- },
- data: [],
- },
- {
- name: '鍚堟牸鐜�',
- type: 'line',
- yAxisIndex: 2,
- showSymbol: true,
- symbol: 'circle',
- symbolSize: 8,
- lineStyle: { color: 'rgba(90, 216, 166, 1)', width: 2 },
- itemStyle: { color: 'rgba(90, 216, 166, 1)' },
- data: [],
- emphasis: { focus: 'series' },
- },
])
const tooltip = {
@@ -109,10 +73,7 @@
formatter(params) {
let result = params[0].axisValueLabel + '<br/>'
params.forEach((item) => {
- let unit = '浠�'
- if (item.seriesName === '鍚堟牸鐜�') unit = '%'
- else if (item.seriesName === '宸ヨ祫') unit = '鍏�'
- result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
+ result += `<div>${item.marker} ${item.seriesName}: ${item.value} 鍏�</div>`
})
return result
},
@@ -122,18 +83,7 @@
{ type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
])
const yAxis1 = [
- { type: 'value', name: '浜ч噺(浠�)', position: 'left', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
- { type: 'value', name: '宸ヨ祫(鍏�)', position: 'left', offset: 50, axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
- {
- type: 'value',
- name: '鍚堟牸鐜�(%)',
- position: 'right',
- min: 0,
- max: 100,
- axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
- nameTextStyle: { color: '#B8C8E0' },
- splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
- },
+ { type: 'value', name: '鍗曚綅: 鍏�', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' }, splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } } },
]
const handleDateTypeChange = () => {
@@ -141,27 +91,15 @@
}
const fetchData = () => {
- productionAccountingAnalysis({ type: dateType.value })
+ productionAccountingAnalysis({ dateType: dateType.value })
.then((res) => {
- console.log('res ======> ', res)
-
- if (!Array.isArray(res?.data)) return
-
+ if (res.code !== 200 || !Array.isArray(res.data)) return
const items = res.data
-
- xAxis1.value[0].data = items.map(d => d.dateStr)
-
- // 浜ч噺
- chartSeries.value[0].data = items.map(d => Number(d.numberOfCompleted) || 0)
-
- // 宸ヨ祫
- chartSeries.value[1].data = items.map(d => Number(d.amount) || 0)
-
- // 鍚堟牸鐜�
- chartSeries.value[2].data = items.map(d => Number(d.passRate) || 0)
+ xAxis1.value[0].data = items.map((d) => d.name)
+ chartSeries.value[0].data = items.map((d) => parseFloat(d.value) || 0)
})
.catch((err) => {
- console.error('鑾峰彇浜ч噺銆佸伐璧勪笌鍚堟牸鐜囨暟鎹け璐�:', err)
+ console.error('鑾峰彇鐢熶骇鏍哥畻鍒嗘瀽澶辫触:', err)
})
}
diff --git a/src/views/reportAnalysis/productionAnalysis/components/right-top.vue b/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
index e6717d1..d3a9eb9 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/right-top.vue
@@ -2,9 +2,21 @@
<div>
<PanelHeader title="宸ュ崟鎵ц鏁堢巼鍒嗘瀽" />
<div class="main-panel panel-item-customers">
- <Echarts ref="chart" :chartStyle="chartStyle" :grid="grid" :legend="barLegend" :series="chartSeries"
- :tooltip="tooltip" :xAxis="xAxis1" :yAxis="yAxis1"
- :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }" style="height: 260px" />
+ <div class="filters-row">
+ <DateTypeSwitch v-model="dateType" @change="handleDateTypeChange" />
+ </div>
+ <Echarts
+ ref="chart"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :legend="barLegend"
+ :series="chartSeries"
+ :tooltip="tooltip"
+ :xAxis="xAxis1"
+ :yAxis="yAxis1"
+ :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
+ style="height: 260px"
+ />
</div>
</div>
</template>
@@ -14,10 +26,13 @@
import { workOrderEfficiencyAnalysis } from '@/api/viewIndex.js'
import PanelHeader from './PanelHeader.vue'
import Echarts from '@/components/Echarts/echarts.vue'
+import DateTypeSwitch from './DateTypeSwitch.vue'
+
+const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
const chartStyle = {
width: '100%',
- height: '160%',
+ height: '140%',
}
const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }
@@ -115,24 +130,25 @@
},
]
+const handleDateTypeChange = () => {
+ fetchData()
+}
+
const fetchData = () => {
- workOrderEfficiencyAnalysis()
+ workOrderEfficiencyAnalysis({ dateType: dateType.value })
.then((res) => {
- // 鏍规嵁浣犵殑缁撴瀯锛屾暟鎹洿鎺ュ湪 res.data 涓�
- if (!res?.data || !Array.isArray(res.data)) return
-
- const list = res.data
-
- xAxis1.value[0].data = list.map((item) => item.date)
-
- chartSeries.value[0].data = list.map((item) => Number(item.startQuantity) || 0)
-
- chartSeries.value[1].data = list.map((item) => Number(item.finishQuantity) || 0)
-
- chartSeries.value[2].data = list.map((item) => Number(item.yieldRate) || 0)
+ if (res.code !== 200 || !Array.isArray(res.data)) return
+ const items = res.data
+ xAxis1.value[0].data = items.map((d) => d.date)
+ // 寮�宸�
+ chartSeries.value[0].data = items.map((d) => Number(d.startQuantity) || 0)
+ // 瀹屾垚
+ chartSeries.value[1].data = items.map((d) => Number(d.finishQuantity) || 0)
+ // 鑹搧鐜�
+ chartSeries.value[2].data = items.map((d) => Math.min(100, parseFloat(d.yieldRate) || 0))
})
.catch((err) => {
- console.error('鑾峰彇宸ュ崟鏁堢巼鏁版嵁澶辫触:', err)
+ console.error('鑾峰彇宸ュ崟鎵ц鏁堢巼鍒嗘瀽澶辫触:', err)
})
}
@@ -148,6 +164,14 @@
gap: 20px;
}
+.filters-row {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ gap: 12px;
+ margin-bottom: 10px;
+}
+
.panel-item-customers {
border: 1px solid #1a58b0;
padding: 18px;
diff --git a/src/views/reportAnalysis/qualityAnalysis/index.vue b/src/views/reportAnalysis/qualityAnalysis/index.vue
index 1163154..a6458a9 100644
--- a/src/views/reportAnalysis/qualityAnalysis/index.vue
+++ b/src/views/reportAnalysis/qualityAnalysis/index.vue
@@ -13,7 +13,7 @@
<!-- 椤堕儴鏍囬鏍� -->
<div class="dashboard-header">
- <div class="factory-name">杩涢攢璐ㄩ噺绫诲垎鏋�</div>
+ <div class="factory-name">璐ㄩ噺鏁版嵁鍒嗘瀽</div>
</div>
<!-- 涓昏鍐呭鍖哄煙 -->
--
Gitblit v1.9.3