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:
a0049873 2022-07-16 16:01:34 +08:00
parent 6062af489e 123b64bc70
commit d38c0ae217
15 changed files with 460 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
back/src/views/modules/activiti/demo/comments.vue
View File

@ -72,16 +72,17 @@ export default {
}) })
}, },
getInfo (id) { getInfo (id) {
this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => { this.$http.get('/demandComment/' + id).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataForm = res.data.resourceDTO this.dataForm = res.data
if (this.dataForm.type != '应用资源') { // this.dataForm = res.data.resourceDTO
this.shifoushizujian = false // if (this.dataForm.type != '应用资源') {
} else { // this.shifoushizujian = false
this.shifoushizujian = true // } else {
} // this.shifoushizujian = true
// }
console.log('this.dataForm', this.dataForm) console.log('this.dataForm', this.dataForm)
}) })
} }

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.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-14 10:58:46 * @LastEditTime: 2022-07-16 13:01:41
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -46,7 +46,7 @@
// window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
// 开发 // 开发
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; 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.239:8888/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';

5
front/src/utils/request.js
View File

@ -74,8 +74,7 @@ instance.interceptors.request.use(
(config) => { (config) => {
debugger debugger
const token = getAccessToken() const token = getAccessToken()
if (token) if (token) config.headers[tokenName] = token
config.headers[tokenName] = token
if ( if (
config.data && config.data &&
config.headers['Content-Type'] === config.headers['Content-Type'] ===
@ -105,7 +104,7 @@ instance.interceptors.response.use(
response['Access-Control-Expose-Headers'] = 'redirect' response['Access-Control-Expose-Headers'] = 'redirect'
const { code, message } = response.data const { code, message } = response.data
debugger debugger
if (code=='0' && response.headers.token) { if (code == '0' && response.headers.token) {
setAccessToken(response.headers.token) setAccessToken(response.headers.token)
} else { } else {
const token = getAccessToken() const token = getAccessToken()

96
front/src/vab/plugins/permissions.js
View File

@ -2,65 +2,65 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-01 17:23:11 * @Date: 2022-04-01 17:23:11
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-11 16:39:36 * @LastEditTime: 2022-07-16 10:57:59
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
/** /**
* @author chuzhixin 1204505056@qq.com * @author chuzhixin 1204505056@qq.com
* @description 路由守卫，目前两种模式：all模式与intelligence模式 * @description 路由守卫，目前两种模式：all模式与intelligence模式
*/ */
import router from '@/router' import router from '@/router'
import store from '@/store' import store from '@/store'
import getPageTitle from '@/utils/pageTitle' import getPageTitle from '@/utils/pageTitle'
import { getUserInfo } from '@/api/user' import { getUserInfo } from '@/api/user'
import { import {
// authentication, // authentication,
loginInterception, loginInterception,
// recordRoute, // recordRoute,
routesWhiteList, routesWhiteList,
} from '@/config' } from '@/config'
import { setAccessToken, getAccessToken } from '@/utils/accessToken' import { setAccessToken, getAccessToken } from '@/utils/accessToken'
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
// debugger // debugger
// const SSOTOKEN = to.query.SSOToken // const SSOTOKEN = to.query.SSOToken
// if (SSOTOKEN) { // if (SSOTOKEN) {
// setAccessToken(SSOTOKEN) // setAccessToken(SSOTOKEN)
// } // }
const token = getAccessToken() const token = getAccessToken()
console.log('token', token) console.log('token', token)
let hasToken = token || store.getters['user/accessToken'] let hasToken = token || store.getters['user/accessToken']
// debugger // debugger
if (!loginInterception) hasToken = true if (!loginInterception) hasToken = true
console.log('hasToken存在巨大问题', hasToken) console.log('hasToken存在巨大问题', hasToken)
if (hasToken) { if (hasToken) {
// setAccessToken(hasToken) // setAccessToken(hasToken)
await store.dispatch('user/getUserInfo') await store.dispatch('user/getUserInfo')
debugger debugger
next() next()
} else { } else {
let accessRoutes = [] let accessRoutes = []
accessRoutes = await store.dispatch('routes/setRoutes') accessRoutes = await store.dispatch('routes/setRoutes')
accessRoutes.forEach((item) => { accessRoutes.forEach((item) => {
router.addRoute(item) router.addRoute(item)
}) })
if (routesWhiteList.indexOf(to.path) !== -1) { if (routesWhiteList.indexOf(to.path) !== -1) {
next() next()
} else { } else {
// 这里是一个单点登录的入口 // 这里是一个单点登录的入口
getUserInfo().then(res=>{ getUserInfo().then((res) => {
console.log(res) console.log(res)
router.replace('/home') router.replace('/home')
}) })
// await store.dispatch('user/getUserInfo') // await store.dispatch('user/getUserInfo')
// next() // next()
// if (recordRoute) // if (recordRoute)
// next({ path: '/login', query: { redirect: to.path }, replace: true }) // next({ path: '/login', query: { redirect: to.path }, replace: true })
// else next({ path: '/login', replace: true }) // else next({ path: '/login', replace: true })
// next() // next()
// window.open('http://www.baidu.com', '_self') // window.open('http://www.baidu.com', '_self')
} }
} }
}) })
router.afterEach((to) => { router.afterEach((to) => {
document.title = getPageTitle(to.meta.title) document.title = getPageTitle(to.meta.title)
}) })

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

@ -110,9 +110,24 @@
:pagination="false" :pagination="false"
> >
<template #bodyCell="{ column, text }"> <template #bodyCell="{ column, text }">
<template v-if="column.dataIndex !== 'name'"> <template
v-if="
column.dataIndex !== 'name' &&
(column.title === '组件服务' || column.title === '应用资源')
"
>
{{ text || 0 }} {{ text || 0 }}
</template> </template>
<template
v-else-if="
column.dataIndex !== 'name' &&
(column.title === '知识库' ||
column.title === '基础设施' ||
column.title === '数据资源')
"
>
--
</template>
</template> </template>
</a-table> </a-table>
</div> </div>

108
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.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-16 11:29:11 * @LastEditTime: 2022-07-16 15:05:16
* @Description: 上架 * @Description: 上架
--> -->
<template> <template>
@ -600,22 +600,47 @@
const mockData = ref([]) const mockData = ref([])
const titles = ref(['未关联的应用名称', '已关联的应用名称']) const titles = ref(['未关联的应用名称', '已关联的应用名称'])
const titleName = ref('关联应用') const titleName = ref('关联应用')
const targetKeys = ref([])
// 上一步关联数据
const targetKeysBack = ref([])
const sourceClick = () => { const sourceClick = () => {
mockData.value = [] mockData.value = []
visibleAssociatedApplication.value = true visibleAssociatedApplication.value = true
queryApplicationRelByResourceId({ props.dataFrom.infoList.forEach((val) => {
referenceId: 0, if (val.attrType === '来源应用' && val.attrValue != '') {
}).then((res) => { queryApplicationRelByResourceId({
// console.log(res.data.data.notLinked) referenceId: 0,
res.data.data.notLinked.forEach((val, index) => { }).then((res) => {
// console.log(val, index) // console.log(res.data.data.notLinked)
mockData.value.push({ res.data.data.notLinked.forEach((val, index) => {
key: val.id, mockData.value.push({
title: val.name, key: val.id,
description: val.id, title: val.name,
description: val.id,
})
})
}) })
}) targetKeys.value = []
val.attrValue.split(',').forEach((item) => {
targetKeys.value.push(item)
})
console.log(targetKeys.value)
// console.log('wowowo')
} else if (val.attrType === '来源应用' && val.attrValue == '') {
queryApplicationRelByResourceId({
referenceId: 0,
}).then((res) => {
// console.log(res.data.data.notLinked)
res.data.data.notLinked.forEach((val, index) => {
mockData.value.push({
key: val.id,
title: val.name,
description: val.id,
})
})
})
}
}) })
} }
// 关联组件 // 关联组件
@ -624,33 +649,57 @@
titleName.value = '关联组件' titleName.value = '关联组件'
mockData.value = [] mockData.value = []
visibleAssociatedApplication.value = true visibleAssociatedApplication.value = true
queryResourceRelByKeyId({ props.dataFrom.infoList.forEach((val) => {
keyId: 0, if (val.attrType === '关联组件信息' && val.attrValue != '') {
type: '组件服务', queryResourceRelByKeyId({
referenceName: '', keyId: 0,
}).then((res) => { type: '组件服务',
// console.log(res.data.data.notLinked) referenceName: '',
res.data.data.notLinked.forEach((val, index) => { }).then((res) => {
// console.log(val, index) // console.log(res.data.data.notLinked)
mockData.value.push({ res.data.data.notLinked.forEach((val, index) => {
key: val.id, mockData.value.push({
title: val.name, key: val.id,
description: val.id, title: val.name,
description: val.id,
})
})
}) })
}) targetKeys.value = []
val.attrValue.split(',').forEach((item) => {
targetKeys.value.push(item)
})
console.log(targetKeys.value)
// console.log('wowowo')
} else if (val.attrType === '关联组件信息' && val.attrValue == '') {
queryResourceRelByKeyId({
keyId: 0,
type: '组件服务',
referenceName: '',
}).then((res) => {
// console.log(res.data.data.notLinked)
res.data.data.notLinked.forEach((val, index) => {
mockData.value.push({
key: val.id,
title: val.name,
description: val.id,
})
})
})
}
}) })
} }
const targetKeys = ref([])
const selectedKeys = ref([]) const selectedKeys = ref([])
const handleChange = (nextTargetKeys, direction, moveKeys) => { const handleChange = (nextTargetKeys, direction, moveKeys) => {
console.log('targetKeys: ', nextTargetKeys) console.log('targetKeys: ', nextTargetKeys)
console.log('direction: ', direction) console.log('direction: ', direction)
console.log('moveKeys: ', moveKeys) console.log('moveKeys: ', moveKeys)
targetKeys.value = moveKeys
} }
const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => { const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
console.log('targetSelectedKeys: ', targetSelectedKeys) console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
} }
const handleOk = (e) => { const handleOk = (e) => {
@ -975,4 +1024,7 @@
font-weight: 400; font-weight: 400;
text-align: left; text-align: left;
} }
:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
display: none !important;
}
</style> </style>

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

