diff --git a/docker-compose.yml b/docker-compose.yml index 62299c412..a4c6d2f85 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,7 +178,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.35" + image: "kuaifan/doookr:0.0.36" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 4d7726c30..796a46b3b 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -492,21 +492,22 @@ export default { // 列表点击事件 clickList(item){ - this.unreadList.map(h=>{ h._active = false; }) - this.doneList.map(h=>{ h._active = false; }) - this.notifyList.map(h=>{ h._active = false; }) - this.initiatedList.map(h=>{ h._active = false; }) - item._active = true; + this.unreadList.map(h => { h._active = false; }) + this.doneList.map(h => { h._active = false; }) + this.notifyList.map(h => { h._active = false; }) + this.initiatedList.map(h => { h._active = false; }) // - if( window.innerWidth < 426 ){ - this.goForward({name: 'manage-approve-details', query: { id: item.id } }); + if (window.innerWidth < 426) { + this.goForward({ name: 'manage-approve-details', query: { id: item.id } }); return; } - if( window.innerWidth < 1010 ){ + if (window.innerWidth < 1010) { this.detailsShow = true; + } else { + item._active = true; } this.details = {} - this.$nextTick(()=>{ + this.$nextTick(() => { this.details = item }) }, @@ -649,19 +650,21 @@ export default { // 更新数据 updateData(key,data,type) { let listKey = key + 'List' - let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 this[key + 'Total'] = data.total; type != 'scroll' ? (this[listKey] = data.rows) : data.rows.map(h => { if (this[listKey].map(item => { return item.id }).indexOf(h.id) == -1) { this[listKey].push(h) } }); - if(this[listKey].length > 0){ - this[listKey][activeIndex]._active = true; - if (this.tabsValue == key) { - this.$nextTick(() => { - this.details = this[listKey][activeIndex] || {} - }) + if (window.innerWidth > 1010){ + let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 + if (this[listKey].length > 0){ + this[listKey][activeIndex]._active = true; + if (this.tabsValue == key) { + this.$nextTick(() => { + this.details = this[listKey][activeIndex] || {} + }) + } } } }, diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index c5e81527a..695376d94 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -166,6 +166,9 @@ .approve-list-active { border: 1px solid #8bcf70; + @media (max-width: 1010px) { + border: 1px solid #eeeeee; + } } } @@ -405,9 +408,7 @@ bottom: 1px; display: flex; z-index: 9; - // background: #ffffff; background: #00000005; - } .comment {