Merge branch 'duhanyu' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-big

src/views/privateOrder/security/components/componentRight.vue

@@ -27,11 +27,11 @@
                 {{ new Date().getFullYear() }}-12
               </div>
               <div>
-                <span>{{ notificationFinishList[0].completionCount }}</span>
-                <span>/{{ notificationFinishList[0].notificationCount }}</span>
+                <span>{{positionTimer.completionCount }}</span>
+                <span>/{{ positionTimer.notificationCount }}</span>
               </div>
               <div>
-                {{ notificationFinishList[0].completionPercent | numFilter }}%
+                {{ positionTimer.completionPercent | numFilter }}%
               </div>
             </div>
           </div>
@@ -327,32 +327,37 @@ export default {
       // 通报完成情况
       notificationFinishList: [
         {
-          timeRangeFlag: 1,
+          timeRangeFlag: "近一个月",
           notificationCount: 0,
           completionCount: 0,
           completionPercent: ``,
         },
         {
-          timeRangeFlag: 2,
+          timeRangeFlag: "近三个月",
           notificationCount: 0,
           completionCount: 0,
           completionPercent: ``,
         },
         {
-          timeRangeFlag: 3,
+          timeRangeFlag: "近六个月",
           notificationCount: 0,
           completionCount: 0,
           completionPercent: "",
         },
         {
-          timeRangeFlag: 4,
+          timeRangeFlag: "近一年",
           notificationCount: 0,
           completionCount: 0,
           completionPercent: "",
         },
       ],
       animate: true,
-      positionTimer: null,
+      positionTimer: {
+        timeRangeFlag: "本年度",
+        notificationCount: 0,
+        completionCount: 0,
+        completionPercent: "",
+      },
       // 最新隐患
       dangerList: [],
       animate2: false,
@@ -459,17 +464,27 @@ export default {
      * 通报完成情况
      */
     getTBOver() {
-      listTbwc().then((res) => {
+      listTbwc({ year: this.$moment(new Date()).format("yyyy") }).then(
+        (res) => {
           res.rows.forEach((value1, index1) => {
-          this.notificationFinishList[index1].timeRangeFlag = value1.timeName;
-          this.notificationFinishList[index1].notificationCount =
+            this.notificationFinishList.forEach((value2, index2) => {
+              if (value1.timeName == value2.timeRangeFlag) {
+                this.notificationFinishList[index2].notificationCount =
                   value1.tbCount;
-          this.notificationFinishList[index1].completionCount =
+                this.notificationFinishList[index2].completionCount =
                   value1.overCount;
-          this.notificationFinishList[index1].completionPercent =
+                this.notificationFinishList[index2].completionPercent =
                   value1.overScale;
+              }
+              if (value1.timeName == "本年度") {
+                this.positionTimer.notificationCount = value1.tbCount;
+                this.positionTimer.completionCount = value1.overCount;
+                this.positionTimer.completionPercent = value1.overScale;
+              }
             });
           });
+        }
+      );
     },
     /**
      * 最新隐患