bug修复解润东

20220516

src/views/danger/addDanger/addDanger.vue

@@ -393,6 +393,13 @@ export default {
         this.hdLev=this.$route.query.hdLev
         this.getList();
         //隐患巡查跳转回显
+        if(this.proId){
+            var obj={
+                id:this.proId,
+                projectName:this.projectName
+            }
+            this.onConProjectName(obj)
+        }
         if(this.hdType){
             this.onConRange(this.hdRange)
         }

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

@@ -107,6 +107,7 @@ export default {
                 name: "implement",
                 query:{
                     id:val.title,
+                    content:val.content
                 }
             });
         }

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

@@ -100,7 +100,8 @@ export default {
     data() {
         return {
             id: "", //巡查周期id
-            text: "执行巡查",
+            content:'',
+            text: this.$route.query.content?this.$route.query.content:'执行巡查',
             messageList: [],
             active: 0,
             hdType:'',
@@ -131,6 +132,9 @@ export default {
         if (this.$route.query.cycle) {
             this.cycle = this.$route.query.cycle;
         }
+        if (this.$route.query.content) {
+            this.content = this.$route.query.content;
+        }
         this.loadingTabs()
     },
     methods: {
@@ -210,6 +214,11 @@ export default {
                 });
         },
         finish() {
+            this.$dialog
+                .confirm({
+                    title: "提示",
+                    message: "确定提交吗？"
+                }).then(() => {
             this.$toast.loading({
                 message: "提交中...",
                 forbidClick: true,
@@ -233,6 +242,10 @@ export default {
                     this.$toast.clear();
                     this.$toast.fail("提交失败,请稍后再试");
                 });
+                 })
+                .catch(() => {
+                    
+                });
         }
     }
 };

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

@@ -102,7 +102,7 @@ export default {
             endTime:'',
             date: '',
             id:'',//巡查周期id
-            text: "巡查记录",
+            text: this.$route.query.content?this.$route.query.content:"巡查记录",
             value:'',//搜索值
             show:false,//是否显示日历
             searchValue: "",

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

@@ -110,7 +110,8 @@ export default {
             this.$router.push({
                 name: "record-patrol",
                 query:{
-                    id:val.title
+                    id:val.title,
+                    content:val.content
                 }
             });
         }