Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages/person/index.vue

@@ -72,11 +72,10 @@
 													cusType="num" 
 													:height="26" 
 													:num="5" 
-													cusTitle="报名工单" 
+													cusTitle="报名工单(我报的)" 
 													@clickItem="goOrder"
-													v-if="false"
 				/>
-				<g-panel-card-num :list="todayDataList" 
+				<!-- <g-panel-card-num :list="todayDataList" 
 													titleNav="/root/person/todayData"
 													:border="true" 
 													:speed="1" 
@@ -86,7 +85,7 @@
 													:num="5" 
 													cusTitle="今日数据 (我报的)" 
 													@clickItem="handleClickNus" 
-				/>
+				/> -->
 			</view>
 			<view class="g_mt_10" v-if="userInfo.admin">
 				<g-panel-form-item
@@ -676,62 +675,65 @@ export default {
 		},
 		getData() {
 			let that = this;
-			this.G.Get(this.api.user_dataValue, {}, (res) => {
+			this.G.Get(this.api.user_dataValue + "?classify=1", {
+				classify:1
+			}, (res) => {
 				console.log("res", res);
 				if (res) {
 					that.map = res;
 				}
+				let resdata = res.classify1num;
 				that.todayDataList = [
 					{
 						name: "报名",
-						num: that.map.agencyData.signUps || 0,
+						num: resdata.signUps || 0,
 						path: "/root/person/todayData",
 					},
 					{
 						name: "到面",
-						num: that.map.agencyData.arrived || 0,
+						num: resdata.arrived || 0,
 						path: "/root/person/todayData",
 					},
 					{
 						name: "通过",
-						num: that.map.agencyData.passed || 0,
+						num: resdata.passed || 0,
 						path: "/root/person/todayData",
 					},
 					{
 						name: "入职",
-						num: that.map.agencyData.entry || 0,
+						num: resdata.entry || 0,
 						path: "/root/person/todayData",
 					},
 					{
 						name: "在职",
-						num: that.map.agencyData.obJob || 0,
+						num: resdata.obJob || 0,
 						path: "/root/person/todayData",
 					},
 				];
 				that.billDataList = [
 					{
 						name: "审核中",
-						num: that.map.classify2num.num10 || 0,
+						num: that.map.classify1num.num10 || 0,
 						path: "/root/person/applyIndex?status=1",
 					},
 					{
 						name: "待接待",
-						num: that.map.classify2num.num20 || 0,
+						num: that.map.classify1num.num20 || 0,
 						path: "/root/person/applyIndex?status=2",
 					},
 					{
 						name: "待面试",
-						num: that.map.classify2num.num25 || 0,
+						num: that.map.classify1num.num25 || 0,
 						path: "/root/person/applyIndex?status=3",
 					},
 					{
 						name: "待入职",
-						num: that.map.classify2num.num30 || 0,
+						num: that.map.classify1num.num30 || 0,
 						path: "/root/person/applyIndex?status=4",
 					},
 					{
 						name: "在职中",
-						num: that.map.classify2num.num40 || 0,
+						num: that.map.classify1num.num40 || 0,
 						path: "/root/person/applyIndex?status=5",
 					},
 				];

pages/workBench/index.vue

@@ -220,7 +220,7 @@ export default {
 					pageNum: that.query.page,
 					pageSize: that.query.size,
 					keys: "",
-					classify: 2,
+					classify: 1,
 					// classify: that.tabActive + 1,
 					statusStr: that.tabInfo[that.tabActive].childList[that.menuActive].tip,
 				},

root/person/applyIndex.vue

@@ -220,7 +220,7 @@ export default {
 					pageNum: that.query.page,
 					pageSize: that.query.size,
 					keys: "",
-					classify: 2,
+					classify: 1,
 					// classify: that.tabActive + 1,
 					statusStr: that.tabInfo[that.tabActive].childList[that.menuActive].tip,
 				},