diff --git a/src/router/ebiz/performance.js b/src/router/ebiz/performance.js index d7ed95c71..d78d55867 100644 --- a/src/router/ebiz/performance.js +++ b/src/router/ebiz/performance.js @@ -13,16 +13,7 @@ export default [ } }, { - path: '/performance/Performance/:parmas', - name: 'Performance', - component: performance, - meta: { - title: '业绩查询', - index: 1 - } - }, - { - path: '/performance/AttendanceInfo/:parmas', + path: '/performance/AttendanceInfo', name: 'AttendanceInfo', component: attendanceInfo, meta: { @@ -31,7 +22,7 @@ export default [ } }, { - path: '/performance/PerformanceList/:obj', + path: '/performance/PerformanceList', name: 'PerformanceList', component: PerformanceList, meta: { diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue index b43c9d1b6..359757710 100644 --- a/src/views/ebiz/attendance/Monthly.vue +++ b/src/views/ebiz/attendance/Monthly.vue @@ -238,7 +238,7 @@ export default { z-index: 100; } .calendar { - z-index: -1; + /* z-index: -1; */ width: 100%; } .calendar_title[data-v-f3b38220] { diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue index e322d6d91..f69d3c776 100644 --- a/src/views/ebiz/performance/AttendanceInfo.vue +++ b/src/views/ebiz/performance/AttendanceInfo.vue @@ -68,10 +68,10 @@
-
{{item.name}}
+
{{item.name}}
- + @@ -85,7 +85,7 @@
{{item1.ysjs}}
{{item1.cbbb}}
-
查看
+
查看
@@ -111,10 +111,9 @@ export default { dateShow: false, minDate: new Date(2019, 1), maxDate: new Date(), - data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 0], + data1: [], titleTime: '', code: '', - arr: [], dateTime: '', list: [], cbbb: '', @@ -122,13 +121,15 @@ export default { ysbb: '', ysjs: '', parmas: {}, + unitName:'' } }, created() { console.log('=======' + this.$route.params.parmas) - this.unitName = JSON.parse(this.$route.params.parmas).unitName - this.titleTime = JSON.parse(this.$route.params.parmas).date.slice(0, 7) - ;(this.dateTime = JSON.parse(this.$route.params.parmas).date), (this.code = JSON.parse(this.$route.params.parmas).code) + console.log(JSON.parse(window.localStorage.getItem('parmas')).time) + this.unitName = JSON.parse(window.localStorage.getItem('parmas')).unitName + this.titleTime = JSON.parse(window.localStorage.getItem('parmas')).date.slice(0, 7) + ;(this.dateTime = JSON.parse(window.localStorage.getItem('parmas')).date), (this.code = JSON.parse(window.localStorage.getItem('parmas')).code) this.getBranchInfos1() }, methods: { @@ -158,17 +159,23 @@ export default { }) }, //跳转查看 - details(parmas) { - console.log(parmas) - ;(this.parmas.code = parmas.code), (this.parmas.date = this.dateTime) - ;(this.parmas.mask = '1'), (this.parmas.Name = this.unitName) + details(e) { + console.log(e) + let i=Number(e) + let parmas={} + parmas.code = this.list[i].code, + parmas.date = this.dateTime + parmas.mask = '1' + parmas.Name = this.data1[i].name + parmas.buName=this.unitName + localStorage.parmas = JSON.stringify(parmas) this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/performance/Performance/${JSON.stringify(this.parmas)}`, + url: location.origin + `/#/performance/Performance`, }, routerInfo: { - path: `/performance/Performance/${JSON.stringify(this.parmas)}`, + path: `/performance/Performance`, }, }) }, @@ -179,14 +186,14 @@ export default { getBranchInfos(date).then((res) => { console.log(res) if (res.result == 0) { - this.data = res.content + this.data1 = res.content let arr = [] for (let i = 0; i < res.content.length; i++) { let code = res.content[i].code arr.push(code) // console.log(arr) } - this.arr = arr + this.arr1 = arr // console.log(this.arr) this.getPerformanceDetailC() } @@ -197,7 +204,7 @@ export default { // console.log(this.agentCode) let code = { date: this.dateTime, - groupList: this.arr, + groupList: this.arr1, } // console.log(code) getPerformanceDetail(code).then((res) => { @@ -247,7 +254,7 @@ export default { .footer { width: 100%; position: fixed; - margin-top: -20px; + margin-top: 70px; } .directly { width: 99px; diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue index 6179ed568..022d663fe 100644 --- a/src/views/ebiz/performance/Performance.vue +++ b/src/views/ebiz/performance/Performance.vue @@ -29,8 +29,8 @@
所在机构: - {{Name}}> - {{unitName}} + {{buName}}> + {{Name}}