From 1db282b081fcd04fd17dd794f923f88f6d50dcb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 18 Jan 2022 19:42:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
=?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6?=
=?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qbzxdjhgk/component/cancel.vue | 22 ++++++++++++-------
.../qbzxdjhgk/component/delay.vue | 18 ++++++++++-----
.../qbzxdjhgk/component/rename.vue | 18 ++++++++++-----
3 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 962c71c46..7455416e2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -157,13 +157,18 @@
placeholder="请输入采用标准"
:maxlength="500"/>
-
-
-
+
+
+
+
+
+
+
{
+ this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
})
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 65116d53e..74b2469ee 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -164,12 +164,16 @@
placeholder="请输入采用标准"
:maxlength="500"/>
-
-
+
+
+
+
+
{
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+ this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
})
},
methods: {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 06387c917..191df8107 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -163,12 +163,16 @@
placeholder="请输入采用标准"
:maxlength="500"/>
-
-
+
+
+
+
+
{
+ this.cbcdOptions = res.data.DEGREESTANDARD //采标程度
this.BZList = res.data.ENERGYTYPES //标准范围
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
})
From a1e466834714af37c7fbfe694597a2c9c25b2f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 18 Jan 2022 19:53:59 +0800
Subject: [PATCH 2/3] commit
---
.../creatProcess/qbzxdjhgk/component/cancel.vue | 16 ++++++++--------
.../creatProcess/qbzxdjhgk/component/delay.vue | 16 ++++++++--------
.../qbzxdjhgk/component/establish.vue | 12 ++++++------
.../creatProcess/qbzxdjhgk/component/merge.vue | 12 ++++++------
.../creatProcess/qbzxdjhgk/component/rename.vue | 16 ++++++++--------
.../pages/creatProcess/qbzxdjhgk/step1-5.vue | 14 +++++++-------
.../pages/creatProcess/qbzxdjhgk/step2.vue | 14 +++++++-------
.../pages/creatProcess/qbzxdjhgk/step3.vue | 14 +++++++-------
.../pages/creatProcess/qbzxdjhgk/step4.vue | 14 +++++++-------
.../pages/creatProcess/qbzxdjhgk/step5.vue | 14 +++++++-------
10 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 7455416e2..98b183dcf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -80,14 +80,6 @@
-
-
-
@@ -108,6 +100,14 @@
>
+
+
+
-
-
-
@@ -115,6 +107,14 @@
>
+
+
+
+
+
+
+
+
@@ -54,12 +60,6 @@
@click.native="choiceZRRS('1')">
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 398a15ef5..5ce6ac679 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -123,18 +123,18 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
@@ -114,6 +106,14 @@
>
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
Date: Tue, 18 Jan 2022 20:19:31 +0800
Subject: [PATCH 3/3] feat:new
---
src/pages/loginVerify/index.vue | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/pages/loginVerify/index.vue b/src/pages/loginVerify/index.vue
index b92c39d53..caefa55bb 100644
--- a/src/pages/loginVerify/index.vue
+++ b/src/pages/loginVerify/index.vue
@@ -135,10 +135,12 @@
if (res.ok) {
this.loginNew(res)
} else {
- this.$message.warning('系统无权限访问')
- this.$store.dispatch('logout')
- // window.location.href = 'http://sso.foton.com.cn/logout?service='
- window.location.href = ssoLogoutUrlDev
+ if(res.code && res.code === 'r0011'){
+ this.$message.warning('系统无权限访问')
+ this.$store.dispatch('logout')
+ // window.location.href = 'http://sso.foton.com.cn/logout?service='
+ window.location.href = ssoLogoutUrlDev
+ }
}
})