Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents 486f224c 521b3983
Showing 5 changed files with 50 additions and 35 deletions
admin-web-master/dist.zip
admin-web-master/src/layout/index.vue
admin-web-master/src/views/detect/analyse.vue
admin-web-master/src/views/promotion/audit.vue
lvdao-miniapp/pagesA/projectManagement/projectManagement.vue
@@ -200,17 +200,17 @@
 				}
 			}
 			return {
-				// msg: [],
-				// list: [], 
+				msg: [],
+				list: [], 
 				// msg: ['招商服务系统'],
-				msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
-				list: [
-					['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
-					['品牌策划', '活动策划', '氛围策划', '媒体推广'],
-					['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
-					['联机交易', '对账处理', '日志管理', '商户服务'],
-					['渠道售票统计分析', '销售额统计分析'],
-				],
+				// msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
+				// list: [
+				// 	['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
+				// 	['品牌策划', '活动策划', '氛围策划', '媒体推广'],
+				// 	['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
+				// 	['联机交易', '对账处理', '日志管理', '商户服务'],
+				// 	['渠道售票统计分析', '销售额统计分析'],
+				// ],
 				listMune: [],
 				mumeList: [],
 				mumeChildren1: [],
@@ -299,10 +299,10 @@
 			this.userAvatar = getUserAvatar()
 		},
 		mounted() {
-			// this.getMemu()
-			// this.address()
-			// this.waibu()
-			this.neibu()
+			this.getMemu()
+			this.address()
+			this.waibu()
+			// this.neibu()
 		},
 		methods: {
@@ -786,12 +786,12 @@
 					['联机交易', '对账处理', '日志管理', '商户服务'],
 					['渠道售票统计分析', '销售额统计分析'],
 				]
-				this.neibu()
+				// this.neibu()
-				// this.getMemu()
-				// this.waibu()
-				// this.list = this.mumeList
+				this.getMemu()
+				this.waibu()
+				this.list = this.mumeList
 			},
@@ -12,6 +12,11 @@
 							range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
 							style="width: 300px;margin-right: 10px;" prefix-icon="none">
 						</el-date-picker>
+						<el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择"
+						  style="width: 168px;margin-right: 10px;">
+						  <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
+						    :key="index"></el-option>
+						</el-select>
 						<el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;">查询
 						</el-button>
 						<el-button @click="resetting" class="buttonHover"
@@ -75,6 +80,10 @@
     resourceSituationProportion,
     resourceUtilizationProportion,
   } from '@/api/newly.js'
+  import {
+    lvdaoduan,
+  	parkTrails
+  } from '@/api/information.js';
 	export default {
 		components: {
 			TitleWithCircle,
@@ -97,9 +106,7 @@
 					belongingGreenwaySection:'',
 					belongingParkTrail:''
 				},
-				formSel: {
-
-				}
+				lvdaoList: [],
 			}
 		},
 		computed: {},
@@ -115,13 +122,17 @@
 				this.pageindex.startTime,
 				this.pageindex.endTime
 			]
-			console.error(this.pageindex)
 			this.getAll()
-
+			this.getlvdao()
 		},
 		mounted() {
 		},
 		methods: {
+			async getlvdao(){
+			const lvdao = await lvdaoduan()
+			const gongyua  = await parkTrails() 
+			  this.lvdaoList = lvdao.data.concat(gongyua.data)	
+			},
 			initecharts1(datas) {
 				let Dom = this.$refs.echarts1
 				let myChart = echarts.init(Dom);  
@@ -396,7 +407,16 @@
 					endTime: this.FormTime[1]
 				}
-
+				const res1 = await resourceQuantityGrowth(Msg)
+				const res2 = await resourceDistributionStatistics({...this.msgList})
+				const res3 = await resourceSituationProportion()
+					
+				 const res4 = await resourceUtilizationProportion()
+					
+				this.initecharts1(res1.data)
+				this.initecharts2(res2.data)
+				this.initecharts3(res3.data)
+				this.initecharts4(res4.data)
 			},
 			async gitOut() {
 				const content = this.$refs.contentToConvert;
@@ -105,8 +105,8 @@
 	                     </div>
 	                 </el-form-item>
 	                 <el-form-item label="宣传内容" class="grid-content bg-purple" prop="promotionContent">
-	                   <div style="padding:20px;" v-html="secondData.promotionContent"></div>
-	                   
+	                   <div v-html="secondData.promotionContent" style="white-space: pre-wrap; height: auto;"></div>
+	                             
 	                 </el-form-item>
 	                 <!-- <el-form-item label="跳转链接" class="grid-content bg-purple" prop="eventAddrs">
 						 <div style="padding:20px;">{{secondData.eventAddrs}}</div>
@@ -725,6 +725,7 @@ actSp(item){
          this.index = val
          this.MsgSp =true
       },
+
     }
   }
 </script>
@@ -741,9 +742,7 @@ actSp(item){
   }
-  /deep/ .el-form-item__content {
-    line-height: 0;
-  }
+
@@ -815,10 +814,6 @@ actSp(item){
     height: 50px;
   }
-  /deep/ .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
-
   .pagination {
     text-align: right;
@@ -19,9 +19,9 @@
 		  </view>
 		</view> -->
-		<view class="screen-list">
+		<!-- <view class="screen-list">
 			<view style="margin-right:20px;" :class="listIn == index ?'color':''" @click="sel(item.state,index)" v-for="(item,index) in shenlist">{{item.title}}</view>
-		</view>
+		</view> -->
 		<!-- 订单列表 -->
 		<view class="goods-data">
 			<view class="goods-list">