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-04 11:56:52 +08:00
parent 5ffeb562da 7303904f68
commit a2a4a5d92c
9 changed files with 123 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
back/src/views/modules/abilityStatistics/componentUsed.vue
View File

@ -21,7 +21,7 @@
</div> </div>
<div class='container-body4'> <div class='container-body4'>
<div style='margin-bottom:30px'> <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'> <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
</div> </div>
<div v-for="(item,index) in usedList" :key='index' > <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> <span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
</div> </div>
<span class='num-style'>{{item.name}}</span> <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>
</div> </div>
<div class='container-body5'> <div class='container-body5'>
<div style='margin-bottom:30px'> <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'> <img src="@/assets/img/TOP5.png" style='margin-left:10px'>
</div> </div>
<div v-for="(item,index) in applicationList" :key='index' > <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> <span style='font-weight:bold' :style="{color:numColorList[index%5]}">{{index+1}}</span>
</div> </div>
<span class='num-style'>{{item.name}}</span> <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> </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)',], 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'], widthList:['90px','80px','70px','60px','50px'],
numColorList:['#fc5656','#ff8a00','#f9af0a','#808fff','#808fff'], numColorList:['#fc5656','#ff8a00','#f9af0a','#808fff','#808fff'],
usedList:[{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:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},] applicationList:[{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称四',score:111},{name:'组件名称五',score:111},]
} }
}, },
created(){ created(){
@ -161,10 +161,10 @@ export default {
}, },
// 应用领域分布 // 应用领域分布
getDistributed () { getDistributed () {
this.$http.get('/census/center/v3/applicationAreaCapabilityList' ,{ this.$http.get('/census/center/v3/applicationUsedAreaCapabilityList' ,{
params : { params : {
id:this.tableId, id:this.tableId,
resourceType:"应用资源" resourceType:"组件服务"
} }
}).then(res => { }).then(res => {
let arry=[] let arry=[]
@ -182,22 +182,22 @@ export default {
}) })
}, },
// 被调用组件及数量 // top5使用组件
getBeCalled () { getBeCalled () {
this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{ this.$http.get('/census/center/v3/assemblerUseTopInfo' ,{
params : { params : {
id:this.tableId, id:this.tableId,
resourceType:"应用资源" resourceType:"组件服务"
// pageNo: pageNo || 1, // pageNo: pageNo || 1,
// pageSize: 20 // pageSize: 20
} }
}).then(res => { }).then(res => {
this.applicationList =res.data.data this.usedList =res.data.data
}) })
}, },
// 被申请组件及数量 // 使用组件评分5
getBeApplied () { getBeApplied () {
this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{ this.$http.get('/census/center/v3/assemblerUseScoreTopInfo' ,{
params : { params : {
id:this.tableId, id:this.tableId,
resourceType:"应用资源" resourceType:"应用资源"

40
back/src/views/modules/abilityStatistics/index.vue
View File

@ -50,46 +50,56 @@
label="部门名称" label="部门名称"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-if='this.departmentId===1'
prop="resourceNum" prop="resourceNum"
label="发布总数" label="发布总数"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if="this.choseId===0" <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceCarNum" prop="resourceCarNum"
label="被申请总数" label="被申请总数"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-if="this.departmentId===1"
prop="resourceBrowseNum" prop="resourceBrowseNum"
label="浏览总量" label="浏览总量"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-if="this.departmentId===1"
prop="resourceCollectionNum" prop="resourceCollectionNum"
label="收藏量" label="收藏量"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if="this.choseId===0" <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceVisits" prop="resourceVisits"
label="被调用总数" label="被调用总数"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if="this.choseId===0" <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceRelNum" prop="resourceRelNum"
label="被应用总数" label="被应用总数"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if="this.choseId===0" <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceShareNum" prop="resourceShareNum"
label="需申请数量" label="需申请数量"
min-width="100%"> min-width="100%">
</el-table-column> </el-table-column>
<el-table-column v-if="this.choseId===0" <el-table-column v-if="this.choseId===0 && this.departmentId===1 "
prop="resourceShareNonNum" prop="resourceShareNonNum"
label="免批数量" label="免批数量"
min-width="100%"> min-width="100%">
</el-table-column> </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 <el-table-column
label="操作" label="操作"
min-width="92%"> min-width="92%">
@ -118,7 +128,6 @@
</template> </template>
<script> <script>
import componentServices from './componentServices.vue' import componentServices from './componentServices.vue'
import componentUsed from './componentUsed.vue'
import applicationResources from './applicationResources.vue' import applicationResources from './applicationResources.vue'
import ComponentUsed from './componentUsed.vue' import ComponentUsed from './componentUsed.vue'
export default { export default {
@ -216,7 +225,7 @@ export default {
// pageSize: 20 // pageSize: 20
} }
}).then(res => { }).then(res => {
// this.tableData =res.data.data this.tableData =res.data.data
}) })
}, },
// // 获取部门列表 // // 获取部门列表
@ -244,7 +253,7 @@ export default {
resourceType:'组件服务' resourceType:'组件服务'
} }
}).then(res => { }).then(res => {
// this.tableData =res.data.data.list this.tableData =res.data.data.list
this.total = res.data.data.total this.total = res.data.data.total
}) })
}, },
@ -258,7 +267,7 @@ export default {
resourceType:'组件服务' resourceType:'组件服务'
} }
}).then(res => { }).then(res => {
// this.tableData =res.data.data.list this.tableData =res.data.data.list
}) })
}, },
@ -272,7 +281,7 @@ export default {
resourceType:'应用资源' resourceType:'应用资源'
} }
}).then(res => { }).then(res => {
// this.tableData =res.data.data.list this.tableData =res.data.data.list
this.total = res.data.data.total this.total = res.data.data.total
}) })
@ -287,7 +296,7 @@ export default {
resourceType:'应用资源' resourceType:'应用资源'
} }
}).then(res => { }).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.tableId=row.deptId
this.fatherId=1 this.fatherId=1
} }
else if(this.choseId===1){ } else if(this.choseId===1){
this.homeIsShow=false this.homeIsShow=false
this.resourcesIsShow=true this.resourcesIsShow=true
this.tableId=row.deptId this.tableId=row.deptId
this.fatherId=2 this.fatherId=2
} }
}
}, },

