Browse Source

集团首页添加弹窗

fujunwen 4 years ago
parent
commit
2435644025
1 changed files with 22 additions and 15 deletions
  1. 22 15
      src/views/statistics/index.vue

+ 22 - 15
src/views/statistics/index.vue

@@ -194,7 +194,7 @@
                     />
                 </div>
                 <section>
-                    <table id="tableReport">
+                    <table id="tableReport" class="table-report">
                         <thead>
                             <tr>
                                 <th width="10%">序号</th>
@@ -213,11 +213,10 @@
                                 <td >{{td.center}}</td>
                                 <td >{{td.zone}}</td>
                                 <td >{{td.name}}</td>
-                                <td >{{td.exceptionReason}}</td>
+                                <td >{{td.reason}}</td>
                             </tr>
                         </tbody>
                     </table>
-                    
                     <Pagination
                         v-show="pageCount>9"
                         :pageCount="pageCount"
@@ -402,23 +401,31 @@ export default {
                 if (res.result === 'success') {
                     let flattenArr = []
                     recursionData(res.data)
+                    console.log(flattenArr)
+                    let finalHandledArr = []
                     flattenArr.forEach(item => {
                         let path = item.path.split('/')
-                        item.center = path[0]
-                        item.zone = path[1]
+                        item.classExList.forEach(each => {
+                            let obj = {}
+                            obj.center = path[0]
+                            obj.zone = path[1]
+                            obj.name = item.name
+                            obj.reason = each.description
+                            finalHandledArr.push(obj)
+                        })
                     })
-                    this.storeExceptionData = cloneDeep(flattenArr)
+                    console.log(finalHandledArr)
+                    this.storeExceptionData = finalHandledArr
                     this.exceptionData =  this.storeExceptionData.slice(this.currentPage, this.pageSize)
-                    this.pageCount = flattenArr.length
+                    this.pageCount = finalHandledArr.length
                     function recursionData(data, parent) {
-                        data.forEach(item => {
+                        data.forEach((item , index) => {
                             item.name = item.cname
                             item.id = item.ccode
                             if (parent) {
                                 item.path = parent + '/' + item.cname
                             }
                             if (item.level === 0) {
-                                item.exceptionReason = item.classExList[0].description
                                 flattenArr.push(item)
                             }
                             let children = item.children
@@ -901,7 +908,7 @@ export default {
                 maxZoom: 10,
                 closePopupOnClick:true,
                 doubleClickZoom:false,
-                wheelPxPerZoomLevel:20
+                wheelPxPerZoomLevel:20,
                 // scrollWheelZoom:false,
                 // dragging: false,
             })
@@ -951,7 +958,6 @@ export default {
          *@description 打开弹窗
          */
         openMaskPanel(system) {
-            return;
             this.tabData = []
             system.assetTypeList.forEach(item => {
                 if (item.is_exception_num > 0) {
@@ -1395,6 +1401,7 @@ export default {
                         border-bottom:1px solid #E4E6E7;
                         td{
                             padding: 0 24px;
+                            line-height: 22px;
                         }
                     }
                 }
@@ -1767,9 +1774,9 @@ export default {
             }
             .map-container {
                 position: relative;
-                height: 70vh;
+                height: 90%;
                 #map {
-                    height: 70vh;
+                    height: 100%;
                     overflow: hidden;
                     
                     svg {
@@ -1779,7 +1786,7 @@ export default {
                 .legend {
                     position: absolute;
                     left: 1.4rem;
-                    bottom: 2.7rem;
+                    bottom: 10rem;
                     padding: 0.6rem;
                     background: white;
                     .legend-bar {
@@ -1836,7 +1843,7 @@ export default {
                 .list {
                     margin-top: 1.4rem;
                     overflow: hidden;
-                    height: calc(100% - 4.5rem);
+                    height: calc(100% - 7.5rem);
                     ul {
                         li {
                             display: flex;