@ -126,10 +126,12 @@
'props.dataList.infoList==============>', 'props.dataList.infoList==============>',
navList.value.filter((item) => item.name === list.value[0]) navList.value.filter((item) => item.name === list.value[0])
) )
if (navList.value.filter((item) => item.name === list.value[0])[0]) { if (list.value.length > 0) {
select.value = navList.value.filter( if (navList.value.filter((item) => item.name === list.value[0])[0]) {
(item) => (item.name === '关联应用') | (item.name === list.value[0]) select.value = navList.value.filter(
)[0].key (item) => (item.name === '关联应用') | (item.name === list.value[0])
)[0].key
}
} }
console.log('11111111111111111111111111', list.value, navList.value) console.log('11111111111111111111111111', list.value, navList.value)
} }

5
front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
View File

@ -149,11 +149,6 @@
dataFrom.value.content[1].childrenContent.push(itemContent) dataFrom.value.content[1].childrenContent.push(itemContent)
}) })
} }
let obj = {
attrType: '访问地址',
attrValue: props.dataList.link || '------',
}
dataFrom.value.content[0].childrenContent.push(obj)
} }
} }
) )

398
front/src/views/detailsAll/components/Business/BusinessNavigation.vue
View File

@ -8,7 +8,12 @@
<template> <template>
<div class="business-navigation" v-if="navList.length > 0"> <div class="business-navigation" v-if="navList.length > 0">
<template v-for="nav in navList" :key="nav.key"> <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 }} {{ nav.name }}
<span class="line"></span> <span class="line"></span>
</div> </div>
@ -16,217 +21,216 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, defineProps, watch, getCurrentInstance } from 'vue' import { ref, defineProps, watch, getCurrentInstance } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { queryPartAppByKeyId2 } from '@/api/home' import { queryPartAppByKeyId2 } from '@/api/home'
// 获取当前路由地址 // 获取当前路由地址
const router = useRouter() const router = useRouter()
const keyId = router.currentRoute.value.query.id const keyId = router.currentRoute.value.query.id
const navList = ref([ const navList = ref([
{ {
name: '组件展示', name: '组件展示',
key: 'business-presentation', key: 'business-presentation',
}, },
{ {
name: '功能介绍', name: '功能介绍',
key: 'function-introduction', key: 'function-introduction',
}, },
{ {
name: '应用场景', name: '应用场景',
key: 'application-scenarios', key: 'application-scenarios',
}, },
{ {
name: '应用案例', name: '应用案例',
key: 'application-case', key: 'application-case',
}, },
{ {
name: '使用方式', name: '使用方式',
key: 'business-usage-mode', key: 'business-usage-mode',
}, },
{ {
name: '常见问题', name: '常见问题',
key: 'common-problem', key: 'common-problem',
}, },
]) ])
const props = defineProps({ const props = defineProps({
associatedComponents: { type: Array, default: null }, associatedComponents: { type: Array, default: null },
selectNow: { type: String, default: '' }, selectNow: { type: String, default: '' },
dataList: { type: Object, default: null }, dataList: { type: Object, default: null },
})
const select = ref('business-associated-ability')
const list = ref([])
// 根据能力id查询是否存在关联应用
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
// 存在关联应用时在导航栏加入关联应用
navList.value.unshift({
name: '关联应用',
key: 'business-associated-ability',
show: true,
})
// list.value.push('关联应用')
console.log('navList', navList)
}
}) })
} const select = ref('business-associated-ability')
const selectNav = (key) => { const list = ref([])
select.value = key // 根据能力id查询是否存在关联应用
console.log(key, select.value) if (keyId) {
mybus.emit('flyToView', select.value) queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
} console.log('ressssssss', res)
if (props.dataList.infoList) { if (res.data.data.length > 0) {
list.value = [] // 存在关联应用时在导航栏加入关联应用
let arr = [ navList.value.unshift({
'关联应用', name: '关联应用',
'组件视频介绍', key: 'business-associated-ability',
'功能介绍', show: true,
'应用场景', })
'应用案例', // list.value.push('关联应用')
'使用方式', console.log('navList', navList)
'常见问题',
]
// 排序
// eslint-disable-next-line vue/no-mutating-props
props.dataList.infoList.sort((a, b) => {
return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
})
props.dataList.infoList.map((item) => {
if (
item.attrType === '常见问题' ||
item.attrType === '功能介绍' ||
item.attrType === '应用场景' ||
item.attrType === '应用案例'
) {
list.value.push(item.attrType)
} else if (item.attrType === '组件视频介绍') {
list.value.push('组件展示')
}
})
list.value.unshift('关联应用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
if (item.name == '关联应用') {
if (props.associatedComponents[0].dataList.length != 0) {
item.show = true
}
} else {
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 === '关联应用') | (item.name === list.value[0])
)[0].key
}
} }
console.log('11111111111111111111111111', list.value, navList.value) const selectNav = (key) => {
} select.value = key
watch( mybus.emit('flyToView', select.value)
() => props.selectNow,
(newValue) => {
select.value = newValue
} }
) if (props.dataList.infoList) {
watch( list.value = []
() => props.dataList, let arr = [
(val) => { '关联应用',
if (val) { '组件视频介绍',
list.value = [] '功能介绍',
let arr = [ '应用场景',
'关联应用', '应用案例',
'组件视频介绍', '使用方式',
'功能介绍', '常见问题',
'应用场景', ]
'应用案例', // 排序
'使用方式', // eslint-disable-next-line vue/no-mutating-props
'常见问题', props.dataList.infoList.sort((a, b) => {
] return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
// 排序 })
// eslint-disable-next-line vue/no-mutating-props props.dataList.infoList.map((item) => {
props.dataList.infoList.sort((a, b) => { if (
// console.log('排序==============>', a, b) item.attrType === '常见问题' ||
return arr.indexOf(a.attrType) - arr.indexOf(b.attrType) item.attrType === '功能介绍' ||
}) item.attrType === '应用场景' ||
val.infoList.map((item) => { item.attrType === '应用案例'
if ( ) {
item.attrType === '常见问题' || list.value.push(item.attrType)
item.attrType === '功能介绍' || } else if (item.attrType === '组件视频介绍') {
item.attrType === '应用场景' || list.value.push('组件展示')
item.attrType === '应用案例' }
) { })
list.value.push(item.attrType) list.value.unshift('关联应用')
} else if (item.attrType === '组件视频介绍') { list.value.push('使用方式')
list.value.push('组件展示') navList.value.forEach((item) => {
} console.log(item)
}) if (list.value.indexOf(item.name) > -1) {
list.value.unshift('关联应用') if (item.name == '关联应用') {
list.value.push('使用方式') if (props.associatedComponents[0].dataList.length != 0) {
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
if (item.name == '关联应用') {
if (props.associatedComponents[0].dataList.length != 0) {
item.show = true
}
} else {
item.show = true item.show = true
} }
} } else {
}) 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 === '关联应用') | (item.name === list.value[0])
)[0].key
} }
} }
console.log('11111111111111111111111111', list.value, navList.value) })
if (list.value.length > 0) {
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
select.value = navList.value.filter(
(item) => (item.name === '关联应用') | (item.name === list.value[0])
)[0].key
}
} }
console.log('11111111111111111111111111', list.value, navList.value)
} }
) watch(
() => props.selectNow,
(newValue) => {
select.value = newValue
}
)
watch(
() => props.dataList,
(val) => {
if (val) {
list.value = []
let arr = [
'关联应用',
'组件视频介绍',
'功能介绍',
'应用场景',
'应用案例',
'使用方式',
'常见问题',
]
// 排序
// eslint-disable-next-line vue/no-mutating-props
props.dataList.infoList.sort((a, b) => {
// console.log('排序==============>', a, b)
return arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
})
val.infoList.map((item) => {
if (
item.attrType === '常见问题' ||
item.attrType === '功能介绍' ||
item.attrType === '应用场景' ||
item.attrType === '应用案例'
) {
list.value.push(item.attrType)
} else if (item.attrType === '组件视频介绍') {
list.value.push('组件展示')
}
})
list.value.unshift('关联应用')
list.value.push('使用方式')
navList.value.forEach((item) => {
console.log(item)
if (list.value.indexOf(item.name) > -1) {
if (item.name == '关联应用') {
if (props.associatedComponents[0].dataList.length != 0) {
item.show = true
}
} else {
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 === '关联应用') | (item.name === list.value[0])
)[0].key
}
}
console.log('11111111111111111111111111', list.value, navList.value)
}
}
)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.business-navigation { .business-navigation {
width: 19.12rem; width: 19.12rem;
height: 0.84rem; height: 0.84rem;
line-height: 0.8rem; line-height: 0.8rem;
display: flex;
justify-content: space-around;
font-size: 0.24rem;
color: #666;
background: #fff;
padding: 0 3rem;
box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
position: relative;
.nav {
cursor: pointer;
display: flex; display: flex;
flex-direction: column; justify-content: space-around;
justify-content: space-between; font-size: 0.24rem;
align-items: center; color: #666;
background: #fff;
padding: 0 3rem;
box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
position: relative;
.line { .nav {
width: 0.4rem; cursor: pointer;
height: 0.04rem; display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.line {
width: 0.4rem;
height: 0.04rem;
}
}
.select {
color: #526aff;
.line {
background: #526aff;
}
} }
} }
.select {
color: #526aff;
.line {
background: #526aff;
}
}
}
</style> </style>

