reactor:自贡图标更换;

src/components/ProTable/index.vue

@@ -43,7 +43,6 @@
 					>
 						<SvgIcon name="iconfont icon-export" />
 					</el-button>
-					<el-button v-if="exportLoading" :loading="exportLoading">导出中，请稍后。。。</el-button>
 				</slot>
 				<slot name="description"> </slot>
 				<slot name="tableBtn"></slot>
@@ -107,7 +106,7 @@
 		</el-table>
 		<!-- 分页组件 -->
 		<slot name="pagination">
-			<div class="pagination-container">
+			<div class="pagination-container" v-if="pagination">
 				<el-pagination
 					:background="background"
 					v-model:current-page="pageIndex"
@@ -127,9 +126,10 @@
 	<col-setting-com v-if="toolButton" ref="colRef" v-model:col-setting="colSetting" @update:colSetting="updateColSetting" @changeRow="changeRow" />
 </template>
 
-<script setup lang="ts" name="ProTable">
-import { ref, provide, onMounted, unref, computed, reactive, PropType, watch } from 'vue';
-import { ElMessageBox, ElTable } from 'element-plus';
+<script setup lang="tsx" name="ProTable">
+import { ref, provide, onMounted, unref, computed, reactive, PropType, watch,h } from 'vue';
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus';
+import {Loading} from "@element-plus/icons-vue"
 import { useSelection } from '@/hooks/useSelection';
 import { ColumnProps, TypeProps } from '@/components/ProTable/interface';
 import ColSettingCom from './components/ColSetting.vue';
@@ -492,6 +492,17 @@ const exportAll = () => {
 				columnInfos: exportNewColumns,
 				isExportAll: true,
 			};
+			const message =  ElMessage({
+				message: (
+					<div class="flex-center-center">
+						正在导出中，请稍后
+							<Loading class="el-icon is-loading ml5"/>
+					</div>
+				),
+				type: 'info',
+				duration:0,
+				plain:true,
+			})
 			if (props.isSpecialExport) {
 				const specialRequest = {
 					...props.exportParams,
@@ -504,10 +515,12 @@ const exportAll = () => {
 							downloadFileByStream(res);
 							emit('exportAll', exportNewColumns);
 							exportLoading.value = false;
+							message.close();
 						})
 						.catch((e) => {
 							console.log(`导出失败:${e}`);
 							exportLoading.value = false;
+							message.close();
 						});
 			} else {
 				props.exportMethod &&
@@ -517,10 +530,12 @@ const exportAll = () => {
 							downloadFileByStream(res);
 							emit('exportAll', exportNewColumns);
 							exportLoading.value = false;
+							message.close();
 						})
 						.catch((e) => {
 							console.log(`导出失败:${e}`);
 							exportLoading.value = false;
+							message.close();
 						});
 			}
 		})

src/theme/element.scss

@@ -26,6 +26,9 @@
 //.el-input,.el-radio__input,.el-checkbox__input,.el-input__inner {
 //	--el-border-color: var(--el-border-color-darker);
 //}
+.el-icon.is-loading{
+	animation: rotating 2s linear infinite;
+}
 // 菜单搜索
 .el-autocomplete-suggestion__wrap {
 	max-height: 280px !important;

src/views/statistics/center/frequentlyEvent.vue

@@ -104,15 +104,14 @@
 </template>
 <script setup lang="tsx" name="statisticsCenterFrequentlyEvent">
 import { onMounted, reactive, ref } from 'vue';
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessageBox, FormInstance } from 'element-plus';
 import { defaultDate, shortcuts } from '@/utils/constants';
-import { smartVisitBaseData } from '@/api/smartVisit';
 import { treeArea } from '@/api/auxiliary/area';
 import { departmentHighFrequencyEvent } from '@/api/statistics/center';
 import { useRouter } from 'vue-router';
 import Other from '@/utils/other';
 import { throttle } from '@/utils/tools';
-import { supplement } from '@/api/system/workflow';
+import { returnBase } from '@/api/business/return';
 
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
@@ -166,7 +165,7 @@ const closeSearch = () => {
 const acceptTypeOptions = ref([]); // 受理类型
 const areaOptions = ref([]); // 事发地址
 const getBaseData = async () => {
-	const [acceptType, area] = await Promise.all([smartVisitBaseData(), treeArea()]);
+	const [acceptType, area] = await Promise.all([returnBase(), treeArea()]);
 	acceptTypeOptions.value = acceptType.result?.acceptTypeOptions;
 	areaOptions.value = area.result ?? [];
 };

src/views/statistics/center/frequentlyTel.vue

@@ -59,7 +59,7 @@ const columns = ref<any[]>([
 		label: '工单数',
 		render: (scope) => {
 			return (
-				<el-button type="primary" link onClick={() => linkDetail(scope.row)}>d
+				<el-button type="primary" link onClick={() => linkDetail(scope.row)}>
 					{scope.row.orderCountNum}
 				</el-button>
 			);

src/views/statistics/center/reportManage.vue

@@ -50,7 +50,6 @@
 				<template #operation="{ row }">
 					<el-button type="primary" link @click="viewEvent">查看预警事件</el-button>
 					<el-button type="primary" link @click="viewReport">查看报告</el-button>
-					<el-button type="primary" link @click="downloadReport">下载</el-button>
 					<el-button type="primary" link @click="deleteReport">删除</el-button>
 				</template>
 			</ProTable>
@@ -80,7 +79,7 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row?.creationTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{ prop: 'operation', label: '操作', fixed: 'right', width: 280, align: 'center' },
+	{ prop: 'operation', label: '操作', fixed: 'right', width: 240, align: 'center' },
 ]);
 const searchCol = ref(true); // 展开/收起
 // 展开/收起
@@ -143,8 +142,6 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 const viewEvent = () => {};
 // 查看报告
 const viewReport = () => {};
-// 下载报告
-const downloadReport = () => {};
 // 删除报告
 const deleteReport = () => {
 	ElMessageBox.confirm('确定删除该报告吗？', '提示', {