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

This commit is contained in:
gaoyuanwei 2022-07-04 17:18:23 +08:00
commit 60bd1daf9b
20 changed files with 381 additions and 229 deletions

View File

@ -48,7 +48,7 @@
</div>
<div class='container-body8'>
<span style='font-size:18px;color;#000000;'>应用领域分布情况</span>
<div id="main8" style="width: 300px;height:200px;"></div>
<div id="main8" style="width: 300px;height:200px;margin-left:-20px;"></div>
</div>
<div class='container-body9'>
<span style='font-size:18px;color;#000000;'>应用状态分布情况</span>
@ -114,8 +114,9 @@ export default {
getDistributedList () {
this.$http.get('/census/center/v3/assemblerUseProjectInfo/' ,{
params : {
keyId:'1522550195034857476'
// this.tableId
id:
// '1522550195034857476'
this.tableId
}
}).then(res => {
let arry=[]
@ -147,8 +148,8 @@ export default {
arry=res.data.data
arry.forEach((item)=>{
const single={
value:item.useNum,
name:item.name
value:item.appNum,
name:item.attr_value
}
this.data3.push(single.name)
this.data4.push(single.value)
@ -377,7 +378,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -599,7 +600,7 @@ export default {
},
series: [
{
data: [5, 5, 5, 5, 5, 5],
data: [1, 1, 1, 1, 1, 1],
type: 'bar',
barWidth: 14,
stack: '1',
@ -654,7 +655,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -725,7 +726,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -804,7 +805,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -822,9 +823,9 @@ export default {
a: {
//
width: 80,
color: "#000000",
color: "#666666",
fontSize: 12,
fontWeight: "bolder",
// fontWeight: "bolder",
},
b: {
// 102030
@ -899,7 +900,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}

View File

@ -200,7 +200,7 @@ export default {
this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{
params : {
id:this.tableId,
resourceType:"应用资源"
resourceType:"组件服务"
// pageNo: pageNo || 1,
// pageSize: 20
}
@ -231,7 +231,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -295,7 +295,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -361,7 +361,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -377,9 +377,9 @@ export default {
a: {
//
width: 100,
color: "#000000",
color: "#666666",
fontSize: 12,
fontWeight: "bolder",
// fontWeight: "bolder",
},
b: {
// 102030

View File

@ -17,11 +17,11 @@
</div>
<div class='container-body3'>
<span style='font-size:18px;color;#000000;'>使用组件应用领域分布情况</span>
<div id="main8" style="width: 400px;height:200px;"></div>
<div id="main3" style="width: 400px;height:200px;"></div>
</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;'>使用组件评分</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=[]
@ -174,30 +174,28 @@ export default {
value:item.total,
name:item.type
}
const newList=[]
this.data3.push(single)
// this.data2=newList
this.myEcharts3()
})
})
},
//
// 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:"应用资源"
@ -231,7 +229,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -295,7 +293,7 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
@ -361,13 +359,14 @@ export default {
var total = 0;
var tarValue;
for (var i = 0; i < data.length; i++) {
total += data[i].value;
total += Number(data[i].value);
if (data[i].name == name) {
tarValue = data[i].value;
}
}
var v = tarValue;
// var v = tarValue;
var p = Math.round(((tarValue / total) * 100));
console.log('@@@@', tarValue, total)
return `{a|${name}} {b|${p}%}`;
},
itemStyle:{},
@ -428,7 +427,7 @@ export default {
option && myChart.setOption(option);
},
backBtn(){
this.$emit('closeChild')
this.$emit('closeChild2')
}
}
}
@ -541,9 +540,13 @@ export default {
position:absolute;
display: flex;
margin-left:90px;
width:200px;
margin-top:5px;
color:#333333;
font-size: 16px;
font-size: 16px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.count-style{
position:absolute;

View File

@ -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="resourceCallNum"
label="申请总数"
min-width="100%">
</el-table-column>
<el-table-column
label="操作"
min-width="92%">
@ -111,14 +121,13 @@
</div>
</el-card>
</div>
<component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-used>
<component-used v-if='UsedIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild2='closeChild2'></component-used>
<component-services v-if='servicesIsShow' :tableId='tableId' :fatherId='fatherId' @closeChild='closeChild'></component-services>
<application-resources v-if='resourcesIsShow' :tableId='tableId' :fatherId='fatherId' @closeApplication='closeApplication'></application-resources>
</div>
</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
}
}
},
@ -354,10 +362,18 @@ export default {
closeChild(){
this.homeIsShow=true
this.servicesIsShow=false
this. handleCurrentChange(1)
},
closeChild2(){
this.homeIsShow=true
this.UsedIsShow=false
this. handleCurrentChange(1)
},
closeApplication(){
this.homeIsShow=true
this.resourcesIsShow=false
this. handleCurrentChange(1)
}
},

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-29 15:59:51
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-01 09:29:57
* @LastEditTime: 2022-07-04 16:17:22
* @Description: 告诉大家这是什么
-->
<!-- 流程业务表单 -->
@ -157,6 +157,7 @@ export default {
})
},
downloadFile2 (url) {
console.log(window.SITE_CONFIG.previewUrl)
window.open(
window.SITE_CONFIG.previewUrl +
'hisense_office/onlinePreview?url=' +

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-01 17:06:39
* @LastEditTime: 2022-07-04 14:13:57
* @Description: 告诉大家这是什么
-->
<!DOCTYPE html>
@ -48,7 +48,7 @@
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['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/';

View File

@ -2,7 +2,7 @@
* @Author: hisense.zhangfeihu
* @Date: 2022-06-13 10:22:27
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-06-20 18:58:40
* @LastEditTime: 2022-07-04 15:32:52
* @Description: 赋能案例-详情页
-->
<template>
@ -172,7 +172,9 @@
watch(
() => router.currentRoute.value.query.id,
() => {
init()
if (router.currentRoute.value.name == 'AssignCaseDetailPage') {
init()
}
},
{ immediate: true }
)

View File

@ -315,7 +315,6 @@
height: 20px;
background: url(../../../assets/assignCase/left.png) no-repeat
center;
margin-top: 30px;
transform: rotate(-90deg);
}
@ -343,6 +342,10 @@
color: #333333;
margin-right: 30px;
cursor: pointer;
display: inline-block;
line-height: 30px;
padding: 5px 10px;
border-radius: 0.16rem;
}
span:nth-of-type(8n) {
margin-right: 50px;

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-01 20:11:33
* @LastEditTime: 2022-07-01 20:34:36
* @Description: 上架
-->
<template>
@ -62,9 +62,9 @@
<span>{{ item.name }}</span>
<a-input v-if="item.type == 'input'" v-model:value="item.note1" :placeholder="'请输入' + item.name" />
<a-radio-group v-else-if="item.type == 'radio'" v-model:value="item.note1" :options="item.options" />
<a-input v-if="item.type == 'text'" v-model:value="item.note1" :placeholder="'请输入' + item.name"
<a-input v-else-if="item.type == 'text'" v-model:value="item.note1" :placeholder="'请输入' + item.name"
:disabled="true" />
<a-input v-if="item.type == 'text2'" v-model:value="item.note1" :placeholder="'请输入' + item.name"
<a-input v-else-if="item.type == 'text2'" v-model:value="item.note1" :placeholder="'请输入' + item.name"
:disabled="true" />
<a-textarea v-else-if="item.type == 'textArea'" v-model:value="item.note1" :showCount="true"
:maxlength="200" :placeholder="'请输入' + item.name" />
@ -76,7 +76,7 @@
:list="props.fileList2" tip="支持文件类型大小不超过100M"></upload>
<upload v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :data="item"
:list="props.videoList" tip="支持视频类型大小不超过100M"></upload>
<a-button v-else-if="item.type == 'dialog'" @click="sourceClick(title.name)">
<a-button v-else-if="item.type == 'dialog'" @click="sourceClick">
请选择来源应用
</a-button>
<a-select v-else-if="item.type == 'select'" style="width: 240px" v-model:value="item.note1"

View File

@ -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')

View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.liangjunhua
* @Date: 2022-06-08 14:54:01
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-30 17:09:40
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-04 10:08:10
* @Description: 算法详情页导航
-->
<template>
@ -65,19 +65,21 @@
])
const list = ref([])
// id
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
//
navList.value.unshift({
name: '关联应用',
key: 'algorithm-associated-ability',
show: true,
})
// list.value.push('')
console.log('navList', navList)
}
})
if (keyId) {
queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
console.log('ressssssss', res)
if (res.data.data.length > 0) {
//
navList.value.unshift({
name: '关联应用',
key: 'algorithm-associated-ability',
show: true,
})
// list.value.push('')
console.log('navList', navList)
}
})
}
const props = defineProps({
selectNow: { type: String, default: '' },
dataList: { type: Object, default: null },
@ -125,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

View File

@ -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
}

View File

@ -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) {

View File

@ -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 == ''

View File

@ -1,6 +1,10 @@
<template>
<div class="ability-to-apply-for">
<div class="title">申请能力</div>
<div class="ability-to-apply-for" :class="{ all: falg }">
<div class="title">
<span>申请能力</span>
<span class="btn" @click="falg = !falg" v-show="!falg">展开</span>
<span class="btn" @click="falg = !falg" v-show="falg">收起</span>
</div>
<div
v-for="(item, index) in dataForm"
:key="index"
@ -12,20 +16,38 @@
</div>
<template v-for="val in item.arr" :key="val.resourceId">
<div class="item">
<div class="name">
<span>{{ val.resourceName }}</span>
<span>{{ val.type }}</span>
</div>
<div class="description">
{{
val.description ||
(val.note1 &&
JSON.parse(val.note1)[0].channelName +
'等' +
JSON.parse(val.note1).length +
'个摄像头') ||
'--'
}}
<div
class="tx"
:class="
val.type == '基础设施'
? 'sxt'
: val.componentType == '智能算法'
? 'znsf'
: val.componentType == '图层服务'
? 'tcfw'
: val.componentType == '开发组件'
? 'kfzj'
: val.componentType == '业务组件'
? 'ywzj'
: ''
"
></div>
<div class="text">
<div class="name">
<span>{{ val.resourceName }}</span>
<span>{{ val.type }}</span>
</div>
<div class="description">
{{
val.description ||
(val.note1 &&
JSON.parse(val.note1)[0].channelName +
'等' +
JSON.parse(val.note1).length +
'个摄像头') ||
'--'
}}
</div>
</div>
<div class="remove" @click="removeFunction(val)"></div>
</div>
@ -35,27 +57,29 @@
</template>
<script setup>
import { useRouter } from 'vue-router'
// import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
import { ref, defineProps } from 'vue'
import mybus from '@/myplugins/mybus'
// import mybus from '@/myplugins/mybus'
const props = defineProps({
dataList: { type: Array, default: null },
})
const falg = ref(false)
let dataForm = ref([])
// eslint-disable-next-line vue/no-setup-props-destructure
dataForm.value = props.dataList
const router = useRouter()
const arr =
router.currentRoute.value.query.name instanceof Array
? router.currentRoute.value.query.name
: [router.currentRoute.value.query.name]
const dataResourceId = router.currentRoute.value.query.resourceId
console.log(dataForm.value)
// const router = useRouter()
// const arr =
// router.currentRoute.value.query.name instanceof Array
// ? router.currentRoute.value.query.name
// : [router.currentRoute.value.query.name]
// const dataResourceId = router.currentRoute.value.query.resourceId
const depList = ref({
Name: [],
depID: [],
})
// const depList = ref({
// Name: [],
// depID: [],
// })
//
const removeFunction = (data) => {
dataForm.value.map((val) => {
@ -71,25 +95,26 @@
<style scoped lang="less">
.ability-to-apply-for {
height: 2.9rem;
overflow: hidden;
.title {
font-size: 0.16rem;
color: #212121;
border-bottom: 0.01rem #dddee1 solid;
padding-bottom: 0.1rem;
margin-bottom: 0.2rem;
display: flex;
justify-content: space-between;
}
.ability-to-apply-for-content {
// margin-bottom: 0.3rem;
// border-bottom: 0.01rem #dddee1 solid;
// padding-bottom: 0.3rem;
padding-right: 0.5rem;
position: relative;
.dep-name {
color: #0558e1;
font-size: 0.18rem;
font-size: 0.22rem;
display: flex;
align-items: center;
line-height: 0.18rem;
line-height: 0.22rem;
margin-bottom: 0.2rem;
span {
display: inline-block;
@ -104,14 +129,19 @@
padding-bottom: 0.1rem;
margin-bottom: 0.1rem;
border-bottom: 1px solid #dddee1;
position: relative;
display: flex;
align-items: center;
.text {
margin-left: 0.2rem;
width: 8.8rem;
}
}
.name {
margin-bottom: 0.2rem;
span:first-child {
display: inline-block;
margin-right: 0.08rem;
font-size: 0.2rem;
font-size: 0.18rem;
color: #000000;
}
span:last-child {
@ -122,16 +152,13 @@
}
}
.description {
width: 10rem;
width: 8.8rem;
color: rgba(0, 0, 0, 0.45);
}
.remove {
margin-left: 0.1rem;
width: 0.32rem;
height: 0.32rem;
position: absolute;
right: 0;
top: 50%;
margin-top: -0.16rem;
background: url('~@/assets/home/remove.png') no-repeat;
background-size: cover;
cursor: pointer;
@ -142,4 +169,37 @@
}
}
}
.all {
height: unset;
min-height: 2.9rem;
}
.btn {
cursor: pointer;
}
.tx {
display: inline-block;
width: 0.8rem;
height: 0.8rem;
margin-left: 0.1rem;
}
.sxt {
background: url('~@/assets/home/sxt_square.png') no-repeat;
background-size: 100%;
}
.znsf {
background: url('~@/assets/home/znsf_square.png') no-repeat;
background-size: 100%;
}
.tcfw {
background: url('~@/assets/home/tcfw_square.png') no-repeat;
background-size: 100%;
}
.kfzj {
background: url('~@/assets/home/kfzj_square.png') no-repeat;
background-size: 100%;
}
.ywzj {
background: url('~@/assets/home/ywzj_square.png') no-repeat;
background-size: 100%;
}
</style>

View File

@ -118,9 +118,10 @@
name="applicationBackground"
:rules="[{ required: true, message: '请输入应用背景' }]"
>
<a-input
<a-textarea
placeholder="请输入应用背景"
v-model:value="formName.applicationBackground"
:rows="4"
/>
</a-form-item>
</div>
@ -130,9 +131,10 @@
name="effectWish"
:rules="[{ required: true, message: '请输入期望效果' }]"
>
<a-input
<a-textarea
placeholder="请输入期望效果"
v-model:value="formName.effectWish"
:rows="4"
/>
</a-form-item>
</div>
@ -173,7 +175,7 @@
</a-upload>
</a-form-item>
<a-form-item :wrapper-col="{ offset: 8, span: 16 }">
<div class="bottom-btn">
<a-button
style="
width: 80px;
@ -211,7 +213,7 @@
>
提交申请
</a-button>
</a-form-item>
</div>
</a-form>
</div>
<div class="success" v-else>
@ -265,11 +267,32 @@
setup() {
const router = useRouter()
const disabled = ref(false)
const list = ref(JSON.parse(localStorage.getItem('applyList')))
const num = ref(0)
list.value.map((item) => {
if (item.checkedList) {
console.log(item)
num.value += Number(item.checkedList.length)
}
})
console.log(
'list',
list.value,
list.value[0].children.filter(
(val) => val.id == list.value[0].checkedList[0]
)[0].resourceName
)
const baseURL = window.SITE_CONFIG.apiURL
let record = ref('1')
const text = ref('')
const formName = reactive({
title: '', //
title: list.value[0].children
.filter((val) => val.id == list.value[0].checkedList[0])[0]
.resourceName.concat(
list.value[0].checkedList.length > 0
? '等能力申请' + num.value + '个'
: '能力申请'
), //
applicationSystem: [], //
applicationScene: [], //
applicationBackground: '', //
@ -292,7 +315,6 @@
formName.unit = res.data.data.deptName
})
})
const list = ref(JSON.parse(localStorage.getItem('applyList')))
// console.log('====================', list.value)
const businessKey = ref(router.currentRoute.value.query.id)
const taskId = ref(router.currentRoute.value.query.taskId)
@ -423,7 +445,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')
@ -504,6 +526,7 @@
},
])
const systemOptions = ref([])
const systemOptions2 = ref([])
const handleChange = (info) => {
if (info.file.status !== 'uploading') {
@ -536,83 +559,50 @@
return isPNG || Upload.LIST_IGNORE
}
const fileList = ref([])
//arr
// mybus.on('reomveOldData', (item) => {
// debugger
// arr = []
// formName.system = []
// record.value = record.value + '1'
// arr = item.Name
// // dataResourceId = item.depID
// if (arr && arr.length !== 0) {
// disabled.value = true
// let str = ''
// arr.forEach((val, index) => {
// str += val
// if (index < arr.length - 1) {
// str += ''
// }
// })
// formName.formNameSystem = str
// }
// arr.forEach((val, index) => {
// formName.system.push({
// resourceName: val,
// // resourceId: dataResourceId[index],
// })
// })
// })
//
const flag = ref(true)
const systemHandleChange = (value) => {
console.log(`selected ${value}`)
}
const systemHandleSearch = (value) => {
console.log(`search ${value}`)
text.value = value
systemOptions.value = []
window.setTimeout(() => {
if (flag.value && text.value == value && text.value !== '') {
console.log('1秒未输入~~~~~~~~~~~~~~~~~~~~~~~~~~')
pageWithAttrs({
pageNum: 99999,
pageSize: 5,
type: '应用资源',
name: text.value,
infoList: [],
}).then((res) => {
if (res.data.code == 0) {
if (res.data.data.records.length == 0) {
message.warning('该关键词,暂无应用资源!')
} else {
res.data.data.records.map((val) => {
systemOptions.value.push({
value: val.name,
label: val.name,
})
})
console.log(
'第一次获取===================>',
systemOptions.value
)
}
} else {
message.error('获取数据失败!')
}
})
}
}, 2000)
systemOptions.value = systemOptions2.value.filter(
(item) => item.label.search(text.value) > -1
)
}
pageWithAttrs({
pageNum: 1,
pageSize: 99999,
type: '应用资源',
name: '',
infoList: [],
}).then((res) => {
if (res.data.code == 0) {
if (res.data.data.records.length == 0) {
message.warning('该关键词,暂无应用资源!')
} else {
res.data.data.records.map((val) => {
systemOptions2.value.push({
value: val.name,
label: val.name,
})
})
// console.log('===================>', systemOptions2.value)
}
} else {
message.error('应用系统获取数据失败!')
}
})
const handleBlur = () => {
console.log('blur')
flag.value = false
}
const handleFocus = () => {
console.log('focus')
flag.value = true
systemOptions.value = []
// console.log(formName.applicationSystem)
// formName.applicationSystem = []
systemOptions.value = systemOptions2.value
// systemOptions.value = []
}
// const filterOption = (input, option) => {
@ -727,4 +717,13 @@
flex-wrap: nowrap;
}
}
textarea {
resize: none;
font-size: 14px;
}
.bottom-btn {
display: flex;
justify-content: center;
// position: fixed;
}
</style>

