修改业绩排行

public/appnew/package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "html2canvas": "^1.0.0-rc.3",
     "qs": "^6.5.1",
     "vue": "^2.5.2",
     "vue-awesome-swiper": "^3.1.3",

public/appnew/src/components/achieveMain/achieveFork.vue

@@ -33,8 +33,19 @@
 		</nav>
 
 		<main>
+			<div style="width:7.50rem;height:.76rem;background:rgba(255,128,24,0.0479);text-align:center;overflow:hidden;">
+				<div style="margin-left:.79rem;float:left;width:2.52rem;font-size:.28rem;font-weight:400;color:rgba(51,51,51.1);line-height:.76rem;">
+					部门
+				</div>
+				<div style="float:left;width:1.9rem;font-size:.28rem;font-weight:400;color:rgba(51,51,51.1);line-height:.76rem;">
+					业绩
+				</div>
+				<div style="float:left;width:1.9rem;font-size:.28rem;font-weight:400;color:rgba(51,51,51.1);line-height:.76rem;">
+					实收
+				</div>
+			</div>
 			<section class="main-sec" v-for="(item, index) in mainData" :key="item.title" v-show="index === initTabNumMain">
-				<ul>
+				<ul v-show="initTabNumMain === 0 ">
 					<li v-for="(item2, index2) in item.listData">
 						<achieve-fork-li :data="item2" :dataindex="index2"></achieve-fork-li>
 					</li>
@@ -42,6 +53,19 @@
 						<achieve-fork-li :data="mainData[index].selfData" :dataindex="mainData[index].selfData.index_-1"></achieve-fork-li>
 					</li>
 				</ul>
+				<ul v-show="initTabNumMain === 1">
+					<li v-for="(item2, index2) in item.listData">
+						<achieve-fork-li-new :data="item2" :dataindex="index2" :moreShow="false"></achieve-fork-li-new>
+					</li>
+					<li class="self-achieve-li" v-if="(item.listData.length>0) && (mainData[index].selfData)">
+						<achieve-fork-li-new :data="mainData[index].selfData" :dataindex="mainData[index].selfData.index_-1"></achieve-fork-li-new>
+					</li>
+				</ul>
+				<ul v-show="initTabNumMain === 2">
+					<li v-for="(item2, index2) in item.listData">
+						<achieve-fork-li-new :data="item2" :dataindex="index2" :moreShow="true"></achieve-fork-li-new>
+					</li>
+				</ul>
 				<div class="no-data-block" v-show="item.listData.length===0">暂无数据...</div>
 				<footer class="oh achieve-footer">
 					<p class="time-title tc" v-show="false">统计时间：{{statisticsStartTime+'-'+statisticsEndTime}}</p>
@@ -56,6 +80,9 @@
 					</div>
 				</footer>
 			</section>
+			<div v-show="initTabNumMain === 2" style="width:7.5rem;height:.78rem;background-color:rgba(255,147,24,1);text-align:center;color:rgba(255,255,255,1);font-size:.28rem;line-height:.78rem">
+				该时段总计：业绩 345，970 实收 345，970
+			</div>
 			<div class="loading-gif-block" v-show="isLoadFlag">正在加载...</div>
 		</main>
 	</div>
@@ -65,11 +92,13 @@
 	import cityDown from '@/components/achieveMain/images/cityDown.png';
 	import citySelect from '@/components/achieveMain/citySelect';
 	import achieveForkLi from '@/components/achieveMain/achieveForkLi';
