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

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
wuhongjian 2022-07-07 18:23:20 +08:00
parent dfa6c6a67b 420a31531f
commit 6f7d059eca
16 changed files with 1247 additions and 1167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
back/src/views/modules/workBench/components/bottom-view.vue
View File

@ -28,108 +28,108 @@
</div>
</template>
<script>
import contentTitle from "./content-title";
import * as Apis from '../api';
import contentTitle from './content-title'
import * as Apis from '../api'
export default {
components: {
contentTitle
},
data () {
return {
title: { dynamic: "部门发布动态", recommend: "部门推荐能力" },
title: { dynamic: '部门发布动态', recommend: '部门推荐能力' },
list: [],
columns: [
{
title: "名称",
key: "name",
dataIndex: "name",
title: '名称',
key: 'name',
dataIndex: 'name',
width: 250
},
{
title: "类型",
key: "type",
dataIndex: "type",
title: '类型',
key: 'type',
dataIndex: 'type',
width: 76
},
{
title: "单位",
key: "deptContacts",
dataIndex: "deptContacts",
title: '单位',
key: 'deptContacts',
dataIndex: 'deptContacts',
width: 144
},
{
title: "时间",
key: "createDate",
dataIndex: "createDate",
title: '时间',
key: 'createDate',
dataIndex: 'createDate',
width: 153
},
{
title: "当前申请数",
key: "applyCount",
dataIndex: "applyCount",
title: '当前申请数',
key: 'applyCount',
dataIndex: 'applyCount',
width: 145
},
}
],
tableData: [],
maxSize: { y: 195 },
loadingDynamic: false,
loadingTable: false,
};
loadingTable: false
}
},
mounted () {
this.getResourceByDept();
this.getResourceByDept()
this.getApplyByDept()
},
methods: {
// 发布动态
getResourceByDept () {
let data = {
const data = {
limit: 5,
page: 1
};
this.loadingDynamic = true;
}
this.loadingDynamic = true
Apis.getResourceByDept(
data,
res => {
this.loadingDynamic = false;
this.loadingDynamic = false
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
console.log('res.data----发布动态-------->', res.data);
console.log('res.data----发布动态-------->', res.data)
this.list = res.data.data.list || []
this.list.push(this.list[0])
this.list.push(this.list[0])
// this.list.push({})
// this.list.push({})
},
err => {
this.loadingDynamic = false;
this.loadingDynamic = false
this.$message.error(err)
console.log('err-----发布动态------->', err);
console.log('err-----发布动态------->', err)
}
);
)
},
// 部门推荐能力
getApplyByDept () {
let data = {
const data = {
limit: 5,
page: 1
};
this.loadingTable = true;
}
this.loadingTable = true
Apis.getApplyByDept(
data,
res => {
this.loadingTable = false;
this.loadingTable = false
if (res.data.code !== 0) {
return this.$message.error(res.data.msg)
}
console.log('res.data------部门推荐能力------>', res.data);
this.tableData = res.data.data.list || [];
console.log('res.data------部门推荐能力------>', res.data)
this.tableData = res.data.data.list || []
},
err => {
this.loadingTable = false;
this.loadingTable = false
this.$message.error(err)
console.log("err", err);
console.log('err', err)
}
);
)
}
}
}
@ -142,7 +142,6 @@ export default {
text-overflow: ellipsis;
}
.bottom-view {
width: 100%;
height: 335px;

44
back/src/views/modules/workBench/components/frequency-top5-view.vue
View File

@ -25,7 +25,7 @@
</div>
<div class="flex-row-between row-name" v-for="(data, i) in listInfo" :key="i">
<div class="left">
<div class="row-index">{{ i + 3 }}</div>
<div class="row-index">{{ i + 4 }}</div>
<el-tooltip effect="dark" :content="data.name" placement="top">
<div class="name-text ellipsis">{{ data.name || '--' }}</div>
</el-tooltip>
@ -47,59 +47,58 @@ export default {
colorObj: {
1: '#4658710',
2: '#734204',
3: '#805932',
3: '#805932'
},
no1Obj: {
name: '',
count: '',
count: ''
},
no2Obj: {
name: '',
count: '',
count: ''
},
no3Obj: {
name: '',
count: '',
count: ''
},
noData: false,
loading: true,
};
loading: true
}
},
mounted () {
this.getData();
this.getData()
},
methods: {
// 频率
getData () {
let data = {
const data = {
limit: 5,
page: 1,
};
page: 1
}
this.loading = true
Apis.getFrequence(data, res => {
this.loading = false;
this.loading = false
if (res.data.code !== 0) {
return this.$message.error(res.data.msg);
return this.$message.error(res.data.msg)
}
console.log("res----频率-------->", res.data);
let _arr = res.data.data.records || [];
console.log('res----频率-------->', res.data)
const _arr = res.data.data.records || []
if (_arr.length == 0) {
this.noData = true
return;
return
}
for (let i = 0; i < 3; i++) {
let k = i + 1;
const k = i + 1
this[`no${k}Obj`].name = _arr[i].name
this[`no${k}Obj`].count = _arr[i].count
}
this.listInfo = []
this.listInfo.push(_arr[3] || {})
this.listInfo.push(_arr[4] || {})
}, err => {
this.loading = false;
this.$message.error(err);
});
this.loading = false
this.$message.error(err)
})
},
formatCount (count) {
return count || count === 0 ? count : '--'
@ -168,7 +167,6 @@ export default {
background-image: url("~@/assets/img/workBench/NO2.png");
}
.no3 {
width: 170px;
height: 120px;
@ -206,11 +204,9 @@ export default {
width: 430px;
}
.num-text {
font-size: 14px;
color: #2b2b2b;
}
.no-data {

9
front/public/static/config/location.js
View File

@ -1,13 +1,22 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
<<<<<<< HEAD
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-07 17:30:10
=======
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-07 17:41:25
>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
* @Description: 数据资源参数配置
*/
const newLocation = 'qingdao'
// const newLocation = 'baotou'
<<<<<<< HEAD
// const newLocation = 'xihaian'
=======
// const newLocation = 'xihaian'
>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
// 数据资源数据
const whoShow = {}

8
front/src/main.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 17:48:03
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-05 15:04:47
* @LastEditTime: 2022-07-07 09:22:56
* @Description: 告诉大家这是什么
*/
import { createApp } from 'vue'
@ -51,9 +51,3 @@ router.beforeEach((to, from, next) => {
document.body.scrollTop = 0
next()
})
// 解决bug：页面/路由跳转后，滚动条消失，页面无法滚动
router.afterEach((to, from, next) => {
document
.querySelector('body')
.setAttribute('style', 'overflow: auto !important;')
})

17
front/src/views/abilityStatistics/components/AtlasResources.vue
View File

@ -31,7 +31,9 @@
v-for="(item, index) in bubbleList"
:key="item.id"
class="bubble-item"
@click.stop.prevent="index == 0 ? showDepartmentList() : ''"
@click.stop.prevent="
index == 0 ? showDepartmentList() : goToDetails(item)
"
>
<a-tooltip>
<template #title>{{ item.name }}</template>
@ -58,7 +60,7 @@
</span>
</nav>
</article>
<p>查看更多&gt;</p>
<!-- <p>查看更多&gt;</p> -->
</div>
<div class="itemList" v-else-if="navSelect.indexOf('应用领域') > 0">
<div class="item" v-for="item in dataList" :key="item.deptId">
@ -136,6 +138,8 @@
provideDeptTopN,
applyDeptTopN,
} from '@/api/abilityStatistics'
// import { useRouter } from 'vue-router'
// const router = useRouter()
// 左侧导航
const navList = ref([
'能力共享方-应用领域',
@ -149,6 +153,15 @@
])
const navSelect = ref('能力共享方-应用领域')
const departmentListFlag = ref(false)
const goToDetails = (item) => {
// console.log('点击气泡===============>', item)
// router.push({
// path: '/details',
// query: {
// id: item.id,
// },
// })
}
// 点击导航
const selectNav = (name) => {
navSelect.value = name

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

@ -147,6 +147,10 @@
break
}
})
let arr = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
dataList.value.dataList.sort((a, b) => {
return arr.indexOf(a.type) - arr.indexOf(b.type)
})
})
let datas = ref([])
let laiyuanDataList = ref([])

