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

This commit is contained in:
851673013@qq.com 2022-07-19 09:57:41 +08:00
commit 0e5ca11c2a
9 changed files with 961 additions and 956 deletions

View File

@ -58,7 +58,7 @@
</div>
</template>
<script>
import * as echarts from 'echarts';
import * as echarts from 'echarts'
export default {
props: {
@ -68,7 +68,7 @@ export default {
},
fatherId: {
type: Number,
default:null,
default: null
}
},
data () {
@ -83,11 +83,11 @@ export default {
data3: [
// { value: 1048,name: '' },
],
colorList:['linear-gradient(to right, rgba(251, 59, 5,0.6),transparent)', 'linear-gradient(to right,rgba(251, 123, 5),transparent)','linear-gradient(to right,rgba(250, 179, 2,.6),transparent)','linear-gradient(to right,rgba(82, 106, 255,.6),transparent','linear-gradient(to right,rgba(82, 106, 255,.6),transparent)',],
colorList: ['linear-gradient(to right, rgba(251, 59, 5,0.6),transparent)', 'linear-gradient(to right,rgba(251, 123, 5),transparent)', 'linear-gradient(to right,rgba(250, 179, 2,.6),transparent)', 'linear-gradient(to right,rgba(82, 106, 255,.6),transparent', 'linear-gradient(to right,rgba(82, 106, 255,.6),transparent)'],
widthList: ['90px', '80px', '70px', '60px', '50px'],
numColorList: ['#fc5656', '#ff8a00', '#f9af0a', '#808fff', '#808fff'],
usedList:[{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称四',useNum:111},{name:'组件名称五',useNum:111},],
applicationList:[{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称四',score:111},{name:'组件名称五',score:111},]
usedList: [{ name: '组件名称一', useNum: 111 }, { name: '组件名称一', useNum: 111 }, { name: '组件名称一', useNum: 111 }, { name: '组件名称四', useNum: 111 }, { name: '组件名称五', useNum: 111 }],
applicationList: [{ name: '组件名称一', score: 111 }, { name: '组件名称一', score: 111 }, { name: '组件名称一', score: 111 }, { name: '组件名称四', score: 111 }, { name: '组件名称五', score: 111 }]
}
},
created () {
@ -100,11 +100,9 @@ export default {
} else {
}
},
mounted () {
},
methods: {
//
@ -112,7 +110,7 @@ export default {
this.$http.get('/census/center/v3/assemblerScoreInfo', {
params: {
id: this.tableId,
resourceType:"应用资源"
resourceType: '应用资源'
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -120,7 +118,6 @@ export default {
let arry = []
arry = res.data.data
arry.forEach((item) => {
const single = {
value: item.scoreNum,
name: item.score
@ -131,14 +128,13 @@ export default {
this.myEcharts1()
})
})
},
//
getAlgorithm () {
this.$http.get('/census/center/v3/assemblerUsedInfo', {
params: {
id: this.tableId,
resourceType:"组件服务"
resourceType: '组件服务'
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -146,7 +142,6 @@ export default {
let arry = []
arry = res.data.data
arry.forEach((item) => {
const single = {
value: item.nums,
name: item.attr_value
@ -157,14 +152,13 @@ export default {
this.myEcharts2()
})
})
},
//
getDistributed () {
this.$http.get('/census/center/v3/applicationUsedAreaCapabilityList', {
params: {
id: this.tableId,
resourceType:"组件服务"
resourceType: '组件服务'
}
}).then(res => {
let arry = []
@ -178,14 +172,13 @@ export default {
this.myEcharts3()
})
})
},
// top5使
getBeCalled () {
this.$http.get('/census/center/v3/assemblerUseTopInfo', {
params: {
id: this.tableId,
resourceType:"组件服务"
resourceType: '组件服务'
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -198,7 +191,7 @@ export default {
this.$http.get('/census/center/v3/assemblerUseScoreTopInfo', {
params: {
id: this.tableId,
resourceType:"应用资源"
resourceType: '应用资源'
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -207,9 +200,9 @@ export default {
})
},
myEcharts1 () {
var chartDom = document.getElementById('main1');
var myChart = echarts.init(chartDom);
var option;
var chartDom = document.getElementById('main1')
var myChart = echarts.init(chartDom)
var option
option = {
tooltip: {
trigger: 'item'
@ -218,31 +211,31 @@ export default {
orient: '',
top: '14%',
left: '55%',
width:"auto",
height:"auto",
orient: "vertical",
width: 'auto',
height: 'auto',
orient: 'vertical',
itemGap: 15,
itemWidth: 14,
// 使
formatter: function (name) {
var data = option.series[0].data;
var total = 0;
var tarValue;
var data = option.series[0].data
var total = 0
var tarValue
for (var i = 0; i < data.length; i++) {
total += Number(data[i].value);
total += Number(data[i].value)
if (data[i].name == name) {
tarValue = data[i].value;
tarValue = data[i].value
}
}
var v = tarValue;
var p = Math.round(((v / total) * 100));
return `${name} ${p}%`;
var v = tarValue
var p = Math.round(((v / total) * 100))
return `${name} ${p}%`
},
itemStyle: {},
textStyle: {
color: "#666666",
color: '#666666',
padding: [0, 8, 0, 18]
},
}
},
color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
series: [
@ -266,14 +259,14 @@ export default {
data: this.data1
}
]
};
}
option && myChart.setOption(option);
option && myChart.setOption(option)
},
myEcharts2 () {
var chartDom = document.getElementById('main2');
var myChart = echarts.init(chartDom);
var option;
var chartDom = document.getElementById('main2')
var myChart = echarts.init(chartDom)
var option
option = {
tooltip: {
trigger: 'item'
@ -282,31 +275,31 @@ export default {
orient: '',
top: '22%',
left: '50%',
width:"auto",
height:"auto",
orient: "vertical",
width: 'auto',
height: 'auto',
orient: 'vertical',
itemGap: 15,
itemWidth: 14,
// 使
formatter: function (name) {
var data = option.series[0].data;
var total = 0;
var tarValue;
var data = option.series[0].data
var total = 0
var tarValue
for (var i = 0; i < data.length; i++) {
total += Number(data[i].value);
total += Number(data[i].value)
if (data[i].name == name) {
tarValue = data[i].value;
tarValue = data[i].value
}
}
var v = tarValue;
var p = Math.round(((tarValue / total) * 100));
return `${name} ${p}%`;
var v = tarValue
var p = Math.round(((tarValue / total) * 100))
return `${name} ${p}%`
},
itemStyle: {},
textStyle: {
color: "#666666",
color: '#666666',
padding: [0, 8, 0, 18]
},
}
},
color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
series: [
@ -331,43 +324,44 @@ export default {
data: this.data2
}
]
};
}
option && myChart.setOption(option);
option && myChart.setOption(option)
},
myEcharts3 () {
var chartDom = document.getElementById('main3');
var myChart = echarts.init(chartDom);
var option;
var chartDom = document.getElementById('main3')
var myChart = echarts.init(chartDom)
var option
option = {
tooltip: {
trigger: 'item'
},
legend: {
orient: "vertical", type: 'scroll',
orient: 'vertical',
type: 'scroll',
top: '22%',
left: '50%',
width:"auto",
height:"auto",
orient: "vertical",
width: 'auto',
height: 'auto',
orient: 'vertical',
itemGap: 15,
itemWidth: 14,
// 使
formatter: function (name) {
var data = option.series[0].data;
var total = 0;
var tarValue;
var data = option.series[0].data
var total = 0
var tarValue
for (var i = 0; i < data.length; i++) {
total += Number(data[i].value);
total += Number(data[i].value)
if (data[i].name == name) {
tarValue = data[i].value;
tarValue = data[i].value
}
}
// var v = tarValue;
var p = Math.round(((tarValue / total) * 100));
var p = Math.round(((tarValue / total) * 100))
console.log('@@@@', tarValue, total)
return `{a|${name}} {b|${p}%}`;
return `{a|${name}} {b|${p}%}`
},
itemStyle: {},
textStyle: {
@ -376,21 +370,21 @@ export default {
a: {
//
width: 100,
color: "#000000",
color: '#000000',
fontSize: 12,
fontWeight: "bolder",
fontWeight: 'bolder'
},
b: {
// 102030
width: 35,
color: "#333",
fontSize: 12,
color: '#333',
fontSize: 12
}
},
},
color: "#666666",
backgroundColor: "transparent",
color: '#666666',
backgroundColor: 'transparent',
padding: [0, 8, 0, 18]
},
}
},
color: ['#0087ff', '#51cb8d', '#fcc549', '#ef6567', '#ff8a00', '#fc5656'],
series: [
@ -422,9 +416,9 @@ export default {
data: this.data3
}
]
};
}
option && myChart.setOption(option);
option && myChart.setOption(option)
},
backBtn () {
this.$emit('closeChild2')
@ -451,7 +445,7 @@ export default {
.back-btn {
background: #3e8ef7;
border-color: rgba(101, 165, 249, 0);
color: #FFF;
color: #fff;
margin-left: 1030px;
padding-bottom: 3px;
}
@ -459,7 +453,7 @@ export default {
width: 1300px;
margin-top: 30px;
display: flex;
flex-wrap:wrap
flex-wrap: wrap;
}
.container-body1 {
width: 420px;
@ -468,7 +462,6 @@ export default {
margin-right: 20px;
padding-top: 20px;
padding-left: 20px;
}
.container-body2 {
width: 640px;
@ -518,14 +511,14 @@ export default {
height: 1px;
background-color: #e0eaf8;
margin-right: 10px;
margin-top:8px
margin-top: 8px;
}
.footer-right {
width: 250px;
height: 1px;
background-color: #e0eaf8;
margin-left: 10px;
margin-top:8px
margin-top: 8px;
}
.ranking-img {
width: 60px;
@ -547,6 +540,7 @@ export default {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.count-style {
position: absolute;

View File

@ -185,14 +185,13 @@ export default {
resourcesIsShow: false,
UsedIsShow: false,
titleList: [
{name:'组件服务',key:1}, {name:'应用资源',key:2}, {name:'基础设施',key:3}, {name:'数据资源',key:3}, {name:'知识库',key:3},
{ name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, { name: '数据资源', key: 3 }, { name: '知识库', key: 3 }
],
tableData: [{ deptName: '部门', resourceNum: 222 }]
}
},
created () {
},
mounted () {
this.getFirstTree()
@ -211,8 +210,7 @@ export default {
handleCurrentChange (val) {
if (this.choseId === 0) {
this.getFirstTree(val)
}
else if(this.choseId===1){
} else if (this.choseId === 1) {
this.getReleaseTree(val)
}
},
@ -220,7 +218,7 @@ export default {
this.$http.get('/census/center/v3/treeList/', {
params: {
keywords: data.name,
deptId:'1067246875800000066',
deptId: '1067246875800000066'
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -268,7 +266,6 @@ export default {
}
}).then(res => {
this.tableData = res.data.data.list
})
},
//
@ -283,7 +280,6 @@ export default {
}).then(res => {
this.tableData = res.data.data.list
this.total = res.data.data.total
})
},
// 使
@ -297,7 +293,6 @@ export default {
}
}).then(res => {
this.tableData = res.data.data.list
})
},
handleClick (row) {
@ -319,8 +314,6 @@ export default {
this.tableId = row.deptId
this.fatherId = 2
}
},
//
choseBtn (index) {
@ -357,13 +350,12 @@ export default {
},
//
handleSizeChange (val) {
console.log(`每页 ${val}`);
console.log(`每页 ${val}`)
},
closeChild () {
this.homeIsShow = true
this.servicesIsShow = false
this.handleCurrentChange(1)
},
closeChild2 () {
this.homeIsShow = true
@ -375,21 +367,20 @@ export default {
this.resourcesIsShow = false
this.handleCurrentChange(1)
}
},
}
}
</script>
<style lang="scss" scoped>
.container {
display: flex;
}
.container-left {
width: 250px;
height: 1000px;
display: inline-block;
// background-color: #ffffff;
margin-right:10px
margin-right: 10px;
}
.left-search {
width: 250px;
@ -428,6 +419,7 @@ input::placeholder {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-break: break-all;
}
}
@ -448,7 +440,6 @@ input::placeholder {
.title-list-style {
display: flex;
margin-top: 10px;
}
.title-single {
font-size: 14px;
@ -458,8 +449,7 @@ input::placeholder {
margin-left: 10px;
border: 1px solid #cccccc;
border-radius: 12px;
cursor:pointer
cursor: pointer;
}
.box-style {
width: 90px;
@ -473,7 +463,7 @@ input::placeholder {
margin-top: 20px;
font-size: 14px;
color: #979eb9;
cursor:pointer
cursor: pointer;
}
.line-style {
width: 100%;
@ -488,14 +478,15 @@ input::placeholder {
}
.choseStyle {
color: #526aff;
border:1px solid #526aff
border: 1px solid #526aff;
}
.departmentStyle {
color:#526aff
color: #526aff;
}
::v-deep .tree-text-styleJ {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
</style>

View File

@ -698,6 +698,7 @@ export default {
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
word-break: break-all;
}
.boxcontent {
width: 100%;
@ -707,6 +708,7 @@ export default {
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
word-break: break-all;
}
.preview-dialog {
width: 100%;

View File

@ -570,7 +570,7 @@ export default {
height: 28px;
margin-left: 14px;
margin-top: 9px;
background-image: url('~@/assets/img/capabilityCatalogingManagement/edit-card.png');
background-image: url("~@/assets/img/capabilityCatalogingManagement/edit-card.png");
}
}
div:nth-child(2) {
@ -609,7 +609,7 @@ export default {
left: 50%;
margin-left: -45.5px;
margin-top: -45.5px;
background-image: url('~@/assets/img/capabilityCatalogingManagement/add.png');
background-image: url("~@/assets/img/capabilityCatalogingManagement/add.png");
cursor: pointer;
}
> span {
@ -618,7 +618,7 @@ export default {
padding-top: 5px;
padding-left: 20px;
font-size: 26px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
}
.add-enterprise-input-wrap {
// height: 50px;
@ -656,7 +656,7 @@ export default {
background: #0fa7f6;
span {
color: #ffffff;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
font-size: 16px;
}
}
@ -704,7 +704,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
}
span:nth-child(2) {
display: inline-block;
@ -713,7 +713,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
border: 1px solid rgba(255, 255, 255, 0.5);
padding-top: 4px;
margin-top: 15px;
@ -724,7 +724,7 @@ export default {
.enterprise-card-tip-first:before,
.enterprise-card-tip-first:after {
position: absolute;
content: ' ';
content: " ";
top: 32px;
left: -16px;
display: block;
@ -752,7 +752,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
}
span:nth-child(2) {
display: inline-block;
@ -761,7 +761,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
border: 1px solid rgba(255, 255, 255, 0.5);
padding-top: 4px;
margin-top: 15px;
@ -772,7 +772,7 @@ export default {
.enterprise-card-tip-third:before,
.enterprise-card-tip-third:after {
position: absolute;
content: ' ';
content: " ";
top: 32px;
left: 180px;
display: block;
@ -801,7 +801,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
}
span:nth-child(2) {
display: inline-block;
@ -810,7 +810,7 @@ export default {
text-align: center;
color: #ffffff;
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
border: 1px solid rgba(255, 255, 255, 0.5);
padding-top: 4px;
margin-top: 15px;
@ -821,7 +821,7 @@ export default {
.enterprise-card-tip-second:before,
.enterprise-card-tip-second:after {
position: absolute;
content: ' ';
content: " ";
top: -15px;
left: 78px;
display: block;
@ -836,7 +836,7 @@ export default {
width: 100%;
// height: 373px;
height: 176px;
background-image: url('~@/assets/img/capabilityCatalogingManagement/small-card-orange.png');
background-image: url("~@/assets/img/capabilityCatalogingManagement/small-card-orange.png");
.resource-detail-title {
width: 100%;
height: 40px;
@ -845,15 +845,17 @@ export default {
padding-top: 10px;
text-align: center;
text-overflow: ellipsis;
word-break: break-all;
span {
width: 100%;
height: 100%;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
font-size: 20px;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
color: #ffffff;
}
}
@ -867,7 +869,7 @@ export default {
width: 100%;
height: 30px;
padding-left: 19px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
font-size: 20px;
color: white;
vertical-align: middle;
@ -899,7 +901,7 @@ export default {
position: absolute;
width: 28px;
height: 28px;
background-image: url('~@/assets/img/capabilityCatalogingManagement/remove.png');
background-image: url("~@/assets/img/capabilityCatalogingManagement/remove.png");
top: 0;
right: 0;
cursor: pointer;
@ -908,7 +910,7 @@ export default {
}
input::-webkit-input-placeholder {
font-size: 14px;
font-family: 'Microsoft YaHei';
font-family: "Microsoft YaHei";
color: #999999;
}
</style>

View File

@ -276,7 +276,8 @@ export default {
}
.ApiBox {
background: url('~@/assets/img/CapabilityOperationMonitoring/bg-blue.png') no-repeat;
background: url("~@/assets/img/CapabilityOperationMonitoring/bg-blue.png")
no-repeat;
background-size: 100%;
width: 22.5rem;
height: 6.875rem;
@ -313,7 +314,8 @@ export default {
}
.ApiBox:last-of-type {
background: url('~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png') no-repeat;
background: url("~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png")
no-repeat;
background-size: 100%;
div {
@ -383,9 +385,11 @@ export default {
display: block;
height: 1.25rem;
width: 2.25rem;
background: linear-gradient(to right,
background: linear-gradient(
to right,
rgba(204, 204, 204, 0.6),
rgba(0, 0, 0, 0));
rgba(0, 0, 0, 0)
);
}
}
@ -401,6 +405,7 @@ export default {
white-space: nowrap;
cursor: pointer;
font-weight: bold;
word-break: break-all;
}
span {
@ -412,9 +417,11 @@ export default {
.RankingListData:nth-of-type(1) i b {
width: 3.75rem;
background: linear-gradient(to right,
background: linear-gradient(
to right,
rgba(251, 59, 5, 0.6),
rgba(0, 0, 0, 0));
rgba(0, 0, 0, 0)
);
}
.RankingListData:nth-of-type(1) span {
@ -423,9 +430,11 @@ export default {
.RankingListData:nth-of-type(2) i b {
width: 3.125rem;
background: linear-gradient(to right,
background: linear-gradient(
to right,
rgba(251, 123, 5, 0.6),
rgba(0, 0, 0, 0));
rgba(0, 0, 0, 0)
);
}
.RankingListData:nth-of-type(2) span {
@ -434,9 +443,11 @@ export default {
.RankingListData:nth-of-type(3) i b {
width: 2.75rem;
background: linear-gradient(to right,
background: linear-gradient(
to right,
rgba(250, 179, 2, 0.6),
rgba(0, 0, 0, 0));
rgba(0, 0, 0, 0)
);
}
.RankingListData:nth-of-type(3) span {
@ -447,7 +458,8 @@ export default {
.AbnormalDistribution {
margin-right: 3.75rem;
.container-body1 {}
.container-body1 {
}
}
.AnomalyStatistics {
@ -472,12 +484,12 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-break: break-all;
}
::v-deep .el-table tbody tr:hover > td {
background-color: transparent;
}
}
.tablePagination {

View File

@ -1298,6 +1298,7 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
word-break: break-all;
}
div:last-child {
height: 30px;

View File

@ -135,8 +135,8 @@ export default {
jumpTo () {
this.$router.push({
path: 'activiti-my-work-dynamics'
});
},
})
}
}
}
</script>
@ -146,6 +146,7 @@ export default {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.bottom-view {

View File

@ -56,7 +56,7 @@ export default {
title: {
type: String,
default: ''
},
}
},
methods: {
formatNum (num) {
@ -65,8 +65,8 @@ export default {
goPage (url) {
this.$router.push({
path: url
});
},
})
}
}
}
</script>
@ -76,6 +76,7 @@ export default {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.no-margin-left {

View File

@ -113,6 +113,7 @@ export default {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.flex-row-between {