Compare commits

..

No commits in common. "073713cf95dba33a1ae7123f728f372c8544bd74" and "3af92de1ec248d2e0ac28fb41c38417acc2585ac" have entirely different histories.

14 changed files with 308 additions and 384 deletions

View File

@ -248,6 +248,7 @@ export default {
this.dataForm.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId
if (type === '同意') { if (type === '同意') {
debugger
// if (this.input !== '') { // if (this.input !== '') {
console.log('this.dataForm', this.dataForm) console.log('this.dataForm', this.dataForm)
const params = qs.stringify({ const params = qs.stringify({
@ -266,7 +267,6 @@ export default {
return return
} }
bus.$emit('applicationforRequirementsInit') bus.$emit('applicationforRequirementsInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -302,7 +302,6 @@ export default {
return return
} }
bus.$emit('applicationforRequirementsInit') bus.$emit('applicationforRequirementsInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',

View File

@ -174,8 +174,7 @@ export default {
} }
return return
} }
bus.$emit('commentInit') bus.$emit('AbilityResourcesRemovedInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -210,8 +209,7 @@ export default {
} }
return return
} }
bus.$emit('commentInit') bus.$emit('AbilityResourcesRemovedInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -261,7 +259,20 @@ export default {
} }
}, },
created () { created () {
// this.dataForm = this.$router.currentRoute.params.id
this.init() this.init()
console.log('fromList', this.$router.currentRoute.params.businessKey)
// this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
var callbacks = {
startProcessSuccessCallback: this.closeCurrentTab,
startProcessErrorCallback: this.startProcessErrorCallback,
taskHandleSuccessCallback: this.closeCurrentTab,
taskHandleErrorCallback: this.taskHandleErrorCallback,
formSaveSuccessCallback: null,
formSaveErrorCallback: null
}
//
this.initProcessMultiple(callbacks)
this.taskId = this.$route.params.taskId this.taskId = this.$route.params.taskId
this.dataForm.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId
}, },

View File

