Browse Source

完成项目首页

YaolongHan 4 years ago
parent
commit
1a510b3cf1
2 changed files with 44 additions and 30 deletions
  1. 34 21
      src/views/homepage/darkColor.vue
  2. 10 9
      src/views/statistics/index.vue

+ 34 - 21
src/views/homepage/darkColor.vue

@@ -125,13 +125,25 @@
             </div>
             <div class="progress-box">
               <div class="progress-list" ref="plist">
-                <div :class="['progress-item',(index+1) >=backrecordLength?'progress-box-bottom':'' ]" :style="'width:'+item.persent" v-for="(item,index) in recordList" :key="index"></div>
+                <div
+                  :class="[
+                    'progress-item',
+                    index + 1 >= backrecordLength ? 'progress-box-bottom' : '',
+                  ]"
+                  :style="'width:' + item.persent"
+                  v-for="(item, index) in recordList"
+                  :key="index"
+                ></div>
               </div>
               <div class="progress-legend">
-                <div class="legend-item" v-for="(item,index) in recordList" :key="index">
+                <div
+                  class="legend-item"
+                  v-for="(item, index) in recordList"
+                  :key="index"
+                >
                   <span class="legend-color"></span>
-                  <span class="title">{{item.typeName}}</span>
-                  <span class="num">{{item.cnt}}条</span>
+                  <span class="title">{{ item.typeName }}</span>
+                  <span class="num">{{ item.cnt }}条</span>
                 </div>
               </div>
             </div>
@@ -256,13 +268,13 @@ export default {
       ],
       recordList: [
         // 更新记录数组
-        { cnt: 0, objtype: 4, typeName: "重要维修" ,persent:'0' },
-        { cnt: 0, objtype: 1, typeName: "重要维保" ,persent:'0' },
-        { cnt: 0, objtype: 5, typeName: "其他事项" ,persent:'0' },
-        { cnt: 0, objtype: 3, typeName: "综合事项" ,persent:'0' },
+        { cnt: 0, objtype: 4, typeName: "重要维修", persent: "0" },
+        { cnt: 0, objtype: 1, typeName: "重要维保", persent: "0" },
+        { cnt: 0, objtype: 5, typeName: "其他事项", persent: "0" },
+        { cnt: 0, objtype: 3, typeName: "综合事项", persent: "0" },
       ],
       recordTotal: 0, //更新总数
-      backrecordLength:0, // 更新数据对应得得数量
+      backrecordLength: 0, // 更新数据对应得得数量
       dataSelect: [
         { id: "000", name: "全部" },
         { id: "1003", name: "消防系统" },
@@ -312,6 +324,17 @@ export default {
         circle.setText(total);
       });
     },
+
+     expandRestItems(item, index) {
+      this.systemList.forEach((eq) => {
+        if (eq.smsxt !== item.smsxt) {
+          eq.expand = false;
+        }
+        eq.selected = false;
+      });
+      item.selected = true;
+      item.expand = !item.expand;
+    },
     imgSrc(code) {
       return require("../../assets/images/icons/" + code + ".png");
     },
@@ -341,17 +364,6 @@ export default {
         };
       }
     },
-    expandRestItems(item, index) {
-      this.cardsList.forEach((each) => {
-        each.forEach((eq) => {
-          if (eq.smsxt !== item.smsxt) {
-            eq.expand = false;
-          }
-          eq.selected = false;
-        });
-      });
-      item.expand = !item.expand;
-    },
     /**
      * @Description 获取集团 中心 区域 项目 数据树数据
      * @method param ccode  管理分区编码 集团首页必填
@@ -462,7 +474,8 @@ export default {
             this.recordList.forEach((recorditem) => {
               if (obj.objtype == recorditem.objtype) {
                 recorditem.cnt = obj.cnt;
-                recorditem.persent = Math.ceil(obj.cnt / res.data.total * 100) +'%'
+                recorditem.persent =
+                  Math.ceil((obj.cnt / res.data.total) * 100) + "%";
               }
             });
           });

+ 10 - 9
src/views/statistics/index.vue

@@ -668,6 +668,7 @@ export default {
       });
     },
     expandRestItems(item, index) {
+      alert(132)
       this.systemList.forEach((eq) => {
         if (eq.smsxt !== item.smsxt) {
           eq.expand = false;
@@ -1168,7 +1169,7 @@ export default {
           };
         },
       }).addTo(myMaps);
- 
+
       if (this.currentLevel === 1) {
         //1集团
         this.pantGroupMap(this.currentZoneData, this.currentSysId);
@@ -1211,6 +1212,7 @@ export default {
      */
     openMaskPanel(system) {
       let target = this.getDataByCityCcode(this.selectedZone)
+      console.log('target',target)
       if (target) {
         this.currentDialogLevel = target.level
         this.currentLevel = target.level
@@ -1234,7 +1236,7 @@ export default {
           });
         }
       });
- 
+
       if (this.tabData.length) {
         this.activeName = this.tabData[0].id;
         this.currentDialogTab = this.activeName;
@@ -1562,7 +1564,7 @@ export default {
         let marker = L.marker(center, { icon: textIcon }).addTo(groupLayer);
         let marker2 = L.marker(center, { icon: circleIcon }).addTo(groupLayer);
         let feaureGroup = L.featureGroup([marker, marker2]);
-       
+
         popup.on('add' , (ev) => {
            let popupDom = document.querySelectorAll('.leaflet-mypopup-content')[0]
            let tipDom = document.querySelectorAll('.leaflet-popup-tip')[0]
@@ -1574,7 +1576,7 @@ export default {
              tipDom.style.background="#09173E"
            }
         })
-      
+
         marker2.on("mouseover", (ev) => {
             popup.openOn(myMaps);
         });
@@ -1628,7 +1630,7 @@ export default {
           let item = data[i];
           if (item.is_exception_num) {
             html += `<div class="line">
-                            <span>${item.category_name}</span> 
+                            <span>${item.category_name}</span>
                             <span>${item.asset_num || "--"}${
               item.category_name === "屋面logo"
                 ? "个"
@@ -1642,7 +1644,7 @@ export default {
                 </div>`;
           } else {
             html += `<div class="line">
-                            <span>${item.category_name}</span> 
+                            <span>${item.category_name}</span>
                             <span>${item.asset_num || "--"}${
               item.category_name === "屋面logo"
                 ? "个"
@@ -1665,7 +1667,7 @@ export default {
 };
 </script>
 
-<style scoped lang="less">  
+<style scoped lang="less">
 @import "../../assets/css/dark.less";
 @import "../../assets/css/light.less";
 .dark-my-leaflet-div-icon{
@@ -1697,5 +1699,4 @@ export default {
   padding-top: 0;
 }
 
-</style> 
- 
+</style>