3
front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
View File

@ -164,6 +164,9 @@
businessArea.value = props.dataList.infoList.filter( businessArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域' (val) => val.attrType === '应用领域'
)[0].attrValue )[0].attrValue
let obj = props.dataList.infoList.filter(
(val) => val.attrType === '组件类型'
)[0]
if ( if (
props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0] props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0]
) { ) {

18
front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
View File

@ -96,6 +96,8 @@
list.value.push(item.attrType) list.value.push(item.attrType)
} else if (item.attrType === '组件视频介绍') { } else if (item.attrType === '组件视频介绍') {
list.value.push('组件展示') list.value.push('组件展示')
} else if (item.attrType === '是否支持试用' && item.attrValue === '是') {
list.value.push('组件试用')
} }
}) })
list.value.unshift('关联应用') list.value.unshift('关联应用')
@ -111,9 +113,12 @@
// } // }
} }
}) })
select.value = navList.value.filter( if (navList.value.filter((item) => item.name === list.value[0])[0]) {
(item) => item.name === list.value[0] select.value = navList.value.filter(
)[0].key (item) => (item.name === '关联应用') | (item.name === list.value[0])
// (item) => item.name === list.value[0]
)[0].key
}
console.log('11111111111111111111111111', list.value, navList.value) console.log('11111111111111111111111111', list.value, navList.value)
} }
watch( watch(
@ -137,10 +142,15 @@
list.value.push(item.attrType) list.value.push(item.attrType)
} else if (item.attrType === '组件视频介绍') { } else if (item.attrType === '组件视频介绍') {
list.value.push('组件展示') list.value.push('组件展示')
} else if (
item.attrType === '是否支持试用' &&
item.attrValue === '是'
) {
list.value.push('组件试用')
} }
}) })
list.value.unshift('关联应用') list.value.unshift('关联应用')
list.value.push('组件试用') // list.value.push('组件试用')
list.value.push('使用方式') list.value.push('使用方式')
navList.value.forEach((item) => { navList.value.forEach((item) => {
console.log(item) console.log(item)

6
front/src/views/detailsAll/components/Developer/DeveloperTrial.vue
View File

@ -49,7 +49,7 @@
}) })
if (props.dataList.infoList) { if (props.dataList.infoList) {
let obj = props.dataList.infoList.filter( let obj = props.dataList.infoList.filter(
(item) => item.attrType === '试用地址' (item) => item.attrType === '是否支持试用' && item.attrValue === '是'
)[0] )[0]
if (!obj) { if (!obj) {
flag.value = false flag.value = false
@ -94,7 +94,9 @@
() => props.dataList, () => props.dataList,
(val) => { (val) => {
if (val) { if (val) {
let obj = val.infoList.filter((item) => item.attrType === '试用地址')[0] let obj = val.infoList.filter(
(item) => item.attrType === '是否支持试用' && item.attrValue === '是'
)[0]
if (!obj) { if (!obj) {
flag.value = false flag.value = false
} else { } else {

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

@ -82,7 +82,6 @@
const select = ref('layer-service-associated-ability') const select = ref('layer-service-associated-ability')
const selectNav = (key) => { const selectNav = (key) => {
select.value = key select.value = key
console.log(key, select.value)
mybus.emit('flyToView', select.value) mybus.emit('flyToView', select.value)
} }
if (props.dataList.infoList) { if (props.dataList.infoList) {
@ -145,9 +144,12 @@
item.show = true item.show = true
} }
}) })
select.value = navList.value.filter( if (navList.value.filter((item) => item.name === list.value[0])[0]) {
(item) => item.name === list.value[0] select.value = navList.value.filter(
)[0].key (item) => (item.name === '关联应用') | (item.name === list.value[0])
// (item) => item.name === list.value[0]
)[0].key
}
console.log('11111111111111111111111111', list.value, navList.value) console.log('11111111111111111111111111', list.value, navList.value)
} }
watch( watch(

36
front/src/views/personalCenter/VueTemplateDemo.vue
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-04-19 17:18:48 * @Date: 2022-04-19 17:18:48
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-05-06 19:11:32 * @LastEditTime: 2022-07-16 15:01:48
* @Description: markdown编辑器 * @Description: markdown编辑器
--> -->
<template> <template>
@ -44,7 +44,7 @@
} }
}, },
created() { created() {
this.uuidSplice() // this.uuidSplice()
this.getDevelopmentFile() this.getDevelopmentFile()
}, },
methods: { methods: {
@ -92,12 +92,15 @@
const blob = new Blob([file], { const blob = new Blob([file], {
type: 'md', type: 'md',
}) })
let myfile = new File([blob], this.uuidSnum + '.md') if (this.uuidSnum === '') {
this.uuidSplice()
}
let myfile = new File([blob], this.uuidSnum)
var formData = new FormData() var formData = new FormData()
const type = pinyin(this.dataFrom.type, { const type = pinyin(this.dataFrom.type, {
pattern: 'initial', pattern: 'initial',
}).replace(/\s*/g, '') }).replace(/\s*/g, '')
formData.append('fileName', this.uuidSnum + '.md') formData.append('fileName', this.uuidSnum)
formData.append('type', type) formData.append('type', type)
formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象 formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
// formData.append('name', this.route.currentRoute.query.id + '.md') // formData.append('name', this.route.currentRoute.query.id + '.md')
@ -118,22 +121,33 @@
} }
}, },
async getDevelopmentFile() { async getDevelopmentFile() {
debugger
const uuidParam = this.dataFrom.infoList.filter((item) => {
if (item.attrType === '技术文档') {
return item
}
})
let uuid = ''
if (uuidParam[0].attrValue) {
uuid = uuidParam[0].attrValue.split('/')[1].split('.')[0]
}
this.uuidSnum = uuid
const type = pinyin(this.dataFrom.type, { const type = pinyin(this.dataFrom.type, {
pattern: 'initial', pattern: 'initial',
}).replace(/\s*/g, '') }).replace(/\s*/g, '')
console.log(type) console.log(type)
const param = { const param = {
type: type, type: type,
resourceId: this.uuidSnum, resourceId: uuid,
} }
const res = await getDevelopmentFile(param) const res = await getDevelopmentFile(param)
this.text = res.data this.text = res.data
let infoList = { // let infoList = {
attrType: '技术文档', // attrType: '技术文档',
attrValue: this.text.data, // attrValue: this.text.data,
delFlag: 0, // delFlag: 0,
} // }
mybus.emit('chageDataFrom', infoList) // mybus.emit('chageDataFrom', infoList)
console.log('res', res) console.log('res', res)
}, },
}, },

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

