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

BUG修改

This commit is contained in:
a0049873 2022-06-30 18:18:10 +08:00
parent 814ed5ff92
commit ecd5c76998
11 changed files with 125 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/public/index.html
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25 * @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-29 19:38:31 * @LastEditTime: 2022-06-30 18:01:54
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -47,7 +47,7 @@
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
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';

10
front/src/api/home.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-01 19:19:40 * @Date: 2022-04-01 19:19:40
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-29 14:34:24 * @LastEditTime: 2022-06-30 18:03:17
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
import request from '@/utils/request' import request from '@/utils/request'
@ -314,3 +314,11 @@ export function queryPartAppByKeyId2(params) {
}) })
} }
//首页 基础设施
export function selectInfrastructureList(params) {
return request({
url: 'resource/selectInfrastructureList',
method: 'get',
params,
})
}

8
front/src/views/abilityStatistics/components/ResourceAggregation.vue
View File

@ -287,6 +287,12 @@
} }
//来源部门漏斗图 //来源部门漏斗图
const funnelPlot = (dataList) => { const funnelPlot = (dataList) => {
let arr = ['0-5', '5-10', '10-15', '15-20', '20以上']
dataList.sort((a, b) => {
console.log(arr.indexOf(a.fanwei), arr.indexOf(b.fanwei))
return arr.indexOf(b.fanwei) - arr.indexOf(a.fanwei)
})
console.log('============》', dataList)
echarts.init(document.getElementById('right')).dispose() echarts.init(document.getElementById('right')).dispose()
let chartDom = document.getElementById('right') let chartDom = document.getElementById('right')
let myChart = echarts.init(chartDom) let myChart = echarts.init(chartDom)
@ -334,7 +340,7 @@
max: 100, max: 100,
minSize: '0%', minSize: '0%',
maxSize: '100%', maxSize: '100%',
sort: 'ascending', sort: 'none',
gap: 2, gap: 2,
label: { label: {
show: true, show: true,

3
front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="right"> <div class="right">
<div @click="technical()">技术文档</div> <div @click="technical()">技术文档</div>
<div>新手指引</div> <!-- <div>新手指引</div> -->
</div> </div>
</div> </div>
<div class="content-right"> <div class="content-right">
@ -152,7 +152,6 @@
} }
) )
function technical() { function technical() {
// 拼接路径 // 拼接路径
const type = pinyin(props.dataList.type, { const type = pinyin(props.dataList.type, {
pattern: 'initial', pattern: 'initial',

7
front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
View File

@ -183,11 +183,14 @@
// // 打开文档 // // 打开文档
// const id = props.dataList.id // const id = props.dataList.id
// window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank') // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
console.log('dataFrom.value.link', dataFrom.value.link) let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
window.open( window.open(
window.SITE_CONFIG.previewUrl + window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' + 'hisense_office/onlinePreview?url=' +
btoa(encodeURI(dataFrom.value.link)) btoa(encodeURI(obj.attrValue))
) )
} }
</script> </script>

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

@ -1152,7 +1152,8 @@
}) })
mybus.on('changePage', (page) => { mybus.on('changePage', (page) => {
paramsGetResources.pageNum = page paramsGetResources.pageNum = page
getAppResources() console.log('changePage', paramsGetResources.pageNum)
getAppResources('分页查询')
console.log('paramsGetResources', paramsGetResources) console.log('paramsGetResources', paramsGetResources)
}) })
mybus.on('changeSelcted', () => { mybus.on('changeSelcted', () => {
@ -1246,11 +1247,11 @@
let newQuery = JSON.parse( let newQuery = JSON.parse(
JSON.stringify(router.currentRoute.value.query) JSON.stringify(router.currentRoute.value.query)
) )
if (Cardsname.value == name) { // if (Cardsname.value == name) {
Cardsname.value = '' // Cardsname.value = ''
} else { // } else {
Cardsname.value = name Cardsname.value = name
} // }
console.log( console.log(
'更改前url中的select=====================>', '更改前url中的select=====================>',
router.currentRoute.value.query.select router.currentRoute.value.query.select

2
front/src/views/home/components/header.vue
View File

@ -172,7 +172,7 @@
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
select: '', select: '组件服务',
}, },
}) })
break break

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

