解决升级日志、APP版本、工单管理主列表页中 查询按钮不平齐样式问题
This commit is contained in:
parent
7d4274e445
commit
80a4be3472
180
src/App.vue
180
src/App.vue
|
|
@ -7,99 +7,103 @@
|
||||||
</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' });
|
||||||
} else {
|
} else {
|
||||||
Object.assign(data.token, { colorTextBase: '#333' });
|
Object.assign(data.token, { colorTextBase: '#333' });
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
// update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
|
};
|
||||||
const appTheme: any = ref({});
|
// update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
|
||||||
const { getDarkMode } = useRootSetting();
|
const appTheme: any = ref({});
|
||||||
watch(
|
const { getDarkMode } = useRootSetting();
|
||||||
() => getDarkMode.value,
|
watch(
|
||||||
(newValue) => {
|
() => getDarkMode.value,
|
||||||
delete appTheme.value.algorithm;
|
(newValue) => {
|
||||||
if (newValue === ThemeEnum.DARK) {
|
delete appTheme.value.algorithm;
|
||||||
appTheme.value.algorithm = theme.darkAlgorithm;
|
if (newValue === ThemeEnum.DARK) {
|
||||||
}
|
appTheme.value.algorithm = theme.darkAlgorithm;
|
||||||
// update-begin--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
|
}
|
||||||
if (import.meta.env.PROD) {
|
// update-begin--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
|
||||||
changeTheme(appStore.getProjectConfig.themeColor);
|
if (import.meta.env.PROD) {
|
||||||
}
|
changeTheme(appStore.getProjectConfig.themeColor);
|
||||||
// update-end--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
|
}
|
||||||
modeAction(appTheme.value);
|
// update-end--author:liaozhiyang---date:20240322---for：【QQYUN-8570】生产环境暗黑模式下主题色不生效
|
||||||
appTheme.value = {
|
modeAction(appTheme.value);
|
||||||
...appTheme.value,
|
appTheme.value = {
|
||||||
};
|
...appTheme.value,
|
||||||
},
|
};
|
||||||
{ immediate: true }
|
},
|
||||||
);
|
{ immediate: true }
|
||||||
watch(
|
);
|
||||||
appStore.getProjectConfig,
|
watch(
|
||||||
(newValue) => {
|
appStore.getProjectConfig,
|
||||||
const primary = newValue.themeColor;
|
(newValue) => {
|
||||||
const result = {
|
const primary = newValue.themeColor;
|
||||||
...appTheme.value,
|
const result = {
|
||||||
...{
|
...appTheme.value,
|
||||||
token: {
|
...{
|
||||||
colorPrimary: primary,
|
token: {
|
||||||
wireframe: true,
|
colorPrimary: primary,
|
||||||
fontSize: 14,
|
wireframe: true,
|
||||||
colorTextBase: '#333',
|
fontSize: 14,
|
||||||
colorSuccess: '#55D187',
|
colorTextBase: '#333',
|
||||||
colorInfo: primary,
|
colorSuccess: '#55D187',
|
||||||
borderRadius: 4,
|
colorInfo: primary,
|
||||||
sizeStep: 4,
|
borderRadius: 4,
|
||||||
sizeUnit: 4,
|
sizeStep: 4,
|
||||||
colorWarning: '#EFBD47',
|
sizeUnit: 4,
|
||||||
colorError: '#ED6F6F',
|
colorWarning: '#EFBD47',
|
||||||
fontFamily:
|
colorError: '#ED6F6F',
|
||||||
'-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol',
|
fontFamily:
|
||||||
},
|
'-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol',
|
||||||
},
|
},
|
||||||
};
|
},
|
||||||
appTheme.value = result;
|
};
|
||||||
modeAction(result);
|
appTheme.value = result;
|
||||||
},
|
modeAction(result);
|
||||||
{ immediate: true }
|
},
|
||||||
);
|
{ immediate: true }
|
||||||
setTimeout(() => {
|
);
|
||||||
appStore.getProjectConfig?.themeColor && changeTheme(appStore.getProjectConfig.themeColor);
|
setTimeout(() => {
|
||||||
}, 300);
|
appStore.getProjectConfig?.themeColor && changeTheme(appStore.getProjectConfig.themeColor);
|
||||||
// update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
|
}, 300);
|
||||||
|
// update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
// update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
|
// update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
|
||||||
img {
|
img {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
// update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
|
|
||||||
|
// update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
|
||||||
|
.p-2 {
|
||||||
|
padding: 14px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
</template>
|
</template>
|
||||||
<!--操作栏-->
|
<!--操作栏-->
|
||||||
<template #action="{ record }">
|
<template #action="{ record }">
|
||||||
<TableAction :actions="getTableAction(record)" />
|
<TableAction :actions="getTableAction(record)" />
|
||||||
</template>
|
</template>
|
||||||
<template v-slot:bodyCell="{ column, record, index, text }">
|
<template v-slot:bodyCell="{ column, record, index, text }">
|
||||||
<template v-if="column.dataIndex === 'versionUrl'">
|
<template v-if="column.dataIndex === 'versionUrl'">
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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">
|
||||||
|
|
@ -20,25 +20,25 @@
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="platType">
|
<a-form-item name="platType">
|
||||||
<template #label><span title="平台类型">平台类型</span></template>
|
<template #label><span title="平台类型">平台类型</span></template>
|
||||||
<j-dict-select-tag type='list' v-model:value="queryParam.platType" dictCode="plat_type"
|
<j-dict-select-tag type='list' v-model:value="queryParam.platType" dictCode="plat_type"
|
||||||
placeholder="请选平台类型" allow-clear />
|
placeholder="请选平台类型" allow-clear />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="status">
|
<a-form-item name="status">
|
||||||
<template #label><span title="工单类型">工单类型</span></template>
|
<template #label><span title="工单类型">工单类型</span></template>
|
||||||
<j-dict-select-tag type='list' v-model:value="queryParam.workType" dictCode="work_type"
|
<j-dict-select-tag type='list' v-model:value="queryParam.workType" dictCode="work_type"
|
||||||
placeholder="请选工单类型" allow-clear />
|
placeholder="请选工单类型" allow-clear />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :lg="6">
|
<a-col :lg="6">
|
||||||
<a-form-item name="status">
|
<a-form-item name="status">
|
||||||
<template #label><span title="工单状态">工单状态</span></template>
|
<template #label><span title="工单状态">工单状态</span></template>
|
||||||
<j-dict-select-tag type='list' v-model:value="queryParam.status" dictCode="work_order_status"
|
<j-dict-select-tag type='list' v-model:value="queryParam.status" dictCode="work_order_status"
|
||||||
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>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue