From b460359cb46342712e2efc2b5a6e6aa84b729c4c Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 25 五月 2026 17:14:55 +0800
Subject: [PATCH] feat: 大屏调整
---
src/views/index.vue | 55 ++++-----------------------
src/views/reportAnalysis/dataDashboard/index.vue | 26 ++++++------
src/api/viewIndex.js | 8 +++
src/views/collaborativeApproval/approvalProcess/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 16 +++++++
5 files changed, 44 insertions(+), 63 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 2d85171..748667d 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -15,6 +15,12 @@
method: 'get'
})
}
+export const analysisSupplierContractAmounts = () => {
+ return request({
+ url: '/home/analysisSupplierContractAmounts',
+ method: 'get'
+ })
+}
// 璐ㄦ鍒嗘瀽
export const qualityStatistics = () => {
return request({
@@ -44,4 +50,4 @@
url: '/sales/ledger/getAmountHalfYear',
method: 'get'
})
-}
\ No newline at end of file
+}
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index f6de64d..b8b51e1 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -126,6 +126,19 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹℃牳鏃ユ湡锛�" prop="approveOverTime">
+ <el-date-picker
+ v-model="form.approveOverTime"
+ type="date"
+ placeholder="璇烽�夋嫨瀹℃牳鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="24">
@@ -191,7 +204,8 @@
checkResult: "",
tempFileIds: [],
approverList: [], // 鏂板瀛楁锛屽瓨鍌ㄦ墍鏈夎妭鐐圭殑瀹℃壒浜篿d
- price: null // 鎶ラ攢閲戦
+ price: null, // 鎶ラ攢閲戦
+ approveOverTime: "" // 瀹℃牳鏃ユ湡锛堟姤閿�绠＄悊涓撶敤锛�
},
rules: {
approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index abe5725..2cc4c4a 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -136,7 +136,7 @@
width: 200
},
{
- label: "缁撴潫鏃ユ湡",
+ label: props.approveType == 4 ? "瀹℃牳鏃ユ湡" : "缁撴潫鏃ユ湡",
prop: "approveOverTime",
width: 120
},
diff --git a/src/views/index.vue b/src/views/index.vue
index 2888b16..58f0fc8 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -19,20 +19,6 @@
</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">
@@ -43,19 +29,6 @@
<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>
@@ -81,11 +54,11 @@
</div>
</div>
</div>
-
+
<!-- 涓儴妯悜涓ゆ爮 -->
<div class="dashboard-row">
<div class="main-panel">
- <div class="section-title">瀹㈡埛鍚堝悓閲戦鍒嗘瀽</div>
+ <div class="section-title">閲囪喘閲戦鍒嗘瀽</div>
<div class="contract-summary">
<div class="contract-info">
<img src="../assets/images/khtitle.png" alt="" style="width: 42px"/>
@@ -135,7 +108,7 @@
style="height: 260px"></Echarts>
</div>
</div>
-
+
<!-- 搴曢儴妯悜涓ゆ爮 -->
<div class="dashboard-row">
<!-- <div class="main-panel">-->
@@ -170,7 +143,7 @@
import * as echarts from 'echarts';
import useUserStore from "@/store/modules/user.js";
import {
- analysisCustomerContractAmounts, getAmountHalfYear,
+ analysisSupplierContractAmounts, getAmountHalfYear,
getBusiness,
homeTodos,
qualityStatistics,
@@ -367,7 +340,7 @@
}
// 鍚堝悓閲戦
const analysisCustomer = () => {
- analysisCustomerContractAmounts().then((res) => {
+ analysisSupplierContractAmounts().then((res) => {
sum.value = res.data.sum
yny.value = res.data.yny
chain.value = res.data.chain
@@ -575,23 +548,11 @@
box-shadow: 0 2px 8px #eee;
display: flex;
flex-direction: column;
- width: 32%;
+ width: 100%;
height: 140px;
-}
-.data-card.sales {
- 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;
-}
-.data-card.inventory {
- background-image: url("../assets/images/kucun.png");
background-size: cover;
background-position: center;
background-repeat: no-repeat;
@@ -789,7 +750,7 @@
}
.quality-card.three {
background-image: url("../assets/images/chuchang.png");
-
+
}
.quality-card span {
color: #4fc3f7;
@@ -801,4 +762,4 @@
height: 220px;
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/reportAnalysis/dataDashboard/index.vue b/src/views/reportAnalysis/dataDashboard/index.vue
index 9069d49..a31f84d 100644
--- a/src/views/reportAnalysis/dataDashboard/index.vue
+++ b/src/views/reportAnalysis/dataDashboard/index.vue
@@ -8,17 +8,17 @@
<path d="M8 3H5a2 2 0 0 0-2 2v3m18 0V5a2 2 0 0 0-2-2h-3m0 18h3a2 2 0 0 0 2-2v-3M3 16v3a2 2 0 0 0 2 2h3"/>
</svg>
</button>
-
+
<div class="dashboard-header">
<div class="factory-name">{{ userStore.currentFactoryName }}</div>
</div>
-
+
<div class="dashboard-content">
<div class="content-main">
<div class="top-panels">
<div class="left-panel">
<div class="panel-header">
- <span class="panel-title">瀹㈡埛淇℃伅缁熻鍒嗘瀽</span>
+ <span class="panel-title">閲囪喘淇℃伅缁熻鍒嗘瀽</span>
</div>
<div class="panel-item-customers">
<div class="panel-title-second">
@@ -55,7 +55,7 @@
</div>
</div>
</div>
-
+
<div class="center-panel">
<div class="stats-cards">
<div class="stat-card">
@@ -80,7 +80,7 @@
</div>
</div>
</div>
-
+
<div class="event-info">
<div class="event-header">
<img src="@/assets/BI/shijianmingxiicon@2x.png" alt="鍥炬爣" class="event-icon" />
@@ -104,7 +104,7 @@
</div>
</div>
</div>
-
+
<div class="financial-header">
<span class="financial-title">璐㈠姟鍒嗘瀽</span>
</div>
@@ -129,7 +129,7 @@
</div>
</div>
</div>
-
+
<div class="right-panel">
<div class="panel-header">
<span class="panel-title">搴旀敹搴斾粯缁熻</span>
@@ -157,7 +157,7 @@
style="height: 260px"
/>
</div>
-
+
<div class="panel-header">
<span class="panel-title">鍥炴涓庡紑绁ㄥ垎鏋�</span>
</div>
@@ -187,7 +187,7 @@
import Echarts from "@/components/Echarts/echarts.vue";
import useUserStore from '@/store/modules/user'
import {
- analysisCustomerContractAmounts, getAmountHalfYear,
+ analysisSupplierContractAmounts, getAmountHalfYear,
homeTodos,
statisticsReceivablePayable
} from "@/api/viewIndex.js";
@@ -526,7 +526,7 @@
charts.value = []
}
const analysisCustomer = () => {
- analysisCustomerContractAmounts().then((res) => {
+ analysisSupplierContractAmounts().then((res) => {
sum.value = res.data.sum
yny.value = res.data.yny
chain.value = res.data.chain
@@ -538,7 +538,7 @@
}
const accountStatisticsInfo = () => {
listPageAnalysis().then((res) => {
- xAxis3.value[0].data = res.data.days
+ xAxis3.value[0].data = res.data.months
barSeries11.value[0].data = res.data.totalIncome
barSeries11.value[1].data = res.data.totalExpense
barSeries11.value[2].data = res.data.netIncome
@@ -794,7 +794,7 @@
contractList._pauseTimer = pauseTimer
}
})
-
+
window.addEventListener('resize', handleResize)
analysisCustomer()
accountStatisticsInfo()
@@ -802,7 +802,7 @@
todoInfoS()
statisticsReceivable()
getAmountHalfYearNum()
-
+
autoSwitchTimer.value = setInterval(() => {
radio1.value = radio1.value === 3 ? 1 : radio1.value + 1
statisticsReceivable()
--
Gitblit v1.9.3