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
commit
a2a4a5d92c
|
|
@ -21,7 +21,7 @@
|
|||
</div>
|
||||
<div class='container-body4'>
|
||||
<div style='margin-bottom:30px'>
|
||||
<span style='font-size:18px;color;#000000;'>被调用组件及数量</span>
|
||||
<span style='font-size:18px;color;#000000;'>Top5使用组件</span>
|
||||
<img src="@/assets/img/TOP5.png" style='margin-left:10px'>
|
||||
</div>
|
||||
<div v-for="(item,index) in usedList" :key='index' >
|
||||
|
|
@ -30,13 +30,13 @@
|
|||
<span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
|
||||
</div>
|
||||
<span class='num-style'>{{item.name}}</span>
|
||||
<span class='count-style' :style="{color:numColorList[index%5]}">{{item.resourceCarNum}}</span>
|
||||
<span class='count-style' :style="{color:numColorList[index%5]}">{{item.useNum}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='container-body5'>
|
||||
<div style='margin-bottom:30px'>
|
||||
<span style='font-size:18px;color;#000000;'>被申请组件及数量</span>
|
||||
<span style='font-size:18px;color;#000000;'>使用组件评分Top5</span>
|
||||
<img src="@/assets/img/TOP5.png" style='margin-left:10px'>
|
||||
</div>
|
||||
<div v-for="(item,index) in applicationList" :key='index' >
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
|
||||
</div>
|
||||
<span class='num-style'>{{item.name}}</span>
|
||||
<span class='count-style' :style="{color:numColorList[index%5]}">{{item.resourceCarNum}}</span>
|
||||
<span class='count-style' :style="{color:numColorList[index%5]}">{{item.score}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -86,8 +86,8 @@ export default {
|
|||
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:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},],
|
||||
applicationList:[{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum: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(){
|
||||
|
|
@ -161,10 +161,10 @@ export default {
|
|||
},
|
||||
// 应用领域分布
|
||||
getDistributed () {
|
||||
this.$http.get('/census/center/v3/applicationAreaCapabilityList' ,{
|
||||
this.$http.get('/census/center/v3/applicationUsedAreaCapabilityList' ,{
|
||||
params : {
|
||||
id:this.tableId,
|
||||
resourceType:"应用资源"
|
||||
resourceType:"组件服务"
|
||||
}
|
||||
}).then(res => {
|
||||
let arry=[]
|
||||
|
|
@ -182,22 +182,22 @@ export default {
|
|||
})
|
||||
|
||||
},
|
||||
// 被调用组件及数量
|
||||
// top5使用组件
|
||||
getBeCalled () {
|
||||
this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
|
||||
this.$http.get('/census/center/v3/assemblerUseTopInfo' ,{
|
||||
params : {
|
||||
id:this.tableId,
|
||||
resourceType:"应用资源"
|
||||
resourceType:"组件服务"
|
||||
// pageNo: pageNo || 1,
|
||||
// pageSize: 20
|
||||
}
|
||||
}).then(res => {
|
||||
this.applicationList =res.data.data
|
||||
this.usedList =res.data.data
|
||||
})
|
||||
},
|
||||
// 被申请组件及数量
|
||||
// 使用组件评分5
|
||||
getBeApplied () {
|
||||
this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
|
||||
this.$http.get('/census/center/v3/assemblerUseScoreTopInfo' ,{
|
||||
params : {
|
||||
id:this.tableId,
|
||||
resourceType:"应用资源"
|
||||
|
|
|
|||
|
|
@ -50,46 +50,56 @@
|
|||
label="部门名称"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
<el-table-column v-if='this.departmentId===1'
|
||||
prop="resourceNum"
|
||||
label="发布总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.choseId===0"
|
||||
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
|
||||
prop="resourceCarNum"
|
||||
label="被申请总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
<el-table-column v-if="this.departmentId===1"
|
||||
prop="resourceBrowseNum"
|
||||
label="浏览总量"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
<el-table-column v-if="this.departmentId===1"
|
||||
prop="resourceCollectionNum"
|
||||
label="收藏量"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.choseId===0"
|
||||
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
|
||||
prop="resourceVisits"
|
||||
label="被调用总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.choseId===0"
|
||||
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
|
||||
prop="resourceRelNum"
|
||||
label="被应用总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.choseId===0"
|
||||
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
|
||||
prop="resourceShareNum"
|
||||
label="需申请数量"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.choseId===0"
|
||||
<el-table-column v-if="this.choseId===0 && this.departmentId===1 "
|
||||
prop="resourceShareNonNum"
|
||||
label="免批数量"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.departmentId===2"
|
||||
prop="resourceUseNum"
|
||||
label="使用总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.departmentId===2"
|
||||
prop="resourceCarNum"
|
||||
label="申请总数"
|
||||
min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
min-width="92%">
|
||||
|
|
@ -118,7 +128,6 @@
|
|||
</template>
|
||||
<script>
|
||||
import componentServices from './componentServices.vue'
|
||||
import componentUsed from './componentUsed.vue'
|
||||
import applicationResources from './applicationResources.vue'
|
||||
import ComponentUsed from './componentUsed.vue'
|
||||
export default {
|
||||
|
|
@ -216,7 +225,7 @@ export default {
|
|||
// pageSize: 20
|
||||
}
|
||||
}).then(res => {
|
||||
// this.tableData =res.data.data
|
||||
this.tableData =res.data.data
|
||||
})
|
||||
},
|
||||
// // 获取部门列表
|
||||
|
|
@ -244,7 +253,7 @@ export default {
|
|||
resourceType:'组件服务'
|
||||
}
|
||||
}).then(res => {
|
||||
// this.tableData =res.data.data.list
|
||||
this.tableData =res.data.data.list
|
||||
this.total = res.data.data.total
|
||||
})
|
||||
},
|
||||
|
|
@ -258,7 +267,7 @@ export default {
|
|||
resourceType:'组件服务'
|
||||
}
|
||||
}).then(res => {
|
||||
// this.tableData =res.data.data.list
|
||||
this.tableData =res.data.data.list
|
||||
|
||||
})
|
||||
},
|
||||
|
|
@ -272,7 +281,7 @@ export default {
|
|||
resourceType:'应用资源'
|
||||
}
|
||||
}).then(res => {
|
||||
// this.tableData =res.data.data.list
|
||||
this.tableData =res.data.data.list
|
||||
this.total = res.data.data.total
|
||||
|
||||
})
|
||||
|
|
@ -287,7 +296,7 @@ export default {
|
|||
resourceType:'应用资源'
|
||||
}
|
||||
}).then(res => {
|
||||
// this.tableData =res.data.data.list
|
||||
this.tableData =res.data.data.list
|
||||
|
||||
})
|
||||
},
|
||||
|
|
@ -304,13 +313,12 @@ export default {
|
|||
this.tableId=row.deptId
|
||||
this.fatherId=1
|
||||
}
|
||||
else if(this.choseId===1){
|
||||
} else if(this.choseId===1){
|
||||
this.homeIsShow=false
|
||||
this.resourcesIsShow=true
|
||||
this.tableId=row.deptId
|
||||
this.fatherId=2
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<!--
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-03-29 16:45:25
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-07-01 17:06:39
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-07-02 00:01:06
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
|
|
@ -28,10 +28,10 @@
|
|||
<!-- 站点配置 -->
|
||||
<script>
|
||||
window.SITE_CONFIG = {};
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
// 包头
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/';
|
||||
|
|
@ -44,11 +44,11 @@
|
|||
// 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['backUrl'] = 'http://15.2.21.238:9797';
|
||||
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['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
|
||||
// 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['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 穿透版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
<!-- 导航 -->
|
||||
<application-navigation
|
||||
:dataList="dataList.data"
|
||||
:associatedComponents="associatedComponents"
|
||||
:class="{ fixed: scrollTop >= 600 }"
|
||||
:selectNow="selectNow"
|
||||
></application-navigation>
|
||||
|
|
@ -28,10 +29,11 @@
|
|||
:dataList="dataList.data"
|
||||
id="application-associated-components"
|
||||
class="scrollBox"
|
||||
v-if="false"
|
||||
></application-associated-components>
|
||||
<!-- 关联能力 -->
|
||||
<application-associated-ability
|
||||
:associatedComponents="associatedComponents"
|
||||
:associatedComponents="associatedComponentsFunction()"
|
||||
id="application-associated-ability"
|
||||
class="scrollBox"
|
||||
></application-associated-ability>
|
||||
|
|
@ -170,6 +172,15 @@
|
|||
console.log('预览==============', obj)
|
||||
}
|
||||
}
|
||||
const associatedComponentsFunction = () => {
|
||||
if (
|
||||
associatedComponents.value[0].dataList.length > 0 ||
|
||||
associatedComponents.value[1].dataList.length > 0 ||
|
||||
associatedComponents.value[2].dataList.length > 0
|
||||
) {
|
||||
return associatedComponents.value
|
||||
}
|
||||
}
|
||||
init(id)
|
||||
onBeforeUnmount(() => {
|
||||
mybus.off('flyToView')
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@
|
|||
navList.value.filter((item) => item.name === list.value[0])
|
||||
)
|
||||
if (navList.value.filter((item) => item.name === list.value[0])[0]) {
|
||||
debugger
|
||||
select.value = navList.value.filter(
|
||||
(item) => item.name === list.value[0]
|
||||
)[0].key
|
||||
|
|
|
|||
|
|
@ -47,19 +47,36 @@
|
|||
})
|
||||
}
|
||||
if (props.associatedComponents) {
|
||||
flag.value = true
|
||||
dataFrom.value = props.associatedComponents
|
||||
console.log('dataFrom.value', dataFrom.value)
|
||||
if (
|
||||
props.associatedComponents[0].dataList.length > 0 ||
|
||||
props.associatedComponents[1].dataList.length > 0 ||
|
||||
props.associatedComponents[2].dataList.length > 0
|
||||
) {
|
||||
flag.value = true
|
||||
dataFrom.value = props.associatedComponents
|
||||
console.log('dataFrom.value', dataFrom.value)
|
||||
} else {
|
||||
flag.value = false
|
||||
}
|
||||
} else {
|
||||
flag.value = false
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.associatedComponents,
|
||||
(val) => {
|
||||
if (val) {
|
||||
flag.value = true
|
||||
dataFrom.value = props.associatedComponents
|
||||
console.log('dataFrom.value', dataFrom.value)
|
||||
if (props.associatedComponents) {
|
||||
if (
|
||||
val[0].dataList.length > 0 ||
|
||||
val[1].dataList.length > 0 ||
|
||||
val[2].dataList.length > 0
|
||||
) {
|
||||
flag.value = true
|
||||
dataFrom.value = props.associatedComponents
|
||||
// console.log('dataFrom.value', dataFrom.value)
|
||||
} else {
|
||||
flag.value = false
|
||||
}
|
||||
} else {
|
||||
flag.value = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
name: '功能介绍',
|
||||
key: 'function-introduction',
|
||||
},
|
||||
{
|
||||
name: '关联组件',
|
||||
key: 'application-associated-components',
|
||||
},
|
||||
// {
|
||||
// name: '关联组件',
|
||||
// key: 'application-associated-components',
|
||||
// },
|
||||
{
|
||||
name: '关联组件',
|
||||
key: 'application-associated-ability',
|
||||
|
|
@ -60,6 +60,7 @@
|
|||
const props = defineProps({
|
||||
selectNow: { type: String, default: '' },
|
||||
dataList: { type: Object, default: null },
|
||||
associatedComponents: { type: Array, default: null },
|
||||
})
|
||||
const select = ref('algorithm-display')
|
||||
const list = ref([])
|
||||
|
|
@ -85,7 +86,17 @@
|
|||
navList.value.forEach((item) => {
|
||||
console.log(item)
|
||||
if (list.value.indexOf(item.name) > -1) {
|
||||
item.show = true
|
||||
if (item.name == '关联组件') {
|
||||
if (
|
||||
props.associatedComponents[0].dataList.length != 0 ||
|
||||
props.associatedComponents[1].dataList.length != 0 ||
|
||||
props.associatedComponents[2].dataList.length != 0
|
||||
) {
|
||||
item.show = true
|
||||
}
|
||||
} else {
|
||||
item.show = true
|
||||
}
|
||||
}
|
||||
})
|
||||
select.value = navList.value.filter(
|
||||
|
|
@ -122,7 +133,17 @@
|
|||
navList.value.forEach((item) => {
|
||||
console.log(item)
|
||||
if (list.value.indexOf(item.name) > -1) {
|
||||
item.show = true
|
||||
if (item.name == '关联组件') {
|
||||
if (
|
||||
props.associatedComponents[0].dataList.length != 0 ||
|
||||
props.associatedComponents[1].dataList.length != 0 ||
|
||||
props.associatedComponents[2].dataList.length != 0
|
||||
) {
|
||||
item.show = true
|
||||
}
|
||||
} else {
|
||||
item.show = true
|
||||
}
|
||||
}
|
||||
})
|
||||
if (list.value.length > 0) {
|
||||
|
|
|
|||
|
|
@ -73,9 +73,12 @@
|
|||
item.attrType === '服务商' ||
|
||||
item.attrType === '服务商联系人' ||
|
||||
item.attrType === '服务商联系电话' ||
|
||||
item.attrType === '服务商名'
|
||||
item.attrType.indexOf('服务商名') != -1
|
||||
) {
|
||||
if (item.attrType === '服务商' || item.attrType === '服务商名') {
|
||||
if (
|
||||
item.attrType === '服务商' ||
|
||||
item.attrType.indexOf('服务商名') != -1
|
||||
) {
|
||||
dataFrom.value.content[1].childrenContent[0] = item
|
||||
if (dataFrom.value.content[1].childrenContent[0].attrValue == '') {
|
||||
dataFrom.value.content[1].childrenContent[0].attrValue = '------'
|
||||
|
|
@ -121,9 +124,12 @@
|
|||
item.attrType === '服务商' ||
|
||||
item.attrType === '服务商联系人' ||
|
||||
item.attrType === '服务商联系电话' ||
|
||||
item.attrType === '服务商名'
|
||||
item.attrType.indexOf('服务商名') != -1
|
||||
) {
|
||||
if (item.attrType === '服务商' || item.attrType === '服务商名') {
|
||||
if (
|
||||
item.attrType === '服务商' ||
|
||||
item.attrType.indexOf('服务商名') != -1
|
||||
) {
|
||||
dataFrom.value.content[1].childrenContent.push(item)
|
||||
if (
|
||||
dataFrom.value.content[1].childrenContent[0].attrValue == ''
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@
|
|||
applySuccess.value = false
|
||||
message.success('操作成功！')
|
||||
console.log('能力申请================>', res)
|
||||
if (ids) {
|
||||
if (ids && ids.length>0) {
|
||||
sgcDel({ ids: ids }).then((res) => {
|
||||
if (res.data.msg === 'success') {
|
||||
mybus.emit('getSgcNum')
|
||||
|
|
|
|||
Loading…
Reference in New Issue