Merge pull request 'fix:图片审批沉浸模式 消息公告名字 消息公告回显标题' (#254) from fix/change_task into test

Reviewed-on: #254
pull/257/head
赵辉 1 year ago
commit c7a5b5f26f

@ -1,5 +1,5 @@
import type { RouteRecordRaw } from 'vue-router'
import { Layout } from '@/router/constant' import { Layout } from '@/router/constant'
import type { RouteRecordRaw } from 'vue-router'
/** /**
* @param name , , * @param name , ,
@ -40,7 +40,7 @@ const routes: Array<RouteRecordRaw> = [
path: 'message-detail', path: 'message-detail',
name: 'message-detail', name: 'message-detail',
meta: { meta: {
title: 'message', title: '消息公告',
}, },
component: () => import('@/views/message/content/Detail.vue'), component: () => import('@/views/message/content/Detail.vue'),
}, },

@ -452,6 +452,7 @@ console.log(tabList)
text-align: left; text-align: left;
color: #666666; color: #666666;
line-height: 25px; line-height: 25px;
margin-bottom: 15px;
} }
.subtitle { .subtitle {

@ -576,7 +576,7 @@ defineExpose({
<template> <template>
<div class="wrapper fullscreen-container" :style="fullscreenStyles"> <div class="wrapper fullscreen-container" :style="fullscreenStyles">
<div class="wrapper-header"> <div class="wrapper-header">
<div class="left"> <div class="left" >
<span class="font">{{ packageName }}</span> <span class="font">{{ packageName }}</span>
<SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" /> <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
<SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" /> <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
@ -638,9 +638,10 @@ defineExpose({
class="left" class="left"
:style="{ :style="{
'background-image': `url(${taskDetailInfo?.imgurl})`, 'background-image': `url(${taskDetailInfo?.imgurl})`,
'flex': imgbigshow ? '0.6' : '1', 'flex': imgbigshow ? '0.6' : '0.98',
'height':imgbigshow?' 100%':'80vh'
}" }"
@click="previewHandler"
@mouseover="showAction" @mouseover="showAction"
@mouseleave="leaveTaskHandler" @mouseleave="leaveTaskHandler"
> >
@ -749,42 +750,45 @@ defineExpose({
@click.stop="handleRejectdubiousfileyd(taskDetailInfo.id)" @click.stop="handleRejectdubiousfileyd(taskDetailInfo.id)"
/> />
</div> </div>
</div> <!-- 缩放线 -->
<!-- 缩放线 -->
<div <div
v-show="isFullScreen" v-show="isFullScreen"
:style="{ :style="{
position: 'fixed', position: 'absolute',
zIndex: 169, zIndex: 169,
background: 'rgb(80, 122, 253)', background: 'rgb(80, 122, 253)',
right: imgbigshow ? '46%' : '16px', right: imgbigshow ? '-23px':'0',
marginTop: '5px', marginTop: '5px',
width: '2px', width: '2px',
height: '350px', height: imgbigshow?'340px':'79vh',
}" }"
/> />
<div <div
v-show="isFullScreen" v-show="isFullScreen"
class="aside-collapse-btn" class="aside-collapse-btn"
:style="{ :style="{
position: 'fixed', position: 'absolute',
right: imgbigshow ? '45%' : '0px', right: imgbigshow ? '-40px':'-16px',
top: '155px', top: '73px',
cursor: 'pointer', cursor: 'pointer',
zIndex: 170, zIndex: 170,
}" }"
> >
<SvgIcon <SvgIcon
:name="false ? 'expand-cir' : 'collapse-cir'" :name="imgbigshow ? 'expand-cir' : 'collapse-cir'"
size="40" size="40"
@click="changeimgbigshow" @click="changeimgbigshow"
/> />
</div> </div>
</div>
<PictureInfo v-show="imgbigshow" :task-detail-info="taskDetailInfo" /> <PictureInfo v-show="imgbigshow" :task-detail-info="taskDetailInfo" />
</div> </div>
<div <div
v-if="imgbigshow"
style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0" style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
> >
<div> <div>
@ -841,7 +845,7 @@ defineExpose({
</div> </div>
</div> </div>
</div> </div>
<div class="wrapper-list"> <div class="wrapper-list" v-if="imgbigshow">
<div <div
v-for="(item, index) in listData" v-for="(item, index) in listData"
:key="index" :key="index"

Loading…
Cancel
Save