yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue 

# Conflicts:
#	src/views/synchronization/eldertag/syncList.vue
This commit is contained in:
1378012178@qq.com 2025-08-27 15:14:21 +08:00
parent e58d5b77b2 6a89ce3c88
commit 26a7afd9fd
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Table/src/BasicTable.vue
View File

@ -521,9 +521,9 @@
//update-end-author:liusq---date:20230517--for: [issues/526]RangePicker 设置预设范围按钮样式问题--- //update-end-author:liusq---date:20230517--for: [issues/526]RangePicker 设置预设范围按钮样式问题---
.ant-table-wrapper { .ant-table-wrapper {
padding: 6px; padding: 14px;
background-color: @component-background; background-color: @component-background;
border-radius: 2px; border-radius: 8px;
.ant-table-title { .ant-table-title {
min-height: 40px; min-height: 40px;

2
src/views/services/directivePackage/components/PackageList.vue
View File

@ -328,7 +328,7 @@ defineExpose({
flex: 1; flex: 1;
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
padding: 24px; padding: 14px;
overflow: auto; overflow: auto;
background: #dfdfdf; background: #dfdfdf;
} }

6
src/views/synchronization/directive/syncList.vue
View File

@ -56,7 +56,7 @@
<AsyncListComponent ref="logsRef"></AsyncListComponent> <AsyncListComponent ref="logsRef"></AsyncListComponent>
</a-modal> --> </a-modal> -->
<a-drawer title="日志" width="85vw" v-model:visible="logsVisible" <a-drawer title="日志" width="85vw" v-model:visible="logsVisible"
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }" :bodyStyle="{ height: '70vh', display: 'flex',padding:'14px', flexDirection: 'column', overflow: 'auto' }"
wrapClassName="org-list-modal" @cancel="handleCancelLogs"> wrapClassName="org-list-modal" @cancel="handleCancelLogs">
<a-row style="overflow-x: hidden !important; background-color: white;"> <a-row style="overflow-x: hidden !important; background-color: white;">
<a-col :span="2" :push="22" style="margin-top: 18px;margin-left: 30px;"> <a-col :span="2" :push="22" style="margin-top: 18px;margin-left: 30px;">
@ -74,7 +74,7 @@
</a-drawer> </a-drawer>
<!-- 标准指令库 --> <!-- 标准指令库 -->
<a-drawer v-model:visible="directiveMainVisible" title="标准指令库" width="85vw" :footer-style="{ textAlign: 'right' }" <a-drawer v-model:visible="directiveMainVisible" title="标准指令库" width="85vw" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }" :bodyStyle="{ height: '70vh', display: 'flex',padding:'14px', flexDirection: 'column', overflow: 'auto' }"
wrapClassName="org-list-modal" @cancel="handleCanceldirectiveMain"> wrapClassName="org-list-modal" @cancel="handleCanceldirectiveMain">
<template #footer> <template #footer>
<a-button @click="handleCanceldirectiveMain" type="primary" style="margin-right: 10px;">关闭</a-button> <a-button @click="handleCanceldirectiveMain" type="primary" style="margin-right: 10px;">关闭</a-button>
@ -86,7 +86,7 @@
</a-drawer> </a-drawer>
<!-- 新增指令 --> <!-- 新增指令 -->
<a-drawer v-model:visible="newDirectiveVisible" title="新增指令" width="85vw" :footer-style="{ textAlign: 'right' }" <a-drawer v-model:visible="newDirectiveVisible" title="新增指令" width="85vw" :footer-style="{ textAlign: 'right' }"
:bodyStyle="{ height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }" :bodyStyle="{ height: '80vh', display: 'flex',padding:'14px', flexDirection: 'column', overflow: 'auto' }"
wrapClassName="org-list-modal" @cancel="handleCancelNewDirective"> wrapClassName="org-list-modal" @cancel="handleCancelNewDirective">
<template #footer> <template #footer>
<a-button @click="handleCancelNewDirective" type="primary">关闭</a-button> <a-button @click="handleCancelNewDirective" type="primary">关闭</a-button>

4
src/views/synchronization/eldertag/orgCom/OrgListCom.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div> <div style="margin-top: -4px;">
<a-row> <a-row>
<a-col v-for="(item, index) in orgTableList.records" :key="item.id" :xs="24" :sm="24" <a-col v-for="(item, index) in orgTableList.records" :key="item.id" :xs="24" :sm="24"
:md="props.layout == 'full' ? 12 : 8" :lg="props.layout == 'full' ? 12 : 8" :xl="props.layout == 'full' ? 8 : 8" :md="props.layout == 'full' ? 12 : 8" :lg="props.layout == 'full' ? 12 : 8" :xl="props.layout == 'full' ? 8 : 8"
:xxl="props.layout == 'full' ? 6 : 8" :xxxl="props.layout == 'full' ? 4 : 8" :xxl="props.layout == 'full' ? 6 : 8" :xxxl="props.layout == 'full' ? 4 : 8"
:style="{ 'padding-right': ((index + 1) % 4 != 0) ? '14px' : '0px', 'padding-bottom': '14px' }"> :style="{ 'padding-right': '14px' , 'padding-bottom': '14px' }">
<OrgCard :orgInfo="item" :layout="props.layout" <OrgCard :orgInfo="item" :layout="props.layout"
:is-selected="selectedOrgs.some(org => org.orgCode === item.orgCode)" :is-selected="selectedOrgs.some(org => org.orgCode === item.orgCode)"
:is-directive-selected="directiveMainSelectedOrg?.orgCode === item.orgCode" :is-directive-selected="directiveMainSelectedOrg?.orgCode === item.orgCode"