From ded027bb646c8922228f88578e1475926b8d4aad Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 23 Aug 2022 13:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=20=20=E7=94=B3=E8=AF=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/utils/location.js                    | 12 ++++++++++
 .../hasToDoTasks/CompetencyApplication.vue    |  3 ++-
 .../modules/myAgent/CompetencyApplication.vue |  7 +++---
 front/public/static/config/location.js        |  2 +-
 front/src/api/home.js                         | 23 +++++++++++++++----
 front/src/utils/location.js                   | 13 +++++++++++
 6 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 back/src/utils/location.js
 create mode 100644 front/src/utils/location.js

diff --git a/back/src/utils/location.js b/back/src/utils/location.js
new file mode 100644
index 00000000..446e5b89
--- /dev/null
+++ b/back/src/utils/location.js
@@ -0,0 +1,12 @@
+/*
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-08-23 10:30:11
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-08-23 10:31:30
+ * @Description: 告诉大家这是什么
+ */
+const returnLocationStr = () => {
+  return 'qingdao'
+}
+
+export default returnLocationStr
diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
index d91d7604..26de944d 100644
--- a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
+++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
@@ -109,6 +109,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
+import returnLocationStr from '@/utils/location'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule, processModule],
@@ -122,7 +123,7 @@ export default {
       },
       dataForm: {
         processDefinitionId: '',
-        processDefinitionKey: 'abilityprocess_v2'
+        processDefinitionKey: returnLocationStr() == 'qingdao' ? 'abilityprocess_v3' : 'abilityprocess_v2'
       }
     }
   },
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index cde3984b..930ae3d4 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 09:39:01
+ * @LastEditTime: 2022-08-23 10:37:29
  * @Description: 能力申请
 -->
 <template>
@@ -121,6 +121,7 @@
 import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
+import returnLocationStr from '@/utils/location'
 export default {
   mixins: [mixinViewModule, processModule],
   data () {
@@ -135,7 +136,7 @@ export default {
       dataForm: {
         taskName: '',
         taskId: '',
-        processDefinitionKey: 'abilityprocess_v2'
+        processDefinitionKey: returnLocationStr() == 'qingdao' ? 'abilityprocess_v3' : 'abilityprocess_v2'
       },
       processInstanceId: ''
     }
@@ -144,7 +145,7 @@ export default {
   methods: {
     // 处理
     taskHandle (row) {
-      console.log('row======================>', row, this.forwardHandleUrl)
+      console.log('row======================>', row, this.forwardHandleUrl, this.dataForm.processDefinitionKey)
       if (!row.businessKey) {
         return this.$message.error(this.$t('task.businessKeyError'))
       }
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index e38d0183..16a78c7d 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-19 09:56:27
+ * @LastEditTime: 2022-08-22 18:21:31
  * @Description: 数据资源参数配置
  */
 //const newLocation = 'qingdao'
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 5f8e986a..ab5cc85a 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,10 +2,11 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-13 14:54:04
+ * @LastEditTime: 2022-08-23 09:37:58
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
+import returnLocationStr from '@/utils/location'
 
 export function selectDicStoreAll(params) {
   return request({
@@ -113,16 +114,30 @@ export function lastestPage(params) {
 
 // 提交申请
 export function submitApply(data) {
+  const newLocation = returnLocationStr()
+  let url = ''
+  if (newLocation == 'qingdao') {
+    url = '/ability/center/v3/apply'
+  } else {
+    url = '/ability/center/v2/apply'
+  }
   return request({
-    url: '/ability/center/v2/apply',
+    url: url,
     method: 'post',
     data,
   })
 }
-// 提交申请
+// 全部应用提交申请
 export function applyAllApplication(data) {
+  const newLocation = returnLocationStr()
+  let url = ''
+  if (newLocation == 'qingdao') {
+    url = '/ability/center/v3/applyAllApplication'
+  } else {
+    url = '/ability/center/v2/applyAllApplication'
+  }
   return request({
-    url: '/ability/center/v2/applyAllApplication',
+    url: url,
     method: 'post',
     data,
   })
diff --git a/front/src/utils/location.js b/front/src/utils/location.js
new file mode 100644
index 00000000..63fa730e
--- /dev/null
+++ b/front/src/utils/location.js
@@ -0,0 +1,13 @@
+/*
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-08-22 18:22:16
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-08-23 09:31:02
+ * @Description: 告诉大家这是什么
+ */
+
+const returnLocationStr = () => {
+  return 'qingdao'
+}
+
+export default returnLocationStr