解决升级日志、APP版本、工单管理主列表页中 查询按钮不平齐样式问题

This commit is contained in:
1378012178@qq.com 2025-11-19 17:03:25 +08:00
parent 7d4274e445
commit 80a4be3472
5 changed files with 109 additions and 105 deletions

View File

@ -7,30 +7,30 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { watch, ref } from 'vue'; import { watch, ref } from 'vue';
import { theme } from 'ant-design-vue'; import { theme } from 'ant-design-vue';
import { ConfigProvider } from 'ant-design-vue'; import { ConfigProvider } from 'ant-design-vue';
import { AppProvider } from '/@/components/Application'; import { AppProvider } from '/@/components/Application';
import { useTitle } from '/@/hooks/web/useTitle'; import { useTitle } from '/@/hooks/web/useTitle';
import { useLocale } from '/@/locales/useLocale'; import { useLocale } from '/@/locales/useLocale';
import { useAppStore } from '/@/store/modules/app'; import { useAppStore } from '/@/store/modules/app';
import { useRootSetting } from '/@/hooks/setting/useRootSetting'; import { useRootSetting } from '/@/hooks/setting/useRootSetting';
import { ThemeEnum } from '/@/enums/appEnum'; import { ThemeEnum } from '/@/enums/appEnum';
import { changeTheme } from '/@/logics/theme/index'; import { changeTheme } from '/@/logics/theme/index';
const appStore = useAppStore(); const appStore = useAppStore();
// //
import 'dayjs/locale/zh-cn'; import 'dayjs/locale/zh-cn';
// support Multi-language // support Multi-language
const { getAntdLocale } = useLocale(); const { getAntdLocale } = useLocale();
useTitle(); useTitle();
/** /**
* 2024-04-07 * 2024-04-07
* liaozhiyang * liaozhiyang
* 暗黑模式下默认文字白色白天模式默认文字 #333 * 暗黑模式下默认文字白色白天模式默认文字 #333
* */ * */
const modeAction = (data) => { const modeAction = (data) => {
if (data.token) { if (data.token) {
if (getDarkMode.value === ThemeEnum.DARK) { if (getDarkMode.value === ThemeEnum.DARK) {
Object.assign(data.token, { colorTextBase: 'fff' }); Object.assign(data.token, { colorTextBase: 'fff' });
@ -38,11 +38,11 @@
Object.assign(data.token, { colorTextBase: '#333' }); Object.assign(data.token, { colorTextBase: '#333' });
} }
} }
}; };
// update-begin--author:liaozhiyang---date:20231218---forQQYUN-6366antd4.x // update-begin--author:liaozhiyang---date:20231218---forQQYUN-6366antd4.x
const appTheme: any = ref({}); const appTheme: any = ref({});
const { getDarkMode } = useRootSetting(); const { getDarkMode } = useRootSetting();
watch( watch(
() => getDarkMode.value, () => getDarkMode.value,
(newValue) => { (newValue) => {
delete appTheme.value.algorithm; delete appTheme.value.algorithm;
@ -60,8 +60,8 @@
}; };
}, },
{ immediate: true } { immediate: true }
); );
watch( watch(
appStore.getProjectConfig, appStore.getProjectConfig,
(newValue) => { (newValue) => {
const primary = newValue.themeColor; const primary = newValue.themeColor;
@ -89,17 +89,21 @@
modeAction(result); modeAction(result);
}, },
{ immediate: true } { immediate: true }
); );
setTimeout(() => { setTimeout(() => {
appStore.getProjectConfig?.themeColor && changeTheme(appStore.getProjectConfig.themeColor); appStore.getProjectConfig?.themeColor && changeTheme(appStore.getProjectConfig.themeColor);
}, 300); }, 300);
// update-end--author:liaozhiyang---date:20231218---forQQYUN-6366antd4.x // update-end--author:liaozhiyang---date:20231218---forQQYUN-6366antd4.x
</script> </script>
<style lang="less"> <style lang="less">
// update-begin--author:liaozhiyang---date:20230803---forQQYUN-5839windihtml2canvas // update-begin--author:liaozhiyang---date:20230803---forQQYUN-5839windihtml2canvas
img { img {
display: inline-block; display: inline-block;
} }
// update-end--author:liaozhiyang---date:20230803---forQQYUN-5839windihtml2canvas
// update-end--author:liaozhiyang---date:20230803---forQQYUN-5839windihtml2canvas
.p-2 {
padding: 14px;
}
</style> </style>

View File

@ -237,7 +237,7 @@
position: relative; position: relative;
flex: 1 1 auto; flex: 1 1 auto;
min-height: 0; min-height: 0;
padding: 3px; // padding: 3px;
} }
.jeecg-menu-item-active>.jeecg-menu{ .jeecg-menu-item-active>.jeecg-menu{
background: #FBFBFD; background: #FBFBFD;

View File

@ -19,7 +19,7 @@
allow-clear /> allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24" style=" margin-top: 0.3%;">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@ -265,7 +265,7 @@ async function setRangeQuery() {
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 14px;
white-space: nowrap; white-space: nowrap;
} }

View File

@ -17,7 +17,7 @@
<JInput v-model:value="queryParam.updateTrips" /> <JInput v-model:value="queryParam.updateTrips" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24" style=" margin-top: 0.3%;">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@ -228,7 +228,7 @@ function searchReset() {
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 14px;
white-space: nowrap; white-space: nowrap;
} }

View File

@ -8,7 +8,7 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="orgName"> <a-form-item name="orgName">
<template #label><span title="机构名称">机构名称</span></template> <template #label><span title="机构名称">机构名称</span></template>
<JInput v-model:value="queryParam.orgName" placeholder="请输入机构名称"/> <JInput v-model:value="queryParam.orgName" placeholder="请输入机构名称" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
@ -38,7 +38,7 @@
placeholder="请选工单状态" allow-clear /> placeholder="请选工单状态" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24" style=" margin-top: 0.3%;">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button> <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@ -54,7 +54,8 @@
<BasicTable @register="registerTable"> <BasicTable @register="registerTable">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<span>说明工单类型为<span style="color:red">平台构建</span>的工单信息需要先创建<span style="color:red">数据源管理</span>后才能进行反馈否则管理平台<span style="color:red">初始化账号</span>功能会失败</span> <span>说明工单类型为<span style="color:red">平台构建</span>的工单信息需要先创建<span
style="color:red">数据源管理</span>后才能进行反馈否则管理平台<span style="color:red">初始化账号</span>功能会失败</span>
</template> </template>
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
@ -224,7 +225,7 @@ function searchReset() {
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 14px;
white-space: nowrap; white-space: nowrap;
} }
@ -249,4 +250,3 @@ function searchReset() {
} }
} }
</style> </style>