View File

@ -62,7 +62,7 @@
<div class="left jcss" v-else></div>
<div class="right">
<div class="header">
<span style="display: block; width: 680px">
<span style="display: flex; align-items: center; width: 680px">
{{ item.name }}
<svg
t="1652322568870"
@ -131,7 +131,7 @@
<div v-if="selectCardsname !== '数据资源'">
浏览量{{ item.visits || 0 }}
</div>
<div>{{ item.applyCount || 0 }}</div>
<div>{{ item.applyCount || 0 }}</div>
<div v-if="selectCardsname === '数据资源'">
数据量{{ item.sjlCount || 0 }}
</div>
@ -437,6 +437,9 @@
resourceName: item.name,
time: item.createDate,
type: item.type,
componentType: item.infoList.filter(
(val) => val.attrType == '组件类型'
)[0].attrValue,
},
],
deptId: item.deptId,

View File

@ -61,9 +61,9 @@
</a-button>
</div>
<i class="boundary"></i>
<!-- 添加至-->
<!-- 添加至购车 -->
<a-button type="primary" @click="addShoppingCart" class="buttonAdd">
添加至
添加至购车
</a-button>
<!-- 一键申请 -->
<a-button type="primary" @click="apply" class="buttonAdd">
@ -253,6 +253,8 @@
let tableHeight = ref('600')
//tab
const tabClick = (indexFather, name) => {
selectedRowKeys.value = []
selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) {
if (name == '视频资源') {
tableHeight.value = 330
@ -404,16 +406,20 @@
}
//
const addShoppingCart = () => {
sgcInsert({
delFlag: '0',
resourceId: '8888888880000000001',
note1: selectedList.value,
// userId: userId.value,
}).then((res) => {
console.log(res)
message.success('添加申购车成功!')
mybus.emit('getSgcNum')
})
if (selectedList.value.length > 0) {
sgcInsert({
delFlag: '0',
resourceId: '8888888880000000001',
note1: selectedList.value,
// userId: userId.value,
}).then((res) => {
console.log(res)
message.success('添加申购车成功!')
mybus.emit('getSgcNum')
})
} else {
message.error('请选择需要添加申购车的数据')
}
}
//
const dataSource = ref([])

View File

@ -49,7 +49,7 @@
<template #title>{{ item.name }}</template>
<div class="content-body-title">
<span
v-if="item.name === '申请摄像头列表'"
v-if="item.name === '申请摄像头列表' && item.ended"
@click="showVideoList(item)"
>
名称{{ item.name }}

View File

@ -108,7 +108,9 @@
>
<template #title>
<span
@click="showItem(item.id, item.type, item.delFlag)"
@click="
showItem(item.resourceId, item.type, item.delFlag)
"
style="cursor: pointer"
class="name"
>