From 3ea048fbced1285c004c2ec60684a9bcc55962b7 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Thu, 27 Mar 2025 15:26:46 +0800
Subject: [PATCH] 最新修改

---
 admin-web-master/src/api/cereBusinessInfo.js                 |   9 +++++++++
 admin-web-master/src/assets/images/msg.png                   | Bin 0 -> 262 bytes
 admin-web-master/src/layout/index.vue                        |  21 ++++++++++++++-------
 admin-web-master/src/utils/request.js                        |   4 ++--
 admin-web-master/src/utils/request2.js                       |   2 +-
 admin-web-master/src/views/rent/InvestmentAnalysis/index.vue | 531 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/scheme/statistics.vue             | 499 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lvdao-miniapp/pages.json                                     |   2 +-
 lvdao-miniapp/pages/participation/participation.vue          |  10 +++++-----
 9 files changed, 1062 insertions(+), 16 deletions(-)
 create mode 100644 admin-web-master/src/assets/images/msg.png
 create mode 100644 admin-web-master/src/views/rent/InvestmentAnalysis/index.vue
 create mode 100644 admin-web-master/src/views/scheme/statistics.vue

diff --git a/admin-web-master/src/api/cereBusinessInfo.js b/admin-web-master/src/api/cereBusinessInfo.js
index fe4913e..5024f11 100644
--- a/admin-web-master/src/api/cereBusinessInfo.js
+++ b/admin-web-master/src/api/cereBusinessInfo.js
@@ -43,3 +43,12 @@ export function close(data) {
   })
 }
 