@ -157,15 +157,6 @@
v-if="item.isCollect == 'true'" v-if="item.isCollect == 'true'"
@click="addCollect(item)" @click="addCollect(item)"
></span> ></span>
<a-button
style="margin-left: 10px"
v-show="
cardType == '组件服务' &&
findComponentName(item, '智能算法')
"
>
免费试用
</a-button>
</div> </div>
<div <div
class="shopping pk" class="shopping pk"
@ -183,10 +174,24 @@
> >
查看详情 查看详情
</a-button> </a-button>
<a-button
style="margin-left: 10px"
v-show="
cardType == '组件服务' && findComponentName(item, '智能算法')
"
>
免费试用
</a-button>
<a-button <a-button
type="primary" type="primary"
@click="toView('apply', item)" @click="toView('apply', item)"
v-show="cardType !== '数据资源'" v-show="
cardType !== '数据资源' &&
!(
cardType == '组件服务' &&
findComponentName(item, '智能算法')
)
"
> >
{{ {{
item.shareCondition == '免批申请' ? '免批申请' : '立即申请' item.shareCondition == '免批申请' ? '免批申请' : '立即申请'

53
front/src/views/mynoticeView/components/NoticeList.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-21 11:55:07 * @Date: 2022-06-21 11:55:07
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-22 12:20:59 * @LastEditTime: 2022-06-30 18:17:40
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -79,7 +79,7 @@
<a-list-item> <a-list-item>
<a-list-item-meta description=""> <a-list-item-meta description="">
<template #title> <template #title>
<div class="left"> <div class="left" @click="read(item)">
{{ item.content }} {{ item.content }}
</div> </div>
<div class="right">{{ '发布时间：' + item.senderDate }}</div> <div class="right">{{ '发布时间：' + item.senderDate }}</div>
@ -209,28 +209,43 @@
path: url, path: url,
}) })
} }
const read = () => { const read = (item) => {
// console.log(item)
if (selectData.value.length === 0) { if (selectData.value.length === 0) {
message.error('未选择消息！') message.error('未选择消息！')
return return
} }
console.log(selectData.value) console.log(selectData.value)
let str = '' // let str = ''
selectData.value.forEach((val, index) => { // selectData.value.forEach((val, index) => {
str += val // str += val
if (index < selectData.value.length - 1) { // if (index < selectData.value.length - 1) {
str += ';' // str += ';'
} // }
}) // })
mynoticeRead(str).then((res) => { if (item) {
if (res.data.code == 0) { mynoticeRead(item.id).then((res) => {
message.success('操作成功！') if (res.data.code == 0) {
mybus.emit('getMynotice') message.success('操作成功！')
init() mybus.emit('getMynotice')
} else { init()
message.error('操作失败！') } else {
} message.error('操作失败！')
}) }
})
} else {
selectData.value.map((val) => {
mynoticeRead(val).then((res) => {
if (res.data.code == 0) {
// message.success('操作成功！')
mybus.emit('getMynotice')
init()
} else {
message.error('操作失败！')
}
})
})
}
} }
const init = () => { const init = () => {
// from 通知 评论 readStatus 0 未读 1 已读 // from 通知 评论 readStatus 0 未读 1 已读

59
front/src/views/newHome/components/CapabilityConvergence.vue
View File

@ -38,10 +38,9 @@
class="name" class="name"
v-for="(item, index) in jcList" v-for="(item, index) in jcList"
:key="item.id" :key="item.id"
:class="index == 4 ? 'name-last' : ''" :class="index == 2 ? 'name-last' : ''"
@click="selectOne(item.id)"
> >
{{ index + 1 }}-{{ item.name }} {{ item.name + '-' + item.num + '个' }}
</div> </div>
<div class="btn" @click="jumpPage('基础设施')">查看更多</div> <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
</div> </div>
@ -76,7 +75,11 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { pageWithAttrs, getDataResource } from '@/api/home.js' import {
pageWithAttrs,
getDataResource,
selectInfrastructureList,
} from '@/api/home.js'
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
@ -157,24 +160,36 @@
}) })
} else { } else {
let type = paramsGetResources.type let type = paramsGetResources.type
pageWithAttrs(paramsGetResources).then((res) => { if (type == '基础设施') {
console.log('object个数======>', type) selectInfrastructureList().then((res) => {
obj.value = res.data.data.records console.log('基础设施==========>', res.data.data)
switch (type) { for (const key in res.data.data) {
case '组件服务': jcList.value.push({
assignmentMethod('zjNum', res) name: key,
break num: res.data.data[key],
case '应用资源': })
assignmentMethod('yyNum', res) }
break })
case '基础设施': } else {
assignmentMethod('jcNum', res) pageWithAttrs(paramsGetResources).then((res) => {
break console.log('object个数======>', type)
case '知识库': obj.value = res.data.data.records
assignmentMethod('zsNum', res) switch (type) {
break case '组件服务':
} assignmentMethod('zjNum', res)
}) break
case '应用资源':
assignmentMethod('yyNum', res)
break
case '基础设施':
assignmentMethod('jcNum', res)
break
case '知识库':
assignmentMethod('zsNum', res)
break
}
})
}
} }
} }
const assignmentMethod = (type, res) => { const assignmentMethod = (type, res) => {

12
front/src/views/newHome/components/Navigation.vue
View File

@ -157,7 +157,7 @@
'数据资源', '数据资源',
'知识库', '知识库',
]) ])
const select = ref('') const select = ref('组件服务')
let applicationDataList = ref([]) let applicationDataList = ref([])
let technosphereDataList = ref([]) let technosphereDataList = ref([])
const fabubumen = ref([ const fabubumen = ref([
@ -219,11 +219,11 @@
appLiCation: '', appLiCation: '',
}) })
const changeCard = (name) => { const changeCard = (name) => {
if (select.value == name) { // if (select.value == name) {
select.value = '' // select.value = ''
} else { // } else {
select.value = name select.value = name
} // }
snum.value.select = select.value snum.value.select = select.value
} }
function selectCard(value) { function selectCard(value) {