reactor:部分列表页面样式调整;

src/views/dataShare/config.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="dataShare-config-container layout-padding">
     <div class="layout-padding-auto layout-padding-view pd20">
-      <el-form :model="state.ruleForm" ref="ruleFormRef" label-width="160px" v-loading="state.loading">
+      <el-form :model="state.ruleForm" ref="ruleFormRef" label-width="160px" v-loading="state.loading" class="scroll-form">
         <el-row :gutter="35">
-          <el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
             <el-form-item label="在线服务代表数" prop="crntSeatNum" :rules="[{ required: true, message: '请填写在线服务代表数', trigger: 'blur' }]">
               <el-input-number v-model="state.ruleForm.crntSeatNum" :min="1" :precision="0" class="w100" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
             <el-form-item label="通话服务代表数" prop="crntTelNum" :rules="[{ required: true, message: '请填写通话服务代表数', trigger: 'blur' }]">
               <el-input-number v-model="state.ruleForm.crntTelNum" :min="1" :precision="0" class="w100" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
             <el-form-item label="坐席数量(个)" prop="seatNum" :rules="[{ required: true, message: '请填写席数量', trigger: 'blur' }]">
               <el-input-number v-model="state.ruleForm.seatNum" :min="1" :precision="0" class="w100" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
             <el-form-item label="坐席话务员数(个)" prop="seatHwyNum" :rules="[{ required: true, message: '请填写坐席话务员数', trigger: 'blur' }]">
               <el-input-number v-model="state.ruleForm.seatHwyNum" :min="1" :precision="0" class="w100" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6" :lg="6" :xl="6">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6">
             <el-form-item
               label="未接通通话记录记录最多上传条数"
               prop="missedCallCount"
