样式调整

src/views/admin/workorder/WorkOrderList.vue

@@ -106,6 +106,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       width: 300,
       fixed: 'right',
     },
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     beforeFetch: async (params) => {
       return Object.assign(params, queryParam);
     },
@@ -216,7 +221,7 @@ function getTableAction(record) {
 
 /**
  * 加盟确认
- * @param record 
+ * @param record
  */
 function joinConfirmFunc(record) {
   joinConfirm(record).then(res => {
@@ -228,7 +233,7 @@ function joinConfirmFunc(record) {
 /**
  * 反馈
  * 修改工单状态、发短信、通知管理平台修改搭建状态
- * @param record 
+ * @param record
  */
 function handFkFunc(record) {
   handFk(record).then(res => {

src/views/iot/hs/electricity/index.vue

@@ -81,6 +81,11 @@
         fieldMapToTime: [
         ],
       },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
       actionColumn: {
         width: 290,
         fixed:'right'

src/views/iot/tplink/camera/index.vue

@@ -108,6 +108,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       // labelWidth: 200,
       schemas: searchFormSchema,
     },
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',

src/views/iot/tplink/network/index.vue

@@ -57,6 +57,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       // labelWidth: 200,
       schemas: searchFormSchema,
     },
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',

src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue

@@ -79,6 +79,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     immediate: false,
     showActionColumn: false,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 120,
       fixed: 'right',

src/views/iot/tq/ApiRequestLog/ApiRequestLogList2.vue

@@ -73,6 +73,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     immediate: false,
     showActionColumn: false,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 120,
       fixed: 'right',

src/views/iot/tq/electricity/apilog/ApiLogList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="3" tab="抄表">
         <ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>

src/views/iot/tq/electricity/apilog/ApiLogModal.vue

@@ -17,7 +17,7 @@ import DepartUtilsList from './ApiLogList.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
 const title = ref<string>('');
-const width = ref<string>('80%');
+const width = ref<string>('1200');
 const visible = ref<boolean>(false);
 const disableSubmit = ref<boolean>(false);
 const registerForm = ref();

src/views/iot/tq/electricity/apilog/WaterApiLogList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="42" tab="抄表">
         <ApiRequestLogList ref="ApiRequestLogListModal42"></ApiRequestLogList>

src/views/iot/tq/electricity/apilog/WaterApiLogModal.vue

@@ -17,7 +17,7 @@ import WaterApiLogList from './WaterApiLogList.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
 const title = ref<string>('');
-const width = ref<string>('80%');
+const width = ref<string>('1200');
 const visible = ref<boolean>(false);
 const disableSubmit = ref<boolean>(false);
 const registerForm = ref();

src/views/iot/tq/electricity/index.vue

@@ -48,7 +48,7 @@
     <HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
     <ApiLogModal ref="apiLogModal"></ApiLogModal>
 <!--    <ElectricitySyncLogListModal ref="syncLogModal"></ElectricitySyncLogListModal>-->
-    
+
     <a-modal v-model:visible="tipVisible" width="300px">
       <template #title>
         <Icon icon="ant-design:info-circle-outlined" :size="20" style="margin-right:10px;color:white;background:#1ea0fa;border-radius:10px;"/>{{tipTitle}}
@@ -105,6 +105,11 @@ import { defHttp } from '/@/utils/http/axios';
         fieldMapToTime: [
         ],
       },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
       actionColumn: {
         width: 290,
         fixed:'right'
@@ -211,7 +216,7 @@ import { defHttp } from '/@/utils/http/axios';
   // 电表合闸
   async function handleControlHz(record: Recordable) {
     if(record.relayState == '1'){
-      
+
       // Modal.info({
       //   title: '合闸',
       //   content: h('div', {}, [

src/views/iot/tq/water/index.vue

@@ -122,6 +122,11 @@
         fieldMapToTime: [
         ],
       },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
       actionColumn: {
         width: 200,
         fixed:'right'

src/views/iot/weihu/components/ReamrksListModal.vue

@@ -1,5 +1,5 @@
 <template>
-   <a-drawer :title="title" :width="'70vw'" v-model:visible="visible" :closable="true"
+   <a-drawer :title="title" v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
     <RemarksList ref="remarksList" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></RemarksList>
     <template #footer>
@@ -14,7 +14,7 @@ import RemarksList from './RemarksList.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 
 const title = ref<string>('');
-const width = ref<number>(1600);
+const width = ref<number>(1200);
 const visible = ref<boolean>(false);
 const disableSubmit = ref<boolean>(false);
 const remarksList = ref();

src/views/iot/weihu/index.vue

@@ -60,6 +60,11 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
         schemas: searchFormSchema,
         showAdvancedButton: false
       },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
       actionColumn: {
         width: 90,
         fixed:'right'

src/views/iot/yiweilian/humid/components/ApiLogAlarmList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="1" tab="抄表">
         <ApiLogList ref="apiLogList"></ApiLogList>

src/views/iot/yiweilian/humid/components/ApiLogList.vue

@@ -65,6 +65,11 @@ const { prefixCls, tableContext } = useListPage({
     //   fieldMapToTime: [
     //   ],
     // },
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 120,
       fixed: 'right',
@@ -136,31 +141,32 @@ defineExpose({
 <style lang="less" scoped>
 .jeecg-basic-table-form-container {
   padding: 0;
-  margin-bottom: 12px;
-
   .table-page-search-submitButtons {
     display: block;
-    margin-bottom: 12px;
+    margin-bottom: 24px;
     white-space: nowrap;
   }
-
+  .query-group-cust{
-  .query-group-cust {
     min-width: 100px !important;
   }
-
+  .query-group-split-cust{
-  .query-group-split-cust {
     width: 30px;
     display: inline-block;
     text-align: center
   }
-
+  .ant-form-item-label >label {
-  .ant-form-item:not(.ant-form-item-with-help) {
+    position: relative;
-    margin-bottom: 12px;
+    display: inline-flex;
+    align-items: center;
+    max-width: 100%;
+    color: rgba(51, 51, 51, 0.88);
+    font-size: 14px;
+  }
+  .ant-form-item:not(.ant-form-item-with-help){
+    margin-bottom: 16px;
     height: 32px;
   }
-
+  :deep(.ant-picker),:deep(.ant-input-number){
-  :deep(.ant-picker),
-  :deep(.ant-input-number) {
     width: 100%;
   }
 }

src/views/iot/yiweilian/humid/index.vue

@@ -89,6 +89,11 @@
         fieldMapToTime: [
         ],
       },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
       actionColumn: {
         width: 180,
         fixed:'right'

src/views/iotManager/components/AreaDeviceAddList.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <div class="p-2">
+    <div>
       <!--查询区域-->
       <div class="jeecg-basic-table-form-container">
         <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@@ -93,6 +93,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     showIndexColumn: true,
     showActionColumn: false,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',
@@ -220,9 +225,4 @@ defineExpose({
     width: 100%;
   }
 }
-
-.p-2{
-  height: calc(100vh - 120px);
-}
-
 </style>

src/views/iotManager/components/AreaDeviceList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@@ -82,6 +82,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     showIndexColumn: true,
     showActionColumn: false,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',
@@ -190,8 +195,5 @@ defineExpose({
   }
 }
 
-.p-2{
-  height: calc(100vh - 120px);
-}
 
 </style>

src/views/iotManager/components/AreaList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@@ -77,6 +77,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     showIndexColumn: true,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',
@@ -192,9 +197,4 @@ defineExpose({
     width: 100%;
   }
 }
-
-.p-2{
-  height: calc(100vh - 120px);
-}
-
 </style>

src/views/iotManager/components/OrgDeviceAddList.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <div class="p-2">
+    <div>
       <!--查询区域-->
       <div class="jeecg-basic-table-form-container">
         <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@@ -92,6 +92,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     useSearchForm: false,
     showIndexColumn: true,
     showActionColumn: false,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 180,
       fixed: 'right',
@@ -217,9 +222,4 @@ defineExpose({
     width: 100%;
   }
 }
-
-.p-2{
-  height: calc(100vh - 120px);
-}
-
 </style>

src/views/iotManager/components/PreviewList.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <div class="p-2">
+    <div>
       <!--查询区域-->
       <div class="jeecg-basic-table-form-container">
         <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
@@ -119,6 +119,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     showIndexColumn: true,
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
     actionColumn: {
       width: 100,
       fixed: 'right',
@@ -293,8 +298,4 @@ defineExpose({
   }
 }
 
-.p-2{
-  height: calc(100vh - 120px);
-}
-
 </style>

src/views/iotManager/index.vue

@@ -221,7 +221,6 @@ function searchReset() {
 </script>
 
 <style lang="less" scoped>
-
 .jeecg-basic-table-form-container {
   padding: 0;
   .table-page-search-submitButtons {
@@ -246,8 +245,4 @@ function searchReset() {
   }
 }
 
-.p-2{
-  height: calc(100vh - 120px);
-}
-
 </style>