From 05d2ad1a45f4ae85da5749b6276afec4a0d22752 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 22 Sep 2022 14:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalCenter/components/MyApply.vue     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 83dcc304..f8c7d3e9 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -129,8 +129,12 @@ let typeList = ref([
   '能力下架',
   '能力需求',
   '需求评论',
-  '设备申请'
 ])
+// 西海岸-设备申请
+let isXiHaiAn = whoShow.itShowXiHaiAn;
+if (isXiHaiAn) {
+  typeList.value.push('设备申请')
+}
 const typeStrObj = {
   '能力上架': 'resourcemountapply',
   '能力下架': 'resourcundercarriageapply',
@@ -141,6 +145,9 @@ let tabList = ref(['全部', '审核中', '审核完成'])
 const contentList = reactive({ data: [] })
 let tabIndex = ref(0)
 let typeIndex = ref(0)
+let typeName = ref(typeList.value[0])
+console.log('typeName------------>', typeName);
+
 const videoVisible = ref(false)
 const numFlag = ref(true)
 const columns = ref([
@@ -182,6 +189,7 @@ const changeType = (item, index) => {
   ended.value = ''
   page.value = 1
   typeIndex.value = index
+  typeName.value = item
   getApplyList()
 }
 let name = ref('')
@@ -379,7 +387,7 @@ const getApplyList = () => {
   if (ended.value === '') {
     delete params.ended
   }
-  if (typeIndex.value == 0) {
+  if (typeName.value == '能力申请') {
     getTabilityapplication(params).then((res) => {
       contentList.data = []
       console.log('获取我的申请===============>', res.data.data)
@@ -388,9 +396,16 @@ const getApplyList = () => {
       showType.value = '能力申请'
       initNum2()
     })
-  } else if (typeIndex.value !== 1) {
-    let typeName = typeList.value[typeIndex.value]
-    processDefinitionKey.value = typeStrObj[typeName]
+  } else if (typeName.value == '能力评价') {
+    contentList.data = []
+    num.value = []
+    showType.value = ''
+  } else if (typeName.value == '设备申请') {
+    contentList.data = []
+    num.value = []
+    showType.value = ''
+  } else if (Object.keys(typeStrObj).includes(typeName.value)) {
+    processDefinitionKey.value = typeStrObj[typeName.value]
     params.processDefinitionKey = processDefinitionKey.value;
     getMyProcessInstancePage(params).then((res) => {
       contentList.data = []