From 221e9f5b5edd5cfc5852ba51c5a509393091805e Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 23 六月 2022 09:35:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/dangerDetails/dnagerDetails.vue | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/views/dangerDetails/dnagerDetails.vue b/src/views/dangerDetails/dnagerDetails.vue
index 65b0885..0d8d558 100644
--- a/src/views/dangerDetails/dnagerDetails.vue
+++ b/src/views/dangerDetails/dnagerDetails.vue
@@ -333,6 +333,7 @@
import Titlename from "../../components/Titlename/index.vue";
import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
import {downloadFile} from "@/api/sgyhpczl/fileUtils";
+ import {self_info} from "../../api/sgyhpczl/hiddenDangerManagement";
export default {
components: {Titlename},
@@ -382,18 +383,34 @@
},
methods: {
getDangerDetails() {
- getDangerDetails(this.$route.query.id).then(res => {
- var data = res.data;
- if (data.ok) {
- this.ruleForm = data.data;
- this.ruleForm.url = process.env.BASE_API;
- this.ruleForm.callback_branch= data.data.check_main_branch
- //this.ruleForm.ispass=0
- this.sendDataForm.id = this.ruleForm.id
- } else {
- this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
- }
- })
+ if(this.$route.query.route!=null && this.$route.query.route == '/hiddenDangerManagement'){
+ self_info(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch= data.data.check_main_branch
+ //this.ruleForm.ispass=0
+ this.sendDataForm.id = this.ruleForm.id
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ }else{
+ getDangerDetails(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch= data.data.check_main_branch
+ //this.ruleForm.ispass=0
+ this.sendDataForm.id = this.ruleForm.id
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ }
+
},
getWfRecordList() {
getWfRecordList(this.$route.query.id).then(res => {
--
Gitblit v1.9.2