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-16 10:00:27 +08:00
parent ed5576a604
commit 86ece3cb09
6 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/public/index.html
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-11 10:11:40 * @Date: 2022-04-11 10:11:40
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-11 18:56:36 * @LastEditTime: 2022-07-15 18:41:00
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -44,7 +44,7 @@
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
// window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
// window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
// window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
// WebSocket地址 // WebSocket地址

5
back/src/mixins/view-module.js
View File

@ -109,6 +109,11 @@ export default {
} }
console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL) console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
if (this.dataList[0].type === '组件服务') {
this.dataList.map(val => {
val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域')
})
}
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }

9
back/src/views/modules/ability/bsabilityai.vue
View File

@ -69,6 +69,14 @@
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></af-table-column>
<af-table-column
:show-overflow-tooltip="true"
width="280"
prop="shareCondition"
label="共享条件"
header-align="center"
align="center"
></af-table-column>
<af-table-column <af-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="300" width="300"
@ -273,6 +281,7 @@ export default {
this.dataList = this.mixinViewModuleOptions.getDataListIsPage this.dataList = this.mixinViewModuleOptions.getDataListIsPage
? res.data.list ? res.data.list
: res.data : res.data
console.log('this.dataList', this.dataList)
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total
: 0 : 0

2
front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
View File

@ -90,7 +90,7 @@
values: '', values: '',
}, },
{ {
type: '最大级别', type: '最大级别名称',
values: '', values: '',
}, },
], ],

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

@ -51,7 +51,7 @@
<script setup> <script setup>
import { ref, reactive, defineProps } from 'vue' import { ref, reactive, defineProps } from 'vue'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { updateVisits } from '@/api/home' import { updateVisits, browsingInsert } from '@/api/home'
const props = defineProps({ const props = defineProps({
resourceList: { type: Array, default: null }, resourceList: { type: Array, default: null },
resourceTotal: { type: String, default: '' }, resourceTotal: { type: String, default: '' },
@ -66,6 +66,9 @@
const openHref = (item) => { const openHref = (item) => {
console.log(item.id, 'wowowo') console.log(item.id, 'wowowo')
console.log(item.visits, 'wowowo') console.log(item.visits, 'wowowo')
browsingInsert({ resourceId: item.id }).then((res) => {
// console.log(res)
})
const arrList = ref([]) const arrList = ref([])
arrList.value = JSON.parse(window.sessionStorage.getItem('visits')) arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
if (arrList.value.indexOf(item.id) === -1) { if (arrList.value.indexOf(item.id) === -1) {

57
front/src/views/personalCenter/components/MyBrowse.vue
View File

@ -44,7 +44,9 @@
> >
<template #title> <template #title>
<span <span
@click="showItem(item.resourceId, item.type, item.delFlag)" @click="
showItem(item.resourceId, item.type, item.delFlag, item)
"
style="cursor: pointer" style="cursor: pointer"
class="name" class="name"
> >
@ -142,6 +144,7 @@
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
import { updateVisits, browsingInsert } from '@/api/home'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { getBsList, BsDel, getTopCategory } from '@/api/personalCenter' import { getBsList, BsDel, getTopCategory } from '@/api/personalCenter'
const router = useRouter() const router = useRouter()
@ -171,7 +174,11 @@
console.log('编目一级=============>', res.data) console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => { res.data.data.forEach((val) => {
// tabList.value.push(val.name) // tabList.value.push(val.name)
if (val.name == '应用资源' || val.name == '组件服务') { if (
val.name == '应用资源' ||
val.name == '组件服务' ||
val.name == '知识库'
) {
tabList.value.push(val.name) tabList.value.push(val.name)
} }
}) })
@ -234,7 +241,9 @@
name: val.resourceDTO.name, name: val.resourceDTO.name,
id: val.id, id: val.id,
checked: false, checked: false,
visits: val.resourceDTO.visits,
type: val.resourceDTO.type, type: val.resourceDTO.type,
link: val.resourceDTO.link,
resourceId: val.resourceId, resourceId: val.resourceId,
createDate: val.createDate, createDate: val.createDate,
description: val.resourceDTO.description, description: val.resourceDTO.description,
@ -267,6 +276,28 @@
console.log('search======================>', name.value) console.log('search======================>', name.value)
} }
const openHref = (item) => {
browsingInsert({ resourceId: item.resourceId }).then((res) => {
// console.log(res)
})
const arrList = ref([])
arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
if (arrList.value.indexOf(item.resourceId) === -1) {
arrList.value.push(item.resourceId)
updateVisits({
id: item.resourceId,
visits: item.visits || '0',
}).then(() => {
window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
})
}
window.open(item.link)
// window.open(
// window.SITE_CONFIG.previewUrl +
// 'hisense_office/onlinePreview?url=' +
// btoa(encodeURI(item.fileHref))
// )
}
//申请id //申请id
const dataResourceId = ref([]) const dataResourceId = ref([])
@ -334,16 +365,20 @@
console.log(e) console.log(e)
} }
// 详情 // 详情
const showItem = (id, type, delFlag) => { const showItem = (id, type, delFlag, item) => {
if (delFlag == 0) { if (delFlag == 0) {
console.log('进入详情') console.log('进入详情', item)
mybus.emit('tabsChange', { flag: id }) if (item.type === '知识库') {
router.push({ openHref(item)
path: '/details', } else {
query: { mybus.emit('tabsChange', { flag: id })
id: id, router.push({
}, path: '/details',
}) query: {
id: id,
},
})
}
} }
} }
</script> </script>