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

merge change修改

This commit is contained in:
wuhongjian 2022-07-13 11:18:02 +08:00
parent 0814ccea07
commit 38bc627486
10 changed files with 49 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
back/src/views/modules/myAgent/demo/Application-resources.vue Normal file
View File

@ -0,0 +1,22 @@
<template>
<div class="wrapper"></div>
</template>
<script>
export default {
components: {},
props: {},
data () {
return {}
},
watch: {},
computed: {},
methods: {},
created () {},
mounted () {}
}
</script>
<style lang="scss" scoped>
.wrapper {
}
</style>

150
back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
View File

@ -8,150 +8,9 @@
:label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
>
<div v-if="shifoushizujian">
<el-form-item label="应用名称">
<el-input
v-model="dataForm.name"
:disabled="fieldDisabled"
placeholder="应用名称"
></el-input>
</el-form-item>
<el-form-item label="应用描述">
<el-tooltip
effect="dark"
:content="dataForm.description"
placement="top"
popper-class="kuandukuandukuandu"
>
<el-input
v-model="dataForm.description"
:disabled="fieldDisabled"
placeholder="应用描述"
></el-input>
</el-tooltip>
</el-form-item>
<el-form-item label="部门联系人">
<el-input
v-model="dataForm.deptContacts"
:disabled="fieldDisabled"
placeholder="部门联系人"
></el-input>
</el-form-item>
<el-form-item label="共享类型">
<el-input
v-model="dataForm.shareType"
:disabled="fieldDisabled"
placeholder="共享类型"
></el-input>
</el-form-item>
<el-form-item label="共享方式">
<el-input
v-model="dataForm.shareMode"
:disabled="fieldDisabled"
placeholder="共享方式"
></el-input>
</el-form-item>
<el-form-item label="共享条件">
<el-input
v-model="dataForm.shareCondition"
:disabled="fieldDisabled"
placeholder="共享方条件"
></el-input>
</el-form-item>
<el-form-item label="访问地址">
<el-input
v-model="dataForm.link"
:disabled="fieldDisabled"
placeholder="访问地址"
></el-input>
</el-form-item>
<Applicationresources></Applicationresources>
</div>
<div v-if="!shifoushizujian">
<el-form-item label="组件名称" v-if="algorithmShow">
<el-input
v-model="dataForm.name"
:disabled="fieldDisabled"
placeholder="组件名称"
></el-input>
</el-form-item>
<el-form-item label="算法名称" v-if="nameNotShow">
<el-input
v-model="dataForm.name"
:disabled="fieldDisabled"
placeholder="算法名称"
></el-input>
</el-form-item>
<el-form-item label="应用描述" v-if="algorithmShow">
<el-input
v-model="dataForm.description"
:disabled="fieldDisabled"
placeholder="应用描述"
></el-input>
</el-form-item>
<el-form-item label="算法描述" v-if="nameNotShow">
<el-input
v-model="dataForm.description"
:disabled="fieldDisabled"
placeholder="算法描述"
></el-input>
</el-form-item>
<el-form-item label="部门联系人" v-if="algorithmShow">
<el-input
v-model="dataForm.deptContacts"
:disabled="fieldDisabled"
placeholder="部门联系人"
></el-input>
</el-form-item>
<el-form-item label="共享类型">
<el-input
v-model="dataForm.shareType"
:disabled="fieldDisabled"
placeholder="共享类型"
></el-input>
</el-form-item>
<el-form-item
label="共享方式"
v-if="coverageNotShow && algorithmShow"
>
<el-input
v-model="dataForm.shareMode"
:disabled="fieldDisabled"
placeholder="共享方式"
></el-input>
</el-form-item>
<el-form-item label="共享条件">
<el-input
v-model="dataForm.shareCondition"
:disabled="fieldDisabled"
placeholder="共享方条件"
></el-input>
</el-form-item>
<el-form-item label="服务接口" v-if="coverageNotShow">
<el-input
v-model="dataForm.apiUrl"
:disabled="fieldDisabled"
placeholder="服务接口"
></el-input>
</el-form-item>
<el-form-item label="接口请求方式" v-if="coverageNotShow">
<el-input
v-model="dataForm.apiMethodType"
:disabled="fieldDisabled"
placeholder="接口请求方式"
></el-input>
</el-form-item>
</div>
<el-form-item
v-for="item in dataForm.infoList"
:key="item.index"
:label="item.attrType"
:disabled="fieldDisabled"
>
<el-input
v-model="item.attrValue"
:placeholder="item.attrType"
:disabled="fieldDisabled"
></el-input>
</el-form-item>
<div v-if="!shifoushizujian">22222</div>
<el-form-item
v-if="dataForm.enclosure"
label="申请附件"
@ -176,10 +35,13 @@
<script>
import processModule from '@/mixins/process-module'
import Applicationresources from './Application-resources.vue'
export default {
// 注入公共方法
mixins: [processModule],
components: {},
components: {
Applicationresources
},
props: {
// fromList: {
// // type: Array,

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

@ -1,11 +1,11 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-12 14:55:46
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-08 08:53:41
* @Description: 数据资源参数配置
*/
const newLocation = 'qingdao'
const newLocation = 'qingdao'
// const newLocation = 'baotou'
// const newLocation = 'xihaian'
@ -163,7 +163,7 @@ else if (newLocation === 'xihaian') {
footerDataList.footerList = {
company: {
left: '青岛西海岸新区大数据发展促进局建设',
right: 'v0.8.1.6',
right: 'v0.8.1.5',
},
address: [
{

7
front/src/api/personalCenter.js
View File

@ -7,6 +7,13 @@ export function getMyProcessInstancePage(params) {
params,
})
}
export function getTabilityapplication(params) {
return request({
url: '/processForm/tabilityapplication/my_page',
method: 'get',
params,
})
}
// 查询申购车列表
export function getSgcList(params) {

6
front/src/utils/accessToken.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 17:48:03
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-09 16:47:54
* @LastEditTime: 2022-04-25 17:47:09
* @Description: 告诉大家这是什么
*/
import { storage, tokenTableName } from '@/config'
@ -33,7 +33,7 @@ export function getAccessToken() {
* @author chuzhixin 1204505056@qq.com
* @description 存储accessToken
* @param accessToken
* @returns {void|*}cs
* @returns {void|*}
*/
export function setAccessToken(accessToken) {
if (storage) {
@ -64,7 +64,7 @@ export function removeAccessToken() {
} else if ('sessionStorage' === storage) {
return sessionStorage.clear()
} else if ('cookie' === storage) {
return cookie.remove(tokenTableName)
// return cookie.remove(tokenTableName)
} else {
return localStorage.removeItem(tokenTableName)
}

7
front/src/views/capabilityCloud/index.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-19 10:11:03
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-09 17:05:49
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-05 19:47:07
* @Description: 告诉大家这是什么
-->
<template>
@ -32,8 +32,7 @@
import { useRouter } from 'vue-router'
const router = useRouter()
const goHome = () => {
// router.push('/home')
window.location.replace('/#/home')
router.push('/home')
}
</script>
<style lang="less">

4
front/src/views/capacityOnTheShelf/BusinessComponent.vue
View File

@ -298,7 +298,7 @@
}
init()
mybus.on('chageDataFrom', (obj) => {
if (obj.attrType == '使用手册' && obj.attrValue != null) {
if (obj.attrType == '技术文档' && obj.attrValue != null) {
shiyongshouce.value = obj
}
dataFrom.value.infoList = dataFrom.value.infoList.filter(
@ -310,7 +310,7 @@
dataFrom.value.infoList.push(obj)
if (shiyongshouce.value.attrValue) {
dataFrom.value.infoList.map((syscitem, syscindex) => {
if (syscitem.attrType == '使用手册') {
if (syscitem.attrType == '技术文档') {
dataFrom.value.infoList[syscindex] = shiyongshouce.value
}
})

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

@ -41,6 +41,7 @@
<script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { ref, defineProps, watch } from 'vue'
let dataFrom = ref({
title: '部署与安全',
englishTitle: 'DEPLOY&SAFE',
@ -60,15 +61,7 @@
dataList: { type: Object, default: null },
})
if (props.dataList.infoList) {
if(props.dataList.link) {
let obj = {
attrType: '访问地址',
attrValue: props.dataList.link
}
props.dataList.infoList.push(obj)
}
props.dataList.infoList.map((item) => {
debugger
if (
item.attrType === '部署区域' ||
item.attrType === '是否统一登录' ||
@ -114,13 +107,6 @@
() => props.dataList,
(val) => {
if (val) {
if(props.dataList.link) {
let obj = {
attrType: '访问地址',
attrValue: props.dataList.link
}
props.dataList.infoList.push(obj)
}
dataFrom.value.content[0].childrenContent = []
dataFrom.value.content[1].childrenContent = []
props.dataList.infoList.map((item) => {

2
front/src/views/home/Navigation.vue
View File

@ -70,7 +70,7 @@
{
componentCapability: '组件服务0',
applicationResources: '应用资源0',
infrastructure: '基础设施0',
infrastructure: '基础设施23万',
dataResources: '数据资源10387',
knowledgeBase: '知识库12',
},

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

@ -848,10 +848,6 @@
background: url('~@/assets/home/rhfw_square.png') no-repeat;
background-size: 100%;
}
.jcss {
background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%;
}
.header {
display: flex;
justify-content: space-between;