样式调整
This commit is contained in:
parent
4799675624
commit
37fe13e762
|
@ -71,7 +71,7 @@
|
|||
//每页条数
|
||||
const pageSize = ref<number>(140);
|
||||
//下拉分页显示
|
||||
const pageSizeOptions = ref<any>(['15', '50', '80', '100']);
|
||||
const pageSizeOptions = ref<any>(['15', '50', '70', '100']);
|
||||
//下拉搜索值
|
||||
const searchIconValue = ref<string>('');
|
||||
const { clipboardRef, isSuccessRef } = useCopyToClipboard(props.value);
|
||||
|
|
|
@ -218,7 +218,7 @@
|
|||
</div>
|
||||
|
||||
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }">
|
||||
<video controls style="width: 100%; max-height: '70vh'; display: block; margin: 0 auto;">
|
||||
<source :src="videoUrl">
|
||||
您的浏览器不支持视频播放。
|
||||
|
|
|
@ -92,6 +92,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
useSearchForm: false,
|
||||
showTableSetting: false,
|
||||
showActionColumn: false,
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
queryParam.type = props.type
|
||||
queryParam.orgCode = props.orgCode
|
||||
|
|
|
@ -18,7 +18,7 @@ export default {
|
|||
totalField: 'total',
|
||||
},
|
||||
// 可选的分页选项
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
// 表格默认尺寸
|
||||
defaultSize: 'middle',
|
||||
//默认每页显示多少条
|
||||
|
|
|
@ -117,7 +117,7 @@ const pagination = reactive({
|
|||
total: 0,
|
||||
showSizeChanger: true,
|
||||
showQuickJumper: true,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
showTotal: total => `共 ${total} 条`
|
||||
});
|
||||
|
||||
|
|
|
@ -112,6 +112,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
width: 140,
|
||||
fixed: 'right',
|
||||
},
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15','50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
let rangerQuery = await setRangeQuery();
|
||||
return Object.assign(params, rangerQuery);
|
||||
|
|
|
@ -94,6 +94,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
width: 120,
|
||||
fixed: 'right',
|
||||
},
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15','50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
let rangerQuery = await setRangeQuery();
|
||||
return Object.assign(params, rangerQuery);
|
||||
|
|
|
@ -186,7 +186,7 @@
|
|||
|
||||
<!-- 音频播放 -->
|
||||
<a-modal v-model:visible="showAudioModal" title="音频播放" :footer="null" @cancel="closeAudioModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }" :keyboard="true">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }" :keyboard="true">
|
||||
<audio controls style="width: 100%; display: block; margin: 20px auto;">
|
||||
<source :src="audioUrl">
|
||||
您的浏览器不支持音频播放。
|
||||
|
@ -195,7 +195,7 @@
|
|||
|
||||
<!-- 视频播放 -->
|
||||
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }">
|
||||
<video controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
|
||||
<source :src="videoUrl">
|
||||
您的浏览器不支持视频播放。
|
||||
|
@ -257,7 +257,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
actionColumn: {
|
||||
width: 200,
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
<!-- 音频播放 -->
|
||||
<a-modal v-model:visible="showAudioModal" title="音频播放" :footer="null" @cancel="closeAudioModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }" :keyboard="true">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }" :keyboard="true">
|
||||
<audio controls style="width: 100%; display: block; margin: 20px auto;">
|
||||
<source :src="audioUrl">
|
||||
您的浏览器不支持音频播放。
|
||||
|
@ -45,7 +45,7 @@
|
|||
|
||||
<!-- 视频播放 -->
|
||||
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }">
|
||||
<video controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
|
||||
<source :src="videoUrl">
|
||||
您的浏览器不支持视频播放。
|
||||
|
@ -97,7 +97,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
actionColumn: {
|
||||
width: 200,
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
<!--查询区域-->
|
||||
<div class="jeecg-basic-table-form-container">
|
||||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
|
||||
:wrapper-col="wrapperCol">
|
||||
:wrapper-col="wrapperCol" style="padding-top: 20px;">
|
||||
<a-row :gutter="24">
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="orgCode">
|
||||
<template #label><span title="所属机构">所属机构</span></template>
|
||||
<j-select-multiple placeholder="请选择所属机构" v-model:value="queryParam.orgCode"
|
||||
<j-dict-select-tag placeholder="请选择所属机构" v-model:value="queryParam.orgCode"
|
||||
dictCode="sys_depart,depart_name,org_code" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
@ -49,7 +49,7 @@ import { columns, superQuerySchema } from './CanAddDirective.data';
|
|||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './CanAddDirective.api';
|
||||
import CanAddDirectiveModal from './components/CanAddDirectiveModal.vue'
|
||||
import { useUserStore } from '/@/store/modules/user';
|
||||
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import { syncDirective } from '/@/views/synchronization/directive/serviceDirective/ConfigServiceDirective.api';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
||||
|
@ -76,6 +76,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
width: 120,
|
||||
fixed: 'right',
|
||||
},
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15','50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
queryParam.existDirectiveIds = props.existDirectiveIds.map(item => item.id).join(',')
|
||||
return Object.assign(params, queryParam);
|
||||
|
@ -190,10 +195,11 @@ defineExpose({
|
|||
<style lang="less" scoped>
|
||||
.jeecg-basic-table-form-container {
|
||||
padding: 0;
|
||||
margin-bottom: 18px;
|
||||
|
||||
.table-page-search-submitButtons {
|
||||
display: block;
|
||||
margin-bottom: 24px;
|
||||
margin-bottom: 0px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
|
@ -208,7 +214,7 @@ defineExpose({
|
|||
}
|
||||
|
||||
.ant-form-item:not(.ant-form-item-with-help) {
|
||||
margin-bottom: 16px;
|
||||
margin-bottom: 18px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<ConfigServiceDirectiveModal ref="registerModal" :testOrgInfo="testOrgInfo" @success="handleSuccess"></ConfigServiceDirectiveModal>
|
||||
|
||||
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }">
|
||||
<video controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
|
||||
<source :src="videoUrl">
|
||||
您的浏览器不支持视频播放。
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
</SyncComponent>
|
||||
|
||||
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
|
||||
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
|
||||
:bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }">
|
||||
<video controls style="width: 100%; max-height: '70vh'; display: block; margin: 0 auto;">
|
||||
<source :src="videoUrl">
|
||||
您的浏览器不支持视频播放。
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<!--查询区域-->
|
||||
<div class="jeecg-basic-table-form-container">
|
||||
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
|
||||
:wrapper-col="wrapperCol">
|
||||
:wrapper-col="wrapperCol" style="padding-top: 20px;">
|
||||
<a-row :gutter="24">
|
||||
<a-col :lg="6">
|
||||
<a-form-item name="instructionTagId">
|
||||
|
@ -78,7 +78,7 @@
|
|||
</a-form>
|
||||
</div>
|
||||
<!--引用表格-->
|
||||
<BasicTable @register="registerTable">
|
||||
<BasicTable @register="registerTable" >
|
||||
<!--插槽:table标题-->
|
||||
<template #tableTitle>
|
||||
</template>
|
||||
|
@ -127,7 +127,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
queryParam.izEnabled = '0'
|
||||
|
@ -184,10 +184,11 @@ defineExpose({
|
|||
<style lang="less" scoped>
|
||||
.jeecg-basic-table-form-container {
|
||||
padding: 0;
|
||||
margin-bottom: 18px;
|
||||
|
||||
.table-page-search-submitButtons {
|
||||
display: block;
|
||||
margin-bottom: 24px;
|
||||
margin-bottom: 0px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
|
@ -202,7 +203,7 @@ defineExpose({
|
|||
}
|
||||
|
||||
.ant-form-item:not(.ant-form-item-with-help) {
|
||||
margin-bottom: 16px;
|
||||
margin-bottom: 18px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
|
|
|
@ -131,11 +131,11 @@
|
|||
<a-button type="primary" @click="removeAll" size="small">全部移除</a-button>
|
||||
<!-- <a-divider type="vertical" style="background-color: #CDCDCF" />
|
||||
<a-button type="warning" @click="syncFunc" size="small">同步</a-button> -->
|
||||
<BasicTable
|
||||
<BasicTable bordered
|
||||
:dataSource="targetChooseType == 'one' ? (targetType == 'needsync' ? rightNeedAddList : rightSourceList) : rightNeedAddList"
|
||||
:columns="targetChooseType == 'one' ? (targetType == 'needsync' ? targetColumns : targetSourceColumns) : targetSourceColumns"
|
||||
size="small" :scroll="{ y: '57vh' }"
|
||||
:pagination="{ current: 1, pageSize: 50, total: rightNeedAddList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
|
||||
size="small" :scroll="{ y: '57vh' }"
|
||||
:pagination="{ current: 1, pageSize: 15, total: targetType == 'needsync' ? rightNeedAddList.length :rightSourceList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '70', '100'] }">
|
||||
<template v-slot:bodyCell="{ column, record, index, text }">
|
||||
<template v-if="column.dataIndex === 'izExist'">
|
||||
<a-tag v-if="rightSourceList.some(item => item.id === record.id)" color="orange">更新</a-tag>
|
||||
|
@ -223,8 +223,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
immediate: false,
|
||||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 10,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSize: 15,
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
queryParam.izEnabled = '0'
|
||||
|
|
|
@ -112,7 +112,7 @@
|
|||
<a-col :lg="12" :sm="24">
|
||||
<a-tag color="green" style="margin-left: 10px;margin-top: 10px;">已选择 {{ rightList.length }} 条</a-tag>
|
||||
<BasicTable :dataSource="rightList" :columns="sourceColumns" size="small" :scroll="{ y: '46vh' }"
|
||||
:pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
|
||||
:pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '70', '100'] }">
|
||||
</BasicTable>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
@ -157,7 +157,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
|
|||
pagination: {
|
||||
current: 1,
|
||||
pageSize: 10,
|
||||
pageSizeOptions: ['15', '50', '80', '100'],
|
||||
pageSizeOptions: ['15', '50', '70', '100'],
|
||||
},
|
||||
beforeFetch: async (params) => {
|
||||
queryParam.izEnabled = '0'
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
<ConfigServiceDirectiveListModal ref="configServiceDirectiveListModal" />
|
||||
<SyncStepListModal ref="syncStepListModal" />
|
||||
<!-- <a-modal v-model:visible="logsVisible" title="日志" width="90vw"
|
||||
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
wrapClassName="org-list-modal" @cancel="handleCancelLogs">
|
||||
<a-row>
|
||||
<a-col :span="2" :push="22" style="margin-top: 15px;margin-left: 60px;">
|
||||
|
@ -53,24 +53,26 @@
|
|||
</template>
|
||||
<AsyncListComponent ref="logsRef"></AsyncListComponent>
|
||||
</a-modal> -->
|
||||
<a-drawer title="日志" width="80vw" v-model:visible="logsVisible"
|
||||
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
<a-drawer title="日志" width="85vw" v-model:visible="logsVisible"
|
||||
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
wrapClassName="org-list-modal" @cancel="handleCancelLogs">
|
||||
<a-row style="overflow-x: hidden !important;">
|
||||
<a-row style="overflow-x: hidden !important; ">
|
||||
<a-col :span="2" :push="22" style="margin-top: 15px;margin-left: 30px;">
|
||||
<a-button type="primary" @click="handleRefreshLogs" title="刷新">
|
||||
刷新
|
||||
</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<AsyncListComponent ref="logsRef"></AsyncListComponent>
|
||||
<div style="padding:0px 8px;">
|
||||
<AsyncListComponent ref="logsRef"></AsyncListComponent>
|
||||
</div>
|
||||
<template #footer>
|
||||
<a-button @click="handleCancelLogs" type="primary" style="float:right;">关闭</a-button>
|
||||
</template>
|
||||
</a-drawer>
|
||||
<!-- 标准指令库 -->
|
||||
<a-drawer v-model:visible="directiveMainVisible" title="标准指令库" width="80vw" :footer-style="{ textAlign: 'right' }"
|
||||
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
<a-drawer v-model:visible="directiveMainVisible" title="标准指令库" width="85vw" :footer-style="{ textAlign: 'right' }"
|
||||
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
wrapClassName="org-list-modal" @cancel="handleCanceldirectiveMain">
|
||||
<template #footer>
|
||||
<a-button @click="handleCanceldirectiveMain" type="primary" style="margin-right: 10px;">关闭</a-button>
|
||||
|
@ -81,15 +83,17 @@
|
|||
</OrgListCom>
|
||||
</a-drawer>
|
||||
<!-- 新增指令 -->
|
||||
<a-drawer v-model:visible="newDirectiveVisible" title="新增指令" width="90vw" :footer-style="{ textAlign: 'right' }"
|
||||
:bodyStyle="{ padding: '0', height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
<a-drawer v-model:visible="newDirectiveVisible" title="新增指令" width="85vw" :footer-style="{ textAlign: 'right' }"
|
||||
:bodyStyle="{ height: '80vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
wrapClassName="org-list-modal" @cancel="handleCancelNewDirective">
|
||||
<template #footer>
|
||||
<a-button @click="handleCancelNewDirective" type="primary">关闭</a-button>
|
||||
<!-- <a-button @click="handleAsyncNewDirective" type="primary">同步</a-button> -->
|
||||
</template>
|
||||
<CanAddDirectiveList ref="canAddDirectiveRef" :directiveMainOrgInfo="directiveMainOrgInfo"
|
||||
:existDirectiveIds="existDirectiveIds" @refreshExistIds="refreshDMExistedIds"></CanAddDirectiveList>
|
||||
<div style="padding:0px 8px;">
|
||||
<CanAddDirectiveList ref="canAddDirectiveRef" :directiveMainOrgInfo="directiveMainOrgInfo"
|
||||
:existDirectiveIds="existDirectiveIds" @refreshExistIds="refreshDMExistedIds"></CanAddDirectiveList>
|
||||
</div>
|
||||
</a-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
</div>
|
||||
</a-card>
|
||||
<a-modal v-model:visible="sourceOrgListVisible" title="请选择源平台" width="90vw"
|
||||
:bodyStyle="{ padding: '0', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
:bodyStyle="{ height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
|
||||
wrapClassName="org-list-modal" @cancel="handleCancelSource">
|
||||
<template #footer>
|
||||
<a-button @click="handleCancelSource" type="primary">取消</a-button>
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
<a-tag color="green" style="margin-left: 10px;margin-top: 10px;">待同步 {{ leftList?.length }} 条</a-tag>
|
||||
<BasicTable :dataSource="leftList" :columns="columns" size="small" :scroll="{ y: '61vh' }"
|
||||
:showIndexColumn="false"
|
||||
:pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '80', '100'] }">
|
||||
:pagination="{ current: 1, pageSize: 50, total: leftList.length, showSizeChanger: true, pageSizeOptions: ['15', '50', '70', '100'] }">
|
||||
</BasicTable>
|
||||
</a-col>
|
||||
<a-col :lg="12" :sm="24">
|
||||
|
|
Loading…
Reference in New Issue