应用资源能力申请 BUG修改

2022-07-18 14:43:24 +08:00 · 2022-07-18 14:43:24 +08:00 · 4819e5ad17
parent 3ad0e3e77c
commit 4819e5ad17
7 changed files with 66 additions and 20 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -2,7 +2,7 @@
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
 * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-16 16:01:48
+ * @LastEditTime: 2022-07-18 14:09:10
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -49,7 +49,7 @@
    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-17 14:11:08
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 15:05:16
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-18 14:41:45
 * @Description: 上架
 -->
 <template>
@ -541,8 +541,16 @@
    })
    if (flag) {
      let obj = {}
+      let sfFlag = false
      list.forEach((item) => {
        if (item.type === 'input2') {
+          sfFlag = data.value[title].filter(
+            (val) => val.type === numType.value
+          )[0]
+          if (sfFlag) {
+            message.warning('已添加过该类型！')
+            return
+          }
          obj[item.field] =
            item.note1 +
            (numType.value == '一次性买断'
@ -558,7 +566,9 @@
          obj[item.field] = item.note1
        }
      })
-      data.value[title].push(obj)
+      if (!sfFlag) {
+        data.value[title].push(obj)
+      }
      // console.log(data.value[title])
      mybus.emit('chageDataFrom', {
        attrType: title,
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@ -21,6 +21,8 @@
            :class="
              val.type == '基础设施'
                ? 'sxt'
+                : val.type == '应用资源'
+                ? 'yyzy'
                : val.componentType == '智能算法'
                ? 'znsf'
                : val.componentType == '图层服务'
@ -103,7 +105,7 @@
  ])
  // eslint-disable-next-line vue/no-setup-props-destructure
  dataForm.value = props.dataList
-  console.log(dataForm.value)
+  console.log('=========================>', dataForm.value)
  // const router = useRouter()
  // const arr =
  //   router.currentRoute.value.query.name instanceof Array
@ -259,6 +261,10 @@
    background: url('~@/assets/home/sxt_square.png') no-repeat;
    background-size: 100%;
  }
+  .yyzy {
+    background: url('~@/assets/home/yyzy_square.png') no-repeat;
+    background-size: 100%;
+  }

  .znsf {
    background: url('~@/assets/home/znsf_square.png') no-repeat;
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -96,7 +96,10 @@
                />
              </div>
            </div>
-            <div class="top-content" v-if="Cardsname == '组件服务'">
+            <div
+              class="top-content"
+              v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
+            >
              <span class="top-content-title">共享条件</span>
              <div class="leixingsumfather">
                <div class="leixingsum">
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@ -75,7 +75,7 @@
                  />
                </a-form-item>
              </div>
-              <div class="base-info">
+              <div class="base-info" v-if="flag">
                <a-form-item
                  label="应用系统"
                  name="applicationSystem"
@ -267,9 +267,19 @@
    setup() {
      const router = useRouter()
      const disabled = ref(false)
+      const flag = ref(false)
      const list = ref(JSON.parse(localStorage.getItem('applyList')))
      const num = ref(0)
      list.value.map((item) => {
+        item.arr.map((val) => {
+          let obj = item.children.filter((type) => type.id == val.id)[0]
+          if (obj) {
+            console.log('11111111111111111111111111111', obj, flag.value)
+            if (obj.type !== '应用资源') {
+              flag.value = true
+            }
+          }
+        })
        if (item.checkedList) {
          console.log(item)
          num.value += Number(item.checkedList.length)
@ -290,9 +300,7 @@
          ? list.value[0].children
              .filter((val) => val.id == list.value[0].checkedList[0])[0]
              .resourceName.concat(
-                list.value[0].checkedList.length > 1
-                  ? '等能力申请' + num.value + '个'
-                  : '能力申请'
+                num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
              )
          : list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
        applicationSystem: [], // 应用系统
@ -656,6 +664,7 @@
        handleFocus,
        systemOptions,
        applicationSceneOpthion,
+        flag,
      }
    },
  }
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -30,7 +30,6 @@
            @click="changeCondition(item.value)"
            v-show="
              item.show &&
-              !(item.name === '申请量' && selectCardsname == '应用资源') &&
              item.name !== '评分' &&
              selectCardsname !== '数据资源'
            "
@ -115,7 +114,7 @@
                p-id="3062"
                width="40"
                height="40"
-                v-if="item.applyState == '通过' && item.type !== '应用资源'"
+                v-if="item.applyState == '通过'"
                style="margin-left: 10px"
              >
                <path
@ -190,9 +189,9 @@
                </div>
                <div
                  v-if="
-                    selectCardsname !== '应用资源' &&
                    selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务'
+                    selectCardsname !== '融合服务' &&
+                    (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
                  "
                >
                  申请量：{{ item.applyCount || 0 }}次
@ -221,7 +220,12 @@
            </div>
            <div class="right" v-if="selectCardsname !== '基础设施'">
              <div class="shopping" :key="shoppingKey">
-                <template v-if="selectCardsname == '组件服务'">
+                <template
+                  v-if="
+                    selectCardsname == '组件服务' ||
+                    (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
+                  "
+                >
                  <span
                    class="shopping-down"
                    v-if="item.isInShoppingCart"
@ -279,7 +283,10 @@
              <a-button
                type="primary"
                @click="toView('apply', item)"
-                v-show="cardType == '组件服务'"
+                v-show="
+                  cardType == '组件服务' ||
+                  (cardType == '应用资源' && whoShow1.itShowQingDao)
+                "
              >
                {{
                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
@ -539,9 +546,14 @@
                      resourceName: item.name,
                      time: item.createDate,
                      type: item.type,
-                      componentType: item.infoList.filter(
-                        (val) => val.attrType == '组件类型'
-                      )[0].attrValue,
+                      componentType:
+                        item.infoList.filter(
+                          (val) =>
+                            (val.attrType == '组件类型')[0] &&
+                            item.infoList.filter(
+                              (val) => val.attrType == '组件类型'
+                            )[0].attrValue
+                        ) || '',
                    },
                  ],
                  deptId: item.deptId,
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@ -198,6 +198,8 @@
                      :class="
                        item.type == '基础设施'
                          ? 'sxt'
+                          : item.type == '应用资源'
+                          ? 'yyzy'
                          : item.componentType == '智能算法'
                          ? 'znsf'
                          : item.componentType == '图层服务'
@ -1015,6 +1017,10 @@
    background: url('~@/assets/home/sxt_square.png') no-repeat;
    background-size: 100%;
  }
+  .yyzy {
+    background: url('~@/assets/home/yyzy_square.png') no-repeat;
+    background-size: 100%;
+  }
  .znsf {
    background: url('~@/assets/home/znsf_square.png') no-repeat;
    background-size: 100%;