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

融合服务，能力集市详情返回

This commit is contained in:
guoyue 2022-09-13 09:38:26 +08:00
parent 7996d8a701
commit 1cba78f8e1
11 changed files with 945 additions and 1335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
front/src/App.vue
View File

@ -13,62 +13,56 @@
</div>
</template>
<script setup>
import zhCN from 'ant-design-vue/es/locale/zh_CN'
import Cookies from 'js-cookie'
import { onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router'
import mybus from '@/myplugins/mybus'
const router = useRouter()
import zhCN from 'ant-design-vue/es/locale/zh_CN'
import Cookies from 'js-cookie'
import { onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router'
import mybus from '@/myplugins/mybus'
const router = useRouter()
// export default {
// name: 'App',
// data() {
// return {
// ,
// }
// },
// }
const locale = zhCN
const token = Cookies.get('ucsToken')
console.log('token=================>', token)
let ws = new WebSocket(
const locale = zhCN
const token = Cookies.get('ucsToken')
console.log('token=================>', token)
let ws = new WebSocket(
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
)
// ws.send()给服务器发送信息
// 服务器每次返回信息都会执行一次onmessage方法
ws.onmessage = function (e) {
)
// ws.send()给服务器发送信息
// 服务器每次返回信息都会执行一次onmessage方法
ws.onmessage = function (e) {
console.log('WebSocket服务器返回的信息: ' + e.data)
mybus.emit('getMynotice')
// 判断当前路由是否是消息中心
if (router.currentRoute.value.name === 'mynoticeView') {
mybus.emit('noticeListInit')
}
}
ws.onerror = function (e) {
}
ws.onerror = function (e) {
console.log('WebSocket连接异常============================>', e)
ws = new WebSocket(
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
)
}
ws.onclose = function (e) {
}
ws.onclose = function (e) {
console.log('WebSocket连接断开============================>', e)
}
onBeforeUnmount(() => {
}
onBeforeUnmount(() => {
// 4.卸载前, 关闭链接
ws.close()
})
})
</script>
<style lang="less">
@import '~@/vab/styles/vab.less';
#vue-admin-beautiful {
@import '~@/vab/styles/vab.less';
#vue-admin-beautiful {
max-width: 1920px;
// max-height: 1080px;
margin: auto;
height: 100%;
position: relative;
background-color: #fff;
}
body {
}
body {
font-size: 0.14rem;
}
}
</style>

BIN
front/src/assets/detailsAll/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

95
front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
View File

