Merge pull request 'fix:样式' (#328) from fix/change_task into test

Reviewed-on: #328
pull/329/head
yaoshuli 1 year ago
commit 72f1a8be9a

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>excel</title>
<defs>
<polygon id="path-1" points="14.6302222 40 18.5555556 34.112 22.4808889 40 25.5315556 40 20.0488889 32.128 25.1902222 24.768 22.1395556 24.768 18.5555556 30.144 14.9715556 24.768 11.9208889 24.768 17.0195556 32.128 11.5795556 40"></polygon>
<filter x="-53.8%" y="-49.2%" width="207.5%" height="198.5%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0.282976676 0 0 0 0 0.125210918 0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1457.000000, -7697.000000)">
<g id="excel" transform="translate(1457.000000, 7697.000000)">
<path d="M34.1239995,6.66666667 L52,24.1066671 L52,53.3333333 C52,54.4379028 51.5522847,55.4379028 50.8284271,56.1617605 C50.1045695,56.8856181 49.1045695,57.3333333 48,57.3333333 L48,57.3333333 L16,57.3333333 C14.8954305,57.3333333 13.8954305,56.8856181 13.1715729,56.1617605 C12.4477153,55.4379028 12,54.4379028 12,53.3333333 L12,53.3333333 L12,10.6666667 C12,9.56209717 12.4477153,8.56209717 13.1715729,7.83823954 C13.8954305,7.11438192 14.8954305,6.66666667 16,6.66666667 L16,6.66666667 L34.1239995,6.66666667 Z" id="形状结合" stroke="#269758" stroke-width="2.66666667" fill="#FFFFFF"></path>
<path d="M36,8.55228475 L50.1143819,22.6666667 L40,22.6666667 C38.8954305,22.6666667 37.8954305,22.2189514 37.1715729,21.4950938 C36.4477153,20.7712362 36,19.7712362 36,18.6666667 L36,18.6666667 L36,8.55228475 Z" id="矩形备份" stroke="#269758" stroke-width="2.66666667" fill="#FFFFFF"></path>
<g id="编组" transform="translate(32.000000, 24.000000)" fill="#EBEDF0">
<rect id="矩形" x="0" y="0" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-2" x="0" y="5.33333333" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-3" x="0" y="10.6666667" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-4" x="0" y="16" width="5.33333333" height="2.66666667"></rect>
</g>
<g id="编组备份" transform="translate(40.000000, 24.000000)" fill="#EBEDF0">
<rect id="矩形" x="0" y="0" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-2" x="0" y="5.33333333" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-3" x="0" y="10.6666667" width="5.33333333" height="2.66666667"></rect>
<rect id="矩形备份-4" x="0" y="16" width="5.33333333" height="2.66666667"></rect>
</g>
<rect id="矩形" fill="#269758" x="5.33333333" y="18.6666667" width="26.6666667" height="26.6666667" rx="2.66666667"></rect>
<g id="X" fill-rule="nonzero">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" xlink:href="#path-1"></use>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icon/Warning</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-2248.000000, -5089.000000)">
<g id="Icon/Warning" transform="translate(2248.000000, 5089.000000)">
<rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="64" height="64"></rect>
<path d="M32,4 C16.5375,4 4,16.5375 4,32 C4,47.4625 16.5375,60 32,60 C47.4625,60 60,47.4625 60,32 C60,16.5375 47.4625,4 32,4 Z M30,18.5 C30,18.225 30.225,18 30.5,18 L33.5,18 C33.775,18 34,18.225 34,18.5 L34,35.5 C34,35.775 33.775,36 33.5,36 L30.5,36 C30.225,36 30,35.775 30,35.5 L30,18.5 Z M32,46 C30.34375,46 29,44.65625 29,43 C29,41.34375 30.34375,40 32,40 C33.65625,40 35,41.34375 35,43 C35,44.65625 33.65625,46 32,46 Z" id="形状" fill="#FFBF00"></path>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -124,18 +124,16 @@ defineExpose({
任务审批/任务终审/AI工单明细动作
</div>
<div class="wrapper-request">
<table style="margin-left: 120px; width: 290px">
<table style="margin-left: 73px; width: 290px">
<tr>
<td>
<div
class="key" style="float: left;
margin-left: 5px;" data-key="c"
class="key" data-key="c"
/>
</td>
<td>
<div
style="float: left;
margin-left: -60px;"
>
关闭关闭当前场景弹窗
</div>
@ -143,14 +141,14 @@ defineExpose({
</tr>
<tr>
<td>
<div class="key" data-key="&larr;" />
<div class="key" style="float:none" data-key="&larr;" />
<span>/</span>
<div class="key" data-key="&rarr;" />
<div class="key" style="float:none" data-key="&rarr;" />
</td>
<td>打开上一条/下一条信息切换</td>
</tr>
</table>
<table style="margin-left: 50px">
<table style="margin-left: 94px">
<tr>
<td style="text-align: left; width: 55px">
<div class="key" data-key="p p" />
@ -166,7 +164,7 @@ defineExpose({
</table>
</div>
<div class="wrapper-request">
<table style="margin-left: 120px; width: 180px">
<table style="margin-left: 123px; width: 180px">
<tr>
<td style="text-align: left; width: 55px">
<div class="key" data-key="k k" />
@ -318,6 +316,7 @@ defineExpose({
}
.key {
float: right;
border-radius: 8px;
display: inline-block;
box-sizing: content-box;

@ -21,7 +21,8 @@ interface ParseResults {
}
const cardStyle = {
width: "620px",
"margin-bottom":"364px",
width: "484px",
"--n-padding-bottom": "10px",
"--n-padding-left": "0px",
};
@ -204,6 +205,7 @@ function afterLeave() {
</div>
</div>
</div>
<div class="topline"></div>
<n-divider />
<div class="wrapper-content">
<div
@ -235,7 +237,12 @@ function afterLeave() {
:key="index"
class="wrapper-content-files"
>
<div>{{ item.fileName }}</div>
<div> <SvgIcon
size="24"
style="margin-top:-6px"
name="excelicon"
/><span style="margin-left:10px;paddin-top:5px">{{ item.fileName }}</span></div>
<div>
<SvgIcon
size="16px"
@ -246,10 +253,14 @@ function afterLeave() {
</div>
</div>
</div>
<div class="bottomline"></div>
</div>
<template #footer>
<div class="footer">
<n-button type="info" @click="handleSumbit"> </n-button>
<n-button type="info" style="width: 60px;
height: 36px;
background: #507afd;" @click="handleSumbit"> 确定 </n-button>
</div>
</template>
</n-card>
@ -262,7 +273,7 @@ function afterLeave() {
display: flex;
justify-content: space-between;
align-items: center;
padding: 6px 0 0 24px;
padding: 0px 0px 0 24px;
// padding: 10px;
}
@ -285,9 +296,9 @@ function afterLeave() {
}
&-icon {
background: #000;
background: #999999;
display: inline-block;
width: 12px;
width: 16px;
height: 1px;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
@ -296,9 +307,9 @@ function afterLeave() {
&:after {
content: "";
display: block;
width: 12px;
width: 16px;
height: 1px;
background: #000;
background: #999999;
transform: rotate(-90deg);
-webkit-transform: rotate(-90deg);
}
@ -306,8 +317,9 @@ function afterLeave() {
}
&-content {
margin: 33px 24px 0 25px;
margin: 55px 24px 0 25px;
&-dragger {
height: 150px;
display: flex;
flex-direction: column;
align-items: center;
@ -317,12 +329,11 @@ function afterLeave() {
font-weight: bold;
border-radius: 2px;
text-align: center;
background: rgba(202, 210, 221, 0.1);
background: rgba(202,210,221,0.10);
}
&-files {
margin-top: 10px;
padding: 0px 10px;
margin-top: 17px;
font-size: 14px;
display: flex;
justify-content: space-between;
@ -354,6 +365,15 @@ function afterLeave() {
margin-top: 0px;
margin-bottom: 0px;
}
::v-deep(.n-divider:not(.n-divider--dashed) .n-divider__line){
background: none;
}
::v-deep(.n-button){
width: 60px !important;
height: 36px !important;
background: #507afd !important;
border-radius: 3px;
}
.wrapper-tip1 {
font-size: 14px;
font-family: PingFang SC, PingFang SC-Regular;
@ -369,4 +389,19 @@ function afterLeave() {
color: #999999;
line-height: 22px;
}
.topline{
background: rgba(0,0,0,0.09);
height: 1px;
width: 100%;
position: absolute;
top:56px
}
.bottomline{
background: rgba(0,0,0,0.09);
height: 1px;
width: 100%;
margin-top: 33px;
// position: absolute;
// bottom:68px
}
</style>

@ -1061,7 +1061,7 @@ defineExpose({
overflow: hidden; /* 默认隐藏滚动条 */
} .cotnet_wrapeertwo {
width: 100%;
height: 67vh;
//padding-right: 10px; /* */
overflow: hidden; /* 默认隐藏滚动条 */
}

@ -310,8 +310,15 @@ defineExpose({
>{{ currentlySelectedAdvanced }}</span>
</template>
{{ currentlySelectedAdvanced }}
</n-tooltip>
<SvgIcon
v-if="icontype!=1"
name="down"
size="16"
color="#999999"
/>
</div>
</template>

@ -0,0 +1,104 @@
<script lang="ts" setup>
import { onMounted, ref } from 'vue'
import { getToolsCount } from '@/api/home/main'
const props = defineProps({
label: {
type: String,
default: 'xxx',
},
})
const emit = defineEmits<{
(e: 'tishiok')
(e: 'reject', params: any)
(e: 'viewrepeat')
}>()
const showx = ref(false)
const label=ref(props.label)
const toolsData = ref({} as any)
async function getData() {
const res = await getToolsCount()
toolsData.value = res.data || {}
if (res.code == 'OK')
showModalx()
}
onMounted(() => {
getData()
})
function showModalx() {
showx.value = true
}
function closeModal() {
showx.value = false
}
function onok(){
emit('tishiok')
}
async function reject() {
emit('reject', { a: 'todo' })
closeModal()
}
async function viewRepeat(e: MouseEvent) {
emit('viewrepeat')
e.preventDefault()
closeModal()
}
defineExpose({
showModalx,
closeModal,
})
</script>
<template>
<n-modal v-model:show="showx" transform-origin="center" class="modal_wrap">
<div>
<div class="title"> <SvgIcon size="21" class="icon" style="margin-right:17.5px" name="warn" @click="closeModal" />确认提示</div>
<div class="content">{{label}}</div>
<div class="footer">
<n-button style="background: #507afd;width: 60px;
height: 36px;" type="info" @click="onok">
确定
</n-button>
<n-button secondary class="btn" style="margin-left: 15px;width: 60px;
height: 36px;" @click="closeModal">
取消
</n-button>
</div>
</div>
</n-modal>
</template>
<style lang="less" scoped>
.modal_wrap{
width: 424px;
height: 192px;
background: #ffffff;
border-radius: 2px;
}
.title{
color: #333333;
line-height: 24px;
font-size: 16px;
font-weight: 550;
margin-top: 33.5px;
margin-left: 33.5px;
}
.content{
font-size: 14px;
color: #666666;
margin-top: 12px;
margin-left: 72px;
}
.footer{
position: absolute;
bottom: 24px;
right: 32px;
}
</style>

@ -400,5 +400,14 @@ function handleOk(item: any) {
z-index: 10;
}
}
::v-deep(.list){
height: calc(100vh - 218px);
background: #fff
}
@media (max-height: 900px) {
::v-deep(.list){
height: calc(100vh - 220px);
background: #fff
}}
</style>
../types

@ -50,6 +50,7 @@ function setAsideItemName(text) {
flex-direction: row;
box-sizing: border-box;
width: 100%;
height: calc(100vh - 192px);
}
</style>

@ -319,6 +319,14 @@ if (searchContent) {
right: -20px;
z-index: 10;
}
::v-deep(.list){
height: calc(100vh - 250px);
}
@media (max-height: 900px) {
::v-deep(.list){
height: calc(100vh - 234px);
}
}
.topline{
border-top: 1px solid #e8e8e8;
width: 100%;

@ -42,10 +42,17 @@ function ApprovalOver(packageId) {
flex-direction: row;
box-sizing: border-box;
width: 100%;
height: 100vh;
height: calc(100vh - 176px);
padding-bottom: 16px;
//height: calc(100% - 170px);
}
@media (max-height: 900px) {
.main {
height: calc(100vh - 150px);
}
}
:deep(.ip_box){
z-index: 10;
bottom: 120px;

Loading…
Cancel
Save