@@ -98,9 +98,11 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-.system-dataShare-container {
-  .el-table {
+.dataShare-config-container {
+  .scroll-form {
     flex: 1;
+    overflow-y: auto;
+    overflow-x: hidden;
   }
 }
 </style>

src/views/dataShare/editExpire.vue

@@ -1,24 +1,6 @@
 <template>
-	<div class="dataShare-editExpire-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="工单标题" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input"/>
-				</el-form-item>
-				<el-form-item label="工单编码" prop="No">
-					<el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery"  class="keyword-input"/>
-				</el-form-item>
-				<el-form-item label="省工单编码" prop="ProvinceNo">
-					<el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery"  class="keyword-input"/>
-				</el-form-item>
-        <el-form-item label-width="0">
-          <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-          <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-            <SvgIcon name="ele-Refresh" class="mr5" />重置
-          </el-button>
-        </el-form-item>
-			</el-form>
-			<!-- 表格 -->
+	<div class="dataShare-editExpire-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -30,6 +12,25 @@
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="工单标题" prop="Keyword">
+              <el-input v-model="state.queryParams.Keyword" placeholder="工单标题" clearable @keyup.enter="handleQuery" class="keyword-input"/>
+            </el-form-item>
+            <el-form-item label="工单编码" prop="No">
+              <el-input v-model="state.queryParams.No" placeholder="工单编码" clearable @keyup.enter="handleQuery"  class="keyword-input"/>
+            </el-form-item>
+            <el-form-item label="省工单编码" prop="ProvinceNo">
+              <el-input v-model="state.queryParams.ProvinceNo" placeholder="省工单编码" clearable @keyup.enter="handleQuery"  class="keyword-input"/>
+            </el-form-item>
+            <el-form-item label-width="0">
+              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+              <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+                <SvgIcon name="ele-Refresh" class="mr5" />重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </template>
 				<template #expiredStatusText="{ row }">
 					<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 				</template>
@@ -42,7 +43,7 @@
           <el-button link type="primary" @click="onRecord(row)" title="查看修改记录"> 修改记录 </el-button>
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
     <el-dialog title="修改期满时间" v-model="state.dialogVisible" width="500px" destroy-on-close append-to-body draggable>
       <el-form :model="state.form" ref="formRef"  label-width="100px">
         <el-form-item label="期满时间" prop="expiredTime" :rules="[{ required: true, message: '请选择修改后的期满时间', trigger: 'change' }]">
@@ -80,7 +81,7 @@ const EditRecord = defineAsyncComponent(() => import('@/views/dataShare/RecordDi
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1, // 当前页
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 	},
 	tableData: [], //表单
 	loading: false, // 加载

src/views/dataShare/newOrderList.vue

@@ -1,37 +1,6 @@
 <template>
-	<div class="dataShare-new-orderList-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="是否及时" prop="IsSuccess">
-					<el-select v-model="state.queryParams.IsSuccess" placeholder="请选择是否及时" @change="handleQuery" clearable>
-						<el-option label="及时" value="true" />
-						<el-option label="不及时" value="false" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD[T]HH:mm:ss"
-						:default-time="defaultTimeStartEnd"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="dataShare-new-orderList-container layout-padding">
+		<div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -42,8 +11,39 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
+				<template #table-search>
+					<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+						<el-form-item label="是否及时" prop="IsSuccess">
+							<el-select v-model="state.queryParams.IsSuccess" placeholder="请选择是否及时" @change="handleQuery" clearable>
+								<el-option label="及时" value="true" />
+								<el-option label="不及时" value="false" />
+							</el-select>
+						</el-form-item>
+						<el-form-item label="时间段" prop="crTime">
+							<el-date-picker
+								v-model="state.queryParams.crTime"
+								type="datetimerange"
+								unlink-panels
+								range-separator="至"
+								start-placeholder="开始时间"
+								end-placeholder="结束时间"
+								:shortcuts="shortcuts"
+								@change="handleQuery"
+								value-format="YYYY-MM-DD[T]HH:mm:ss"
+								:default-time="defaultTimeStartEnd"
+								:clearable="false"
+							/>
+						</el-form-item>
+						<el-form-item label-width="0">
+							<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+							<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+								<SvgIcon name="ele-Refresh" class="mr5" />重置
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataShareNewOrderList">
@@ -109,7 +109,7 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		// 查询条件
 		Id: null, // 热线号码
 		IsSuccess: null, // 是否成功

src/views/dataShare/newOrderNoCallLog.vue

@@ -1,31 +1,6 @@
 <template>
-	<div class="dataShare-new-orderNoCallLog-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-            value-format="YYYY-MM-DD[T]HH:mm:ss"
-            :default-time="defaultTimeStartEnd"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="dataShare-new-orderNoCallLog-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -36,6 +11,31 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="时间段" prop="crTime">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="datetimerange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD[T]HH:mm:ss"
+                  :default-time="defaultTimeStartEnd"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item label-width="0">
+              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+              <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+                <SvgIcon name="ele-Refresh" class="mr5" />重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </template>
 				<template #tableHeader="scope">
 <!--					<el-button type="primary" @click="onEdit(false)" :disabled="!scope.isSelected" :loading="state.loading" title="修改来源渠道">
 						修改来源渠道
@@ -45,7 +45,7 @@
 					</el-button>
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataShareNewOrderNoCallLog">
@@ -118,7 +118,7 @@ const ruleFormRef = ref<RefType>(); // 表单ref
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		crTime: defaultDateTime,
     StartTime:null,
     EndTime:null

src/views/dataShare/newTaskDetail.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="dataShare-taskDetail-container layout-pd">
-    <el-card shadow="never">
+  <div class="dataShare-taskDetail-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
       <ProTable
         ref="proTableRef"
         :columns="columns"
@@ -10,10 +10,9 @@
         :total="state.total"
         v-model:page-index="state.queryParams.PageIndex"
         v-model:page-size="state.queryParams.PageSize"
-        border
       >
       </ProTable>
-    </el-card>
+    </div>
   </div>
 </template>
 <script setup lang="tsx" name="dataShareNewTaskDetail">
@@ -51,7 +50,7 @@ const state = reactive({
   queryParams: {
     // 查询条件
     PageIndex: 1,
-    PageSize: 10,
+    PageSize: 20,
   },
   tableData: [], //表单
   loading: false, // 加载

src/views/dataShare/newTimeliness.vue

@@ -1,278 +1,278 @@
 <template>
-	<div class="dataShare-new-timeliness-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-            value-format="YYYY-MM-DD[T]HH:mm:ss"
-            :default-time="defaultTimeStartEnd"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-row :gutter="20">
-			<el-divider><el-text tag="b" class="font16">工单</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.orderCountNum">
-						<template #title>
-							<span class="color-info font14">工单总量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.handleEndOrderNum">
-						<template #title>
-							<span class="color-info font14">办结件数</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.handleEndOrderOnTime">
-						<template #title>
-							<span class="color-info font14">按时办结数量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.handleEndOrderRate">
-						<template #title>
-							<span class="color-info font14">办结率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.handleEndOrderOnTimeRate">
-						<template #title>
-							<span class="color-info font14">按时办结率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">工单及时率</el-text> </el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.orderTimely">
-						<template #title>
-							<span class="color-info font14">工单及时上传</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.orderNotTimely">
-						<template #title>
-							<span class="color-info font14">工单未及时上传</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.orderTimelinessRate">
-						<template #title>
-							<span class="color-info font14">工单及时率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">电话数量</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telCountNum">
-						<template #title>
-							<span class="color-info font14">电话总量</span>
-						</template>
-					</el-statistic>
-				</el-card> </el-col
-			><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telConnectCountNum">
-						<template #title>
-							<span class="color-info font14">电话接通数</span>
-						</template>
-					</el-statistic>
-				</el-card> </el-col
-			><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telNotConnectCountNum">
-						<template #title>
-							<span class="color-info font14">电话未接通数</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telConnectRate">
-						<template #title>
-							<span class="color-info font14">电话接通率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">电话及时率</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telTimely">
-						<template #title>
-							<span class="color-info font14">电话及时上传</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telNotTimely">
-						<template #title>
-							<span class="color-info font14">电话未及时上传</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.telTimelinessRate">
-						<template #title>
-							<span class="color-info font14">电话及时率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">匹配率</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.rgdhOrderCount">
-						<template #title>
-							<span class="color-info font14">电话来源工单数量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.containTel">
-						<template #title>
-							<span class="color-info font14">匹配通话记录数</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.notContainTel">
-						<template #title>
-							<span class="color-info font14">未匹配通话记录数</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.matchingRate">
-						<template #title>
-							<span class="color-info font14">匹配率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">回访</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.visitCountNum">
-						<template #title>
-							<span class="color-info font14">回访总量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.satisfactionCountNum">
-						<template #title>
-							<span class="color-info font14">满意总量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.notSatisfiedCountNum">
-						<template #title>
-							<span class="color-info font14">不满意总量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.satisfactionRate">
-						<template #title>
-							<span class="color-info font14">满意率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card> </el-col
-			><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.notSatisfiedRate">
-						<template #title>
-							<span class="color-info font14">不满意率</span>
-						</template>
-						<template #suffix>%</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-divider><el-text tag="b" class="font16">知识库</el-text></el-divider>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.knowledgeCount">
-						<template #title>
-							<span class="color-info font14">知识库总量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-			<el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
-				<el-card shadow="never" v-loading="state.loading" class="statistics-item">
-					<el-statistic :value="state.data.updateKnowledgeCount">
-						<template #title>
-							<span class="color-info font14">更新知识库量</span>
-						</template>
-					</el-statistic>
-				</el-card>
-			</el-col>
-		</el-row>
+	<div class="dataShare-new-timeliness-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20 h100">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD[T]HH:mm:ss"
+                :default-time="defaultTimeStartEnd"
+                :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item label-width="0">
+            <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+            <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+              <SvgIcon name="ele-Refresh" class="mr5" />重置
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <el-row :gutter="20" style="flex:1;overflow:auto;">
+          <el-divider><el-text tag="b" class="font16">工单</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.orderCountNum">
+                <template #title>
+                  <span class="color-info font14">工单总量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.handleEndOrderNum">
+                <template #title>
+                  <span class="color-info font14">办结件数</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.handleEndOrderOnTime">
+                <template #title>
+                  <span class="color-info font14">按时办结数量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.handleEndOrderRate">
+                <template #title>
+                  <span class="color-info font14">办结率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.handleEndOrderOnTimeRate">
+                <template #title>
+                  <span class="color-info font14">按时办结率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-divider><el-text tag="b" class="font16">工单及时率</el-text> </el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.orderTimely">
+                <template #title>
+                  <span class="color-info font14">工单及时上传</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.orderNotTimely">
+                <template #title>
+                  <span class="color-info font14">工单未及时上传</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.orderTimelinessRate">
+                <template #title>
+                  <span class="color-info font14">工单及时率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-divider><el-text tag="b" class="font16">电话数量</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.telCountNum">
+                <template #title>
+                  <span class="color-info font14">电话总量</span>
+                </template>
+              </el-statistic>
+            </el-card> </el-col
+          ><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+          <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+            <el-statistic :value="state.data.telConnectCountNum">
+              <template #title>
+                <span class="color-info font14">电话接通数</span>
+              </template>
+            </el-statistic>
+          </el-card> </el-col
+        ><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+          <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+            <el-statistic :value="state.data.telNotConnectCountNum">
+              <template #title>
+                <span class="color-info font14">电话未接通数</span>
+              </template>
+            </el-statistic>
+          </el-card>
+        </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.telConnectRate">
+                <template #title>
+                  <span class="color-info font14">电话接通率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-divider><el-text tag="b" class="font16">电话及时率</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.telTimely">
+                <template #title>
+                  <span class="color-info font14">电话及时上传</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.telNotTimely">
+                <template #title>
+                  <span class="color-info font14">电话未及时上传</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.telTimelinessRate">
+                <template #title>
+                  <span class="color-info font14">电话及时率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-divider><el-text tag="b" class="font16">匹配率</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.rgdhOrderCount">
+                <template #title>
+                  <span class="color-info font14">电话来源工单数量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.containTel">
+                <template #title>
+                  <span class="color-info font14">匹配通话记录数</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.notContainTel">
+                <template #title>
+                  <span class="color-info font14">未匹配通话记录数</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.matchingRate">
+                <template #title>
+                  <span class="color-info font14">匹配率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-divider><el-text tag="b" class="font16">回访</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.visitCountNum">
+                <template #title>
+                  <span class="color-info font14">回访总量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.satisfactionCountNum">
+                <template #title>
+                  <span class="color-info font14">满意总量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.notSatisfiedCountNum">
+                <template #title>
+                  <span class="color-info font14">不满意总量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.satisfactionRate">
+                <template #title>
+                  <span class="color-info font14">满意率</span>
+                </template>
+                <template #suffix>%</template>
+              </el-statistic>
+            </el-card> </el-col
+          ><el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+          <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+            <el-statistic :value="state.data.notSatisfiedRate">
+              <template #title>
+                <span class="color-info font14">不满意率</span>
+              </template>
+              <template #suffix>%</template>
+            </el-statistic>
+          </el-card>
+        </el-col>
+          <el-divider><el-text tag="b" class="font16">知识库</el-text></el-divider>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.knowledgeCount">
+                <template #title>
+                  <span class="color-info font14">知识库总量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+            <el-card shadow="never" v-loading="state.loading" class="statistics-item">
+              <el-statistic :value="state.data.updateKnowledgeCount">
+                <template #title>
+                  <span class="color-info font14">更新知识库量</span>
+                </template>
+              </el-statistic>
+            </el-card>
+          </el-col>
+        </el-row>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataShareNewTimeliness">
@@ -420,5 +420,8 @@ onMounted(() => {
 	.statistics-item {
 		margin-bottom: 10px;
 	}
+  :deep(.layout-padding-view){
+    background-color: transparent;
+  }
 }
 </style>

src/views/dataShare/pushData.vue

@@ -1,51 +1,53 @@
 <template>
-	<div class="dataShare-pushData-container layout-pd">
-		<el-card shadow="never">
-			<el-tabs v-model="platform" @tab-change="handleQuery">
+	<div class="dataShare-pushData-container layout-padding">
+		<div class="layout-padding-auto layout-padding-view pd20">
+			<el-tabs v-model="platform" @tab-change="handleQuery" class="tabs h100">
 				<el-tab-pane name="province" label="省平台"></el-tab-pane>
 				<el-tab-pane name="other" label="其他平台"></el-tab-pane>
+				<ProTable
+					ref="proTableRef"
+					:columns="columns"
+					:data="state.tableData"
+					@updateTable="queryList"
+					:loading="state.loading"
+					:total="state.total"
+					v-model:page-index="state.queryParams.PageIndex"
+					v-model:page-size="state.queryParams.PageSize"
+				>
+					<template #table-search>
+						<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+							<el-form-item label="时间段" prop="crTime">
+								<el-date-picker
+									v-model="state.queryParams.crTime"
+									type="datetimerange"
+									unlink-panels
+									range-separator="至"
+									start-placeholder="开始时间"
+									end-placeholder="结束时间"
+									:shortcuts="shortcuts"
+									@change="handleQuery"
+									value-format="YYYY-MM-DD[T]HH:mm:ss"
+									:default-time="defaultTimeStartEnd"
+									:clearable="false"
+								/>
+							</el-form-item>
+							<el-form-item label-width="0">
+								<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+								<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+									<SvgIcon name="ele-Refresh" class="mr5" />重置
+								</el-button>
+							</el-form-item>
+						</el-form>
+					</template>
+				</ProTable>
 			</el-tabs>
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-            value-format="YYYY-MM-DD[T]HH:mm:ss"
-            :default-time="defaultTimeStartEnd"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-			<ProTable
-				ref="proTableRef"
-				:columns="columns"
-				:data="state.tableData"
-				@updateTable="queryList"
-				:loading="state.loading"
-				:total="state.total"
-				v-model:page-index="state.queryParams.PageIndex"
-				v-model:page-size="state.queryParams.PageSize"
-			>
-			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataSharePushData">
 import { onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { defaultDateTime, defaultTimeStartEnd, shortcuts } from "@/utils/constants";
+import { defaultDateTime, defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import { getOtherPushData, getProvincePushData } from '@/api/dataShare';
 import { formatDate } from '@/utils/formatTime';
 import other from '@/utils/other';
@@ -79,7 +81,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'stateText',
 		label: '推送状态',
-		align: 'center'
+		align: 'center',
 	},
 	{
 		prop: 'platformSourceText',
@@ -105,7 +107,7 @@ const columns = ref<any[]>([
 		render: (scope) => {
 			return <span>{formatDate(scope.row.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
-	}
+	},
 ]);
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
@@ -114,10 +116,10 @@ const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		crTime: defaultDateTime,
-    StartTime:null,
-    EndTime:null
+		StartTime: null,
+		EndTime: null,
 	},
 	tableData: [], //表单
 	loading: false, // 加载
@@ -178,3 +180,18 @@ onMounted(() => {
 	queryList();
 });
 </script>
+<style lang="scss" scoped>
+.dataShare-pushData-container {
+	.tabs {
+		display: flex;
+		flex-direction: column;
+		:deep(.el-tabs__content) {
+			display: flex;
+			height: 100%;
+		}
+		:deep(.pro-table-main) {
+			height: v-bind(height);
+		}
+	}
+}
+</style>

src/views/dataShare/pushFail.vue

@@ -1,31 +1,6 @@
 <template>
-	<div class="dataShare-pushTask-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD[T]HH:mm:ss"
-						:default-time="defaultTimeStartEnd"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="dataShare-pushTask-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -36,11 +11,36 @@
 				v-model:page-index="state.queryParams.PageIndex"
 				v-model:page-size="state.queryParams.PageSize"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="时间段" prop="crTime">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="datetimerange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD[T]HH:mm:ss"
+                  :default-time="defaultTimeStartEnd"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item label-width="0">
+              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+              <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+                <SvgIcon name="ele-Refresh" class="mr5" />重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </template>
 				<template #operation="{ row }">
 					<el-button link type="primary" @click="onRePush(row)" title="重新推送"> 重推 </el-button>
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataSharePushFail">
@@ -89,7 +89,7 @@ const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		crTime: defaultDateTime,
 		StartTime: null,
 		EndTime: null,

src/views/dataShare/pushedTask.vue

@@ -1,53 +1,55 @@
 <template>
-	<div class="dataShare-pushedTask-container layout-pd">
-		<el-card shadow="never">
-			<el-tabs v-model="state.queryParams.SelectType" @tab-change="handleQuery">
+	<div class="dataShare-pushedTask-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+			<el-tabs v-model="state.queryParams.SelectType" @tab-change="handleQuery" class="tabs h100">
 				<el-tab-pane name="1" label="服务工单受理"></el-tab-pane>
 				<el-tab-pane name="2" label="电话记录"></el-tab-pane>
 				<el-tab-pane name="3" label="服务工单处理过程"></el-tab-pane>
 				<el-tab-pane name="4" label="服务工单处理结果"></el-tab-pane>
 				<el-tab-pane name="5" label="省平台推送其他"></el-tab-pane>
 				<el-tab-pane name="6" label="其他平台"></el-tab-pane>
+        <ProTable
+            ref="proTableRef"
+            :columns="columns"
+            :data="state.tableData"
+            @updateTable="queryList"
+            :loading="state.loading"
+            :total="state.total"
+            v-model:page-index="state.queryParams.PageIndex"
+            v-model:page-size="state.queryParams.PageSize"
+        >
+          <template #table-search>
+            <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+              <el-form-item label="时间段" prop="crTime">
+                <el-date-picker
+                    v-model="state.queryParams.crTime"
+                    type="datetimerange"
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    :shortcuts="shortcuts"
+                    @change="handleQuery"
+                    value-format="YYYY-MM-DD[T]HH:mm:ss"
+                    :default-time="defaultTimeStartEnd"
+                    :clearable="false"
+                />
+              </el-form-item>
+              <el-form-item label-width="0">
+                <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+                <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+                  <SvgIcon name="ele-Refresh" class="mr5" />重置
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </template>
+          <template #operation="{ row }">
+            <el-button link type="primary" @click="onDetail(row)" title="查看任务明细"> 任务明细 </el-button>
+            <el-button link type="primary" @click="onRePush(row)" title="重新推送"> 重推 </el-button>
+          </template>
+        </ProTable>
 			</el-tabs>
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="datetimerange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-            value-format="YYYY-MM-DD[T]HH:mm:ss"
-            :default-time="defaultTimeStartEnd"
-            :clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-			<ProTable
-				ref="proTableRef"
-				:columns="columns"
-				:data="state.tableData"
-				@updateTable="queryList"
-				:loading="state.loading"
-				:total="state.total"
-				v-model:page-index="state.queryParams.PageIndex"
-				v-model:page-size="state.queryParams.PageSize"
-			>
-				<template #operation="{ row }">
-					<el-button link type="primary" @click="onDetail(row)" title="查看任务明细"> 任务明细 </el-button>
-					<el-button link type="primary" @click="onRePush(row)" title="重新推送"> 重推 </el-button>
-				</template>
-			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="dataSharePushedTask">
@@ -123,7 +125,7 @@ const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		Id: null, //
 		Keyword: null,
 		IsSuccess: null,
@@ -199,3 +201,18 @@ onMounted(() => {
 	queryList();
 });
 </script>
+<style lang="scss" scoped>
+.dataShare-pushedTask-container {
+  .tabs {
+    display: flex;
+    flex-direction: column;
+    :deep(.el-tabs__content) {
+      display: flex;
+      height: 100%;
+    }
+    :deep(.pro-table-main) {
+      height: v-bind(height);
+    }
+  }
+}
+</style>

src/views/dataShare/userInfo.vue

@@ -1,19 +1,6 @@
 <template>
-	<div class="dataShare-userInfo-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="平台名称" prop="Keyword">
-					<el-input v-model="state.queryParams.Keyword" placeholder="平台名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
-				</el-form-item>
-				<el-form-item label-width="0">
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-						<SvgIcon name="ele-Refresh" class="mr5" />重置
-					</el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="dataShare-userInfo-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -25,13 +12,26 @@
 				v-model:page-size="state.queryParams.PageSize"
 				:key="Math.random()"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="平台名称" prop="Keyword">
+              <el-input v-model="state.queryParams.Keyword" placeholder="平台名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+            </el-form-item>
+            <el-form-item label-width="0">
+              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+              <el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+                <SvgIcon name="ele-Refresh" class="mr5" />重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </template>
 				<template #tableHeader="scope">
 					<el-button type="primary" @click="onAdd(false)" :loading="state.loading" title="新增账号">
 						<SvgIcon name="ele-Plus" class="mr5" />新增账号
 					</el-button>
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 		<el-dialog title="新增账号" v-model="state.dialogVisible" destroy-on-close append-to-body draggable>
 			<el-form :model="state.form" ref="formRef" label-width="120px">
 				<el-row :gutter="10">
@@ -92,7 +92,7 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1, // 当前页
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 	},
 	tableData: [], //表单
 	loading: false, // 加载