From f2aa5c5e3c03268fe807ad3291213a22066fd8b5 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 15 Jul 2022 10:35:05 +0800
Subject: [PATCH] =?UTF-8?q?BUg=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js        |  2 +-
 .../views/capacityOnTheShelf/Algorithm.vue    |  4 +-
 .../home/components/searchResultList.vue      |  1 +
 .../personalCenter/components/MyApply.vue     | 96 ++++++++++---------
 4 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 66106bcf..685e6098 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -32,7 +32,7 @@ if (newLocation === 'qingdao') {
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '指导手册', key: 'instructionManual' },
-    // { name: '需求中心', key: 'demandCenter' },
+    { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index ee58275e..5b70026c 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:44:38
+ * @LastEditTime: 2022-07-15 10:14:57
  * @Description: 算法上架
 -->
 <template>
@@ -162,7 +162,7 @@
         {
           name: '计费标准',
           field: 'price',
-          type: 'number',
+          type: 'input',
           company: '元',
           note1: '',
         },
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 03d81ba4..0dcb7c21 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -168,6 +168,7 @@
               <div
                 v-if="
                   selectCardsname !== '应用资源' &&
+                  selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务'
                 "
               >
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 73ed4267..02be1c6f 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -83,10 +83,7 @@
           </div> -->
           <div class="content-body-content">
             <p class="content-body-content-son">
-              审核结果：{{
-                // item.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中'
-                item.approveStatus || item.resourceStatusTip || '--'
-              }}
+              审核结果：{{ item.ended ? '审核完成' : '审核中' }}
             </p>
           </div>
           <!-- <div class="content-body-content" v-if="item.currentTaskList">
@@ -344,6 +341,7 @@
   let tabIndex = ref(0)
   let typeIndex = ref(0)
   const videoVisible = ref(false)
+  const numFlag = ref(true)
   const columns = ref([
     {
       title: '摄像头名称',
@@ -374,6 +372,7 @@
   }
   // 选择类型
   const changeType = (item, index) => {
+    numFlag.value = true
     num.value = []
     showType.value = ''
     console.log(item, index)
@@ -499,48 +498,54 @@
     unfinished: 0,
   })
   const initNum = () => {
-    num.value = []
-    getMyProcessInstancePage({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-      processDefinitionKey: processDefinitionKey.value,
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getMyProcessInstancePage({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-          processDefinitionKey: processDefinitionKey.value,
-        }).then((res) => {
-          if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-          }
-        })
-      }
-    })
+    if (numFlag.value) {
+      num.value = []
+      getMyProcessInstancePage({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+        processDefinitionKey: processDefinitionKey.value,
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getMyProcessInstancePage({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+            processDefinitionKey: processDefinitionKey.value,
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
   const initNum2 = () => {
-    num.value = []
-    getTabilityapplication({
-      page: 1,
-      limit: 4,
-      ended: 'false',
-    }).then((res) => {
-      if (res.data.code == 0) {
-        num.value.unfinished = res.data.data.total
-        getTabilityapplication({
-          page: 1,
-          limit: 4,
-          ended: 'true',
-        }).then((res) => {
-          if (res.data.code == 0) {
-            num.value.finished = res.data.data.total
-          }
-        })
-      }
-    })
+    if (numFlag.value) {
+      num.value = []
+      getTabilityapplication({
+        page: 1,
+        limit: 4,
+        ended: 'false',
+      }).then((res) => {
+        if (res.data.code == 0) {
+          num.value.unfinished = res.data.data.total
+          getTabilityapplication({
+            page: 1,
+            limit: 4,
+            ended: 'true',
+          }).then((res) => {
+            if (res.data.code == 0) {
+              num.value.finished = res.data.data.total
+              numFlag.value = false
+            }
+          })
+        }
+      })
+    }
   }
   // initNum()
   const total = ref('')
@@ -564,6 +569,9 @@
       ended: ended.value,
       // name: name.value,
     }
+    if (ended.value === '') {
+      delete params.ended
+    }
     if (typeIndex.value == 0) {
       getTabilityapplication(params).then((res) => {
         contentList.data = []