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

src/views/statistics/order/acceptTopTen.vue

@@ -1,30 +1,6 @@
 <template>
-	<div class="statistics-order-accept-top-ten-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="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-            :clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-accept-top-ten-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -36,8 +12,32 @@
 				:pagination="false"
         :summary-method="getSummaries"
 			>
+        <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="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderAcceptTop10">

src/views/statistics/order/acceptType.vue

@@ -36,8 +36,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14">
 					<v-chart class="chart" :option="option" :loading="state.loading" autoresize />
@@ -52,7 +50,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'setting', 'exportAll']"
 						:exportMethod="statisticsOrderAcceptExport"
 						:exportParams="requestParams"
@@ -218,7 +216,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>

src/views/statistics/order/detailAcceptTime.vue

@@ -1,38 +1,38 @@
 <template>
-	<div class="statistics-order-detail-accept-time-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="来电主体" prop="IdentityType">
-					<el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
-						<el-option :value="0" label="全部" />
-						<el-option :value="1" label="市民" />
-						<el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="statistics-order-detail-accept-time-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+		  <div class="table-search-content">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="来电主体" prop="IdentityType">
+            <el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
+              <el-option :value="0" label="全部" />
+              <el-option :value="1" label="市民" />
+              <el-option :value="2" label="企业" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="daterange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD"
+                :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item>
+            <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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -49,7 +49,7 @@
 				isSpecialExport
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailAcceptTime">

src/views/statistics/order/detailAcceptType.vue

@@ -1,31 +1,6 @@
 <template>
-	<div class="statistics-order-detail-accept-type layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="工单标题" prop="Title">
-					<el-input v-model="state.queryParams.Title" 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="CurrentHandleOrgName">
-					<el-input
-						v-model="state.queryParams.CurrentHandleOrgName"
-						placeholder="接办部门"
-						clearable
-						@keyup.enter="handleQuery"
-						class="keyword-input"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-detail-accept-type layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -39,6 +14,31 @@
 				:exportMethod="statisticsOrderAcceptListDetailExport"
 				:exportParams="requestParams"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="工单标题" prop="Title">
+              <el-input v-model="state.queryParams.Title" 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="CurrentHandleOrgName">
+              <el-input
+                  v-model="state.queryParams.CurrentHandleOrgName"
+                  placeholder="接办部门"
+                  clearable
+                  @keyup.enter="handleQuery"
+                  class="keyword-input"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="onJbExport" :disabled="!scope.isSelected" :loading="state.loading"
 						><SvgIcon name="iconfont icon-daochu" class="mr5" />交办单导出
@@ -54,7 +54,7 @@
 					<order-detail :order="row" @updateList="queryList" />
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsDetailAcceptType">
@@ -77,7 +77,7 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1, // 当前页
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 		Title: null,
 		No: null,
     CurrentHandleOrgName: null,

src/views/statistics/order/detailAcceptTypeList.vue

@@ -1,43 +1,43 @@
 <template>
