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

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-11-17 15:37:35 +08:00
parent 11994b6120 904c7cbbb5
commit 177d0cc95d
10 changed files with 66 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,7 +636,7 @@ export default {
this.showPutOnTheShelfFlag = true this.showPutOnTheShelfFlag = true
this.$http.get('/category/getCategoryTree').then((res) => { this.$http.get('/category/getCategoryTree').then((res) => {
this.insertList = res.data.data.filter( this.insertList = res.data.data.filter(
(item) => item.name === '组件服务一' (item) => item.name === '组件服务'
)[0] )[0]
}) })
}, },
@ -887,7 +887,7 @@ export default {
UpdateData (item) { UpdateData (item) {
this.$http.get('/category/getCategoryTree').then((res) => { this.$http.get('/category/getCategoryTree').then((res) => {
this.insertList = res.data.data.filter( this.insertList = res.data.data.filter(
(item) => item.name === '组件服务一' (item) => item.name === '组件服务'
)[0] )[0]
this.radio = item.infoList.filter( this.radio = item.infoList.filter(
(val) => val.attrType === '组件类型' (val) => val.attrType === '组件类型'

4
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -577,7 +577,7 @@ export default {
showPutOnTheShelf () { showPutOnTheShelf () {
this.showPutOnTheShelfFlag2 = true this.showPutOnTheShelfFlag2 = true
this.$http.get('/category/getCategoryTree').then(res => { this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0] this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
this.putOnTheShelfList = this.insertList.children this.putOnTheShelfList = this.insertList.children
}) })
}, },
@ -747,7 +747,7 @@ export default {
// 新修改 // 新修改
UpdateData (item) { UpdateData (item) {
this.$http.get('/category/getCategoryTree').then(res => { this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0] this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
this.radio = '应用资源' this.radio = '应用资源'
// this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
this.putOnTheShelfList = this.insertList.children this.putOnTheShelfList = this.insertList.children

2
front/src/views/abilityStatistics/components/AbilityRanking.vue
View File

@ -259,7 +259,7 @@
padding-bottom: 0; padding-bottom: 0;
.main { .main {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 60px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;

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

@ -240,8 +240,8 @@
}, },
legend: { legend: {
icon: 'emptyCircle', icon: 'emptyCircle',
height: 3, itemGap: 20,
itemGap: 40, padding: 20,
// orient: 'horizontal', // orient: 'horizontal',
bottom: 0, bottom: 0,
formatter: function (name) { formatter: function (name) {
@ -261,8 +261,7 @@
{ {
center: ['50%', '40%'], center: ['50%', '40%'],
type: 'pie', type: 'pie',
selectedMode: 'single', // selectedMode: 'single',
silent: true,
radius: ['50%', '30%'], radius: ['50%', '30%'],
color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'], color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
top: '0', top: '0',
@ -290,7 +289,6 @@
type: 'pie', type: 'pie',
center: ['50%', '40%'], center: ['50%', '40%'],
radius: ['58%', '50%'], radius: ['58%', '50%'],
silent: true,
itemStyle: { itemStyle: {
normal: { normal: {
color: '#c2c7d6', color: '#c2c7d6',

33
front/src/views/abilityStatistics/components/SharingSituation.vue
View File

@ -97,6 +97,12 @@
let myChart = echarts.init(chartDom) let myChart = echarts.init(chartDom)
let option let option
option = { option = {
grid: {
top: '10%',
right: '5%',
bottom: '10%',
left: '5%',
},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: datas.time, data: datas.time,
@ -255,16 +261,21 @@
} }
.situation { .situation {
font-weight: 600; font-size: 30px;
font-style: normal; color: #000;
font-size: 24px;
text-align: center; text-align: center;
} display: flex;
.line { flex-direction: column;
width: 34px; flex-wrap: wrap;
height: 3px; justify-content: center;
background-color: #0058e1; align-items: center;
margin-top: 8px; margin-bottom: 26px;
.line {
width: 34px;
height: 3px;
background-color: #0058e1;
margin-top: 8px;
}
} }
.SharingSituation { .SharingSituation {
@ -321,8 +332,8 @@
.Chart { .Chart {
flex: 1; flex: 1;
width: 598px; width: 638px;
height: 286px; height: 296px;
background: #f7f7f7; background: #f7f7f7;
text-align: center; text-align: center;
margin: auto; margin: auto;

14
front/src/views/capacityOnTheShelf/Algorithm.vue
View File

@ -81,10 +81,10 @@
:required="required" :required="required"
:notFilled="notFilled" :notFilled="notFilled"
></put-on-the-shelf> ></put-on-the-shelf>
</div> </div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''"> <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<a-popconfirm <a-popconfirm
v-if=" v-if="
showView == '算法优势' && showView == '算法优势' &&
@ -592,7 +592,7 @@ const init = () => {
getCategoryTree().then((res) => { getCategoryTree().then((res) => {
// console.clear() // console.clear()
res.data.data = res.data.data res.data.data = res.data.data
.filter((item) => item.name === '组件服务一')[0] .filter((item) => item.name === '组件服务')[0]
.children.filter((item) => item.name === '智能算法')[0] .children.filter((item) => item.name === '智能算法')[0]
navList.value = [] navList.value = []
navList2.value = [] navList2.value = []
@ -974,7 +974,7 @@ onBeforeUnmount(() => {
} }
// .quxiao:hover{ // .quxiao:hover{
// background: #0058e1; // background: #0058e1;
// color:#ffffff; // color:#ffffff;
// } // }
.buzhou{ .buzhou{
margin-right:12px; margin-right:12px;
@ -986,11 +986,11 @@ onBeforeUnmount(() => {
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
// .buzhou:hover{ // .buzhou:hover{
// background: #ffffff; // background: #ffffff;
// color:#0058e1; // color:#0058e1;
// } // }
} }
.first { .first {
justify-content: center; justify-content: center;

14
front/src/views/capacityOnTheShelf/Application.vue
View File

@ -103,7 +103,7 @@
></application-deployment-use> --> ></application-deployment-use> -->
</div> </div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''"> <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<a-popconfirm <a-popconfirm
v-if=" v-if="
@ -378,7 +378,7 @@
// ) { // ) {
// notFilled.value.push('共享条件') // notFilled.value.push('共享条件')
// } // }
if (notFilled.value.length > 0) { if (notFilled.value.length > 0) {
message.warning('请填写必填字段') message.warning('请填写必填字段')
console.log(notFilled.value) console.log(notFilled.value)
@ -480,7 +480,7 @@
getCategoryTree().then((res) => { getCategoryTree().then((res) => {
// console.clear() // console.clear()
res.data.data = res.data.data.filter( res.data.data = res.data.data.filter(
(item) => item.name === '应用资源一' (item) => item.name === '应用资源'
)[0] )[0]
navList.value = [] navList.value = []
navList2.value = [] navList2.value = []
@ -873,7 +873,7 @@
} }
// .quxiao:hover{ // .quxiao:hover{
// background: #0058e1; // background: #0058e1;
// color:#ffffff; // color:#ffffff;
// } // }
.buzhou{ .buzhou{
margin-right:12px; margin-right:12px;
@ -885,11 +885,11 @@
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
// .buzhou:hover{ // .buzhou:hover{
// background: #ffffff; // background: #ffffff;
// color:#0058e1; // color:#0058e1;
// } // }
} }
.first { .first {
justify-content: center; justify-content: center;

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

@ -82,7 +82,7 @@
></put-on-the-shelf> ></put-on-the-shelf>
</div> </div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''"> <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<a-popconfirm <a-popconfirm
v-if=" v-if="
showView == '功能介绍' && showView == '功能介绍' &&
@ -99,7 +99,7 @@
<button class="buzhou" >上一步</button> <button class="buzhou" >上一步</button>
</a-popconfirm> </a-popconfirm>
<button <button
class="buzhou" class="buzhou"
v-else-if=" v-else-if="
showView == '功能介绍' && showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length == gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -125,7 +125,7 @@
<button class="buzhou" >上一步</button> <button class="buzhou" >上一步</button>
</a-popconfirm> </a-popconfirm>
<button <button
class="buzhou" class="buzhou"
v-else-if=" v-else-if="
showView == '应用场景' && showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length == yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -171,7 +171,7 @@
<button class="buzhou" >下一步</button> <button class="buzhou" >下一步</button>
</a-popconfirm> </a-popconfirm>
<button <button
class="buzhou" class="buzhou"
v-else-if=" v-else-if="
showView == '功能介绍' && showView == '功能介绍' &&
gnjs[0].list.filter((val) => val.note1 !== '').length == gnjs[0].list.filter((val) => val.note1 !== '').length ==
@ -197,7 +197,7 @@
<button class="buzhou" >下一步</button> <button class="buzhou" >下一步</button>
</a-popconfirm> </a-popconfirm>
<button <button
class="buzhou" class="buzhou"
v-else-if=" v-else-if="
showView == '应用场景' && showView == '应用场景' &&
yycj[0].list.filter((val) => val.note1 !== '').length == yycj[0].list.filter((val) => val.note1 !== '').length ==
@ -579,7 +579,7 @@
getCategoryTree().then((res) => { getCategoryTree().then((res) => {
// console.clear() // console.clear()
res.data.data = res.data.data res.data.data = res.data.data
.filter((item) => item.name === '组件服务一')[0] .filter((item) => item.name === '组件服务')[0]
.children.filter((item) => item.name === '业务组件')[0] .children.filter((item) => item.name === '业务组件')[0]
navList.value = [] navList.value = []
navList2.value = [] navList2.value = []
@ -964,7 +964,7 @@
} }
// .quxiao:hover{ // .quxiao:hover{
// background: #0058e1; // background: #0058e1;
// color:#ffffff; // color:#ffffff;
// } // }
.buzhou{ .buzhou{
margin-right:12px; margin-right:12px;
@ -976,11 +976,11 @@
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
// .buzhou:hover{ // .buzhou:hover{
// background: #ffffff; // background: #ffffff;
// color:#0058e1; // color:#0058e1;
// } // }
} }
.first { .first {
justify-content: center; justify-content: center;

12
front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
View File

@ -81,7 +81,7 @@
></put-on-the-shelf> ></put-on-the-shelf>
</div> </div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''"> <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<a-popconfirm <a-popconfirm
v-if=" v-if="
showView == '功能介绍' && showView == '功能介绍' &&
@ -577,7 +577,7 @@
getCategoryTree().then((res) => { getCategoryTree().then((res) => {
// console.clear() // console.clear()
res.data.data = res.data.data res.data.data = res.data.data
.filter((item) => item.name === '组件服务一')[0] .filter((item) => item.name === '组件服务')[0]
.children.filter((item) => item.name === '开发组件')[0] .children.filter((item) => item.name === '开发组件')[0]
navList.value = [] navList.value = []
navList2.value = [] navList2.value = []
@ -961,7 +961,7 @@
} }
// .quxiao:hover{ // .quxiao:hover{
// background: #0058e1; // background: #0058e1;
// color:#ffffff; // color:#ffffff;
// } // }
.buzhou{ .buzhou{
margin-right:12px; margin-right:12px;
@ -973,11 +973,11 @@
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
// .buzhou:hover{ // .buzhou:hover{
// background: #ffffff; // background: #ffffff;
// color:#0058e1; // color:#0058e1;
// } // }
} }
.first { .first {
justify-content: center; justify-content: center;

12
front/src/views/capacityOnTheShelf/LayerServices.vue
View File

@ -78,7 +78,7 @@
></put-on-the-shelf> ></put-on-the-shelf>
</div> </div>
<div class="btn" :class="showView === '基本信息' ? 'first' : ''"> <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
<a-popconfirm <a-popconfirm
v-if=" v-if="
showView == '应用场景' && showView == '应用场景' &&
@ -472,7 +472,7 @@
getCategoryTree().then((res) => { getCategoryTree().then((res) => {
// console.clear() // console.clear()
res.data.data = res.data.data res.data.data = res.data.data
.filter((item) => item.name === '组件服务一')[0] .filter((item) => item.name === '组件服务')[0]
.children.filter((item) => item.name === '图层服务')[0] .children.filter((item) => item.name === '图层服务')[0]
navList.value = [] navList.value = []
navList2.value = [] navList2.value = []
@ -829,7 +829,7 @@
} }
// .quxiao:hover{ // .quxiao:hover{
// background: #0058e1; // background: #0058e1;
// color:#ffffff; // color:#ffffff;
// } // }
.buzhou{ .buzhou{
margin-right:12px; margin-right:12px;
@ -841,11 +841,11 @@
border-radius: 2px; border-radius: 2px;
border: 1px #0058e1 solid; border: 1px #0058e1 solid;
} }
// .buzhou:hover{ // .buzhou:hover{
// background: #ffffff; // background: #ffffff;
// color:#0058e1; // color:#0058e1;
// } // }
} }
.first { .first {
justify-content: center; justify-content: center;