@ -68,8 +68,8 @@
</a-button> </a-button>
</div> </div>
</div> </div>
<div class="items"> <div class="items" :key="showKey">
<div class="item" v-for="val in list" :key="val.id"> <div class="item" v-for="(val, valIndex) in list" :key="val.id">
<div class="item-top" @click="showBottom(val)"> <div class="item-top" @click="showBottom(val)">
<div> <div>
<a-checkbox <a-checkbox
@ -89,7 +89,6 @@
:loading="val.initLoading" :loading="val.initLoading"
item-layout="horizontal" item-layout="horizontal"
:data-source="val.children" :data-source="val.children"
:key="showKey"
> >
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
@ -131,7 +130,7 @@
title="是否删除该记录?" title="是否删除该记录?"
ok-text="是" ok-text="是"
cancel-text="否" cancel-text="否"
@confirm="delOne(item)" @confirm="delOne(item, valIndex)"
@cancel="cancel" @cancel="cancel"
> >
<a-button <a-button
@ -453,7 +452,7 @@
reverseSelectionFalg.value = !reverseSelectionFalg.value reverseSelectionFalg.value = !reverseSelectionFalg.value
} }
// 重置 // 重置
const clean = () => { const clean = (index) => {
name.value = '' name.value = ''
type.value = '' type.value = ''
pageNum.value = '1' pageNum.value = '1'
@ -463,10 +462,10 @@
checkedListAll.value = [] checkedListAll.value = []
checkAll.value = false checkAll.value = false
showKey.value++ showKey.value++
getList() getList('', index)
} }
// 获取信息 // 获取信息
const getList = (type) => { const getList = (type, index) => {
if (type == 'init') { if (type == 'init') {
pageNum.value = 1 pageNum.value = 1
pageSize.value = 99999 pageSize.value = 99999
@ -491,7 +490,7 @@
val.pageNum = '1' val.pageNum = '1'
val.pageSize = '99999' val.pageSize = '99999'
}) })
if (statistics == res.data.data.list.length) { if (statistics != 0 && statistics == res.data.data.list.length) {
checkAll.value = true checkAll.value = true
} }
if (list.value.length == 0) { if (list.value.length == 0) {
@ -501,8 +500,31 @@
load.value = Number(pageNum.value) load.value = Number(pageNum.value)
} }
// console.log('整体页面加载次数===============>', load.value) // console.log('整体页面加载次数===============>', load.value)
// 判断是否有已打开项，如果有重新载入之后自动打开
debugger
list.value = res.data.data.list list.value = res.data.data.list
if (index || index === 0) {
debugger
list.value[index].show = true
// console.log('1111', list.value[index])
showNew(list.value[index])
// showBottom()
}
// list.value = res.data.data.list
console.log(
'重新请求值',
index,
// res.data.data.list[index].show,
list.value
)
total.value = res.data.data.deptCount total.value = res.data.data.deptCount
console.log(
'重新请求值2',
index,
// res.data.data.list[index].show,
list.value
)
showKey.value++ showKey.value++
if (type == 'init' || type == 'changePage') { if (type == 'init' || type == 'changePage') {
getListByDeptId(list.value[0]) getListByDeptId(list.value[0])
@ -573,11 +595,15 @@
} }
// 显示资源信息 // 显示资源信息
const showBottom = (item) => { const showBottom = (item) => {
debugger
item.show = !item.show item.show = !item.show
if (item.show) { if (item.show) {
getListByDeptId(item) getListByDeptId(item)
} }
} }
const showNew = (item) => {
getListByDeptId(item)
}
// 切换页数 // 切换页数
const pageChange = (val) => { const pageChange = (val) => {
checkAll.value = false checkAll.value = false
@ -642,13 +668,13 @@
} }
// 判断是否全选 // 判断是否全选
const judgeAll = (item, val) => { const judgeAll = (item, val) => {
// console.log( console.log(
// '判断是否全选============>', '判断是否全选============>',
// item, item,
// val, val,
// list.value, list.value,
// checkedList.value checkedList.value
// ) )
if (!val) { if (!val) {
let all = true let all = true
list.value.map((val) => { list.value.map((val) => {
@ -734,7 +760,7 @@
} }
} }
const delOne = (item) => { const delOne = (item, index) => {
// console.log(item) // console.log(item)
sgcDel({ sgcDel({
ids: [item.id], ids: [item.id],
@ -743,7 +769,8 @@
message.success('删除成功') message.success('删除成功')
// console.log('删除申购车列表================>', res) // console.log('删除申购车列表================>', res)
mybus.emit('getSgcNum') mybus.emit('getSgcNum')
clean() clean(index)
// val.show = true
} }
}) })
} }