wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

应用资源 能力申请 BUG修改

This commit is contained in:
a0049873 2022-07-18 14:43:24 +08:00
parent 3ad0e3e77c
commit 4819e5ad17
7 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/public/index.html
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-16 16:01:48 * @LastEditTime: 2022-07-18 14:09:10
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -49,7 +49,7 @@
window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; 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['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['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'; // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';

16
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08 * @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-16 15:05:16 * @LastEditTime: 2022-07-18 14:41:45
* @Description: 上架 * @Description: 上架
--> -->
<template> <template>
@ -541,8 +541,16 @@
}) })
if (flag) { if (flag) {
let obj = {} let obj = {}
let sfFlag = false
list.forEach((item) => { list.forEach((item) => {
if (item.type === 'input2') { if (item.type === 'input2') {
sfFlag = data.value[title].filter(
(val) => val.type === numType.value
)[0]
if (sfFlag) {
message.warning('已添加过该类型！')
return
}
obj[item.field] = obj[item.field] =
item.note1 + item.note1 +
(numType.value == '一次性买断' (numType.value == '一次性买断'
@ -558,7 +566,9 @@
obj[item.field] = item.note1 obj[item.field] = item.note1
} }
}) })
data.value[title].push(obj) if (!sfFlag) {
data.value[title].push(obj)
}
// console.log(data.value[title]) // console.log(data.value[title])
mybus.emit('chageDataFrom', { mybus.emit('chageDataFrom', {
attrType: title, attrType: title,

8
front/src/views/home/AbilityToApplyFor.vue
View File

@ -21,6 +21,8 @@
:class=" :class="
val.type == '基础设施' val.type == '基础设施'
? 'sxt' ? 'sxt'
: val.type == '应用资源'
? 'yyzy'
: val.componentType == '智能算法' : val.componentType == '智能算法'
? 'znsf' ? 'znsf'
: val.componentType == '图层服务' : val.componentType == '图层服务'
@ -103,7 +105,7 @@
]) ])
// eslint-disable-next-line vue/no-setup-props-destructure // eslint-disable-next-line vue/no-setup-props-destructure
dataForm.value = props.dataList dataForm.value = props.dataList
console.log(dataForm.value) console.log('=========================>', dataForm.value)
// const router = useRouter() // const router = useRouter()
// const arr = // const arr =
// router.currentRoute.value.query.name instanceof Array // router.currentRoute.value.query.name instanceof Array
@ -259,6 +261,10 @@
background: url('~@/assets/home/sxt_square.png') no-repeat; background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.yyzy {
background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%;
}
.znsf { .znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat; background: url('~@/assets/home/znsf_square.png') no-repeat;

5
front/src/views/home/DetailsPageconetent.vue
View File

@ -96,7 +96,10 @@
/> />
</div> </div>
</div> </div>
<div class="top-content" v-if="Cardsname == '组件服务'"> <div
class="top-content"
v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
>
<span class="top-content-title">共享条件</span> <span class="top-content-title">共享条件</span>
<div class="leixingsumfather"> <div class="leixingsumfather">
<div class="leixingsum"> <div class="leixingsum">

17
front/src/views/home/apply.vue
View File

@ -75,7 +75,7 @@
/> />
</a-form-item> </a-form-item>
</div> </div>
<div class="base-info"> <div class="base-info" v-if="flag">
<a-form-item <a-form-item
label="应用系统" label="应用系统"
name="applicationSystem" name="applicationSystem"
@ -267,9 +267,19 @@
setup() { setup() {
const router = useRouter() const router = useRouter()
const disabled = ref(false) const disabled = ref(false)
const flag = ref(false)
const list = ref(JSON.parse(localStorage.getItem('applyList'))) const list = ref(JSON.parse(localStorage.getItem('applyList')))
const num = ref(0) const num = ref(0)
list.value.map((item) => { 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) { if (item.checkedList) {
console.log(item) console.log(item)
num.value += Number(item.checkedList.length) num.value += Number(item.checkedList.length)
@ -290,9 +300,7 @@
? list.value[0].children ? list.value[0].children
.filter((val) => val.id == list.value[0].checkedList[0])[0] .filter((val) => val.id == list.value[0].checkedList[0])[0]
.resourceName.concat( .resourceName.concat(
list.value[0].checkedList.length > 1 num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
? '等能力申请' + num.value + '个'
: '能力申请'
) )
: list.value[0].arr[0].resourceName.concat('能力申请'), // 标题 : list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
applicationSystem: [], // 应用系统 applicationSystem: [], // 应用系统
@ -656,6 +664,7 @@
handleFocus, handleFocus,
systemOptions, systemOptions,
applicationSceneOpthion, applicationSceneOpthion,
flag,
} }
}, },
} }

30
front/src/views/home/components/searchResultList.vue
View File

@ -30,7 +30,6 @@
@click="changeCondition(item.value)" @click="changeCondition(item.value)"
v-show=" v-show="
item.show && item.show &&
!(item.name === '申请量' && selectCardsname == '应用资源') &&
item.name !== '评分' && item.name !== '评分' &&
selectCardsname !== '数据资源' selectCardsname !== '数据资源'
" "
@ -115,7 +114,7 @@
p-id="3062" p-id="3062"
width="40" width="40"
height="40" height="40"
v-if="item.applyState == '通过' && item.type !== '应用资源'" v-if="item.applyState == '通过'"
style="margin-left: 10px" style="margin-left: 10px"
> >
<path <path
@ -190,9 +189,9 @@
</div> </div>
<div <div
v-if=" v-if="
selectCardsname !== '应用资源' &&
selectCardsname !== '数据资源' && selectCardsname !== '数据资源' &&
selectCardsname !== '融合服务' selectCardsname !== '融合服务' &&
(selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
" "
> >
申请量：{{ item.applyCount || 0 }}次 申请量：{{ item.applyCount || 0 }}次
@ -221,7 +220,12 @@
</div> </div>
<div class="right" v-if="selectCardsname !== '基础设施'"> <div class="right" v-if="selectCardsname !== '基础设施'">
<div class="shopping" :key="shoppingKey"> <div class="shopping" :key="shoppingKey">
<template v-if="selectCardsname == '组件服务'"> <template
v-if="
selectCardsname == '组件服务' ||
(selectCardsname == '应用资源' && whoShow1.itShowQingDao)
"
>
<span <span
class="shopping-down" class="shopping-down"
v-if="item.isInShoppingCart" v-if="item.isInShoppingCart"
@ -279,7 +283,10 @@
<a-button <a-button
type="primary" type="primary"
@click="toView('apply', item)" @click="toView('apply', item)"
v-show="cardType == '组件服务'" v-show="
cardType == '组件服务' ||
(cardType == '应用资源' && whoShow1.itShowQingDao)
"
> >
{{ {{
item.shareCondition == '免批申请' ? '免批申请' : '立即申请' item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
@ -539,9 +546,14 @@
resourceName: item.name, resourceName: item.name,
time: item.createDate, time: item.createDate,
type: item.type, type: item.type,
componentType: item.infoList.filter( componentType:
(val) => val.attrType == '组件类型' item.infoList.filter(
)[0].attrValue, (val) =>
(val.attrType == '组件类型')[0] &&
item.infoList.filter(
(val) => val.attrType == '组件类型'
)[0].attrValue
) || '',
}, },
], ],
deptId: item.deptId, deptId: item.deptId,

6
front/src/views/personalCenter/components/PurchaseVehicle.vue
View File

@ -198,6 +198,8 @@
:class=" :class="
item.type == '基础设施' item.type == '基础设施'
? 'sxt' ? 'sxt'
: item.type == '应用资源'
? 'yyzy'
: item.componentType == '智能算法' : item.componentType == '智能算法'
? 'znsf' ? 'znsf'
: item.componentType == '图层服务' : item.componentType == '图层服务'
@ -1015,6 +1017,10 @@
background: url('~@/assets/home/sxt_square.png') no-repeat; background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%; background-size: 100%;
} }
.yyzy {
background: url('~@/assets/home/yyzy_square.png') no-repeat;
background-size: 100%;
}
.znsf { .znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat; background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 100%; background-size: 100%;