Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/danger/dangerPatrol/dangerPatrolTime/index.vue

@@ -39,28 +39,41 @@ export default {
         return {
             text: "隐患巡查",
             contentList: [
+                
+            ],
+            contentLists:[
                 {
-                    title: "A1",
+                    title: "1",
                     imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
                     content: "日查清单"
                 },
                 {
-                    title: "A2",
+                    title: "2",
                     imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
                     content: "周查清单"
                 },
                 {
-                    title: "A3",
+                    title: "3",
+                    imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
+                    content: "半月查清单"
+                },
+                {
+                    title: "4",
                     imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
                     content: "月查清单"
                 },
                 {
-                    title: "A4",
+                    title: "5",
                     imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
                     content: "季查清单"
                 },
                 {
-                    title: "A5",
+                    title: "6",
+                    imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
+                    content: "半年查清单"
+                },
+                {
+                    title: "7",
                     imgUrl: require("@/assets/dangerPatrol/patrol-icon.png"),
                     content: "年查清单"
                 }
@@ -72,9 +85,15 @@ export default {
     },
     methods: {
         loading(){
-            // postWork("portal/cycle").then((res) => {
-            //     console.log(res)
-            // })
+            postWork("patrol/running/listCycle").then((res) => {
+                this.contentLists.forEach((x)=>{
+                    res.data.forEach((y)=>{
+                        if(x.title==y.cycle){
+                            this.contentList.push(x)
+                        }
+                    })
+                })
+            })
         },
         onClick(val) {
             this.$router.push({