4
front/src/views/capabilityCloud/components/ComponentServices.vue
View File

@ -271,8 +271,8 @@
},
grid: {
top: '10%',
left: '0%',
right: '5%',
left: '3%',
right: '10%',
bottom: '0%',
containLabel: true,
},

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

@ -65,6 +65,7 @@
<script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { message } from 'ant-design-vue'
import { pinyin } from 'pinyin-pro'
import { ref, defineProps, watch } from 'vue'
let dataFrom = ref({
@ -184,12 +185,19 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '技术文档'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
// console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂无上传技术文档')
}
}
</script>

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

@ -2,7 +2,10 @@
<!-- 使用方式 -->
<div class="usage-mode" v-if="flag">
<div class="tltle">
<DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
<DetalsTitle
:title="dataFrom.title"
:type="dataFrom.englishTitle"
></DetalsTitle>
</div>
<div class="content" v-for="item in dataFrom.content" :key="item.title">
<div class="content-left">
@ -87,6 +90,7 @@
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { pinyin } from 'pinyin-pro'
import { ref, defineProps, watch } from 'vue'
import { message } from 'ant-design-vue'
let dataFrom = ref({
title: '使用方式',
englishTitle: 'USAGE',
@ -202,12 +206,18 @@ function technical() {
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '技术文档'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂无上传技术文档')
}
}
function technicalNew() {
// 拼接路径
@ -221,11 +231,18 @@ function technicalNew() {
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂无上传使用手册')
}
}
</script>
@ -243,7 +260,8 @@ function technicalNew() {
.content-left {
height: 1.5rem;
width: 6.2rem;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png') no-repeat;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
no-repeat;
background-position: center;
background-size: 100% 100%;
border-radius: 0.1rem;
@ -309,7 +327,8 @@ function technicalNew() {
.content-right {
height: 1.5rem;
width: 6.2rem;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png') no-repeat;
background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
no-repeat;
background-position: center;
background-size: 100% 100%;
border-radius: 0.1rem;

10
front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
View File

@ -8,7 +8,12 @@
<template>
<div class="business-navigation" v-if="navList.length > 0">
<template v-for="nav in navList" :key="nav.key">
<div class="nav" :class="{ select: nav.key == select }" v-if="nav.show" @click="selectNav(nav.key)">
<div
class="nav"
:class="{ select: nav.key == select }"
v-if="nav.show"
@click="selectNav(nav.key)"
>
{{ nav.name }}
<span class="line"></span>
</div>
@ -215,12 +220,11 @@ watch(
item.show = true
}
})
if (list.value.length > 0) {
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => item.name === list.value[0]
)[0].key
}
console.log('11111111111111111111111111', list.value, navList.value)
}
}
)

