From c8107a39f7611e256c473d72df58e45bc02ad7eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 11 十月 2023 16:54:04 +0800
Subject: [PATCH] #

---
 pages/index/index.vue |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 315a8ea..8d56aff 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,13 +25,31 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="top-box">
+			<view class="box-title">鍏徃鍏憡</view>
+			<view class="box-item">
+				<view style="display: flex;align-items: stretch;margin: 4px 0 ;" v-for="(item,i) in notices" :key="i">
+					<text style="flex: 1;align-self: center;padding: 8px 4px;">{{item.notice}}</text>
+					<text style="width: 150rpx;align-self: center;padding: 0 2px;">{{item.update_time}}</text>
+				</view>
+				<view>鏌ョ湅鏇村 >></view>
+			</view>
+		</view>
+		
+		<view class="charts-box">
+		  <qiun-data-charts type="column" canvasId="scrollcolumnid" :opts="{enableScroll:true,xAxis:{scrollShow:true,itemCount:4,disableGrid:true}}" :ontouch="true" :canvas2d="true" :chartData="chartsDataColumn4" :background="red"/>
+		</view>
 	</view>
 </template>
 
 <script>
+	import demodata from '@/mockdata/demodata.json';
+	import getCompanyData from '@/pages/api/index.js'
 	export default {
 		data() {
 			return {
+				chartsDataColumn4:{},
 				title: 'Hello',
 				mainItem: [
 					{
@@ -64,14 +82,46 @@
 					{name: '鏉庝笘璞�3绾�',performance:'200涓囧厓'},
 					{name: '鏉庝笘璞�1绾�',performance:'112涓囧厓'}
 				],
-				bgs: ['bg-blue','bg-red']
+				bgs: ['bg-blue','bg-red'],
+				red: '#aaffff',
+				notices: [
+					{notice: '杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡asdas杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡杩欐潯娴嬭瘯鍏憡琚慨鏀逛簡',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '杩欐槸涓�鏉℃祴璇曞叕鍛�',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'},
+					{notice: '娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙告槸涓壃闆嗗洟鏃椾笅涓撲笟鐨勬櫤鑳戒粨鍌ㄧ墿娴佽澶囨簮澶存湇鍔″晢锛岃嚧鍔涗簬璁╁埗閫犱笌鐗╂祦鏇撮珮鏁堛�傞泦鍥㈠勾閿�鍞瓒�5浜夸汉姘戝竵锛屾槸涓浗绔嬩綋浠撳簱澶у瀷鍘傚涔嬩竴锛岄泦绉戠爺銆佺敓浜с�侀攢鍞�佸敭鍚庝负涓�浣撶殑鍥藉楂樻柊鎶�鏈紒涓氾紝娴欐睙鐪佲�滀笓绮剧壒鏂扳�濅紒涓氾紝娴欐睙鐪佲�滃皷鍏点�侀闆佲�濅紒涓氾紝娴欐睙鐪侀噸鐐瑰煿鑲蹭紒涓氾紝缁煎悎瀹炲姏浣嶅眳琛屼笟鍓嶅垪',crtate_time: '2023-09-09 13:49:46',update_time: '2023-10-09 13:49:46'}
+				]
+				
 				
 			}
 		},
 		onLoad() {
 			this.backGroundRepeat()
 		},
+		onReady() {
+		  //妯℃嫙浠庢湇鍔″櫒鑾峰彇鏁版嵁
+			this.getServerData()
+			this.getCompanyData()
+			
+		},
+		mounted() {
+			
+		},
 		methods: {
+			getServerData() {
+			  setTimeout(() => {
+			  	//鍥犻儴鍒嗘暟鎹牸寮忎竴鏍凤紝杩欓噷涓嶅悓鍥捐〃寮曠敤鍚屼竴鏁版嵁婧愮殑璇濓紝闇�瑕佹繁鎷疯礉涓�涓嬫瀯閫犱笉鍚岀殑瀵硅薄
+			  	//寮�鍙戣�呴渶瑕佽嚜琛屽鐞嗘湇鍔″櫒杩斿洖鐨勬暟鎹紝搴斾笌鏍囧噯鏁版嵁鏍煎紡涓�鑷达紝娉ㄦ剰series鐨刣ata鏁板�煎簲涓烘暟瀛楁牸寮�
+			  	this.chartsDataColumn4=JSON.parse(JSON.stringify(demodata.Column))
+			  }, 1500);
+			},
 			backGroundRepeat() {
 				let len = this.bgs.length
 				let i = 0
@@ -82,13 +132,23 @@
 					this.mainItem[k]['bg'] = this.bgs[i]
 					i++
 				}
-				console.log(this.mainItem);
-			}
+				// console.log(this.mainItem);
+			},
+			async getCompanyData() {
+				let companyDatas = await getCompanyData.getCompanyData()
+				this.mainItem[0].title = '鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌'
+				this.mainItem[0].subTitle = '鍥㈤槦鏁版嵁'
+				this.mainItem[0].items = companyDatas
+			},
 		}
 	}
 </script>
 
 <style scoped>
+	.charts-box {
+		height: 300px;
+		margin: 8px;
+	}
 	.content {
 		display: flex;
 		flex-direction: column;
@@ -110,7 +170,7 @@
 		margin: 8px;
 		font-size: 26rpx;
 		font-weight: 700;
-		min-height: 240rpx;
+		min-height: 80rpx;
 		background-color: rgba(255,255,255,.3);
 		border-radius: 10rpx;
 	}
@@ -135,7 +195,6 @@
 	.top-box {
 		margin: 8px;
 		border-radius: 10rpx;
-		/* height: 100rpx; */
 		color: #FFF;
 		background: #D38312;  /* fallback for old browsers */
 		background: -webkit-linear-gradient(to right, #A83279, #D38312);  /* Chrome 10-25, Safari 5.1-6 */

--
Gitblit v1.9.1