BUg修改

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' },

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: '',
         },

front/src/views/home/components/searchResultList.vue

@@ -168,6 +168,7 @@
               <div
                 v-if="
                   selectCardsname !== '应用资源' &&
+                  selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务'
                 "
               >

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.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中'
-                item.approveStatus || item.resourceStatusTip || '--'
-              }}
             </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 = []
+    if (numFlag.value) {
-    getMyProcessInstancePage({
+      num.value = []
-      page: 1,
+      getMyProcessInstancePage({
-      limit: 4,
+        page: 1,
-      ended: 'false',
+        limit: 4,
-      processDefinitionKey: processDefinitionKey.value,
+        ended: 'false',
-    }).then((res) => {
+        processDefinitionKey: processDefinitionKey.value,
-      if (res.data.code == 0) {
+      }).then((res) => {
-        num.value.unfinished = res.data.data.total
+        if (res.data.code == 0) {
-        getMyProcessInstancePage({
+          num.value.unfinished = res.data.data.total
-          page: 1,
+          getMyProcessInstancePage({
-          limit: 4,
+            page: 1,
-          ended: 'true',
+            limit: 4,
-          processDefinitionKey: processDefinitionKey.value,
+            ended: 'true',
-        }).then((res) => {
+            processDefinitionKey: processDefinitionKey.value,
-          if (res.data.code == 0) {
+          }).then((res) => {
-            num.value.finished = res.data.data.total
+            if (res.data.code == 0) {
-          }
+              num.value.finished = res.data.data.total
-        })
+              numFlag.value = false
-      }
+            }
-    })
+          })
+        }
+      })
+    }
   }
   const initNum2 = () => {
-    num.value = []
+    if (numFlag.value) {
-    getTabilityapplication({
+      num.value = []
-      page: 1,
+      getTabilityapplication({
-      limit: 4,
+        page: 1,
-      ended: 'false',
+        limit: 4,
-    }).then((res) => {
+        ended: 'false',
-      if (res.data.code == 0) {
+      }).then((res) => {
-        num.value.unfinished = res.data.data.total
+        if (res.data.code == 0) {
-        getTabilityapplication({
+          num.value.unfinished = res.data.data.total
-          page: 1,
+          getTabilityapplication({
-          limit: 4,
+            page: 1,
-          ended: 'true',
+            limit: 4,
-        }).then((res) => {
+            ended: 'true',
-          if (res.data.code == 0) {
+          }).then((res) => {
-            num.value.finished = res.data.data.total
+            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 = []