17
front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
View File

@ -90,6 +90,7 @@
<script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { message } from 'ant-design-vue'
import { pinyin } from 'pinyin-pro'
import { ref, defineProps, watch } from 'vue'
let dataFrom = ref({
@ -213,12 +214,18 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '技术文档'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂无上传技术文档')
}
}
function technicalNew() {
// 拼接路径
@ -231,12 +238,18 @@
let obj = props.dataList.infoList.filter(
(item) => item.attrType === '使用手册'
)[0]
console.log('dataFrom.value.link', obj.attrValue)
if (obj) {
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +
btoa(encodeURI(obj.attrValue))
)
} else {
message.config({
top: '100px', // 距离顶部的位置
})
message.error('暂上传使用手册')
}
}
</script>

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

@ -96,7 +96,7 @@
/>
</div>
</div>
<div class="top-content">
<div class="top-content" v-if="Cardsname == '组件服务'">
<span class="top-content-title">共享条件</span>
<div class="leixingsumfather">
<div class="leixingsum">
@ -106,6 +106,8 @@
>
申请
</a-checkable-tag>
</div>
<div class="leixingsum">
<a-checkable-tag
:checked="tagFlag == '免批申请'"
@change="() => chagneTag('免批申请')"
@ -312,7 +314,7 @@
/>
</div>
</div>
<div class="top-content">
<div class="top-content" v-if="Cardsname == '组件服务'">
<span class="top-content-title">共享条件</span>
<div class="leixingsumfather">
<div class="leixingsum">
@ -322,6 +324,8 @@
>
申请
</a-checkable-tag>
</div>
<div class="leixingsum">
<a-checkable-tag
:checked="tagFlag == '免批申请'"
@change="() => chagneTag('免批申请')"
@ -508,7 +512,7 @@
/>
</div>
</div>
<div class="top-content">
<div class="top-content" v-if="Cardsname == '组件服务'">
<span class="top-content-title">共享条件</span>
<div class="leixingsumfather">
<div class="leixingsum">
@ -518,6 +522,8 @@
>
申请
</a-checkable-tag>
</div>
<div class="leixingsum">
<a-checkable-tag
:checked="tagFlag == '免批申请'"
@change="() => chagneTag('免批申请')"

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