@ -44,10 +44,10 @@
</template>
<script setup>
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { ref, defineProps, watch } from 'vue'
const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
const dataFromLeft = ref({
import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
import { ref, defineProps, watch } from 'vue'
const iconImg = require('@/assets/detailsAll/layer-service/layer-icon.png')
const dataFromLeft = ref({
content: [
{
type: '服务类型',
@ -62,8 +62,8 @@
values: '',
},
],
})
const dataFromCenter = ref({
})
const dataFromCenter = ref({
content: [
{
type: '坐标系',
@ -78,8 +78,8 @@
values: '',
},
],
})
const dataFromRight = ref({
})
const dataFromRight = ref({
content: [
{
type: '图层名称',
@ -90,13 +90,13 @@
values: '',
},
],
})
//数据初始化
const props = defineProps({
})
//数据初始化
const props = defineProps({
dataList: { type: Object, default: null },
})
const flag = ref(true)
if (props.dataList.infoList) {
})
const flag = ref(true)
if (props.dataList.infoList) {
let obj = props.dataList.infoList.filter(
(item) =>
item.attrType === '服务类型' ||
@ -116,6 +116,11 @@
// dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
console.log('dataList', props.dataList)
props.dataList.infoList.map((item) => {
handleInfoList(item)
})
}
}
const handleInfoList = (item) => {
if (item.attrType === '服务类型') {
dataFromLeft.value.content[0].values = item.attrValue || '123'
} else if (item.attrType === '覆盖区域') {
@ -133,12 +138,12 @@
} else if (item.attrType === '图层类型') {
dataFromRight.value.content[1].values = item.attrValue || '--'
} else if (item.attrType === '最大级别') {
if (dataFromRight.value.content && dataFromRight.value.content[2]) {
dataFromRight.value.content[2].values = item.attrValue || '--'
}
})
}
}
watch(
}
watch(
() => props.dataList,
(val) => {
if (val) {
@ -157,45 +162,48 @@
if (!obj) {
flag.value = false
} else {
// dataFrom.value.content[0].link.value = val.apiUrl
// dataFrom.value.content[0].facilitator.value = val.deptContacts
console.log('dataList', val)
val.infoList.map((item) => {
if (item.attrType === '服务类型') {
dataFromLeft.value.content[0].values = item.attrValue || '123'
} else if (item.attrType === '覆盖区域') {
dataFromLeft.value.content[1].values = item.attrValue || '--'
} else if (item.attrType === '切片策略') {
dataFromLeft.value.content[2].values = item.attrValue || '--'
} else if (item.attrType === '坐标系') {
dataFromCenter.value.content[0].values = item.attrValue || '--'
} else if (item.attrType === '切片尺寸') {
dataFromCenter.value.content[1].values = item.attrValue || '--'
} else if (item.attrType === '最小级别') {
dataFromCenter.value.content[2].values = item.attrValue || '--'
} else if (item.attrType === '数据范围') {
dataFromRight.value.content[0].values = item.attrValue || '--'
} else if (item.attrType === '图层类型') {
dataFromRight.value.content[1].values = item.attrValue || '--'
} else if (item.attrType === '最大级别') {
dataFromRight.value.content[2].values = item.attrValue || '--'
}
handleInfoList(item)
// if (item.attrType === '服务类型') {
// dataFromLeft.value.content[0].values = item.attrValue || '123'
// } else if (item.attrType === '覆盖区域') {
// dataFromLeft.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '切片策略') {
// dataFromLeft.value.content[2].values = item.attrValue || '--'
// } else if (item.attrType === '坐标系') {
// dataFromCenter.value.content[0].values = item.attrValue || '--'
// } else if (item.attrType === '切片尺寸') {
// dataFromCenter.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '最小级别') {
// dataFromCenter.value.content[2].values = item.attrValue || '--'
// } else if (item.attrType === '数据范围') {
// dataFromRight.value.content[0].values = item.attrValue || '--'
// } else if (item.attrType === '图层类型') {
// dataFromRight.value.content[1].values = item.attrValue || '--'
// } else if (item.attrType === '最大级别') {
// if (dataFromRight.value.content && dataFromRight.value.content[2]) {
// dataFromRight.value.content[2].values = item.attrValue || '--'
// }
// }
})
}
}
}
)
)
</script>
<style lang="less" scoped>
.usage-mode {
.usage-mode {
display: flex;
flex-direction: column;
align-items: center;
padding: 0.8rem 0;
.content {
margin-top: 0.3rem;
display: flex;
.content-left {
height: 2.8rem;
width: 13rem;
@ -216,10 +224,12 @@
display: flex;
justify-content: space-between;
align-items: center;
ul {
padding: 0;
margin: 0;
}
ul li {
list-style: none;
display: flex;
@ -227,11 +237,13 @@
margin-bottom: 0.3rem;
line-height: 0.25rem;
}
img {
margin: 0 0.2rem 0 0;
width: 0.15rem;
height: 0.15rem;
}
span {
font-size: 0.2rem;
color: #666666;
@ -239,6 +251,7 @@
margin-right: 0.5rem;
width: 120px;
}
p {
width: 2rem;
margin-bottom: 0;
@ -253,5 +266,5 @@
}
}
}
}
}
</style>

890
front/src/views/home/DetailsPageconetent.vue
View File

File diff suppressed because it is too large Load Diff

27
front/src/views/home/components/integrationServiceOrder.vue
View File

