fix: BUG修改

src/views/goverment/huizhou/assessmentManagement/unitList/index.vue

@@ -328,10 +328,10 @@ const getTableList = (params: any) => {
 	// 	newParams.createTime_end = newParams.createTime[1];
 	// 	delete newParams.createTime;
 	// }
-	if (!companyType.value) {
+	newParams.enterpriseType = companyType.value.dictLabel;
+	if (!newParams.enterpriseType) {
 		return;
 	}
-	newParams.enterpriseType = companyType.value.dictLabel;
 	return scorePage(newParams);
 };
 // div点击事件

src/views/goverment/huizhou/droneImaging/index.vue

@@ -12,7 +12,7 @@
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
 					<span class="projectName">{{
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
+						data.projectName || data.engineeringName
 					}}</span>
 					<div class="leftMenu_item">
 						<div class="video">
@@ -87,7 +87,7 @@
 					class="pagination"
 				/>
 				<changeTheme />
-				<el-dialog class="imgDialog" :title="title" width="40%" v-model="visible" show-close>
+				<el-dialog class="imgDialog" :title="title" width="40%" v-model="visible" show-close @close="closeDialog">
 					<el-form class="diaForm" :rules="rules" :model="formData" ref="ruleFormRef" label-width="160px">
 						<el-form-item label="录像标题：" prop="title">
 							<el-input style="width: 70%" v-model="formData.title" placeholder="请输入" />
@@ -142,7 +142,6 @@ import type { FormRules, FormInstance } from "element-plus";
 import { ElMessage, UploadProps } from "element-plus";
 import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import changeTheme from "@/components/changeTheme/index.vue";
 import { getUnmannedProjectPage, getUnmannedEngineeringPage, getUnmannedPage } from "@/api/modules/goverment";
 import { videoDataAdd, videoDataEdit, videoDataDelete } from "@/api/modules/project";
@@ -155,7 +154,7 @@ const pages = ref({
 	pageSize: 7,
 	total: 0
 });
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 const active = ref(1);
 const store = GlobalStore();
 const headers = ref({ Authorization: "Bearer " + store.token });
@@ -219,6 +218,10 @@ const searchSn = ref("");
 
 // 项目或者工程名字
 const searchName = ref<string>("");
+const closeDialog = () => {
+	visible.value = false;
+	ruleFormRef.value?.clearValidate();
+};
 // 删除用户信息
 const deleteAccount = async (params: jxj_User.ResUserList) => {
 	await useHandleData(videoDataDelete, { id: params.id }, `删除`);
@@ -292,12 +295,12 @@ const addVideoData = () => {
 	visible.value = true;
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
 	const { result } = await getUnmannedPage(
 		active.value === 0
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
+			? { projectSn: params.projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
 			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
+					engineeringSn: params.engineeringSn,
 					pageNo: pageable.value.pageNo,
 					pageSize: pageable.value.pageSize
 			  }
@@ -305,11 +308,11 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
 	pageable.value.total = Number(result.total);
 	videoData.value.records = result.records;
 	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
+		? (searchSn.value = params.projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
+		: (searchSn.value = params.engineeringSn);
 	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
+		? (searchName.value = params.projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
+		: (searchName.value = params.engineeringName);
 	// getVideoData();
 };
 // leftMenu页面的搜索按钮
@@ -408,11 +411,10 @@ watch(
 	}
 );
 onMounted(async () => {
-	getVideoData();
 	await getEngPage();
+	searchSn.value = (records.value as any[])[0].projectSn;
+	searchName.value = (records.value as any[])[0].projectName;
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
 });
 </script>
 

src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue

@@ -11,9 +11,7 @@
 		>
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
-					<span class="projectName">{{
+					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
-					}}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
@@ -125,10 +123,9 @@
 
 <script setup lang="tsx" name="ProjectSupervisionRecord">
 import { computed, reactive, ref, onMounted, onBeforeMount, watch } from "vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import { bigItemGovermentAll } from "@/api/modules/huizhou";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment";
+import { getDustprojectPage, getDustengineeringPage } from "@/api/modules/goverment";
 const headerList = reactive([
 	{ label: "未开始", color: "#D0A530" },
 	{ label: "推进中", color: "#35e5fd" },
@@ -140,7 +137,7 @@ const headerList = reactive([
 ]);
 const colors = ref(["#D0A530", "#35e5fd", "#f1d520", "#4fd389", "#F80840", "#fc6f8e", "#C13F5B"]);
 const active = ref(1);
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 const projects = ref([]);
 const pages = ref({
 	pageNo: 1,
@@ -215,23 +212,9 @@ const itemRefs = [];
 const searchSn = ref("");
 
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
+	active.value === 0 ? (searchSn.value = (params as any).projectSn) : (searchSn.value = (params as any).engineeringSn);
-		active.value === 0
+	active.value === 0 ? (searchName.value = (params as any).projectName) : (searchName.value = (params as any).engineeringName);
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
-	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
-	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 	getDataList();
 };
 // leftMenu页面的搜索按钮
@@ -354,11 +337,10 @@ const getEngPage = async () => {
 };
 onBeforeMount(() => {});
 onMounted(async () => {
-	getDataList();
 	await getEngPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 });
 const getGanttStyle = (project: any) => {
 	console.log("进入 getGanttStyle --- ", project);

src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue

@@ -12,7 +12,7 @@
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
 					<span class="projectName">{{
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
+						data.projectName || data.engineeringName
 					}}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
@@ -255,13 +255,12 @@
 import { ref, reactive, onMounted, watch } from "vue";
 import type { FormRules, FormInstance } from "element-plus";
 import { Delete, CirclePlus } from "@element-plus/icons-vue";
-import { getDustprojectPage, getAIQuestionPage } from "@/api/modules/goverment";
+import { getDustprojectPage } from "@/api/modules/goverment";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
 import { ElMessage, UploadProps } from "element-plus";
 import changeTheme from "@/components/changeTheme/index.vue";
 import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import { bigItemGovermentList, bigItemGovermentEngList, addEntBigItem, updateEntBigItem } from "@/api/modules/huizhou";
 const rules = reactive<FormRules>({
 	name: {
@@ -286,7 +285,7 @@ const pages = ref({
 	pageSize: 7,
 	total: 0
 });
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 const active = ref(1);
 const baseUrl = import.meta.env.VITE_API_URL;
 const globalStore = GlobalStore();
@@ -503,23 +502,13 @@ const searchSn = ref("");
 // 项目或者工程名字
 const searchName = ref<string>("");
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
-		active.value === 0
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
 	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
+		? (searchSn.value = params.projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
+		: (searchSn.value = params.engineeringSn);
 	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
+		? (searchName.value = params.projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
+		: (searchName.value = params.engineeringName);
 	getDataList();
 };
 // leftMenu页面的搜索按钮
@@ -587,8 +576,8 @@ watch(
 onMounted(async () => {
 	await getEngPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 });
 </script>
 

src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue

@@ -143,6 +143,9 @@ const getTableList = (params: any) => {
 	} else {
 		newParams.engineeringSn = searchSn.value;
 	}
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return engineerInfoPage(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件
@@ -208,7 +211,7 @@ watch(
 	async (value: number) => {
 		pages.value.pageNo = 1;
 		pages.value.total = 0;
-		// console.log(value);
+		console.log(66666666666666666);
 
 		if (value === 0) {
 			await getProPage();
@@ -224,9 +227,9 @@ watch(
 );
 onMounted(async () => {
 	await getEngPage();
-	onSearch(records.value[0]);
 	searchSn.value = records.value[0].projectSn;
 	searchName.value = records.value[0].projectName;
+	onSearch(records.value[0]);
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 </script>

src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue

@@ -306,6 +306,9 @@ const getTableList = (params: any) => {
 	} else {
 		newParams.engineeringSn = searchSn.value;
 	}
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return payGovermentList(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件

src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue

@@ -401,6 +401,9 @@ const getTableList = (params: any) => {
 	// 	newParams.engineeringSn = searchSn.value;
 	// }
 	newParams.projectSn = searchSn.value;
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return globalPlanGovermentList(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件

src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue

@@ -252,6 +252,9 @@ const getTableList = (params: any) => {
 	} else {
 		newParams.engineeringSn = searchSn.value;
 	}
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return applyTimeGovermentList(newParams);
 };
 

src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue

@@ -11,9 +11,7 @@
 		>
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
-					<span class="projectName">{{
+					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
-					}}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
@@ -90,11 +88,10 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted, watch } from "vue";
-import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment";
+import { getDustprojectPage, getDustengineeringPage } from "@/api/modules/goverment";
 import { ElMessage } from "element-plus";
 import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import ProTable from "@/components/ProTable/index.vue";
 import DialogForm from "@/components/DialogForm/index.vue";
 import { ColumnProps } from "@/components/ProTable/interface";
@@ -108,7 +105,7 @@ const pages = ref({
 	total: 0
 });
 const router = useRouter();
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 const active = ref(1);
 const store = GlobalStore();
 // 表格配置项
@@ -319,26 +316,15 @@ const getTableList = (params: any) => {
 	} else {
 		newParams.engineeringSn = searchSn.value;
 	}
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return parentItemGovermentList(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
+	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
-		active.value === 0
+	active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
-	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
-	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 	proTable.value.getTableList();
 };
 // leftMenu页面的搜索按钮
@@ -406,8 +392,8 @@ watch(
 onMounted(async () => {
 	await getEngPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 	console.log(store.path);
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });

src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue

@@ -11,9 +11,7 @@
 		>
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
-					<span class="projectName">{{
+					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
-					}}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
@@ -87,8 +85,7 @@ import transformInfo from "./components/transformInfo.vue";
 import orderAdd from "./components/orderAdd.vue";
 import { statisticsTable } from "@/api/modules/goverment";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
+import { getDustprojectPage, getDustengineeringPage } from "@/api/modules/goverment";
-import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment";
 import { sendIframeMessage } from "@/utils/util";
 import { GlobalStore } from "@/stores";
 const route = useRoute();
@@ -98,7 +95,7 @@ const pages = ref({
 	total: 0
 });
 const store = GlobalStore();
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 // 表格配置项
 const columns: ColumnProps[] = [
 	{ type: "index", label: "序号", width: 80 },
@@ -178,23 +175,9 @@ const handleAddItem = () => {
 	orderDialog.value = true;
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
+	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
-		active.value === 0
+	active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
-	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
-	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 	proTable.value.getTableList();
 };
 // 全部审核完成
@@ -243,6 +226,9 @@ const getTableList = (params: any) => {
 		newParams.engineeringSn = searchSn.value;
 	}
 	newParams.type = 2;
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return statisticsTable(newParams);
 };
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
@@ -298,8 +284,8 @@ watch(
 onMounted(async () => {
 	await getEngPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 </script>

src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue

@@ -11,9 +11,7 @@
 		>
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
-					<span class="projectName">{{
+					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
-					}}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
 							<div style="margin-top: 5px" class="flx-justify-between">
@@ -88,8 +86,7 @@ import transformInfo from "./components/transformInfo.vue";
 import orderAdd from "./components/orderAdd.vue";
 import { statisticsTable } from "@/api/modules/goverment";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
+import { getDustprojectPage, getDustengineeringPage } from "@/api/modules/goverment";
-import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment";
 import { sendIframeMessage } from "@/utils/util";
 import { GlobalStore } from "@/stores";
 const route = useRoute();
@@ -99,7 +96,7 @@ const pages = ref({
 	total: 0
 });
 const store = GlobalStore();
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 // 表格配置项
 const columns: ColumnProps[] = [
 	{ type: "index", label: "序号", width: 80 },
@@ -179,23 +176,9 @@ const handleAddItem = () => {
 	orderDialog.value = true;
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
+	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
-		active.value === 0
+	active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
-	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
-	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 	proTable.value.getTableList();
 };
 // 全部审核完成
@@ -243,6 +226,9 @@ const getTableList = (params: any) => {
 		newParams.engineeringSn = searchSn.value;
 	}
 	newParams.type = 1;
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return statisticsTable(newParams);
 };
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
@@ -298,8 +284,8 @@ watch(
 onMounted(async () => {
 	await getEngPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 </script>

src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue

@@ -184,6 +184,9 @@ const getTableList = (params: any) => {
 	} else {
 		newParams.engineeringSn = searchSn.value;
 	}
+	if (!(newParams.projectSn || newParams.engineeringSn)) {
+		return;
+	}
 	return getRealTimePage(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件

src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.vue

@@ -11,9 +11,7 @@
 		>
 			<template #default="{ data }">
 				<div class="leftProject" @click="onSearch(data)">
-					<span class="projectName">{{
+					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
-						(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
-					}}</span>
 					<div class="leftMenu_item flx-justify-between">
 						<div style="margin-top: 5px" class="flx-justify-between">
 							<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
@@ -81,10 +79,9 @@
 <script lang="tsx" setup name="historyDataAnalysis">
 import { ref, reactive, onMounted, watch } from "vue";
 import { useRoute } from "vue-router";
-import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage, getDustMonitorDev } from "@/api/modules/goverment";
+import { getDustprojectPage, getDustengineeringPage, getDustMonitorDev } from "@/api/modules/goverment";
 import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import { sendIframeMessage } from "@/utils/util";
 import { getRealTimePage } from "@/api/modules/project";
 import * as echarts from "echarts";
@@ -118,7 +115,7 @@ const pages = ref({
 	pageSize: 7,
 	total: 0
 });
-const records = ref<ResAiProjectPage[] | ResAiEngineerPage[]>([]);
+const records = ref([]);
 const active = ref(0);
 const store = GlobalStore();
 interface formData {
@@ -390,23 +387,9 @@ const drawEcharts = (item: any) => {
 	option && myChart.setOption(option);
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
+const onSearch = async (params: any) => {
-	const { result } = await getAIQuestionPage(
+	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
-		active.value === 0
+	active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
-			? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
-			: {
-					engineeringSn: (params as ResAiEngineerPage).engineeringSn,
-					pageNo: pageable.value.pageNo,
-					pageSize: pageable.value.pageSize
-			  }
-	);
-	pageable.value.total = Number(result.total);
-	active.value === 0
-		? (searchSn.value = (params as ResAiProjectPage).projectSn)
-		: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
-	active.value === 0
-		? (searchName.value = (params as ResAiProjectPage).projectName)
-		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 };
 // leftMenu页面的搜索按钮
 const onSearchInput = async (params: string) => {
@@ -473,8 +456,8 @@ onMounted(async () => {
 	getDeviceList();
 	await getProPage();
 	onSearch(records.value[0]);
-	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
+	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	searchName.value = (records.value as any[])[0].projectName;
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 </script>

src/views/goverment/huizhou/smartConstructionSite/index.vue

@@ -394,7 +394,7 @@ watch(
 onMounted(async () => {
 	// getAIengPage();
 	getStatisticsList();
-	getproList();
+	// getproList();
 	await mapData();
 	addMarker();
 	await getAIengPage();