+// 招商统计分析
+export function getInvestmentStatistics(data) {
+  return request({
+    url: '/attractInvestmentStatisticsController/getInvestmentStatistics',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/admin-web-master/src/assets/images/msg.png b/admin-web-master/src/assets/images/msg.png
new file mode 100644
index 0000000..2b8f0f2
Binary files /dev/null and b/admin-web-master/src/assets/images/msg.png differ
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 8e37620..bc6f159 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -10,8 +10,8 @@
 				<li :class="index ==  ins ? 'topList':'weiList'" style="line-height: 55px;height: 100%"
 					v-for="(item,ins) in msg" @click="clk(ins)">{{item}}</li>
 			</ul>
-			<div style="position: absolute;top:0px;right:0px;display: flex">
-				<div style="border-radius:20px; width: 110px; height: 30px;margin-top: 11px;margin-right: 10px;background:rgba(255, 255, 255, 0.1);display: flex;flex-flow: row nowrap;justify-content: center;
+			<div style="position: absolute;top:0px;right:0px;display: flex;align-items: center;height: 50px;">
+				<div style="border-radius:20px; width: 110px; height: 30px;background:rgba(255, 255, 255, 0.1);display: flex;flex-flow: row nowrap;justify-content: center;
        align-items: center;cursor: pointer;" @click="gzt">
 					<!-- <el-image src="https://028wlkj.cn:30021/public/static/logos/home-stable.png"
 						style="padding:10px 0;"></el-image> -->
@@ -19,10 +19,13 @@
 						style="height: 24px;object-fit: contain;width:24px;margin-right:6px;" />
 					<div style="color: #fff;line-height: 20px;font-size:14px">工作台</div>
 				</div>
-
+				<div @click="gomsg" style="padding-left: 30px;cursor: pointer;">
+					<img src="../assets/images/msg.png" alt=""
+						style="height: 24px;object-fit: contain;width:24px;margin-right:6px;" />
+				</div>
 				<div class="right-menu">
 					<div class="avatar-container">
-						<div class="avatar-wrapper" style="margin-left: 20px">
+						<div class="avatar-wrapper" style="margin-left: 30px">
 							<img :src="userAvatar" class="user-avatar">
 							<span class="user-name">{{ name }}</span>
 						</div>
@@ -722,6 +725,9 @@
 
 
 			},
+			gomsg(){
+				window.location.href = 'https://zhgw-uat.028wlkj.com/cdwlOa/systemMessages'
+			},
 			findMatchingNames(List, msg) {
 				return List.filter((item) => msg.includes(item.name))
 			},
@@ -937,8 +943,8 @@
 
 	.right-menu {
 		float: right;
-		height: 100%;
-		line-height: 50px;
+		height: 50px;
+		// line-height: 40px;
 
 		&:focus {
 			outline: none;
@@ -994,8 +1000,9 @@
 		vertical-align: top;
 		font-size: 14px;
 		margin-left: 5px;
-		margin-top: -4px;
+		// margin-top: -4px;
 		display: inline-block;
+		line-height: 40px;
 		color: #fff
 	}
 
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 9860c64..2e8c629 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  // baseURL = 'http://128.10.249.42:9003';
+  baseURL = 'http://128.10.249.23:9003';
 
 
 } else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index f35ad56..3c359a2 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
   // baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-    baseURL = 'http://128.10.249.42:9004';
+    baseURL = 'http://128.10.249.239004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/rent/InvestmentAnalysis/index.vue b/admin-web-master/src/views/rent/InvestmentAnalysis/index.vue
new file mode 100644
index 0000000..d2e5f9b
--- /dev/null
+++ b/admin-web-master/src/views/rent/InvestmentAnalysis/index.vue
@@ -0,0 +1,531 @@
+<template>
+	<div style="background-color:#f7f7f7;padding:10px 10px;">
+		<div class="zhuti">
+			<div style="height:58px;line-height:58px;">
+				<div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
+						style="color:#000000e6">招商统计分析</span></div>
+			</div>
+			<div class="toolbar">
+			  <el-form  :inline="true" :model="pageindex"> 
+			    <el-form-item label="资源类型">
+			    <el-select  placeholder="全部"   v-model="pageindex.leaseType"
+			      style="width: 120px;margin-right: 15px">
+			     <el-option label="商铺" value="商铺" />
+				 <el-option label="场地" value="场地" />
+				 <el-option label="广告位" value="广告位" />
+			    </el-select>
+			    </el-form-item>
+			    <el-form-item label="日期">
+			      <el-date-picker
+			        v-model="pageindex.list"
+			        type="daterange"
+			        range-separator="至"
+			        start-placeholder="开始时间"
+			        end-placeholder="结束时间"
+			        value-format="yyyy-MM-dd"
+			      />
+			    </el-form-item>
+			
+			    <el-form-item label-width="0">
+			      <el-button   @click="search" style="background-color: #3F9B6A;color: #fff">查询</el-button>
+			      <el-button  @click="clear" class="buttonHover"
+			     style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
+			    </el-form-item>
+			  </el-form>
+			</div>
+			<div style="width: 100%;margin-bottom:30px;">
+				<div style="display:flex;margin-top:10px;">
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">商户统计</div>
+						</div>
+						<div ref="shop1TJ" style="width:100%;height: 400px;"></div>
+					</div>
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">转化率分析</div>
+						</div>
+						<div ref="shop1ZX" style="width:100%;height: 400px;"></div>
+
+					</div>
+
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom;20px;">
+				<div style="display:flex;margin-top:10px;">
+
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">出租率</div>
+						</div>
+						<div ref="shop2TJ" style="width:100%;height: 400px;"></div>
+					</div>
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">空置资源统计</div>
+						</div>
+						<div ref="shop3QS" style="width:100%;height: 400px;"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</template>
+
+<script>
+  import {
+   getInvestmentStatistics
+  } from '@/api/cereBusinessInfo'
+	import * as echarts from 'echarts'
+	export default {
+		name: 'atmosphereGl',
+		data() {
+			return {
+				currentPage: 1,
+				radio1: 0,
+				total: 100,
+				flag: false,
+				pageSize: 10,
+				tableData: [],
+				pageindex: {
+				leaseType:'',
+				startTime:'',
+				endTime:'',
+				list:[]
+				},
+				listType:[]
+
+			}
+		},
+		computed: {},
+		mounted() {
+			this.getAll()
+			
+		},
+
+		methods: {
+			search(){
+				if(this.pageindex.list.length!=0){
+					this.pageindex.startTime = this.pageindex.list[0]+' 00:00:00'
+					this.pageindex.endTime = this.pageindex.list[1]+' 23:59:59'	
+				}
+				
+				this.getAll()
+			},
+			clear(){
+				this.pageindex={
+				leaseType:'',
+				startTime:'',
+				endTime:'',
+				list:[]
+				}
+				this.getAll()
+			},
+			charDam(val) {
+		
+
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.shop2TJ
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+			 val.sort((a, b) => {
+			       return new Date(a.month) - new Date(b.month);
+			     });
+			    const months =  val.map(item => item.month);
+			   const lettingRate = val.map(item => item.lettingRate);
+			    
+			      const option = {
+			        tooltip: {
+			          trigger: 'axis'
+			        },
+			        xAxis: {
+			          type: 'category',
+			          boundaryGap: false,
+			          data:months,
+			        },
+			        yAxis: {
+			          type: 'value',
+			          axisLabel: {
+			            formatter: '{value}%'
+			          }
+			        },
+			        series: [
+			          {
+			            name: '出租率',
+			            type: 'line',
+			            data: lettingRate,
+			            symbol: 'circle',
+			            symbolSize: 8,
+			            lineStyle: {
+			              color: '#4A90E2'
+			            },
+			            areaStyle: {
+			              color: new echarts.graphic.LinearGradient(
+			                0, 0, 0, 1,
+			                [
+			                  { offset: 0, color: '#4A90E2' },
+			                  { offset: 1, color: 'rgba(74, 144, 226, 0.1)' }
+			                ]
+			              )
+			            },
+						// 新增：设置节点（小圆点）颜色
+						            itemStyle: { 
+						              normal: { 
+						                color: '#2c87ff' // 节点颜色设为红色，可替换为其他颜色值（如 '#00ff00' 绿色、'#0000ff' 蓝色）
+						              }
+						            },
+			          }
+			        ]
+			      };
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+			charDam1(val) {
+
+				const chartDom = this.$refs.shop1ZX;
+				const myChart = echarts.init(chartDom)
+					
+			const option = {
+			        series: [
+			          {
+			            name: '转化率',
+			            type: 'funnel',
+						minSize: '25%',
+						maxSize: '80%',
+						sort: 'descending',
+						color: ['#50B5FF', '#5AD8A6'],
+			            data: [
+			          { name: `意向客户 ${val.intention}`, value: val.intention },
+			          { name: `签约客户 ${val.signContract}`, value: val.signContract }
+			            ],
+			            itemStyle: {
+			              normal: {
+			                borderColor: '#333',
+			                borderWidth: 1,
+							 scale: 10
+			              }
+			            },
+			            label: {
+			              normal: {
+			                show: true,
+			                position: 'inside'
+			              }
+			            },
+			            labelLine: {
+			              normal: {
+			                show: true
+			              }
+			            },
+			            tooltip: {
+			              formatter: function (params) {
+			                return `${params.name}: ${params.value}`;
+			              }
+			            },
+			            funnelAlign: 'center',
+			            gap: 5,
+			            left: '10%',
+			            right: '10%'
+						
+			          }
+			        ],
+					graphic: [
+					          {
+					            type: 'text',
+					            left: '80%',
+					            top: '60%',
+					            style: {
+					              text: `转化率${val.percentConversion}%`,
+					              fill: '#666',
+					              fontSize: 12
+					            }
+					          },
+					        ]
+			      };
+				    option && myChart.setOption(option,true);
+				    window.addEventListener('resize', () => myChart.resize());
+			},
+			charDam3(val) {
+				let Dom = this.$refs.shop1TJ
+				let myChart = echarts.init(Dom)
+				  val.sort((a, b) => {
+				        return new Date(a.mouth) - new Date(b.mouth);
+				      });
+				     const months =  val.map(item => item.mouth);
+				    const intentMerchants = val.map(item => item.intention);
+				     const signedMerchants =  val.map(item => item.signContract);
+				      // 配置项
+				      const option = {
+				        tooltip: {
+				          trigger: 'axis'
+				        },
+				        grid: {
+				          left: '10%',
+				          right: '10%',
+				          bottom: '15%'
+				        },
+				        xAxis: {
+				          type: 'category',
+				          data: months,
+				          boundaryGap: false
+				        },
+				        yAxis: {
+				          type: 'value',
+				          name: '商户数量'
+				        },
+				        series: [
+				          {
+				            name: '签约商户',
+				            type: 'line',
+				            data: signedMerchants,
+				            symbol: 'circle',
+				            lineStyle: {
+				              color: '#1890ff'
+				            },
+				            itemStyle: {
+				              color: '#1890ff'
+				            }
+				          },
+				          {
+				            name: '意向商户',
+				            type: 'line',
+				            data: intentMerchants,
+				            symbol: 'circle',
+				            lineStyle: {
+				              color: '#52c41a'
+				            },
+				            itemStyle: {
+				              color: '#52c41a'
+				            }
+				          }
+				        ]
+				      };
+				option && myChart.setOption(option);
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+
+			charDam5(val) {
+			
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.shop3QS
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+				 // const data = val.sort((a, b) => b.vacancyDays - a.vacancyDays);
+		   // 按vacancyDays降序排序
+		      const sortedData = val.sort((a, b) => b.vacancyDays - a.vacancyDays);
+		
+		      // 取前10条数据
+		      const top10Data = sortedData.slice(0, 10);
+		
+		      // 计算其他项的vacancyDays总和
+		      const otherVacancyDays = sortedData.slice(10).reduce((sum, item) => sum + item.vacancyDays, 0);
+		
+		      // 添加其他项
+		      top10Data.push({
+		        resourceName: '其他',
+		        vacancyDays: otherVacancyDays
+		      });
+		      const option = {
+		        tooltip: {
+		          trigger: 'axis',
+		          axisPointer: {
+		            type: 'shadow'
+		          }
+		        },
+				grid: {
+				  left: '0%', 
+				  right: '5%',
+				  top: '8%',
+				  bottom: '8%',
+				  containLabel: true
+				},
+				
+		        xAxis: {
+		          type: 'value'
+		        },
+		        yAxis: {
+		          type: 'category',
+		          data: top10Data.map(item => item.resourceName)
+		        },
+		        series: [
+		          {
+		            name: '空置天数',
+		            type: 'bar',
+		            data: top10Data.map(item => item.vacancyDays),
+					barWidth: 30,  
+					barCategoryGap: '50%', // 原为 40%，调整为 60% 增加间隙
+					barGap: '20%', 
+		            itemStyle: {
+		              color: '#3f9b6a',
+		            },
+		            label: {
+		              normal: {
+		                show: true,
+		                position: 'insideRight' // 数值显示在柱子右侧
+		              }
+		            }
+		          }
+		        ],
+				
+				  // graphic: [
+				  //         {
+				  //           type: 'text',
+				  //           left: '92%', // 右侧5%位置
+				  //           bottom: '12%', // 底部5%位置
+				  //           style: {
+				  //             text: '天',
+				  //             fill: '#666',
+				  //             fontSize: 12,
+				  //             // fontWeight: 'bold'
+				  //           }
+				  //         }
+				  //       ]
+		      };
+			
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			
+			},
+
+			async getAll() {
+				const res = await getInvestmentStatistics(this.pageindex)
+			this.charDam3(res.data.signContractAndIntentionVOList)
+				this.charDam1(res.data.percentConversionVO)
+				this.charDam(res.data.lettingRateVOList)
+				this.charDam5(res.data.vacantDaysVOS)
+				
+			},
+	
+		}
+	}
+</script>
+
+<style scoped>
+	.zhuti {
+		padding: 0 20px 20px 20px;
+		min-height: calc(100vh - 50px - 20px);
+		background-color: #Fff;
+
+	}
+
+	/deep/ .el-form-item__content {
+		line-height: 0;
+	}
+
+	.tableBtn {
+		display: inline-block;
+		margin-right: 10px;
+	}
+
+	.formSearch {
+		position: relative;
+		margin-top: 30px;
+		display: flex;
+		width: 100%;
+		height: 30px;
+		font-size: 14px;
+		margin-bottom: 10px;
+	}
+
+	.greens {
+		color: #3F9B6A;
+	}
+
+
+	.fenye {
+		margin-top: 20px;
+		display: flex;
+		justify-content: flex-start;
+		position: relative;
+	}
+
+	/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+		background-color: #3F9B6A;
+	}
+
+	.el-row {
+		margin-bottom: 20px;
+	}
+
+	:last-child {
+		margin-bottom: 0;
+	}
+
+	.el-col {
+		border-radius: 4px;
+	}
+
+	.bg-purple-dark {
+		background: #99a9bf;
+	}
+
+	.bg-purple {
+		background: #d3dce6;
+	}
+
+	.bg-purple-light {
+		background: #e5e9f2;
+	}
+
+	.grid-content {
+		border-radius: 4px;
+		min-height: 36px;
+	}
+
+	.row-bg {
+		padding: 10px 0;
+		background-color: #f9fafc;
+	}
+
+	/deep/ .bg-purple[data-v-0e3fe4ec] {
+		background: #fff;
+		height: 50px;
+	}
+
+	/deep/ .el-form--label-top .el-form-item__label {
+		padding: 0;
+	}
+
+	.demo-input-suffix {
+		display: flex;
+		margin-right: 20px;
+	}
+
+	.pagination {
+		text-align: right;
+		line-height: 20px;
+	}
+
+	/deep/ .el-pagination__total {
+		margin-top: 4px;
+	}
+
+	::v-deep .el-select .el-input.is-focus .el-input__inner {
+		border-color: #3F9B6A
+	}
+
+	/deep/ .el-dialog__header {
+		background-color: #fff;
+		padding: 0
+	}
+
+	/deep/ .el-radio__input.is-checked .el-radio__inner {
+		border-color: #3F9B6A;
+		background: #3F9B6A;
+	}
+
+	::v-deep .buttonHover:hover {
+		color: #3f9b6a !important;
+		border-color: #c5e1d2 !important;
+		background-color: #ecf5f0 !important;
+		outline: none;
+	}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/views/scheme/statistics.vue b/admin-web-master/src/views/scheme/statistics.vue
new file mode 100644
index 0000000..31820fa
--- /dev/null
+++ b/admin-web-master/src/views/scheme/statistics.vue
@@ -0,0 +1,499 @@
+<template>
+	<div style="background-color:#f7f7f7;padding:10px 10px;">
+		<div class="zhuti">
+			<div style="height:58px;line-height:58px;">
+				<div style="color:#0006"> <span>招商方案管理</span> <span style="padding:0 5px;">></span> <span
+						style="color:#000000e6">招商方案统计</span></div>
+			</div>
+			<div class="toolbar">
+			  <el-form  :inline="true" :model="pageindex"> 
+			    <el-form-item label="资源类型">
+			    <el-select  placeholder="全部"   v-model="pageindex.leaseType"
+			      style="width: 120px;margin-right: 15px">
+			     <el-option label="商铺" value="商铺" />
+				 <el-option label="场地" value="场地" />
+				 <el-option label="广告位" value="广告位" />
+			    </el-select>
+			    </el-form-item>
+			    <el-form-item label="日期">
+			      <el-date-picker
+			        v-model="pageindex.list"
+			        type="daterange"
+			        range-separator="至"
+			        start-placeholder="开始时间"
+			        end-placeholder="结束时间"
+			        value-format="yyyy-MM-dd"
+			      />
+			    </el-form-item>
+			
+			    <el-form-item label-width="0">
+			      <el-button   @click="search" style="background-color: #3F9B6A;color: #fff">查询</el-button>
+			      <el-button  @click="clear" class="buttonHover"
+			     style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置</el-button>
+			    </el-form-item>
+			  </el-form>
+			</div>
+			<div style="width: 100%;margin-bottom:30px;">
+				<div style="display:flex;margin-top:10px;">
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">月度签约趋势</div>
+						</div>
+						<div ref="shop1TJ" style="width:100%;height: 400px;"></div>
+					</div>
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">资源使用占比</div>
+						</div>
+						<div ref="shop1ZX" style="width:100%;height: 400px;"></div>
+
+					</div>
+
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom;20px;">
+				<div style="display:flex;margin-top:10px;">
+
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">商铺经营类型占比</div>
+						</div>
+						<div ref="shop2TJ" style="width:100%;height: 400px;"></div>
+					</div>
+					<div style="width:50%;height: 400px;marigin-right:20px;">
+						<div style="display: flex;justify-content: space-between;">
+							<div style="line-height:35px;">租金价格趋势</div>
+						</div>
+						<div ref="shop3QS" style="width:100%;height: 400px;"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</template>
+
+<script>
+  import {
+   getInvestmentStatistics
+  } from '@/api/cereBusinessInfo'
+	import * as echarts from 'echarts'
+	export default {
+		name: 'atmosphereGl',
+		data() {
+			return {
+				currentPage: 1,
+				radio1: 0,
+				total: 100,
+				flag: false,
+				pageSize: 10,
+				tableData: [],
+				pageindex: {
+				leaseType:'',
+				startTime:'',
+				endTime:'',
+				list:[]
+				},
+				listType:[]
+
+			}
+		},
+		computed: {},
+		mounted() {
+			this.getAll()
+			
+		},
+
+		methods: {
+			search(){
+				if(this.pageindex.list.length!=0){
+					this.pageindex.startTime = this.pageindex.list[0]+' 00:00:00'
+					this.pageindex.endTime = this.pageindex.list[1]+' 23:59:59'	
+				}
+				
+				this.getAll()
+			},
+			clear(){
+				this.pageindex={
+				leaseType:'',
+				startTime:'',
+				endTime:'',
+				list:[]
+				}
+				this.getAll()
+			},
+			charDam(val) {
+		
+
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.shop2TJ
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+		// 模拟数据
+		     const shopCount = 50;
+		     const adCount = 30;
+		     const venueCount = 20;
+		     const totalCount = shopCount + adCount + venueCount;
+				
+		     const option = {
+		       tooltip: {
+		         trigger: 'item',
+		         formatter: '{a} <br/>{b}: {c} ({d}%)'
+		       },
+		       legend: {
+		          orient: 'horizontal', // 横向展示
+		                 left: 'center', // 居中显示
+		         data: ['商铺', '广告位', '场地']
+		       },
+		       series: [
+		         {
+		           name: '资源分布',
+		           type: 'pie',
+		           radius: ['50%', '70%'],
+		           avoidLabelOverlap: false,
+		           label: {
+		             show: true,
+		             position: 'outside',
+		             formatter: '{b}: {c}'
+		           },
+		           labelLine: {
+		             show: true
+		           },
+		           data: [
+		             { value: shopCount, name: '商铺' },
+		             { value: adCount, name: '广告位' },
+		             { value: venueCount, name: '场地' }
+		           ]
+		         },
+		         {
+		   name: '总量',
+		   type: 'pie',
+		   radius: ['0%', '0%'], // 不显示圆形
+		   label: {
+		     show: true,
+		     position: 'center',
+		     formatter: `总量: ${totalCount}`,
+		     fontSize: 20
+		   },
+		           data: [
+		             { value: totalCount, name: '总量' }
+		           ]
+		         }
+		       ]
+		     };
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+			charDam1(val) {
+
+				const chartDom = this.$refs.shop1ZX;
+				const myChart = echarts.init(chartDom)
+					
+		 // 模拟数据
+		      const shopCount = 50;
+		      const adCount = 30;
+		      const venueCount = 20;
+		      const totalCount = shopCount + adCount + venueCount;
+		
+		      const option = {
+		        tooltip: {
+		          trigger: 'item',
+		          formatter: '{a} <br/>{b}: {c} ({d}%)'
+		        },
+		        legend: {
+		           orient: 'horizontal', // 横向展示
+		                  left: 'center', // 居中显示
+		          data: ['商铺', '广告位', '场地']
+		        },
+		        series: [
+		          {
+		            name: '资源分布',
+		            type: 'pie',
+		            radius: ['50%', '70%'],
+		            avoidLabelOverlap: false,
+		            label: {
+		              show: true,
+		              position: 'outside',
+		              formatter: '{b}: {c}'
+		            },
+		            labelLine: {
+		              show: true
+		            },
+		            data: [
+		              { value: shopCount, name: '商铺' },
+		              { value: adCount, name: '广告位' },
+		              { value: venueCount, name: '场地' }
+		            ]
+		          },
+		          {
+            name: '总量',
+            type: 'pie',
+            radius: ['0%', '0%'], // 不显示圆形
+            label: {
+              show: true,
+              position: 'center',
+              formatter: `总量: ${totalCount}`,
+              fontSize: 20
+            },
+		            data: [
+		              { value: totalCount, name: '总量' }
+		            ]
+		          }
+		        ]
+		      };
+
+				    option && myChart.setOption(option,true);
+				    window.addEventListener('resize', () => myChart.resize());
+			},
+			charDam3(val) {
+				let Dom = this.$refs.shop1TJ
+				let myChart = echarts.init(Dom)
+				  // val.sort((a, b) => {
+				  //       return new Date(a.mouth) - new Date(b.mouth);
+				  //     });
+				  //    const months =  val.map(item => item.mouth);
+				  //   const intentMerchants = val.map(item => item.intention);
+				  //    const signedMerchants =  val.map(item => item.signContract);
+			    // 模拟月度签约数据
+			      const months = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
+			      const contractCounts = [12, 15, 20, 18, 22, 25, 28, 30, 26, 24, 21, 23];
+			
+			      const option = {
+			        tooltip: {
+			          trigger: 'axis'
+			        },
+			        xAxis: {
+			          type: 'category',
+			          data: months,
+			          boundaryGap: false
+			        },
+			        yAxis: {
+			          type: 'value',
+			          name: '签约数'
+			        },
+			        series: [
+			          {
+			            name: '签约数',
+			            type: 'line',
+			            data: contractCounts,
+			            symbol: 'circle',
+			            lineStyle: {
+			              color: '#4A90E2'
+			            },
+			            itemStyle: {
+			              color: '#4A90E2'
+			            },
+			            areaStyle: {
+			              color: new echarts.graphic.LinearGradient(
+			                0, 0, 0, 1,
+			                [
+			                  { offset: 0, color: 'rgba(74, 144, 226, 0.3)' },
+			                  { offset: 1, color: 'rgba(74, 144, 226, 0.1)' }
+			                ]
+			              )
+			            }
+			          }
+			        ]
+			      };
+
+				option && myChart.setOption(option);
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			},
+
+			charDam5(val) {
+			
+				// 获取图表容器的 DOM 元素
+				const chartDom = this.$refs.shop3QS
+				// 初始化 ECharts 实例
+				const myChart = echarts.init(chartDom);
+				 
+		
+		        // 模拟租金价格数据，这里假设是按月份统计
+		           const months = ['1月', '2月', '3月', '4月', '5月', '6月'];
+		           const rentPrices = [50, 52, 55, 53, 56, 58];
+		     
+		           const option = {
+		             tooltip: {
+		               trigger: 'axis'
+		             },
+		             xAxis: {
+		               type: 'category',
+		               data: months,
+		               boundaryGap: false
+		             },
+		             yAxis: {
+		               type: 'value',
+		               name: '租金价格（元/m²）'
+		             },
+		             series: [
+		               {
+		                 name: '租金价格',
+		                 type: 'line',
+		                 data: rentPrices,
+		                 symbol: 'circle',
+		                 lineStyle: {
+		                   color: '#4A90E2'
+		                 },
+		                 itemStyle: {
+		                   color: '#4A90E2'
+		                 },
+		                 areaStyle: {
+		                   color: new echarts.graphic.LinearGradient(
+		                     0, 0, 0, 1,
+		                     [
+		                       { offset: 0, color: 'rgba(74, 144, 226, 0.3)' },
+		                       { offset: 1, color: 'rgba(74, 144, 226, 0.1)' }
+		                     ]
+		                   )
+		                 }
+		               }
+		             ]
+		           };
+
+				// 使用刚指定的配置项和数据显示图表
+				option && myChart.setOption(option)
+				window.addEventListener('resize', function() {
+					myChart.resize();
+				})
+			
+			},
+
+			async getAll() {
+				const res = await getInvestmentStatistics(this.pageindex)
+			this.charDam3()
+				this.charDam1()
+				this.charDam()
+				this.charDam5()
+				
+			},
+	
+		}
+	}
+</script>
+
+<style scoped>
+	.zhuti {
+		padding: 0 20px 20px 20px;
+		min-height: calc(100vh - 50px - 20px);
+		background-color: #Fff;
+
+	}
+
+	/deep/ .el-form-item__content {
+		line-height: 0;
+	}
+
+	.tableBtn {
+		display: inline-block;
+		margin-right: 10px;
+	}
+
+	.formSearch {
+		position: relative;
+		margin-top: 30px;
+		display: flex;
+		width: 100%;
+		height: 30px;
+		font-size: 14px;
+		margin-bottom: 10px;
+	}
+
+	.greens {
+		color: #3F9B6A;
+	}
+
+
+	.fenye {
+		margin-top: 20px;
+		display: flex;
+		justify-content: flex-start;
+		position: relative;
+	}
+
+	/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+		background-color: #3F9B6A;
+	}
+
+	.el-row {
+		margin-bottom: 20px;
+	}
+
+	:last-child {
+		margin-bottom: 0;
+	}
+
+	.el-col {
+		border-radius: 4px;
+	}
+
+	.bg-purple-dark {
+		background: #99a9bf;
+	}
+
+	.bg-purple {
+		background: #d3dce6;
+	}
+
+	.bg-purple-light {
+		background: #e5e9f2;
+	}
+
+	.grid-content {
+		border-radius: 4px;
+		min-height: 36px;
+	}
+
+	.row-bg {
+		padding: 10px 0;
+		background-color: #f9fafc;
+	}
+
+	/deep/ .bg-purple[data-v-0e3fe4ec] {
+		background: #fff;
+		height: 50px;
+	}
+
+	/deep/ .el-form--label-top .el-form-item__label {
+		padding: 0;
+	}
+
+	.demo-input-suffix {
+		display: flex;
+		margin-right: 20px;
+	}
+
+	.pagination {
+		text-align: right;
+		line-height: 20px;
+	}
+
+	/deep/ .el-pagination__total {
+		margin-top: 4px;
+	}
+
+	::v-deep .el-select .el-input.is-focus .el-input__inner {
+		border-color: #3F9B6A
+	}
+
+	/deep/ .el-dialog__header {
+		background-color: #fff;
+		padding: 0
+	}
+
+	/deep/ .el-radio__input.is-checked .el-radio__inner {
+		border-color: #3F9B6A;
+		background: #3F9B6A;
+	}
+
+	::v-deep .buttonHover:hover {
+		color: #3f9b6a !important;
+		border-color: #c5e1d2 !important;
+		background-color: #ecf5f0 !important;
+		outline: none;
+	}
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index ab9346f..933022d 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -141,7 +141,7 @@
 		{
 			"path": "pages/participation/participation",
 			"style": {
-				"navigationBarTitleText": "活动参与",
+				"navigationBarTitleText": "商家活动",
 				"navigationBarBackgroundColor": "#fff",
 				"enablePullDownRefresh": true
 			}
diff --git a/lvdao-miniapp/pages/participation/participation.vue b/lvdao-miniapp/pages/participation/participation.vue
index 3494297..9540130 100644
--- a/lvdao-miniapp/pages/participation/participation.vue
+++ b/lvdao-miniapp/pages/participation/participation.vue
@@ -1,13 +1,13 @@
 <template>
 	<!-- 活动参与 -->
 	<view class="page">
-		<view class="more page-box" @click="toMyAdd">
+		<!-- <view class="more page-box" @click="toMyAdd">
 			<u-section :bold="false" title="我的活动申请" sub-title='' :show-line="false" color="#0FBB59">
 				<view slot="right">
 					<u-icon name="arrow-rightward" color="#0FBB59" size="28"></u-icon>
 				</view>
 			</u-section>
-		</view>
+		</view> -->
 		<!-- 搜索 -->
 		<!-- 	<view class="head-search">
 			<u-search bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" :show-action="false" @search="search"></u-search>
@@ -50,10 +50,10 @@
 			</view>
 		</view>
 
-		<view style="height: 120rpx;"></view>
-		<view class="page-footer">
+		<!-- <view style="height: 120rpx;"></view> -->
+		<!-- <view class="page-footer">
 			<u-button type="success" @click="toAdd">活动申请</u-button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
--
libgit2 0.21.4