diff --git a/src/assets/css/main.css b/src/assets/css/main.css index f71cdc06..30449205 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -4527,19 +4527,40 @@ textarea { } .insectPestDetail .detail-info .detail-div .detail-detail { - width: calc(100% - 220px); + width: calc(100%); min-height: 50%; display: grid; - grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); + grid-template-columns: repeat(4, minmax(240px, 1fr)); grid-row-gap: 10px; grid-column-gap: 10px; } +.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div { + display: flex; + flex-direction: column; + justify-content: center; +} + .insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .title { font-weight: bold; margin-bottom: 5px; } +.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div.to-more { + cursor: pointer; +} + +.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .text { + display: flex; + align-items: center; +} + +.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .text img { + width: 20px; + height: 20px; + margin-right: 5px; +} + .insectPestDetail .detail-data { width: 100%; height: 49%; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 7d1f0936..0aad7db7 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -4831,17 +4831,32 @@ textarea { } } .detail-detail{ - width: calc(100% - 220px); + width: calc(100% ); min-height: 50%; display: grid; - grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); + grid-template-columns: repeat(4, minmax(240px, 1fr)); grid-row-gap: 10px; //纵向间隔 grid-column-gap: 10px; //横向间隔 - .detail-detail-div{ + .detail-detail-div{display: flex; + flex-direction: column; + justify-content: center; .title{ font-weight: bold; margin-bottom: 5px; } + &.to-more{ + cursor: pointer; + } + .text{ + display: flex; + align-items: center; + + img{ + width: 20px; + height: 20px; + margin-right: 5px; + } + } } } } diff --git a/src/assets/image/more.png b/src/assets/image/more.png new file mode 100644 index 00000000..d1e12109 Binary files /dev/null and b/src/assets/image/more.png differ diff --git a/src/views/index.vue b/src/views/index.vue index cae20477..7dce10b6 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -510,7 +510,7 @@ export default { toRouter(item) { if (item.router) { // 是虫情 - if(this.deviceName=='99'){ + if(this.routerNow == 'insectPestDetail'||this.routerNow == 'insectPestImageList'){ this.$message('虫情设备无该页面'); return } @@ -584,14 +584,14 @@ export default { if (item.http) { window.location.href = item.http; }else if(item.isRouter){ - // 虫情页面逻辑 if(item.deviceName=='99'){ this.$router.push({ path: item.router,query:{id:item.deviceId} }) + }else{ this.$router.push({ path: item.router }) } - + } else if ( this.$route.query.index != item.index) { if (this.routerNow == 'realTime'||item.router=='realTime') { this.$store.state.equipmentIndex = item.index diff --git a/src/views/insectPest/detail.vue b/src/views/insectPest/detail.vue index 95c39908..abdc663d 100644 --- a/src/views/insectPest/detail.vue +++ b/src/views/insectPest/detail.vue @@ -3,9 +3,9 @@