From 1c0863efe062af3ebcdecb8c10568d779f5c8295 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 26 一月 2026 15:10:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New' into dev_tide_mis_xindao
---
src/views/index.vue | 245 ++++++++++++++++++++++++------------------------
1 files changed, 122 insertions(+), 123 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index e06a40b..2888b16 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -18,126 +18,126 @@
</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="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="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="dashboard-row">
<!-- <div class="main-panel">-->
<!-- <div class="section-title">璐ㄩ噺缁熻</div>-->
<!-- <div class="quality-cards">-->
@@ -155,11 +155,11 @@
<!-- :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 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>
</template>
@@ -386,7 +386,6 @@
}
// 搴斾粯搴旀敹缁熻
const statisticsReceivable = (type) => {
- console.log(type)
statisticsReceivablePayable({type: radio1.value}).then((res) => {
barSeries.value[0].data = [
// { value: res.data.prepayMoney, itemStyle: { color: barColors2[0] } },
@@ -507,7 +506,7 @@
min-width: 0;
background-color: #EFF2FB; /* 浣跨敤鎸囧畾鐨勮儗鏅鑹� */
background-image: url("../assets/images/denglu.png");
- background-size: 100% 260%;
+ background-size: cover;
background-position: center;
background-repeat: no-repeat;
border-radius: 12px;
--
Gitblit v1.9.3