@ -252,7 +252,6 @@ export default {
return return
} }
bus.$emit('AbilityResourcesRemovedInit') bus.$emit('AbilityResourcesRemovedInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -288,7 +287,6 @@ export default {
return return
} }
bus.$emit('AbilityResourcesRemovedInit') bus.$emit('AbilityResourcesRemovedInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',

View File

@ -128,7 +128,6 @@
</template> </template>
<script> <script>
import bus from '@/views/bus.js'
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import processModule from '@/mixins/process-module' import processModule from '@/mixins/process-module'
export default { export default {
@ -151,14 +150,6 @@ export default {
} }
}, },
components: {}, components: {},
created () {
bus.$off('commentInit')
bus.$on('commentInit', () => {
debugger
this.getDataList()
bus.$emit('updateTaskNum')
})
},
methods: { methods: {
// //
taskHandle (row) { taskHandle (row) {

View File

@ -269,7 +269,6 @@ export default {
return return
} }
bus.$emit('abilityResourceShelfInit') bus.$emit('abilityResourceShelfInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -307,7 +306,6 @@ export default {
return return
} }
bus.$emit('abilityResourceShelfInit') bus.$emit('abilityResourceShelfInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',

View File

@ -443,7 +443,6 @@ export default {
return return
} }
bus.$emit('competencyApplicationInit') bus.$emit('competencyApplicationInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
@ -479,7 +478,6 @@ export default {
return return
} }
bus.$emit('competencyApplicationInit') bus.$emit('competencyApplicationInit')
bus.$emit('workInit')
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',

View File

@ -35,7 +35,7 @@ import CenterView from '../workBench/components/center-view.vue'
import DeptChartView from '../workBench/components/dept-chart-view.vue' import DeptChartView from '../workBench/components/dept-chart-view.vue'
import deptTodoView from '../workBench/components/dept-todo-view.vue' import deptTodoView from '../workBench/components/dept-todo-view.vue'
import * as Apis from './api.js' import * as Apis from './api.js'
import bus from '@/views/bus.js'
export default { export default {
components: { components: {
deptTodoView, deptTodoView,
@ -87,14 +87,6 @@ export default {
loadingRequire: false loadingRequire: false
} }
}, },
created () {
bus.$off('workInit')
bus.$on('workInit', () => {
console.log("刷新工作台===================")
this.getToDo()
this.getHasToDo()
})
},
mounted () { mounted () {
// //
this.getToDo() this.getToDo()

View File

@ -44,7 +44,7 @@
<div class="left-list1">排行</div> <div class="left-list1">排行</div>
<div class="left-list2">部门名称</div> <div class="left-list2">部门名称</div>
<div class="left-list1">应用数</div> <div class="left-list1">应用数</div>
<div class="left-list1" style="color: #1ffefd">节省金额</div> <div class="left-list1" style="color: #1ffefd">贡献金额</div>
</div> </div>
<div style=" height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;"> <div style=" height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
<div class="left-list" v-for="(item, index) in top5DeptFundList"> <div class="left-list" v-for="(item, index) in top5DeptFundList">
@ -105,7 +105,7 @@
<div class="left-list1">序号</div> <div class="left-list1">序号</div>
<div class="left-list2">部门名称</div> <div class="left-list2">部门名称</div>
<div class="left-list1">应用数</div> <div class="left-list1">应用数</div>
<div class="left-list1" style="color: #1ffefd">节省金额</div> <div class="left-list1" style="color: #1ffefd">贡献金额</div>
</div> </div>
<div style="height: 200px; overfolw-y: auto"> <div style="height: 200px; overfolw-y: auto">
<div <div

View File

@ -160,7 +160,7 @@
height: 1.8rem; height: 1.8rem;
} }
.header1 { .header1 {
top: 70px; top: 78px;
position: absolute; position: absolute;
left: 795px; left: 795px;
align-items: center; align-items: center;

View File

@ -28,8 +28,8 @@
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
<div class="toptitle"> <div class="toptitle">
<a-tooltip placement="topLeft" v-if="item.demandSubject.length>20"> <a-tooltip placement="topLeft">
<template #title>{{ item.demandSubject}}</template> <template #title>{{ item.demandSubject }}</template>
<span <span
@click="showDetail(item)" @click="showDetail(item)"
style="cursor: pointer" style="cursor: pointer"
@ -38,19 +38,15 @@
{{ item.demandSubject }} {{ item.demandSubject }}
</span> </span>
</a-tooltip> </a-tooltip>
<span v-else>
{{ item.demandSubject }}
</span>
<span class="time">{{ item.createDate }}</span> <span class="time">{{ item.createDate }}</span>
</div> </div>
<a-tooltip placement="topLeft">
<div class="bottomdesc" v-if="item.demandDetails.length<100"> <template #title>描述 {{ item.demandDetails }}</template>
<div class="bottomdesc">
描述 {{ item.demandDetails || '--' }} 描述 {{ item.demandDetails || '--' }}
</div> </div>
<div class="bottomdesc" v-else> </a-tooltip>
描述 {{ item.demandDetails.slice(0,100) }}...<span style="cursor:pointer;color:#1492ff" @click="showDetail(item)">查看更多>></span>
</div>
</a-list-item> </a-list-item>
</template> </template>
</a-list> </a-list>
@ -198,7 +194,6 @@ onMounted(() => {
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.main-cont { .main-cont {
margin-top: 64px; margin-top: 64px;
width: 100%; width: 100%;
@ -265,7 +260,6 @@ onMounted(() => {
box-shadow: 10px 8px 10px 3px #9dc6ea; box-shadow: 10px 8px 10px 3px #9dc6ea;
padding: 20px; padding: 20px;
.toptitle { .toptitle {
cursor: pointer;
margin-bottom: 10px; margin-bottom: 10px;
& > span:first-child { & > span:first-child {
display: -webkit-box; display: -webkit-box;
@ -293,7 +287,7 @@ onMounted(() => {
.bottomdesc { .bottomdesc {
display: -webkit-box; display: -webkit-box;
/*设置为弹性盒子*/ /*设置为弹性盒子*/
-webkit-line-clamp: 2; -webkit-line-clamp: 1;
/*最多显示2行*/ /*最多显示2行*/
overflow: hidden; overflow: hidden;
/*超出隐藏*/ /*超出隐藏*/

View File

@ -9,13 +9,13 @@
<div class="algorithm-top-details"> <div class="algorithm-top-details">
<div class="left"> <div class="left">
<div class="top"> <div class="top">
<a-tooltip placement="top" v-if="(props.dataList.name.length>20)"> <a-tooltip placement="top">
<template #title>{{ props.dataList.name }}</template> <template #title>{{ props.dataList.name }}</template>
<span class="name"> <span class="name">
{{ props.dataList.name }} {{ props.dataList.name }}
</span> </span>
</a-tooltip> </a-tooltip>
<span class="name" v-else>{{ props.dataList.name }}</span> <!-- <span class="name">{{ props.dataList.name }}</span> -->
<div class="label-content"> <div class="label-content">
<p class="lable-father"> <p class="lable-father">
<span class="label" v-if="props.dataList.type"> <span class="label" v-if="props.dataList.type">
@ -27,55 +27,29 @@
<span class="label" v-if="props.dataList.shareCondition"> <span class="label" v-if="props.dataList.shareCondition">
{{ props.dataList.shareCondition }} {{ props.dataList.shareCondition }}
</span> </span>
</p> </p>
</div> </div>
<!-- <span class="label">免费</span> --> <!-- <span class="label">免费</span> -->
</div> </div>
<div class="main"> <div class="main">
<!-- <a-tooltip placement="top"> <!-- <a-tooltip placement="top">
<template #title>应用领域{{ applicationArea }}</template> <template #title>应用领域{{ applicationArea }}</template>
<div>应用领域{{ applicationArea }}</div> <div>应用领域{{ applicationArea }}</div>
</a-tooltip> --> </a-tooltip> -->
<!-- <a-tooltip placement="top"> <a-tooltip placement="top">
<template #title>{{ props.dataList.description }}</template> <template #title>{{ props.dataList.description }}</template>
<div> <div>
{{ props.dataList.description }} {{ props.dataList.description }}
</div> </div>
</a-tooltip> --> </a-tooltip>
<div class="bottomdesc" v-if="props.dataList.description.length < 200"> <div style="padding-top:20px">
场景描述 {{ props.dataList.description || '--' }} <span >场景入口:</span>
</div> <span style="margin-left:10px;cursor: pointer; text-decoration: underline;"
<div class="bottomdesc" v-else-if="dowmOrUp === '展开>>'"> @click="openScene(props.dataList.sceneUrl)">{{(props.dataList.sceneUrl)}}</span>
场景描述 {{ props.dataList.description.slice(0, 200) }}... </div>
<span
style="cursor: pointer; color: rgb(241 211 112)"
@click="showDetail(dowmOrUp)"
>
{{ dowmOrUp }}
</span>
</div>
<div class="bottomdesc1" v-else>
场景描述 {{ props.dataList.description }}
<span
style="cursor: pointer; color: rgb(241 211 112)"
@click="showDetail(dowmOrUp)"
>
{{ dowmOrUp }}
</span>
</div>
<div style="padding-top: 20px">
<span>场景入口:</span>
<span
style="
margin-left: 10px;
cursor: pointer;
text-decoration: underline;
"
@click="openScene(props.dataList.sceneUrl)"
>
{{ props.dataList.sceneUrl }}
</span>
</div>
</div> </div>
<div class="bottom" v-if="props.dataList.id"> <div class="bottom" v-if="props.dataList.id">
<!-- 融合服务 存在fuseResourceList --> <!-- 融合服务 存在fuseResourceList -->
@ -106,299 +80,287 @@
</a-button> --> </a-button> -->
</div> </div>
</div> </div>
<div class="right"></div> <div class="right">
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
// import { ShoppingCartOutlined } from '@ant-design/icons-vue' // import { ShoppingCartOutlined } from '@ant-design/icons-vue'
import { defineProps, ref, watch } from 'vue' import { defineProps, ref, watch } from 'vue'
import { scInsert, scDel } from '@/api/personalCenter' import { scInsert, scDel } from '@/api/personalCenter'
import { sgcInsert } from '@/api/home' import { sgcInsert } from '@/api/home'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { message } from 'ant-design-vue' import { message } from 'ant-design-vue'
// //
const router = useRouter() const router = useRouter()
let dowmOrUp = ref('展开>>') // down ; up const props = defineProps({
dataList: { type: Object, default: null },
})
// console.log('dataList------------>', props.dataList)
const showDetail = (val) => { const applicationArea = ref('')
if (val === '展开>>') { // //
dowmOrUp.value = '收起<<' const addShoppingCart = () => {
} else { if (props.dataList.isInShoppingCart) {
dowmOrUp.value = '展开>>' message.error('已经加入申购车了')
} else {
console.log('加入申购车==================>', props.dataList)
sgcInsert({
delFlag: '0',
resourceId: props.dataList.id,
// userId: userId.value,
}).then((res) => {
console.log(res)
message.success('添加申购车成功!')
mybus.emit('getSgcNum')
props.dataList.isInShoppingCart = true
console.log(
props.dataList.isInShoppingCart,
'props.dataList.isInShoppingCart'
)
})
}
} }
} //
const props = defineProps({ const openScene = (val) => {
dataList: { type: Object, default: null }, window.open(val, "_blank");
}) }
// //
console.log('dataList------------>', props.dataList) function toView() {
const applicationArea = ref('') // window.open(newpage.href, '_blank')
// // // router.push({
const addShoppingCart = () => { // path: '/apply',
if (props.dataList.isInShoppingCart) { // query: {
message.error('已经加入申购车了') // name: props.dataList.name,
} else { // resourceId: [props.dataList.id],
console.log('加入申购车==================>', props.dataList) // },
sgcInsert({ // })
delFlag: '0', console.log('一键申请===================>', props.dataList)
resourceId: props.dataList.id, localStorage.setItem(
// userId: userId.value, 'applyList',
}).then((res) => { JSON.stringify([
console.log(res) {
message.success('添加申购车成功!') arr: [
mybus.emit('getSgcNum') {
props.dataList.isInShoppingCart = true delFlag: props.dataList.delFlag,
console.log( description: props.dataList.description,
props.dataList.isInShoppingCart, resourceId: props.dataList.id,
'props.dataList.isInShoppingCart' resourceName: props.dataList.name,
) time: props.dataList.createDate,
type: props.dataList.type,
// componentType: '',
},
],
deptId: props.dataList.deptId,
deptName: props.dataList.deptName,
},
])
)
router.push({
path: '/apply',
}) })
} }
} // --
// const handleAKeyApplication = () => {
const openScene = (val) => { let _applyList = []
window.open(val, '_blank') ;(props.dataList.fuseResourceList || []).map((v) => {
} let resource = v.resource || {}
// // let obj = {
function toView() {
// window.open(newpage.href, '_blank')
// router.push({
// path: '/apply',
// query: {
// name: props.dataList.name,
// resourceId: [props.dataList.id],
// },
// })
console.log('一键申请===================>', props.dataList)
localStorage.setItem(
'applyList',
JSON.stringify([
{
arr: [ arr: [
{ {
delFlag: props.dataList.delFlag, delFlag: resource.delFlag,
description: props.dataList.description, description: resource.description,
resourceId: props.dataList.id, resourceId: resource.id,
resourceName: props.dataList.name, resourceName: resource.name,
time: props.dataList.createDate, time: resource.createDate,
type: props.dataList.type, type: resource.type,
// componentType: '',
}, },
], ],
deptId: props.dataList.deptId, deptId: resource.deptId,
deptName: props.dataList.deptName, deptName: resource.deptName,
}, }
]) _applyList.push(obj)
})
localStorage.setItem('applyList', JSON.stringify(_applyList))
router.push({
path: '/apply',
})
}
//
const scFlag2 = ref(true)
const goTOCollection = () => {
console.log('收藏===================》', props.dataList)
if (scFlag2.value) {
scFlag2.value = false
if (props.dataList.isCollect == 'true') {
scDel([props.dataList.id]).then((res) => {
if (res.data.msg === 'success') {
message.success('取消成功')
// eslint-disable-next-line vue/no-mutating-props
props.dataList.isCollect = 'false'
scFlag2.value = true
}
})
} else {
scInsert([
{
resourceId: props.dataList.id,
},
]).then((res) => {
if (res.data.msg === 'success') {
message.success('添加收藏成功!')
// eslint-disable-next-line vue/no-mutating-props
props.dataList.isCollect = 'true'
scFlag2.value = true
}
})
}
}
// scInsert([{ resourceId: props.dataList.id }]).then((res) => {
// console.log(res)
// message.success('')
// })
}
if (props.dataList.infoList) {
applicationArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域'
)[0].attrValue
}
watch(
() => props.dataList,
(val) => {
if (val) {
console.log('props.dataList-----watch------->', val)
applicationArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域'
)[0].attrValue
}
}
) )
router.push({
path: '/apply',
})
}
// --
const handleAKeyApplication = () => {
let _applyList = []
;(props.dataList.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',
})
}
//
const scFlag2 = ref(true)
const goTOCollection = () => {
console.log('收藏===================》', props.dataList)
if (scFlag2.value) {
scFlag2.value = false
if (props.dataList.isCollect == 'true') {
scDel([props.dataList.id]).then((res) => {
if (res.data.msg === 'success') {
message.success('取消成功')
// eslint-disable-next-line vue/no-mutating-props
props.dataList.isCollect = 'false'
scFlag2.value = true
}
})
} else {
scInsert([
{
resourceId: props.dataList.id,
},
]).then((res) => {
if (res.data.msg === 'success') {
message.success('添加收藏成功!')
// eslint-disable-next-line vue/no-mutating-props
props.dataList.isCollect = 'true'
scFlag2.value = true
}
})
}
}
// scInsert([{ resourceId: props.dataList.id }]).then((res) => {
// console.log(res)
// message.success('')
// })
}
if (props.dataList.infoList) {
applicationArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域'
)[0].attrValue
}
watch(
() => props.dataList,
(val) => {
if (val) {
console.log('props.dataList-----watch------->', val)
applicationArea.value = props.dataList.infoList.filter(
(val) => val.attrType === '应用领域'
)[0].attrValue
}
}
)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.algorithm-top-details { .algorithm-top-details {
height: 6rem; height: 6rem;
padding: 1.8rem 0 0; padding: 1.8rem 0 0;
background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat; background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
background-size: 100%;
display: flex;
justify-content: center;
.left {
max-width: 7.2rem;
color: #fff;
margin-right: 0.8rem;
.top {
display: flex;
align-items: center;
span {
font-size: 0.14rem;
}
.name {
// max-width: 3.3rem;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
font-size: 0.4rem;
margin-right: 0.2rem;
font-size: 0.4rem;
margin-right: 0.2rem;
max-width: 6rem;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.label-content {
position: relative;
}
.lable-father {
position: absolute;
min-width: 3.5rem;
right: -3.5rem;
top: 0;
}
.label {
padding: 0.01rem 0.1rem;
margin-right: 0.1rem;
border-radius: 0.13rem;
background: rgba(255, 255, 255, 0.4);
}
}
.main {
.bottomdesc {
display: -webkit-box;
/*设置为弹性盒子*/
-webkit-line-clamp: 4;
/*最多显示2行*/
overflow: hidden;
/*超出隐藏*/
text-overflow: ellipsis;
/*超出显示为省略号*/
-webkit-box-orient: vertical;
word-break: break-all;
width: 800px;
font-size: 14px;
}
.bottomdesc1 {
overflow: auto;
width: 800px;
font-size: 14px;
height: 200px;
}
margin-top: 0.2rem;
font-size: 0.18rem;
line-height: 0.34rem;
}
.bottom {
margin-top: 0.4rem;
display: flex;
.ant-btn {
height: 0.5rem;
margin-right: 0.2rem;
background: #ff8b55;
border-radius: 0.06rem;
font-size: 0.2rem;
display: flex;
justify-content: center;
align-items: center;
}
.ant-btn:nth-of-type(1) {
width: 1.8rem;
}
.ant-btn:nth-of-type(2) {
width: 2.2rem;
}
.ant-btn:nth-of-type(3) {
width: 1.45rem;
}
}
}
.right {
width: 5.8rem;
height: 4rem;
background: url('~@/assets/detailsAll/sf_right_bg.png') no-repeat;
background-size: 100%; background-size: 100%;
margin-top: -0.4rem; display: flex;
justify-content: center;
.left {
max-width: 7.2rem;
color: #fff;
margin-right: 0.8rem;
.top {
display: flex;
align-items: center;
span {
font-size: 0.14rem;
}
.name {
// max-width: 3.3rem;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
font-size: 0.4rem;
margin-right: 0.2rem;
font-size: 0.4rem;
margin-right: 0.2rem;
max-width: 6rem;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
.label-content {
position: relative;
}
.lable-father {
position: absolute;
min-width: 3.5rem;
right: -3.5rem;
top: 0;
}
.label {
padding: 0.01rem 0.1rem;
margin-right: 0.1rem;
border-radius: 0.13rem;
background: rgba(255, 255, 255, 0.4);
}
}
.main {
margin-top: 0.2rem;
font-size: 0.18rem;
line-height: 0.34rem;
// & > div:nth-of-type(1) {
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
// }
& > div:nth-of-type(1) {
max-height: 1rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-break: break-all;
}
}
.bottom {
margin-top: 0.4rem;
display: flex;
.ant-btn {
height: 0.5rem;
margin-right: 0.2rem;
background: #ff8b55;
border-radius: 0.06rem;
font-size: 0.2rem;
display: flex;
justify-content: center;
align-items: center;
}
.ant-btn:nth-of-type(1) {
width: 1.8rem;
}
.ant-btn:nth-of-type(2) {
width: 2.2rem;
}
.ant-btn:nth-of-type(3) {
width: 1.45rem;
}
}
}
.right {
width: 5.8rem;
height: 4rem;
background: url('~@/assets/detailsAll/sf_right_bg.png') no-repeat;
background-size: 100%;
margin-top: -0.4rem;
}
} }
}
</style> </style>

View File

@ -420,7 +420,7 @@
}) })
mybus.on('changeMenuStyle', (data) => { mybus.on('changeMenuStyle', (data) => {
debugger
targetRouter.value = data targetRouter.value = data
if (data.path == '/algorithmCompare') { if (data.path == '/algorithmCompare') {
jumpPage( jumpPage(

View File

@ -31,11 +31,9 @@
/> />
<i class="searchImg" aria-hidden="true"></i> <i class="searchImg" aria-hidden="true"></i>
<button class="button-reset" @click="resetAction()">重置</button> <button class="button-reset" @click="resetAction()">重置</button>
<div class="hengxian"></div> <div class="hengxian"></div>
</div> </div>
</div> </div>
<div v-if="number === 0" class="checkResult">检测结果: <span>{{resourceTotal}}</span></div>
<div v-loading="loadingData"> <div v-loading="loadingData">
<searchResultList <searchResultList
v-if="number === 1" v-if="number === 1"
@ -54,9 +52,7 @@
:resourceTotal="resourceTotal" :resourceTotal="resourceTotal"
:selectCardsname="number == 0 ? '融合服务' : '赋能场景'" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
/> />
<div class="pagination"> <div class="pagination">
<a-pagination <a-pagination
v-if="resourceList.data && resourceList.data.length > 0" v-if="resourceList.data && resourceList.data.length > 0"
v-model:current="currentPage" v-model:current="currentPage"
@ -334,22 +330,9 @@
}) })
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.checkResult{
margin-left: 0.2rem;
font-size: 14px;
font-weight: 500;
color: #212121;
margin-top: 10px;
span {
font-size: 18px;
color: #0087ff;
}
}
.resultListSearchInput-father { .resultListSearchInput-father {
background: #f3f5f9; background: #f3f5f9;
padding: 0rem 0.2rem; padding: 0.2rem;
.resultListSearchInput-son { .resultListSearchInput-son {
background: #fff; background: #fff;

View File

@ -347,8 +347,6 @@
message.success(`${info.file.name} 文件上传成功`) message.success(`${info.file.name} 文件上传成功`)
formName.enclosure = info.file.response.data formName.enclosure = info.file.response.data
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
formName.enclosure = ''
fileList.value=[]
message.error(`${info.file.name} 文件上传失败`) message.error(`${info.file.name} 文件上传失败`)
} }
} }