+	import achieveForkLiNew from '@/components/achieveMain/achieveForkLiNew';
 	import '@/assets/js/layer041002.js';
 	export default {
 		components: {
 			'city-select': citySelect,
 			'achieve-fork-li': achieveForkLi,
+			'achieve-fork-li-new': achieveForkLiNew,
 		},
 		data: () => ({
 			headerData: {

public/appnew/src/components/achieveMain/achieveForkLiNew.vue

+<template>
+	<div style="width:7.5rem;height:.9rem;line-height:1rem;overflow:hidden;" @click="turn(data)">
+		<div style="margin-left:.29rem;width:.5rem;float:left;text-align:center;">
+			<img :src="first" style="width:80%;margin-top:.3rem;" v-if="dataindex == 0">
+			<img :src="second" style="width:80%;margin-top:.3rem;" v-else-if="dataindex == 1">
+			<img :src="third" style="width:80%;margin-top:.3rem;" v-else-if="dataindex == 2">
+			<span style="text-align:center" v-else>{{dataindex+1}}</span>
+		</div>
+		<div class="nameSpan">{{data.name}}</div>
+		<div class="priceSpan">{{dealJine(data.performance_total)}}</div>
+		<div class="priceSpan">{{dealJine(data.performance_total)}}</div>
+		<img :src="more" style="flot:left; width:.1rem;" v-show="moreShow && level == 40"/>
+	</div>
+</template>
+
+<script>
+	import onErrorImg from '@/assets/images/ic_default_headpic.png';
+	import more from '@/components/achieveMain/images/more.png';
+	import first from '@/components/achieveMain/images/third.png';
+	import second from '@/components/achieveMain/images/first.png';
+	import third from '@/components/achieveMain/images/second.png';
+	
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default: () => ({
+					message: 'hello'
+				})
+			},
+			dataindex: {
+				type: [Number, String],
+				default: () => 0
+			},
+			moreShow :{
+				type : Boolean,
+				default : ()=> false 
+			}
+		},
+		data: () => ({
+			more ,
+			first,
+			second,
+			third ,
+			level :''
+		}),
+		mounted (){
+			this.level = localStorage.getItem('userlevel');
+		},
+		methods: {
+			countRankPic(index) {
+				switch (index){
+					case 0:
+						return 'rank-first-pic';
+					case 1:
+						return 'rank-second-pic';
+					case 2:
+						return 'rank-third-pic';
+					default:
+						return '';
+				};
+			},
+			dealJine(v) {
+				let _this = this;
+				return _this.common.jineComma(v, 2);
+			},
+			turn (data){
+				if ( this.level != 40 ){
+					return false ; 
+				}
+				_this.$router.push({
+					path: '/achieveRegion',
+					query: {
+						'ywyId': localStorage.getItem('tlYjAgentId')
+					}
+				});
+			}
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	.priceSpan {
+		float:left;
+		width:1.9rem;
+		float:left;
+		overflow:hidden;
+		color:#FF8018;
+		font-size:.28rem;
+		font-family:DIN-Bold;
+		font-weight:bold;
+		color:rgba(255,128,24,1);
+		text-align:center;
+	}
+	.nameSpan{
+		margin-left:.1rem;
+		float:left;
+		width:2.32rem;
+		float:left;
+		overflow:hidden;
+		font-size:.28rem;
+		font-family:PingFangSC-Regular;
+		font-weight:400;
+		color:rgba(51,51,51,1);
+	}
+</style>
\ No newline at end of file

public/appnew/src/components/test/test.vue

+<template>
+	<div>s
+		<div id="capture" style="padding: 10px; background: #f5da55">
+		    <h4 style="color: #000; ">Hello world!</h4>
+		</div>
+	</div>
+</template>
+
+<script>
+	import html2canvas from 'html2canvas'
+	export default{
+		
+		data : ()=>({
+			
+		}),
+		mounted (){
+			console.log("123");
+			console.log(html2canvas);
+			this.getImg();
+		},
+		methods : {
+			getImg (){
+				html2canvas(document.querySelector("#capture"),{
+					background: "rgba(255,255,255,1)",
+					onrendered: function(canvas) {
+						console.log(canvas)
+						var dataUrl = canvas.toDataURL('image/jpeg');
+						console.log(dataUrl.length);
+						uploadimg_x(dataUrl);
+					}
+				}).then ((canvas) =>{
+					console.log(canvas);
+					console.log(canvas.toDataURL())
+				})
+			},
+			 
+      }
+	}
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file

public/appnew/src/router/index.js

@@ -30,6 +30,7 @@ import openSquareDetails from '@/components/openSquareDetails/openSquareDetails'
 import buildList from '@/components/office_building/buildList'
 import builldDetail from '@/components/office_building/builldDetail'
 import receiveDetail from '@/components/receive/receiveDetail'
+import test from '@/components/test/test'
 
 
 Vue.use(VueRouter)
@@ -194,6 +195,10 @@ export default new VueRouter({
 			path: '/receiveDetail',
 			name: 'v-receiveDetail',
 			component: receiveDetail
+		},{
+			path: '/test',
+			name: 'v-test',
+			component: test
 		}