@ -267,21 +267,17 @@
if (mynoticeDom) {
mynoticeDom.addEventListener('mouseover', () => {
mynoticeFlag.value = true
// document.documentElement.style.overflowY = 'hidden'
})
mynoticeDom.addEventListener('mouseout', () => {
mynoticeFlag.value = false
document.documentElement.style.overflowY = 'scroll'
})
}
if (mynotice) {
mynotice.addEventListener('mouseover', () => {
mynoticeFlag.value = true
// document.documentElement.style.overflowY = 'hidden'
})
mynotice.addEventListener('mouseout', () => {
mynoticeFlag.value = false
document.documentElement.style.overflowY = 'scroll'
})
}
mybus.on('getSgcNum', () => {

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

@ -137,7 +137,7 @@
<div v-if="selectCardsname !== '数据资源'">
浏览量：{{ item.visits || 0 }}次
</div>
<div>申购量：{{ item.applyCount || 0 }}次</div>
<div>申请量：{{ item.applyCount || 0 }}次</div>
<div v-if="selectCardsname === '数据资源'">
数据量：{{ item.sjlCount || 0 }}
</div>
@ -430,8 +430,7 @@
item.guid
)
} else {
window.open(
'http://10.134.135.24:30090/#/home')
window.open('http://10.134.135.24:30090/#/home')
}
} else {
if (type === 'apply') {

22
front/src/views/home/infrastructurePage.vue
View File

@ -5,11 +5,17 @@
<div class="infrastructrue-tab">
<div v-for="(item, index) in tabList" :key="index" class="tabBox">
<b class="leftType">{{ item.title }}</b>
<button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
<a-button @click="nullClick" v-if="item.title == '视频标签'">
清空
</a-button>
<span
v-for="itemContent in item.content"
:key="itemContent"
<<<<<<< HEAD
@click="tabClick(index, item.title)"
=======
@click="tabClick(index, itemContent, item)"
>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
:class="
clickList[index].content.indexOf(itemContent.labelName) != -1 ||
clickList[index].content.indexOf(itemContent) != -1
@ -253,6 +259,7 @@
let tableHeight = ref('600')
//tab切换点击事件
const tabClick = (indexFather, name) => {
console.log(clickList.value, indexFather, name)
selectedRowKeys.value = []
selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) {
@ -538,6 +545,19 @@
}
.tabBox {
margin-bottom: 0.16rem;
:deep(.ant-btn:active) {
color: unset;
border-color: unset;
}
:deep(.ant-btn) {
margin-left: 10px;
border: 1px solid #666666;
color: #666666;
border-radius: 10px;
}
:deep(.ant-btn:hover) {
color: #40a9ff;
}
}
.tabBox:last-of-type {
margin-bottom: 0;

8
front/src/views/newHome/components/PopularAbility.vue
View File

@ -16,7 +16,7 @@
>
<span
class="img"
:class="sel == '浏览量' ? 'fwl' : sel == '申购量' ? 'sgl' : 'scl'"
:class="sel == '浏览量' ? 'fwl' : sel == '申请量' ? 'sgl' : 'scl'"
></span>
<span class="text">{{ sel }}</span>
</div>
@ -35,7 +35,7 @@
<div class="fw" v-if="select == '浏览量'">
{{ select }}:{{ item.visits }}
</div>
<div class="fw" v-if="select == '申购量'">
<div class="fw" v-if="select == '申请量'">
{{ select }}:{{ item.applyCount }}
</div>
<div class="fw" v-if="select == '收藏量'">
@ -64,7 +64,7 @@
const store = useStore()
const router = useRouter()
const select = ref('浏览量')
const selList = ref(['浏览量', '申购量', '收藏量'])
const selList = ref(['浏览量', '申请量', '收藏量'])
const list = ref([])
const paramsGetResources = {
@ -83,7 +83,7 @@
case '浏览量':
paramsGetResources.orderField = 'visits'
break
case '申购量':
case '申请量':
paramsGetResources.orderField = 'applyCount'
break
case '收藏量':