@ -1,22 +1,15 @@
<template>
<ul class="integrationServiceOrder">
<li
v-for="(item, i) in integrationOrderList"
:key="i"
@click="
<li v-for="(item, i) in integrationOrderList" :key="i" @click="
changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
"
>
">
{{ item.name }}
<span
class="arrow"
:class="
<span class="arrow" :class="
integrationOrder.orderType == 'ASC' &&
integrationOrder.orderField == item.value
? 'down'
: ''
"
></span>
"></span>
</li>
</ul>
</template>
@ -54,13 +47,17 @@ const integrationOrder = reactive({
// 融合服务--排序
const changeOrder = (i, val, type) => {
let newType = type
console.log('i, val, type------------>', i, val, type);
integrationOrder.orderField = val
integrationOrder.orderType = newType
integrationOrderList.value[i].orderType = newType
integrationOrder.orderType = type;
// 0 apply_count ASC
let _index = integrationOrderList.value.findIndex(x => x.value = val)
if (_index > -1) {
integrationOrderList.value[_index].orderType = type
}
mybus.emit('changeCondition', {
orderField: val,
orderType: newType,
orderType: type,
})
}

305
front/src/views/home/components/searchResultList.vue
View File

@ -9,78 +9,55 @@
}}
</div>
<div class="condition" :key="showKey">
<IntegrationServiceOrder
ref="integrationServiceOrderDom"
v-if="
<IntegrationServiceOrder ref="integrationServiceOrderDom" v-if="
selectCardsname === '融合服务' || selectCardsname === '赋能场景'
"
></IntegrationServiceOrder>
"></IntegrationServiceOrder>
<ul v-else>
<li
v-for="item in selList"
:key="item.value"
@click="changeCondition(item.value)"
v-show="
<li v-for="(item, i) in selList" :key="i" @click="changeCondition(item)" v-show="
item.show &&
item.name !== '评分' &&
selectCardsname !== '数据资源'
"
>
">
{{ item.name }}
<span
class="arrow"
:class="item.value == selData ? 'down' : ''"
></span>
<!-- {{orderObj.orderType}}{{orderObj.orderField}} -->
<!-- <span class="arrow" :class="item.value == selData ? 'down' : ''"></span> -->
<!-- {{orderObj.orderType == 'ASC' ? '11' : '22'}} -->
<!-- {{orderObj.orderField == item.value ? '11' : '22'}} -->
<span class="arrow" :class="
orderObj.orderType == 'ASC' &&
orderObj.orderField == item.value
? 'down'
: ''
"></span>
</li>
</ul>
<!-- {{JSON.stringify(orderObj)}} -->
</div>
</div>
<div
class="result-list"
v-for="(item, index) in resourceList.data"
:key="item.index"
>
<div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
<div class="item" :key="showKey">
<div
class="left"
style="display: flex; align-items: center"
v-if="
<div class="left" style="display: flex; align-items: center" v-if="
item.type === '应用资源' &&
item.infoList &&
item.infoList.filter((val) => val.attrType == '应用图片')[0]
"
>
<a-image
:width="106"
:preview="false"
:src="
">
<a-image :width="106" :preview="false" :src="
item.infoList.filter((val) => val.attrType == '应用图片')[0]
.attrValue
"
/>
" />
</div>
<div
class="left"
style="display: flex; align-items: center"
v-else-if="
<div class="left" style="display: flex; align-items: center" v-else-if="
(selectCardsname === '融合服务' ||
selectCardsname === '赋能场景') &&
item.fuseAttrList &&
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
"
>
<a-image
:width="106"
:preview="false"
:src="
">
<a-image :width="106" :preview="false" :src="
item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
.attrValue
"
/>
" />
</div>
<div
class="left"
:class="
<div class="left" :class="
item.type == '应用资源'
? 'yyzy'
: !item.type
@ -105,80 +82,49 @@
.attrValue == '业务组件'
? 'ywzj'
: ''
"
@click="toView('details', item)"
v-else-if="
" @click="toView('details', item)" v-else-if="
selectCardsname !== '基础设施' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景'
"
></div>
"></div>
<div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
<div
class="left rhfw"
v-else-if="
<div class="left rhfw" v-else-if="
selectCardsname === '融合服务' || selectCardsname === '赋能场景'
"
></div>
"></div>
<div class="right" @click="toView('details', item)">
<div class="header">
<span style="display: flex; align-items: center; width: 680px">
{{ item.name }}
<!-- 已申请--通过 -->
<svg
t="1652322568870"
class="icon"
viewBox="0 0 3072 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="3062"
width="40"
height="40"
v-if="
<svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="
item.applyState == '已申请' && item.approveStatus == '通过'
"
style="margin-left: 10px; min-width: 40px"
>
" style="margin-left: 10px; min-width: 40px">
<path
d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
fill="#d81e06"
p-id="3063"
></path>
fill="#d81e06" p-id="3063"></path>
<path
d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
fill="#d81e06"
p-id="3064"
></path>
fill="#d81e06" p-id="3064"></path>
<path
d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
fill="#d81e06"
p-id="3065"
></path>
fill="#d81e06" p-id="3065"></path>
</svg>
</span>
<div class="header-right">
<div
v-if="
<div v-if="
selectCardsname === '融合服务' ||
selectCardsname === '赋能场景'
"
class="label-content"
>
<template
v-if="
" class="label-content">
<template v-if="
item.fuseAttrList &&
item.fuseAttrList.filter(
(val) => val.attrType == '应用领域'
)[0]
"
>
<span
class="label"
v-for="(data, index) in item.fuseAttrList
">
<span class="label" v-for="(data, index) in item.fuseAttrList
.filter((val) => val.attrType == '应用领域')[0]
.attrValue.split(';')"
:key="index"
>
.attrValue.split(';')" :key="index">
{{ data }}
</span>
</template>
@ -196,21 +142,15 @@
</div>
</div>
<div class="dec">
<div
v-if="
<div v-if="
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景' &&
selectCardsname !== '基础设施'
"
>
">
<span>{{ item.deptName || '--' }}</span>
</div>
</div>
<div
v-if="selectCardsname !== '基础设施'"
style="margin-top: 0.1rem"
class="description"
>
<div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
<a-tooltip>
<template #title>{{ item.description }}</template>
{{ item.description || '--' }}
@ -228,22 +168,18 @@
>
浏览量：{{ item.visits || 0 }}次
</div> -->
<div
v-if="
<div v-if="
selectCardsname !== '数据资源' &&
selectCardsname !== '赋能场景' &&
(selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
"
>
">
申请量：{{ item.applyCount || 0 }}次
</div>
<div
v-if="
<div v-if="
selectCardsname === '数据资源' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景'
"
>
">
数据量：{{ item.sjlCount || 0 }}
</div>
<div v-if="selectCardsname !== '数据资源'">
@ -253,75 +189,39 @@
</div>
<div class="right" v-if="selectCardsname !== '基础设施'">
<div class="shopping" :key="shoppingKey">
<template
v-if="
<template v-if="
(selectCardsname == '组件服务' &&
item.infoList.filter(
(val) => val.attrType == '外部服务地址'
).length === 0) ||
(selectCardsname == '应用资源' && whoShow1.itShowQingDao)
"
>
<span
class="shopping-down"
v-if="item.isInShoppingCart"
></span>
<span
class="shopping-on"
v-else
@click.stop="addShoppingCart(item, index)"
></span>
">
<span class="shopping-down" v-if="item.isInShoppingCart"></span>
<span class="shopping-on" v-else @click.stop="addShoppingCart(item, index)"></span>
</template>
</div>
<div class="sc">
<span
class="sc-down"
v-if="item.isCollect == 'false'"
@click.stop="addCollect(item)"
></span>
<span
class="sc-on"
v-if="item.isCollect == 'true'"
@click.stop="addCollect(item)"
></span>
<span class="sc-down" v-if="item.isCollect == 'false'" @click.stop="addCollect(item)"></span>
<span class="sc-on" v-if="item.isCollect == 'true'" @click.stop="addCollect(item)"></span>
</div>
<div
class="shopping pk"
:key="pk"
v-show="
<div class="shopping pk" :key="pk" v-show="
cardType == '组件服务' && findComponentName(item, '智能算法')
"
>
<span
class="pk-on"
@click.stop="goComparePk(item, index)"
></span>
">
<span class="pk-on" @click.stop="goComparePk(item, index)"></span>
</div>
<a-button
type="primary"
@click.stop="toView('details', item)"
v-if="!whoShow1.itShowBaoTou"
>
<a-button type="primary" @click.stop="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
查看详情
</a-button>
<a-button
style="margin-left: 10px"
v-show="
<a-button style="margin-left: 10px" v-show="
selectCardsname === '融合服务' ||
selectCardsname === '赋能场景'
"
@click.stop="handleAKeyApplication(item)"
>
" @click.stop="handleAKeyApplication(item)">
一键申请
</a-button>
<a-button
type="primary"
@click.stop="toView('apply', item)"
v-show="
<a-button type="primary" @click.stop="toView('apply', item)" v-show="
cardType == '组件服务' ||
(cardType == '应用资源' && whoShow1.itShowQingDao)
"
>
">
{{
item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
}}
@ -336,12 +236,7 @@
</div>
</div>
</div>
<a-modal
v-model:visible="visible"
title="视频预览"
:width="750"
destroyOnClose
>
<a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
<template #footer></template>
<div style="width: 100%; display: flex; justify-content: center">
<div style="width: 100%; height: 100%">
@ -352,7 +247,7 @@
</div>
</template>
<script>
import { ref, reactive, nextTick } from 'vue'
import { ref, reactive, nextTick, defineEmits, defineExpose, getCurrentInstance } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
import { getUser, sgcInsert } from '@/api/home'
@ -365,7 +260,7 @@ export default {
props: {
resourceList: {
type: Object,
default: () => {},
default: () => { },
},
resourceTotal: {
type: String,
@ -458,18 +353,24 @@ export default {
components: {
IntegrationServiceOrder,
},
setup(props) {
setup(props, context) {
const whoShow1 = whoShow
const showKey = ref(0)
let shoppingKey = ref(1)
const integrationServiceOrderDom = ref(null);
let orderObj = reactive({
// orderField: 'tdr.create_date',
// orderType: 'ASC',
orderField: '',
orderType: '',
})
const integrationServiceOrderDom = ref(null)
// 购物车id列表
const selList = ref([
{ name: '发布时间', value: 'tdr.create_date', show: true },
{ name: '浏览量', value: 'visits', show: true },
{ name: '申请量', value: 'applyCount', show: true },
{ name: '收藏量', value: 'collectCount', show: true },
{ name: '评分', value: 'score', show: true },
{ name: '发布时间', value: 'tdr.create_date', show: true, orderType: 'DESC' },
{ name: '浏览量', value: 'visits', show: true, orderType: 'DESC' },
{ name: '申请量', value: 'applyCount', show: true, orderType: 'DESC' },
{ name: '收藏量', value: 'collectCount', show: true, orderType: 'DESC' },
{ name: '评分', value: 'score', show: true, orderType: 'DESC' },
])
if (props.selectCardsname === '基础设施') {
selList.value.map((val) => (val.show = false))
@ -513,6 +414,7 @@ export default {
})
showKey.value++
const selData = ref('total')
const flag = ref(true)
// userId
const userId = ref('')
@ -527,8 +429,9 @@ export default {
console.log('use value', searchValue)
console.log('or use this.value', searchValue.value)
}
function toView(type, item) {
debugger
// debugger
if (props.selectCardsname == '数据资源') {
if (whoShow1.itShowQingDao) {
window.open(
@ -539,6 +442,7 @@ export default {
window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
}
} else if (props.selectCardsname === '融合服务') {
context.emit('saveSearchCodition')
// 打包模式
router.push({
path: '/packagingDetails',
@ -605,6 +509,7 @@ export default {
})
}
} else {
context.emit('saveSearchCodition')
router.push({
path: '/details',
query: {
@ -665,15 +570,29 @@ export default {
}
}
}
// 更换查询条件
const changeCondition = (val) => {
selData.value = selData.value == val ? 'total' : val
const orderType = selData.value == val ? 'ASC' : 'DESC'
mybus.emit('changeCondition', {
orderField: val,
orderType: orderType,
/**更换查询条件
* val: 排序字段值
* isFromFather: 是否来自父组件传值
*/
const changeCondition = (item, isFromFather = false) => {
console.log('item, isFromFather------------>', item, isFromFather);
let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC';
if (isFromFather) {
newType = item.orderType;
}
orderObj.orderField = item.value;
orderObj.orderType = newType;
let _index = selList.value.findIndex(x => x.value == item.value)
if (_index > -1) {
selList.value[_index].orderType = newType
}
selList.value = selList.value.splice(0);
nextTick(() => {
console.log('orderObj------------>', orderObj);
console.log('selList------------>', selList.value);
})
console.log('选择===========》', val, selData.value)
mybus.emit('changeCondition', orderObj)
}
// 融合服务--一键申请
@ -724,10 +643,8 @@ export default {
_applyList.push(obj)
})
_applyList = jcss.concat(_applyList)
console.log('_applyList------------>', _applyList)
localStorage.setItem('applyList', JSON.stringify(_applyList))
// 融合服务 item
// 融合服务
localStorage.setItem('integrationServicesItemInfo', JSON.stringify(item))
router.push({
path: '/apply',
@ -735,7 +652,6 @@ export default {
}
mybus.on('chongzhi', (typeObj) => {
console.log('typeObj------------>', typeObj)
if (!typeObj) {
selData.value = 'total'
}
@ -743,7 +659,8 @@ export default {
typeObj &&
(typeObj.type === '融合服务' || typeObj.type === '打包模式')
) {
integrationServiceOrderDom.value.reset && integrationServiceOrderDom.value.reset()
integrationServiceOrderDom.value.reset &&
integrationServiceOrderDom.value.reset()
}
})
let videoUrl = ref('')
@ -819,6 +736,7 @@ export default {
showKey,
handleAKeyApplication,
integrationServiceOrderDom,
orderObj,
}
},
beforeUnmount() {
@ -1062,7 +980,6 @@ export default {
font-size: 14px;
margin: 5px 0;
.right {
flex: 1;
display: flex;
@ -1149,11 +1066,11 @@ export default {
margin-top: 10px;
align-items: center;
& > div {
&>div {
display: flex;
align-items: center;
& > div {
&>div {
margin: 0 10px;
}
}

34
front/src/views/home/detailBack.vue Normal file
View File

@ -0,0 +1,34 @@
<template>
<div class="detail-back" @click="previousPage" :style="{ color: textColor }">
</div>
</template>
<script setup>
import { reactive, ref, watch, defineProps } from 'vue'
import { useRouter } from 'vue-router'
const router = useRouter()
console.log('router------------>', router)
const props = defineProps({
textColor: { type: String, default: '' },
})
const previousPage = () => {
window.history.go(-1)
}
</script>
<style scoped lang="less">
.detail-back {
position: absolute;
top: 0.85rem;
left: 100px;
font-size: 0.18rem;
color: #fff;
cursor: pointer;
width: 50px;
height: 50px;
background-image: url('~@/assets/detailsAll/back.png');
background-size: 100% 100%;
}
</style>

4
front/src/views/home/details.vue
View File

@ -9,6 +9,7 @@
<div>
<div id="apply-container">
<home-header :showView="showView"></home-header>
<detail-back></detail-back>
<details-view v-if="showView === 'details-view'"></details-view>
<algorithm-details
v-else-if="showView === 'algorithm-details'"
@ -38,6 +39,7 @@
import DeveloperComponents from '@/views/detailsAll/DeveloperComponents'
import BusinessDetails from '@/views/detailsAll/BusinessDetails'
import LayerService from '@/views/detailsAll/LayerService'
import detailBack from '@/views/home/detailBack.vue'
import { selectOne } from '@/api/home'
import { useRouter } from 'vue-router'
export default defineComponent({
@ -52,6 +54,7 @@
DeveloperComponents,
BusinessDetails,
LayerService,
detailBack
},
setup() {
const formState = reactive({
@ -163,6 +166,7 @@
}
}
init()
return {
formState,
options,

6
front/src/views/home/infrastructurePage.vue
View File

@ -432,7 +432,7 @@
placeholder="请输入关键词"
enter-button="搜索"
size="large"
@change="getCamera"
@change="(e) => getCamera(true, e.target.value)"
/>
<a-button
type="primary"
@ -1697,6 +1697,7 @@
// }
const wrjFlag = ref(false)
const getCamera = (flag, str) => {
console.log('mapSearchParam.value.cameraName------------>', mapSearchParam.value.cameraName);
if (flag) {
mapSearchParam.value.cameraName = str
console.log('赋值===============》', str, mapSearchParam.value)
@ -1710,6 +1711,8 @@
pagination.value.total = res.data.count
})
} else {
console.log('mapSearchParam------------>', mapSearchParam);
let params = {
regionId:
mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@ -1720,6 +1723,7 @@
latitude: mapSearchParam.value.gpsY || '',
radius: mapSearchParam.value.radius || '',
status: 1,
name: mapSearchParam.value.cameraName
}
if (
params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&

228
front/src/views/home/integrationServices.vue
View File

@ -5,13 +5,8 @@
<div class="top">
<div class="top-title">
全部：
<div
v-for="(item, index) in titleName"
:key="index"
class="tabAll"
@click="changeCards(index)"
:class="{ sel: index == number }"
>
<div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
:class="{ sel: index == number }">
<span>
{{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
</span>
@ -20,52 +15,25 @@
<div class="resultListSearchInput-father" v-if="number === 0">
<div class="resultListSearchInput-son">
模糊搜索
<a-input-search
v-model:value="searchValue"
placeholder="请输入关键词"
enter-button="搜索"
size="large"
@search="getAppResources"
@change="onSearch"
class="resultListSearchInput"
/>
<button class="button-reset" @click="chongzhi()">重置</button>
<a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
@search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
<button class="button-reset" @click="resetAction()">重置</button>
<div class="hengxian"></div>
</div>
</div>
<div v-loading="loadingData">
<searchResultList
v-if="number === 0"
v-show="resourceList.data && resourceList.data.length > 0"
:resourceList="resourceList"
:resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
/>
<CanAssignCase
v-else
v-show="resourceList.data && resourceList.data.length > 0"
:resourceList="resourceList"
:resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
/>
<searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
:resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
<CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
:resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
<div class="pagination">
<a-pagination
v-if="resourceList.data && resourceList.data.length > 0"
v-model:current="currentPage"
v-model:pageSize="currentPageSize"
show-size-changer
show-less-items
show-quick-jumper
:total="resourceTotal"
:page-size-options="pageSizeOptions"
@change="pageChange"
@showSizeChange="onShowSizeChange"
/>
<a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
:total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
@showSizeChange="onShowSizeChange" />
</div>
<div
v-if="resourceList.data && resourceList.data.length <= 0"
style="margin-top: 2rem"
>
<div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
<a-empty />
</div>
</div>
@ -76,8 +44,7 @@
<script>
import HomeFooter from '@/views/newHome/components/Footer'
import mybus from '@/myplugins/mybus'
import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
import { getIntegrationServicesList } from '@/api/home.js'
import { useRouter } from 'vue-router'
import HomeHeader from '@/views/home/components/header'
@ -86,19 +53,38 @@ import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
import { message } from 'ant-design-vue'
export default defineComponent({
beforeRouteEnter(to, from, next) {
console.log('to---integrationServices--beforeRouteEnter------->', to)
console.log('from---integrationServices--beforeRouteEnter------->', from)
console.log('next---integrationServices--beforeRouteEnter------->', next)
// 返回按钮，刷新页面，所以from.name为undefined
// if (from.name || from.name !== 'details') {
// console.log('清空------------>')
// localStorage.removeItem('DetailsPageconetent')
// }
next()
},
beforeRouteLeave(to, from, next) {
console.log('to---integrationServices--beforeRouteLeave------->', to)
console.log('from---integrationServices--beforeRouteLeave------->', from)
console.log('next---integrationServices--beforeRouteLeave------->', next)
if (to.name !== 'packagingDetails') {
localStorage.removeItem('integrationServices')
}
next()
},
setup() {
// 分页
const loading = ref(true)
const currentPage = ref(1)
const currentPageSize = ref(5)
const pageSizeOptions = ref(['5', '10', '20', '50'])
const pageSizeOptions = ref(['2','5', '10', '20', '50'])
const router = useRouter()
const select = router.currentRoute.value.query.select
const searchValue = ref('')
const Cardsname = ref(select)
const resourceList = reactive({ data: [] })
const resourceTotal = ref(0)
const current = ref(1)
const loadingData = ref(false)
// 选项卡
const titleName = ref([
@ -109,49 +95,73 @@ export default defineComponent({
name: '赋能场景',
},
])
const searchData = null;
const number = ref(0)
// 查询参数
const paramsGetResources = {
pageNum: 1,
pageSize: currentPageSize.value,
page: currentPage.value,
limit: currentPageSize.value,
type: titleName.value[number.value].name,
name: '',
orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
name: searchValue.value,
orderField: 'create_date',
orderType: 'DESC', // ASC 升序 DESC 降序
}
const searchResultListDom = ref(null)
const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
// 读取本地存储：表单赋值
const handleSetSearchData = () => {
console.log('storageSearchInfo------------>', storageSearchInfo)
if (storageSearchInfo) {
// 搜索名称
searchValue.value = storageSearchInfo.name;
currentPage.value = storageSearchInfo.page;
currentPageSize.value = storageSearchInfo.limit;
titleName.value[number.value].name = storageSearchInfo.type;;
paramsGetResources.limit = storageSearchInfo.limit;
paramsGetResources.page = storageSearchInfo.page;
paramsGetResources.type = storageSearchInfo.type;
// 延迟使用，因为还没有返回跟挂载
nextTick(() => {
searchResultListDom.value.changeCondition({
value: storageSearchInfo.orderField,
orderType: storageSearchInfo.orderType,
}, true)
})
console.log('paramsGetResources------------>', paramsGetResources);
return;
getIntegrationList()
}
}
const changeCards = (val) => {
console.log(val)
number.value = val
chongzhi()
resetAction()
}
// 查询
const onSearch = () => {
loading.value = true
currentPage.value = 1
getIntegrationList()
}
// 重置数据
const chongzhi = () => {
loading.value = true
const resetAction = () => {
// 重置模糊查字段
searchValue.value = ''
// 分页
currentPage.value = 1
currentPageSize.value = 5
// 重置查询条件
paramsGetResources.pageNum = 1
paramsGetResources.pageSize = 5
paramsGetResources.page = 1
paramsGetResources.limit = 5
paramsGetResources.orderField = 'create_date'
paramsGetResources.orderType = 'DESC'
mybus.emit('chongzhi', {
mybus.emit('resetAction', {
type: titleName.value[number.value].name,
})
getAppResources()
}
const getAppResources = () => {
getIntegrationList()
}
@ -159,16 +169,9 @@ export default defineComponent({
const getIntegrationList = () => {
loadingData.value = true
console.log('获取融合服务列表------------>')
let postData = {
limit: currentPageSize.value,
page: currentPage.value,
orderField: paramsGetResources.orderField,
orderType: paramsGetResources.orderType,
name: searchValue.value,
type: titleName.value[number.value].name,
}
getIntegrationServicesList(postData).then(
paramsGetResources.name = searchValue.value;
console.log('paramsGetResources------------>', paramsGetResources);
getIntegrationServicesList(paramsGetResources).then(
(res) => {
loadingData.value = false
if (res.data.code !== 0) {
@ -190,52 +193,66 @@ export default defineComponent({
} else {
delete paramsGetResources.deptIds
}
getAppResources()
console.log('paramsGetResources', paramsGetResources)
getIntegrationList()
console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
})
mybus.on('changePage', (page) => {
paramsGetResources.pageNum = page
getAppResources('分页查询')
paramsGetResources.page = page
console.log('paramsGetResources----changePage-------->', paramsGetResources);
getIntegrationList('分页查询')
})
mybus.on('changeSelcted', () => {
getAppResources()
getIntegrationList()
})
mybus.on('refresh', () => {
paramsGetResources.pageNum = 1
paramsGetResources.page = 1
currentPage.value = 1
getAppResources()
getIntegrationList()
})
mybus.on('changeCondition', (condition) => {
console.log('------>', condition)
console.log('changeCondition------>', condition)
paramsGetResources.orderField = condition.orderField
paramsGetResources.orderType = condition.orderType
getAppResources()
getIntegrationList()
})
const pageChange = (val) => {
console.log(val)
loading.value = true
console.log('val-----pageChange------->', val);
currentPage.value = val
paramsGetResources.pageNum = val
let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
getAppResources(params)
}
paramsGetResources.page = val
getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
console.log('paramsGetResources----pageChange-------->', paramsGetResources);
onMounted(() => {
getAppResources()
})
}
// 分页
const onShowSizeChange = (current, pageSize) => {
currentPage.value = current
currentPageSize.value = pageSize
paramsGetResources.pageNum = current
paramsGetResources.pageSize = pageSize
getAppResources()
paramsGetResources.page = current
paramsGetResources.limit = pageSize
getIntegrationList()
}
watch(currentPageSize, () => {
console.log('pageSize', currentPageSize.value)
// 存储查询条件到本地
const saveSearchCodition = () => {
console.log('融合服务------------>', searchData);
localStorage.setItem(
'integrationServices',
JSON.stringify(paramsGetResources)
)
}
onMounted(() => {
if (storageSearchInfo) {
handleSetSearchData()
} else {
getIntegrationList()
}
})
return {
@ -245,17 +262,20 @@ export default defineComponent({
resourceTotal,
pageChange,
Cardsname,
getAppResources,
chongzhi,
getIntegrationList,
resetAction,
onSearch,
currentPageSize,
pageSizeOptions,
current,
loading,
titleName,
changeCards,
number,
loadingData,
onShowSizeChange,
saveSearchCodition,
searchResultListDom,
}
},
components: {
@ -277,8 +297,6 @@ export default defineComponent({
background: #f3f5f9;
padding: 0.2rem;
// padding-left: 0.2rem;
// padding-top: 0.2rem;
.resultListSearchInput-son {
background: #fff;
padding: 0.2rem 0.2rem 0rem 0.3rem;

7
front/src/views/home/packagingDetails.vue
View File

@ -2,6 +2,7 @@
<!-- 青岛 -->
<div class="details-pageconetent">
<home-header></home-header>
<detail-back></detail-back>
<div class="content-box" v-loading="loadingPage">
<div class="package-title">打包模式</div>
<div class="basic-info">
@ -70,6 +71,7 @@ import { message } from 'ant-design-vue'
import { getIntegrationDetail } from '@/api/home'
import HomeHeader from '@/views/home/components/header'
import { scInsert, scDel } from '@/api/personalCenter'
import detailBack from '@/views/home/detailBack.vue'
const router = useRouter()
const id = router.currentRoute.value.query.id
@ -110,7 +112,6 @@ const getIntegrationServicesDeatil = (id) => {
}
detailInfoObj.value = res.data.data || {}
console.log('detailInfoObj------------>', detailInfoObj);
let fuseResourceList = detailInfoObj.value.fuseResourceList || []
abilityList.value.map(v => {
let list = fuseResourceList.filter(x => x.type == v.name) || [];
@ -197,7 +198,6 @@ const addCollect = () => {
}
})
.catch(err => {
console.log('err------------>', err);
message.success(err)
})
} else {
@ -216,16 +216,13 @@ const addCollect = () => {
}
})
.catch(err => {
console.log('err------------>', err);
message.success(err)
})
}
}
}
getIntegrationServicesDeatil(id)
</script>
<style lang="less" scoped>
.flex-row-start {