22
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-01 17:06:39 * @LastEditTime: 2022-07-02 00:01:06
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -28,10 +28,10 @@
<!-- 站点配置 --> <!-- 站点配置 -->
<script> <script>
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
// window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001'; window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/'; 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['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
// window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; 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['backUrl'] = 'http://10.110.205.1:8001';
// window.SITE_CONFIG['previewUrl'] = 'http://10.110.205.1:8002/'; // 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['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://15.2.21.238:9797';
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.238:8888/renren-admin'; // 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['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['backUrl'] = 'http://124.222.94.39:9797';
// window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/';

13
front/src/views/detailsAll/ApplicationDetails.vue
View File

@ -14,6 +14,7 @@
<!-- 导航 --> <!-- 导航 -->
<application-navigation <application-navigation
:dataList="dataList.data" :dataList="dataList.data"
:associatedComponents="associatedComponents"
:class="{ fixed: scrollTop >= 600 }" :class="{ fixed: scrollTop >= 600 }"
:selectNow="selectNow" :selectNow="selectNow"
></application-navigation> ></application-navigation>
@ -28,10 +29,11 @@
:dataList="dataList.data" :dataList="dataList.data"
id="application-associated-components" id="application-associated-components"
class="scrollBox" class="scrollBox"
v-if="false"
></application-associated-components> ></application-associated-components>
<!-- 关联能力 --> <!-- 关联能力 -->
<application-associated-ability <application-associated-ability
:associatedComponents="associatedComponents" :associatedComponents="associatedComponentsFunction()"
id="application-associated-ability" id="application-associated-ability"
class="scrollBox" class="scrollBox"
></application-associated-ability> ></application-associated-ability>
@ -170,6 +172,15 @@
console.log('预览==============', obj) 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) init(id)
onBeforeUnmount(() => { onBeforeUnmount(() => {
mybus.off('flyToView') mybus.off('flyToView')

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

@ -127,7 +127,6 @@
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 (navList.value.filter((item) => item.name === list.value[0])[0]) {
debugger
select.value = navList.value.filter( select.value = navList.value.filter(
(item) => item.name === list.value[0] (item) => item.name === list.value[0]
)[0].key )[0].key

31
front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
View File

@ -47,19 +47,36 @@
}) })
} }
if (props.associatedComponents) { if (props.associatedComponents) {
flag.value = true if (
dataFrom.value = props.associatedComponents props.associatedComponents[0].dataList.length > 0 ||
console.log('dataFrom.value', dataFrom.value) 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 { } else {
flag.value = false flag.value = false
} }
watch( watch(
() => props.associatedComponents, () => props.associatedComponents,
(val) => { (val) => {
if (val) { if (props.associatedComponents) {
flag.value = true if (
dataFrom.value = props.associatedComponents val[0].dataList.length > 0 ||
console.log('dataFrom.value', dataFrom.value) 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 { } else {
flag.value = false flag.value = false
} }

33
front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
View File

@ -32,10 +32,10 @@
name: '功能介绍', name: '功能介绍',
key: 'function-introduction', key: 'function-introduction',
}, },
{ // {
name: '关联组件', // name: '关联组件',
key: 'application-associated-components', // key: 'application-associated-components',
}, // },
{ {
name: '关联组件', name: '关联组件',
key: 'application-associated-ability', key: 'application-associated-ability',
@ -60,6 +60,7 @@
const props = defineProps({ const props = defineProps({
selectNow: { type: String, default: '' }, selectNow: { type: String, default: '' },
dataList: { type: Object, default: null }, dataList: { type: Object, default: null },
associatedComponents: { type: Array, default: null },
}) })
const select = ref('algorithm-display') const select = ref('algorithm-display')
const list = ref([]) const list = ref([])
@ -85,7 +86,17 @@
navList.value.forEach((item) => { navList.value.forEach((item) => {
console.log(item) console.log(item)
if (list.value.indexOf(item.name) > -1) { 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( select.value = navList.value.filter(
@ -122,7 +133,17 @@
navList.value.forEach((item) => { navList.value.forEach((item) => {
console.log(item) console.log(item)
if (list.value.indexOf(item.name) > -1) { 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) { if (list.value.length > 0) {

14
front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
View File

@ -73,9 +73,12 @@
item.attrType === '服务商' || item.attrType === '服务商' ||
item.attrType === '服务商联系人' || 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 dataFrom.value.content[1].childrenContent[0] = item
if (dataFrom.value.content[1].childrenContent[0].attrValue == '') { if (dataFrom.value.content[1].childrenContent[0].attrValue == '') {
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 === '服务商联系电话' || 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) dataFrom.value.content[1].childrenContent.push(item)
if ( if (
dataFrom.value.content[1].childrenContent[0].attrValue == '' dataFrom.value.content[1].childrenContent[0].attrValue == ''

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

@ -425,7 +425,7 @@
applySuccess.value = false applySuccess.value = false
message.success('操作成功！') message.success('操作成功！')
console.log('能力申请================>', res) console.log('能力申请================>', res)
if (ids) { if (ids && ids.length>0) {
sgcDel({ ids: ids }).then((res) => { sgcDel({ ids: ids }).then((res) => {
if (res.data.msg === 'success') { if (res.data.msg === 'success') {
mybus.emit('getSgcNum') mybus.emit('getSgcNum')