diff --git a/front/public/index.html b/front/public/index.html index 6353bd6c..ffd3a7ac 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -47,7 +47,7 @@ window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; 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'; diff --git a/front/src/api/home.js b/front/src/api/home.js index 9f715249..fbc1578f 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-29 14:34:24 + * @LastEditTime: 2022-06-30 18:03:17 * @Description: 告诉大家这是什么 */ 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, + }) +} diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index ffb04a83..b71cd34d 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -287,6 +287,12 @@ } //来源部门漏斗图 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() let chartDom = document.getElementById('right') let myChart = echarts.init(chartDom) @@ -334,7 +340,7 @@ max: 100, minSize: '0%', maxSize: '100%', - sort: 'ascending', + sort: 'none', gap: 2, label: { show: true, diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue index 77edfd0b..f49ebce5 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue @@ -27,7 +27,7 @@
技术文档
-
新手指引
+
@@ -152,7 +152,6 @@ } ) function technical() { - // 拼接路径 const type = pinyin(props.dataList.type, { pattern: 'initial', diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index c4ceef11..f146cdf4 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -183,11 +183,14 @@ // // 打开文档 // const id = props.dataList.id // 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.SITE_CONFIG.previewUrl + 'hisense_office/onlinePreview?url=' + - btoa(encodeURI(dataFrom.value.link)) + btoa(encodeURI(obj.attrValue)) ) } diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 5060a8ba..b2645069 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1152,7 +1152,8 @@ }) mybus.on('changePage', (page) => { paramsGetResources.pageNum = page - getAppResources() + console.log('changePage', paramsGetResources.pageNum) + getAppResources('分页查询') console.log('paramsGetResources', paramsGetResources) }) mybus.on('changeSelcted', () => { @@ -1246,11 +1247,11 @@ let newQuery = JSON.parse( JSON.stringify(router.currentRoute.value.query) ) - if (Cardsname.value == name) { - Cardsname.value = '' - } else { - Cardsname.value = name - } + // if (Cardsname.value == name) { + // Cardsname.value = '' + // } else { + Cardsname.value = name + // } console.log( '更改前url中的select=====================>', router.currentRoute.value.query.select diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 46f6f7ae..0fb2a6c6 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -172,7 +172,7 @@ router.push({ path: '/DetailsPageconetent', query: { - select: '', + select: '组件服务', }, }) break diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index af86e9fd..13fdcfac 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -157,15 +157,6 @@ v-if="item.isCollect == 'true'" @click="addCollect(item)" > - - 免费试用 -
查看详情 + + 免费试用 + {{ item.shareCondition == '免批申请' ? '免批申请' : '立即申请' diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index 80ed1e3b..9232ec13 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-21 11:55:07 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 12:20:59 + * @LastEditTime: 2022-06-30 18:17:40 * @Description: 告诉大家这是什么 -->