-	<div class="statistics-order-detail-accept-type-list-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="来电主体" prop="TypeId">
-					<el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
-						<el-option :value="0" label="全部" />
-						<el-option :value="1" label="市民" />
-						<el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="热线号码" prop="Gateway">
-					<el-select v-model="state.queryParams.Gateway" placeholder="请选择热线号码" clearable @change="handleQuery">
-						<el-option v-for="item in state.callForwardingSource" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						: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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" /> 图表 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="statistics-order-detail-accept-type-list-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+      <div class="table-search-content">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="来电主体" prop="TypeId">
+            <el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
+              <el-option :value="0" label="全部" />
+              <el-option :value="1" label="市民" />
+              <el-option :value="2" label="企业" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="热线号码" prop="Gateway">
+            <el-select v-model="state.queryParams.Gateway" placeholder="请选择热线号码" clearable @change="handleQuery">
+              <el-option v-for="item in state.callForwardingSource" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="daterange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD"
+                :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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" /> 图表 </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -53,7 +53,7 @@
 				isSpecialExport
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailAcceptTypeList">
@@ -182,8 +182,9 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-.chart {
-	height: 60vh;
-	margin-top: 10px;
+.statistics-order-detail-accept-type-list-container {
+  :deep(.pro-table-main) {
+    height: calc(100% - 50px) !important;
+  }
 }
-</style>
+</style>

src/views/statistics/order/detailAreaTime.vue

@@ -1,39 +1,38 @@
 <template>
-	<div class="statistics-order-detail-area-time-container layout-pd">
-		<!-- 搜索  -->
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="来电主体" prop="IdentityType">
-					<el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
-						<el-option :value="0" label="全部" />
-						<el-option :value="1" label="市民" />
-						<el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="statistics-order-detail-area-time-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+			<div class="table-search-content">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="来电主体" prop="IdentityType">
+            <el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
+              <el-option :value="0" label="全部" />
+              <el-option :value="1" label="市民" />
+              <el-option :value="2" label="企业" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="daterange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD"
+                :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item>
+            <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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -50,7 +49,7 @@
 				isSpecialExport
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailAreaTime">

src/views/statistics/order/detailDispatch.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="statistics-order-detail-dispatch-container layout-pd">
-    <el-card shadow="never">
+  <div class="statistics-order-detail-dispatch-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
       <ProTable
         ref="proTableRef"
         :columns="columns"
@@ -21,7 +21,7 @@
           <order-detail :order="row" @updateList="queryList" />
         </template>
       </ProTable>
-    </el-card>
+    </div>
   </div>
 </template>
 
@@ -41,7 +41,7 @@ const state = reactive({
   queryParams: {
     // 查询条件
     PageIndex: 1,
-    PageSize: 10,
+    PageSize: 20,
     State: null, // 特提状态
     Keyword: null, // 关键字
   },

src/views/statistics/order/detailHotSpotTime.vue

@@ -1,39 +1,38 @@
 <template>
-	<div class="statistics-order-detail-hotspot-time-container layout-pd">
-		<!-- 搜索  -->
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="来电主体" prop="IdentityType">
-					<el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
-						<el-option :value="0" label="全部" />
-						<el-option :value="1" label="市民" />
-						<el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="statistics-order-detail-hotspot-time-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+      <div class="table-search-content">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="来电主体" prop="IdentityType">
+            <el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
+              <el-option :value="0" label="全部" />
+              <el-option :value="1" label="市民" />
+              <el-option :value="2" label="企业" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="daterange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD"
+                :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item>
+            <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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -50,7 +49,7 @@
 				isSpecialExport
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailHotspotTime">

src/views/statistics/order/detailHotspotArea.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="statistics-order-detail-dispatch-container layout-pd">
-		<el-card shadow="never">
+	<div class="statistics-order-detail-dispatch-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -24,7 +24,7 @@
 					<order-detail :order="row" @updateList="queryList" />
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 
@@ -50,7 +50,7 @@ const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		State: null, // 特提状态
 		Keyword: null, // 关键字
 	},

src/views/statistics/order/detailHotspotSatisfied.vue

@@ -1,30 +1,6 @@
 <template>
-	<div class="statistics-order-detail-dispatch-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="daterange"
-              unlink-panels
-              range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              :shortcuts="shortcuts"
-              @change="handleQuery"
-              value-format="YYYY-MM-DD"
-              :clearable="false"
-          />
-        </el-form-item>
-        <el-form-item>
-          <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="statistics-order-detail-dispatch-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -38,6 +14,30 @@
 				:exportMethod="statisticsOrderHotSatisfyDetailExport"
 				:exportParams="requestParams"
 			>
+        <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="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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.order?.expiredStatus" :title="row.order?.expiredStatusText"></span>
 				</template>
@@ -49,7 +49,7 @@
 					<order-detail :order="row.order" @updateList="queryList" />
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 
@@ -76,7 +76,7 @@ const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		State: null, // 特提状态
 		Keyword: null, // 关键字
     crTime:defaultDate,

src/views/statistics/order/detailSource.vue

@@ -1,39 +1,38 @@
 <template>
-	<div class="statistics-order-dispatch-container layout-pd">
-		<!-- 搜索  -->
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="来电主体" prop="IdentityType">
-					<el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
-						<el-option :value="0" label="全部" />
-						<el-option :value="1" label="市民" />
-						<el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
-				</el-form-item>
-			</el-form>
-		</el-card>
-		<el-card shadow="never">
+	<div class="statistics-order-dispatch-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+			<div class="table-search-content">
+        <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+          <el-form-item label="来电主体" prop="IdentityType">
+            <el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
+              <el-option :value="0" label="全部" />
+              <el-option :value="1" label="市民" />
+              <el-option :value="2" label="企业" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="时间段" prop="crTime">
+            <el-date-picker
+                v-model="state.queryParams.crTime"
+                type="daterange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                @change="handleQuery"
+                value-format="YYYY-MM-DD"
+                :clearable="false"
+            />
+          </el-form-item>
+          <el-form-item>
+            <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-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -51,7 +50,7 @@
 				@updateColSetting="updateColSetting"
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailSource">

src/views/statistics/order/detailSourceOrder.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="statistics-order-detail-source-order-container layout-pd">
-		<el-card shadow="never">
+	<div class="statistics-order-detail-source-order-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -25,7 +25,7 @@
           <order-detail :order="row" @updateList="queryList" />
         </template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsDetailSourceOrder">
@@ -43,7 +43,7 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 const state = reactive<any>({
 	queryParams: {
 		PageIndex: 1, // 当前页
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 	},
 	tableData: [], //表单
 	loading: false, // 加载

src/views/statistics/order/detailSourceTime.vue

@@ -1,7 +1,7 @@
 <template>
-	<div class="statistics-order-detail-source-time-container layout-pd">
-		<!-- 搜索  -->
-		<el-card shadow="never">
+	<div class="statistics-order-detail-source-time-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
+		<div class="table-search-content">
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="来电主体" prop="IdentityType">
 					<el-select v-model="state.queryParams.IdentityType" placeholder="请选择来电主体" @change="handleQuery">
@@ -32,8 +32,7 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-PieChart" class="mr5" />图表 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
+		</div>
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -50,7 +49,7 @@
         isSpecialExport
 			>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderDetailSourceTime">

src/views/statistics/order/dispatch.vue

@@ -1,33 +1,6 @@
 <template>
-  <div class="statistics-order-dispatch-container layout-pd">
-    <el-card shadow="never">
-      <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-        <el-form-item label="派单员" prop="UserName">
-          <el-input v-model="state.queryParams.UserName" placeholder="派单员姓名" clearable @keyup.enter="handleQuery" class="keyword-input" />
-        </el-form-item>
-        <el-form-item label="时间段" prop="crTime">
-          <el-date-picker
-            v-model="state.queryParams.crTime"
-            type="daterange"
-            unlink-panels
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            :shortcuts="shortcuts"
-            @change="handleQuery"
-            value-format="YYYY-MM-DD"
-            :clearable="false"
-          />
-        </el-form-item>
-        <el-form-item>
-          <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="statistics-order-dispatch-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
       <ProTable
         ref="proTableRef"
         :columns="columns"
@@ -39,8 +12,35 @@
         :pagination="false"
         :summary-method="getSummaries"
       >
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="派单员" prop="UserName">
+              <el-input v-model="state.queryParams.UserName" placeholder="派单员姓名" clearable @keyup.enter="handleQuery" class="keyword-input" />
+            </el-form-item>
+            <el-form-item label="时间段" prop="crTime">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderDispatch">

src/views/statistics/order/hotspotCount.vue

@@ -1,62 +1,6 @@
 <template>
-	<div class="statistics-order-hotspot-count-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item prop="dateType" label="时间单位">
-					<el-select v-model="state.queryParams.dateType" placeholder="部门名称" @change="handleQuery">
-						<el-option label="年" value="year" />
-						<el-option label="月" value="month" />
-						<el-option label="日" value="date" />
-						<el-option label="自定义" value="daterange" />
-					</el-select>
-				</el-form-item>
-				<el-form-item prop="crTime" v-if="state.queryParams.dateType === 'daterange'" label="时间">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item prop="hbTime" v-if="state.queryParams.dateType === 'daterange'" label="环比时间段">
-					<el-date-picker
-						v-model="state.queryParams.hbTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item prop="time" v-else label="时间">
-					<el-date-picker
-						v-model="state.queryParams.time"
-						:type="state.queryParams.dateType"
-						placeholder="选择时间"
-						@change="handleQuery"
-						:value-format="valueFormat"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-hotspot-count-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -70,8 +14,64 @@
         border
         :pagination="false"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item prop="dateType" label="时间单位">
+              <el-select v-model="state.queryParams.dateType" placeholder="部门名称" @change="handleQuery">
+                <el-option label="年" value="year" />
+                <el-option label="月" value="month" />
+                <el-option label="日" value="date" />
+                <el-option label="自定义" value="daterange" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="crTime" v-if="state.queryParams.dateType === 'daterange'" label="时间">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item prop="hbTime" v-if="state.queryParams.dateType === 'daterange'" label="环比时间段">
+              <el-date-picker
+                  v-model="state.queryParams.hbTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item prop="time" v-else label="时间">
+              <el-date-picker
+                  v-model="state.queryParams.time"
+                  :type="state.queryParams.dateType"
+                  placeholder="选择时间"
+                  @change="handleQuery"
+                  :value-format="valueFormat"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderHotspotCount">

src/views/statistics/order/hotspotSatisfied.vue

@@ -1,39 +1,6 @@
 <template>
-	<div class="statistics-order-hotspot-satisfied-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item label="热点名称" prop="HotspotName">
-					<el-input v-model="state.queryParams.HotspotName" placeholder="热点名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
-				</el-form-item>
-				<el-form-item label="归档类型" prop="TypeId">
-					<el-select v-model="state.queryParams.TypeId" placeholder="归档类型" @change="handleQuery">
-						<el-option label="办件结果" value="1" />
-						<el-option label="办件态度" value="2" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="时间段" prop="crTime">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-hotspot-satisfied-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -48,6 +15,39 @@
 				:exportParams="requestParams"
 				border
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item label="热点名称" prop="HotspotName">
+              <el-input v-model="state.queryParams.HotspotName" placeholder="热点名称" clearable @keyup.enter="handleQuery" class="keyword-input" />
+            </el-form-item>
+            <el-form-item label="归档类型" prop="TypeId">
+              <el-select v-model="state.queryParams.TypeId" placeholder="归档类型" @change="handleQuery">
+                <el-option label="办件结果" value="1" />
+                <el-option label="办件态度" value="2" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="时间段" prop="crTime">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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 #description>
 					<el-popover :width="500" trigger="click">
 						<template #reference>
@@ -79,7 +79,7 @@
 					</el-popover>
 				</template>
 			</ProTable>
-		</el-card>
+		</div>
 	</div>
 </template>
 <script setup lang="tsx" name="statisticsOrderHotspotSatisfied">

src/views/statistics/order/hotspotSubclass.vue

@@ -1,37 +1,6 @@
 <template>
-	<div class="statistics-order-hotspot-subclass-container layout-pd">
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item prop="TypeId" label="来电主体">
-					<el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
-            <el-option :value="0" label="全部" />
-            <el-option :value="1" label="市民" />
-            <el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item prop="crTime" label="时间段">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-hotspot-subclass-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -46,8 +15,39 @@
 				:tree-props="{ children: 'children', hasChildren: 'hasChild' }"
 				show-summary
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item prop="TypeId" label="来电主体">
+              <el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
+                <el-option :value="0" label="全部" />
+                <el-option :value="1" label="市民" />
+                <el-option :value="2" label="企业" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="crTime" label="时间段">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderHotspotSubclass">

src/views/statistics/order/source.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="statistics-order-source-container layout-pd">
-		<!-- 搜索  -->
 		<el-card shadow="never">
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
 				<el-form-item label="来电主体" prop="IdentityType">
@@ -32,8 +31,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="20">
 				<el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
 					<template v-if="dataTable.length">
@@ -51,7 +48,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'exportAll']"
 						:exportMethod="orderSourceExport"
 						:exportParams="requestParams"
@@ -185,7 +182,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>

src/views/statistics/order/specialTable.vue

@@ -1,27 +1,6 @@
 <template>
-	<div class="statistics-order-special-table-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="State">
-					<el-select v-model="state.queryParams.State" placeholder="请选择特提状态" clearable @change="handleQuery">
-						<el-option label="待审核" value="0"></el-option>
-						<el-option label="审核通过" value="1"></el-option>
-						<el-option label="审核不通过" value="2"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-					<el-button @click="resetQuery(ruleFormRef)" v-waves 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="statistics-order-special-table-container  layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
       <ProTable
         ref="proTableRef"
         :columns="columns"
@@ -32,6 +11,26 @@
         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="Keyword">
+              <el-input v-model="state.queryParams.Keyword" placeholder="工单编码/标题" clearable @keyup.enter="handleQuery" class="keyword-input" />
+            </el-form-item>
+            <el-form-item label="特提状态" prop="State">
+              <el-select v-model="state.queryParams.State" placeholder="请选择特提状态" clearable @change="handleQuery">
+                <el-option label="待审核" value="0"></el-option>
+                <el-option label="审核通过" value="1"></el-option>
+                <el-option label="审核不通过" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+              <el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button" :loading="state.loading">
+                <SvgIcon name="ele-Refresh" class="mr5" />重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </template>
         <template #title="{ row }">
           <order-detail :order="row.order" @updateList="queryList">{{ row.order?.title }}</order-detail>
         </template>
@@ -41,7 +40,7 @@
           <order-detail :order="row.order" @updateList="queryList" />
         </template>
       </ProTable>
-		</el-card>
+		</div>
 		<!-- 审批详情 -->
 		<special-audit-detail ref="specialAuditDetailRef" />
 	</div>
@@ -65,7 +64,7 @@ const state = reactive({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1,
-		PageSize: 10,
+		PageSize: 20,
 		State: null, // 特提状态
 		Keyword: null, // 关键字
 	},

src/views/statistics/order/specials.vue

@@ -1,30 +1,6 @@
 <template>
-	<div class="statistics-order-specials-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="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-specials-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -36,8 +12,32 @@
 				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="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderSpecial">
@@ -77,7 +77,7 @@ const state = reactive<any>({
 	queryParams: {
 		// 查询条件
 		PageIndex: 1, // 页码
-		PageSize: 10, // 每页条数
+		PageSize: 20, // 每页条数
 		crTime: defaultDate, // 时间默认今天开始到今天结束
 	},
 	tableData: [], //表单

src/views/statistics/order/subRegional.vue

@@ -1,61 +1,6 @@
 <template>
-	<div class="statistics-order-sub-regional-container layout-pd">
-		<!-- 搜索  -->
-		<el-card shadow="never">
-			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
-				<el-form-item prop="dateType" label="时间单位">
-					<el-select v-model="state.queryParams.dateType" placeholder="部门名称" @change="handleQuery">
-						<el-option label="年" value="year" />
-						<el-option label="月" value="month" />
-						<el-option label="日" value="date" />
-						<el-option label="自定义" value="daterange" />
-					</el-select>
-				</el-form-item>
-				<el-form-item prop="crTime" v-if="state.queryParams.dateType === 'daterange'" label="时间段">
-					<el-date-picker
-						v-model="state.queryParams.crTime"
-						type="daterange"
-						unlink-panels
-						range-separator="至"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						:shortcuts="shortcuts"
-						@change="handleQuery"
-						value-format="YYYY-MM-DD"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item prop="time" v-else label="时间">
-					<el-date-picker
-						v-model="state.queryParams.time"
-						:type="state.queryParams.dateType"
-						placeholder="选择时间"
-						@change="handleQuery"
-						:value-format="valueFormat"
-						:clearable="false"
-					/>
-				</el-form-item>
-				<el-form-item label="来电主体" prop="TypeId">
-					<el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
-            <el-option :value="0" label="全部" />
-            <el-option :value="1" label="市民" />
-            <el-option :value="2" label="企业" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="热线号码" prop="Line">
-					<el-select v-model="state.queryParams.Line" placeholder="请选择热线号码" clearable @change="handleQuery">
-						<el-option v-for="item in state.callForwardingSource" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<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="statistics-order-sub-regional-container layout-padding">
+    <div class="layout-padding-auto layout-padding-view pd20">
 			<ProTable
 				ref="proTableRef"
 				:columns="columns"
@@ -69,8 +14,62 @@
 				border
 				:pagination="false"
 			>
+        <template #table-search>
+          <el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent inline>
+            <el-form-item prop="dateType" label="时间单位">
+              <el-select v-model="state.queryParams.dateType" placeholder="部门名称" @change="handleQuery">
+                <el-option label="年" value="year" />
+                <el-option label="月" value="month" />
+                <el-option label="日" value="date" />
+                <el-option label="自定义" value="daterange" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="crTime" v-if="state.queryParams.dateType === 'daterange'" label="时间段">
+              <el-date-picker
+                  v-model="state.queryParams.crTime"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  @change="handleQuery"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item prop="time" v-else label="时间">
+              <el-date-picker
+                  v-model="state.queryParams.time"
+                  :type="state.queryParams.dateType"
+                  placeholder="选择时间"
+                  @change="handleQuery"
+                  :value-format="valueFormat"
+                  :clearable="false"
+              />
+            </el-form-item>
+            <el-form-item label="来电主体" prop="TypeId">
+              <el-select v-model="state.queryParams.TypeId" placeholder="请选择来电主体" @change="handleQuery">
+                <el-option :value="0" label="全部" />
+                <el-option :value="1" label="市民" />
+                <el-option :value="2" label="企业" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="热线号码" prop="Line">
+              <el-select v-model="state.queryParams.Line" placeholder="请选择热线号码" clearable @change="handleQuery">
+                <el-option v-for="item in state.callForwardingSource" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <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="statisticsOrderSubRegional">

src/views/statistics/order/timeAccept.vue

@@ -31,8 +31,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="20">
 				<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 					<v-chart class="chart" :option="option" :loading="state.loading" autoresize />
@@ -47,7 +45,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'setting', 'exportAll']"
 						:key="Math.random()"
 						:exportMethod="orderAcceptTimeExport"
@@ -222,7 +220,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>

src/views/statistics/order/timeArea.vue

@@ -31,8 +31,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="20">
 				<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 					<v-chart class="chart" :option="option" :loading="state.loading" autoresize />
@@ -47,7 +45,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'setting', 'exportAll']"
 						:key="Math.random()"
 						:exportMethod="orderAreaTimeExport"
@@ -222,7 +220,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>

src/views/statistics/order/timeHotspot.vue

@@ -31,8 +31,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="20">
 				<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 					<v-chart class="chart" :option="option" :loading="state.loading" autoresize />
@@ -47,7 +45,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'setting', 'exportAll']"
 						:key="Math.random()"
 						:exportMethod="orderHotTimeExport"
@@ -222,7 +220,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>

src/views/statistics/order/timeSource.vue

@@ -31,8 +31,6 @@
 					<el-button type="primary" @click="onDetail" :loading="state.loading"> <SvgIcon name="ele-List" class="mr5" /> 列表明细 </el-button>
 				</el-form-item>
 			</el-form>
-		</el-card>
-		<el-card shadow="never">
 			<el-row :gutter="20">
 				<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 					<v-chart class="chart" :option="option" :loading="state.loading" autoresize />
@@ -47,7 +45,7 @@
 						:pagination="false"
 						border
 						:tool-button="false"
-						max-height="60vh"
+						max-height="70vh"
 						:toolButton="['refresh', 'setting', 'exportAll']"
 						:key="Math.random()"
 						:exportMethod="orderSourceTimeExport"
@@ -222,7 +220,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .chart {
-	height: 60vh;
+	height: 70vh;
 	margin-top: 10px;
 }
 </style>