融合服务支持收藏量

This commit is contained in:
guoyue 2022-09-08 13:12:40 +08:00
parent 5eefd4d306
commit 43aec16d92
5 changed files with 1848 additions and 1967 deletions

View File

@ -2,9 +2,6 @@
<div>
<home-header></home-header>
<div id="apply-container">
<!-- <aside>
<aside-menu></aside-menu>
</aside> -->
<article>
<div class="from-card" v-if="applySuccess && !applyAll">
<AbilityToApplyFor :dataList="list"></AbilityToApplyFor>
@ -126,59 +123,6 @@
/>
</a-form-item>
</div>
<!-- <div>
<a-form-item
label="期望效果"
name="effectWish"
:rules="[{ required: true, message: '请输入期望效果' }]"
>
<a-textarea
placeholder="请输入期望效果"
v-model:value="formName.effectWish"
:rows="4"
/>
</a-form-item>
</div> -->
<!-- <a-form-item
style="color: #666; font-size: 16px"
label="申请单附件"
name="applyDoc"
>
<a-upload
v-model:file-list="fileList"
name="file"
:action="`${baseURL}/upload`"
:headers="headers"
@change="handleChange"
:before-upload="beforeUpload"
:maxCount="1"
>
<a-button
style="
width: 100px;
height: 30px;
margin-right: 10px;
background: #edf4fc;
color: #0087ff;
font-size: 14px;
border-radius: 6px;
border: 1px solid #bbd3ef;
padding: 0;
text-align: center;
"
>
<upload-outlined></upload-outlined>
文件上传
</a-button>
<span style="font-size: 14px; color: #999">
支持docdocxjpgpngjpegpdfxlxsppt类型文件
</span>
<div v-if="fileList.length < 1">
<plus-outlined />
<div style="margin-top: 8px">上传限一个文件</div>
</div>
</a-upload>
</a-form-item> -->
<div class="bottom-btn">
<a-button
style="
@ -238,7 +182,6 @@
import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
import qs from 'qs'
// import { UploadOutlined } from '@ant-design/icons-vue'
import { Upload } from 'ant-design-vue'
import {
lastestPage,
@ -255,23 +198,27 @@
import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
import mybus from '@/myplugins/mybus'
import { sgcDel, getApplyForm } from '@/api/personalCenter'
import { pageWithAttrs } from '@/api/home'
// import { baseURL } from '@/config'
// import AsideMenu from './components/asideMenu.vue'
import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
export default {
name: '',
props: {},
components: {
HomeHeader,
AbilityToApplyFor,
// AsideMenu,
// UploadOutlined,
},
setup() {
const router = useRouter()
const disabled = ref(false)
const flag = ref(false)
const list = ref(JSON.parse(localStorage.getItem('applyList')))
const integrationServicesItemInfo = ref(
JSON.parse(localStorage.getItem('integrationServicesItemInfo') || '{}')
)
console.log(
'integrationServicesItemInfo------------>',
integrationServicesItemInfo
)
const applyAll = router.currentRoute.value.query.applyAll
const num = ref(0)
if (!applyAll) {
@ -294,13 +241,7 @@
}
})
}
console.log(
'list',
list.value
// list.value[0].children.filter(
// (val) => val.id == list.value[0].checkedList[0]
// )[0].resourceName
)
console.log('list', list.value)
const baseURL = window.SITE_CONFIG.apiURL
let record = ref('1')
const text = ref('')
@ -318,7 +259,6 @@
)
: '申请' + list.value[0].arr[0].resourceName, //
applicationSystem: '', //
// applicationSystem: [], //
applicationScene: [], //
applicationBackground: '', //
effectWish: '', //
@ -337,14 +277,12 @@
if (id) {
getApplyForm(id).then((res) => {
console.log('修改==============>', res.data.data)
// formName.id = res.data.data.id || ''
formName.applicationSystem = res.data.data.applicationSystem || ''
formName.applicationScene = res.data.data.applicationScene || []
formName.applicationBackground =
res.data.data.applicationBackground || ''
formName.effectWish = res.data.data.effectWish || ''
formName.phone = res.data.data.phone || ''
// formName.system = res.data.data.system || []
formName.enclosure = res.data.data.enclosure || ''
formName.enclosureName = res.data.data.enclosureName || ''
if (res.data.data.enclosure) {
@ -365,7 +303,6 @@
formName.unit = res.data.data.deptName
})
})
// console.log('====================', list.value)
const applicationSceneOpthion = ref([])
getCategoryTreePage({
page: 1,
@ -384,7 +321,6 @@
// console.log(formName.system)
const formRef = ref()
const applySuccess = ref(true)
// const rootObj = null
const dataForm = {
processDefinitionKey: 'abilityprocess',
}
@ -401,6 +337,7 @@
window.history.go(-1)
}
const processStartHandle = () => {
debugger
formRef.value.validate().then(() => {
if (!formUrl) {
return message.error('请设置保存表单的URL')
@ -480,11 +417,7 @@
}
})
} else {
if (
res.data.msg === 'success' &&
falgNum == 0 &&
sxt
) {
if (res.data.msg === 'success' && falgNum == 0 && sxt) {
message.success('申请提交成功,请到消息中心查看!')
sxt = false
}
@ -500,7 +433,7 @@
})
})
console.log(
'提交数据==========================>',
'提交数据============submitApply==============>',
formName,
ids
)
@ -526,6 +459,10 @@
}
})
} else {
// todo
if (Object.keys(integrationServicesItemInfo).length > 0) {
updateIntegrationServiceAction()
}
router.push({
path: '/DetailsPageconetent',
query: {
@ -622,11 +559,7 @@
}
})
} else {
if (
res.data.msg === 'success' &&
falgNum == 0 &&
sxt
) {
if (res.data.msg === 'success' && falgNum == 0 && sxt) {
message.success('申请提交成功,请到消息中心查看!')
sxt = false
}
@ -641,11 +574,7 @@
}
})
})
console.log(
'提交数据==========================>',
formName,
ids
)
console.log('提交数据==========================>', formName, ids)
if (formName.system.length !== 0) {
if (formName.applicationSystem.length == 0) {
formName.applicationSystem = ''
@ -668,6 +597,10 @@
}
})
} else {
// todo
if (Object.keys(integrationServicesItemInfo).length > 0) {
updateIntegrationServiceAction()
}
router.push({
path: '/DetailsPageconetent',
query: {
@ -707,10 +640,8 @@
businessKey: businessKey,
variables: formData,
}
// proxy.$http['post']('/act/running/startOfBusinessKey', data)
startOfBusinessKey(data)
.then(({ data: res }) => {
// applySuccess.value = false
if (res.code !== 0) {
if (callbacks.startProcessErrorCallback) {
callbacks.startProcessErrorCallback(res.data)
@ -732,9 +663,7 @@
processDefinitionKey: processDefinitionKey,
businessKey: businessKey,
})
// proxy.$http['post'](instanceIdUrl + '?' + params)
updateInstanceId(params).then(
// ({ data: res }) => {}
() => {}
)
}
@ -803,11 +732,6 @@
console.log(`selected ${value}`)
}
const systemHandleSearch = (value) => {
// console.log(`search ${value}`)
// text.value = value
// systemOptions.value = systemOptions2.value.filter(
// (item) => item.label.search(text.value) > -1
// )
let valueArray = []
systemOptions.value.map((val) => {
valueArray.push(val.value)
@ -847,8 +771,6 @@
}
const handleFocus = () => {
console.log('focus')
// console.log(formName.applicationSystem)
// formName.applicationSystem = []
let arrId = []
for (var valueIndex of systemOptions2.value) {
if (arrId.indexOf(valueIndex['value']) == -1) {
@ -856,15 +778,26 @@
systemOptions.value.push(valueIndex)
}
}
// systemOptions.value = systemOptions2.value
// systemOptions.value = []
}
// const filterOption = (input, option) => {
// return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
// }
onBeforeUnmount(() => {
mybus.off('reomveOldData')
})
// - todo
const updateIntegrationServiceAction = () => {
let _applyCount = Number(integrationServicesItemInfo.value.applyCount || 0) + 1
let _data = Object.assign({}, integrationServicesItemInfo.value, {
applyCount: _applyCount,
})
updateIntegrationServices(_data)
.then((res) => {
console.log('res---更新--------->', res)
})
.catch((err) => {
console.log('err----更新-------->', err)
})
}
return {
formRef,
formName,

View File

@ -255,10 +255,6 @@
case '融合服务':
router.push({
path: '/integrationServices',
// path: '/DetailsPageconetent',
query: {
select: '融合服务',
},
})
break
case 'CIM专区':

View File

@ -0,0 +1,103 @@
<template>
<ul class="integrationServiceOrder">
<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="
integrationOrder.orderType == 'ASC' &&
integrationOrder.orderField == item.value
? 'down'
: ''
"
></span>
</li>
</ul>
</template>
<script setup>
import { ref, reactive, nextTick, defineExpose } from 'vue'
import mybus from '@/myplugins/mybus'
const orderList = [
{
value: 'apply_count',
name: '申请量',
orderType: 'DESC',
},
{
value: 'collectCount',
name: '收藏量',
orderType: 'DESC',
},
{
value: 'create_date',
name: '发布时间',
orderType: 'DESC',
},
{
value: 'update_date',
name: '更新时间',
orderType: 'DESC',
},
]
const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
const integrationOrder = reactive({
orderField: '',
orderType: '',
})
// --
const changeOrder = (i, val, type) => {
let newType = type
integrationOrder.orderField = val
integrationOrder.orderType = newType
integrationOrderList.value[i].orderType = newType
mybus.emit('changeCondition', {
orderField: val,
orderType: newType,
})
}
const reset = () => {
integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
integrationOrder.orderField = ''
integrationOrder.orderType = ''
}
defineExpose({
reset,
})
</script>
<style lang="less" scoped>
.integrationServiceOrder {
display: flex;
li {
width: 90px;
height: 12px;
text-align: center;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
.arrow {
display: inline-block;
width: 12px;
height: 12px;
background: url('~@/assets/newHome/arrow.png');
margin-left: 10px;
}
.down {
background: url('~@/assets/newHome/down.png');
margin-top: 6px;
}
}
}
</style>

View File

@ -1,7 +1,6 @@
<template>
<div id="search-result-list-container">
<div class="shai-xuan">
<!-- <div class="circle">!</div> -->
<div class="result">
检测结果:
<span>{{ resourceTotal || '' }}</span>
@ -10,23 +9,12 @@
}}
</div>
<div class="condition" :key="showKey">
<ul
<IntegrationServiceOrder
ref="integrationServiceOrderDom"
v-if="
selectCardsname === '融合服务' || selectCardsname === '赋能场景'
"
>
<li
v-for="(item, i) in orderList"
:key="item.value"
@click="changeOrder(i, item.value, item.orderType)"
>
{{ item.name }}
<span
class="arrow"
:class="item.orderType == 'ASC' ? 'down' : ''"
></span>
</li>
</ul>
></IntegrationServiceOrder>
<ul v-else>
<li
v-for="item in selList"
@ -167,48 +155,6 @@
p-id="3065"
></path>
</svg>
<!-- 审核中 -->
<!-- <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"
>
<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>
<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>
</svg>
<span
v-if="
item.applyState == '已申请' && item.approveStatus == '审核中'
"
style="
font-size: 12px;
-webkit-transform: scale(0.75);
color: #d81e06;
position: relative;
left: -35px;
top: -0.6px;
font-weight: 500;
"
>
审核中
</span> -->
</span>
<div class="header-right">
<div
@ -285,7 +231,6 @@
<div
v-if="
selectCardsname !== '数据资源' &&
selectCardsname !== '融合服务' &&
selectCardsname !== '赋能场景' &&
(selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
"
@ -407,16 +352,16 @@
</div>
</template>
<script>
import { ref, reactive } from 'vue'
import { ref, reactive, nextTick } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
import { getUser, sgcInsert } from '@/api/home'
import { scInsert, scDel } from '@/api/personalCenter'
import mybus from '@/myplugins/mybus'
import { getHls } from '@/api/home.js'
import IntegrationServiceOrder from './integrationServiceOrder.vue'
export default {
name: '',
// props: ['resourceList', 'resourceTotal', 'selectCardsname'],
props: {
resourceList: {
type: Object,
@ -503,41 +448,22 @@
})
newArr.push(arr)
}
console.log(
'dataList======================>',
newArr,
this.resourceList
)
console.log('dataList======================>', newArr, this.resourceList)
return newArr
},
isShoppingCartOrNot() {
return ''
},
},
components: {},
components: {
IntegrationServiceOrder,
},
setup(props) {
// eslint-disable-next-line no-undef
const whoShow1 = whoShow
const showKey = ref(0)
let shoppingKey = ref(1)
//
const orderList = ref([
{
value: 'collectCount',
name: '收藏量',
orderType: 'DESC',
},
{
value: 'create_date',
name: '发布时间',
orderType: 'DESC',
},
{
value: 'update_date',
name: '更新时间',
orderType: 'DESC',
},
])
const integrationServiceOrderDom = ref(null);
// id
const selList = ref([
{ name: '发布时间', value: 'tdr.create_date', show: true },
@ -553,6 +479,7 @@
(val) => (val.show = val.name === '发布时间' || val.name === '申请量')
)
}
const findComponentName = (list, name) => {
if (list.infoList) {
return list.infoList.find((item) => {
@ -565,9 +492,7 @@
console.log('this.resourceList', props.resourceList.data)
props.resourceList.data.map((val) => {
if (val.infoList) {
let obj = val.infoList.filter(
(item) => item.attrType == '组件类型'
)[0]
let obj = val.infoList.filter((item) => item.attrType == '组件类型')[0]
if (obj) {
switch (obj.attrValue) {
case '智能算法':
@ -612,9 +537,7 @@
item.guid
)
} else {
window.open(
'http://10.134.135.24:30090/#/home?id=' + item.serviceId
)
window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
}
} else if (props.selectCardsname === '融合服务') {
//
@ -683,11 +606,6 @@
})
}
} else {
console.log(
'111111111111111111===========>',
router,
props.selectCardsname
)
router.push({
path: '/details',
query: {
@ -705,7 +623,6 @@
sgcInsert({
delFlag: '0',
resourceId: item.id,
// userId: userId.value,
}).then((res) => {
console.log(res)
message.success('添加申购车成功!')
@ -760,16 +677,6 @@
console.log('选择===========》', val, selData.value)
}
// --
const changeOrder = (i, val, type) => {
let newType = type === 'DESC' ? 'ASC' : 'DESC'
orderList.value[i].orderType = newType
mybus.emit('changeCondition', {
orderField: val,
orderType: newType,
})
}
// --
//
const handleAKeyApplication = (item) => {
@ -820,39 +727,16 @@
_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',
})
}
// const handleAKeyApplication = (item) => {
// let _applyList = []
// ; (item.fuseResourceList || []).map((v) => {
// let resource = v.resource || {}
// let obj = {
// arr: [
// {
// delFlag: resource.delFlag,
// description: resource.description,
// resourceId: resource.id,
// resourceName: resource.name,
// time: resource.createDate,
// type: resource.type,
// },
// ],
// deptId: resource.deptId,
// deptName: resource.deptName,
// }
// _applyList.push(obj)
// })
// localStorage.setItem('applyList', JSON.stringify(_applyList))
// router.push({
// path: '/apply',
// })
// }
mybus.on('chongzhi', (typeObj) => {
console.log('typeObj------------>', typeObj)
if (!typeObj) {
@ -860,25 +744,14 @@
}
if (
typeObj &&
(typeObj.type === '融合服务' || typeObj.type === '赋能场景')
(typeObj.type === '融合服务' || typeObj.type === '打包模式')
) {
orderList.value = [
{
value: 'collectCount',
name: '收藏量',
orderType: 'DESC',
},
{
value: 'create_date',
name: '发布时间',
orderType: 'DESC',
},
{
value: 'update_date',
name: '更新时间',
orderType: 'DESC',
},
]
console.log('integrationServiceOrderDom------------>', integrationServiceOrderDom);
// integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
console.log('integrationServiceOrderDom.value------------>', integrationServiceOrderDom.value);
integrationServiceOrderDom.value.reset()
}
})
let videoUrl = ref('')
@ -932,6 +805,7 @@
},
})
}
return {
onSearch,
resultList,
@ -951,18 +825,20 @@
goComparePk,
whoShow1,
showKey,
orderList,
handleAKeyApplication,
changeOrder,
integrationServiceOrderDom,
}
},
beforeUnmount() {
mybus.off('chongzhi')
// mybus.emit('changeSelcted')
},
}
</script>
<style scoped lang="less">
.activeBg {
background-color: #0087ff;
}
#search-result-list-container {
width: 1088px;
padding: 0 20px;
@ -980,9 +856,6 @@
.shai-xuan {
width: 1047px;
height: 36px;
// margin: 11px 0 20px;
// background: #e5f2ff;
// padding-left: 20px;
display: flex;
align-items: center;
position: relative;
@ -1197,19 +1070,7 @@
font-size: 14px;
margin: 5px 0;
// .left {
// width: 600px;
// display: flex;
// justify-content: space-between;
// flex-wrap: wrap;
// & > div {
// width: 300px;
// & > span {
// color: #0087ff;
// font-weight: 600;
// }
// }
// }
.right {
flex: 1;
display: flex;

View File

@ -37,7 +37,6 @@
<searchResultList
v-if="number === 0"
v-show="resourceList.data && resourceList.data.length > 0"
:key="listKey2"
:resourceList="resourceList"
:resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
@ -45,7 +44,6 @@
<CanAssignCase
v-else
v-show="resourceList.data && resourceList.data.length > 0"
:key="listKey2"
:resourceList="resourceList"
:resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
@ -113,11 +111,6 @@
])
const number = ref(0)
//
let listKey = ref(0)
//
const listKey2 = ref(0)
//
const paramsGetResources = {
pageNum: 1,
@ -174,17 +167,15 @@
name: searchValue.value,
type: titleName.value[number.value].name,
}
getIntegrationServicesList(postData).then(
(res) => {
loadingData.value = false
if (res.data.code !== 0) {
return message.error(res.data.msg)
}
console.log('res.data------------>', res.data)
resourceList.data = res.data.data.list || []
resourceTotal.value = res.data.data.total || 0
listKey2.value++
},
(err) => {
loadingData.value = false
@ -216,6 +207,7 @@
getAppResources()
})
mybus.on('changeCondition', (condition) => {
console.log('------>', condition)
paramsGetResources.orderField = condition.orderField
paramsGetResources.orderType = condition.orderType
getAppResources()
@ -231,8 +223,6 @@
}
onMounted(() => {
console.log('222----onMounted-------->', 222)
listKey2.value++
getAppResources()
})
@ -249,13 +239,11 @@
})
return {
listKey,
searchValue,
currentPage,
resourceList,
resourceTotal,
pageChange,
listKey2,
Cardsname,
getAppResources,
chongzhi,