diff --git a/src/api/modules/enterpriseApi.ts b/src/api/modules/enterpriseApi.ts index 630f5e7..692d8c3 100644 --- a/src/api/modules/enterpriseApi.ts +++ b/src/api/modules/enterpriseApi.ts @@ -386,10 +386,14 @@ export const equipEdit = (params: FormData) => { export const equipDelete = (params: any) => { return http.post(BASEURL + `/ent/unmannedDevice/delete`, params); }; -// 分页列表查询工程信息 +// 分页列表查询工程影像信息 export const getengineeringPage = (params: User.ReqUserParams) => { return http.post>(BASEURL + `/ent/unmannedVideo/engineeringPage`, params); }; +// 分页列表查询工程设备信息 +export const getengineeringEquipPage = (params: User.ReqUserParams) => { + return http.post>(BASEURL + `/ent/unmannedDevice/engineeringPage`, params); +}; // 分部分项 // 分部分项全部数据 diff --git a/src/views/enterprise/qualitySupervision/index.vue b/src/views/enterprise/qualitySupervision/index.vue index 3a1cacc..3944c95 100644 --- a/src/views/enterprise/qualitySupervision/index.vue +++ b/src/views/enterprise/qualitySupervision/index.vue @@ -220,8 +220,14 @@ onMounted(() => { } } .table { + height: calc(100% - 133px); position: relative; z-index: 500; + :deep() { + .table-main { + height: calc(100% - 82px); + } + } } } diff --git a/src/views/enterprise/safetySupervision/index.vue b/src/views/enterprise/safetySupervision/index.vue index 8385847..30acd17 100644 --- a/src/views/enterprise/safetySupervision/index.vue +++ b/src/views/enterprise/safetySupervision/index.vue @@ -220,8 +220,14 @@ onMounted(() => { } } .table { + height: calc(100% - 133px); position: relative; z-index: 500; + :deep() { + .table-main { + height: calc(100% - 82px); + } + } } } diff --git a/src/views/enterprise/unmannedVideo/equipList/index.vue b/src/views/enterprise/unmannedVideo/equipList/index.vue index 9a8831f..14de31c 100644 --- a/src/views/enterprise/unmannedVideo/equipList/index.vue +++ b/src/views/enterprise/unmannedVideo/equipList/index.vue @@ -17,7 +17,7 @@
- 影像视频数:{{ data.deviceNum }} + 接入无人机总数:{{ data.deviceNum }}
@@ -108,7 +108,7 @@ import { ColumnProps } from "@/components/ProTable/interface"; import { useHandleData } from "@/hooks/useHandleData"; import ProTable from "@/components/ProTable/index.vue"; import { jxj_User } from "@/api/types"; -import { equipList, equipAdd, equipEdit, equipDelete, getengineeringPage } from "@/api/modules/enterpriseApi"; +import { equipList, equipAdd, equipEdit, equipDelete, getengineeringEquipPage } from "@/api/modules/enterpriseApi"; import { Delete } from "@element-plus/icons-vue"; import { GlobalStore } from "@/stores"; @@ -240,7 +240,7 @@ const onSearchInput = async (params: string) => { const { result } = await getAIprojectPage({ projectName: params, ...pages.value }); records.value = result.records; } else { - const { result } = await getengineeringPage({ engineeringName: params, ...pages.value }); + const { result } = await getengineeringEquipPage({ engineeringName: params, ...pages.value }); records.value = result.records; } }; @@ -250,7 +250,7 @@ const onCurChange = async (params: number) => { const { result } = await getAIprojectPage({ ...pages.value, pageNo: params }); records.value = result.records; } else { - const { result } = await getengineeringPage({ ...pages.value, pageNo: params }); + const { result } = await getengineeringEquipPage({ ...pages.value, pageNo: params }); records.value = result.records; pages.value.total = +result.total; } @@ -270,6 +270,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { const res = await equipAdd(form); ElMessage.success("保存成功"); visible.value = false; + getAIengPage(); } proTable.value.getTableList(); } else { @@ -315,10 +316,10 @@ const getTableList = (params: any) => { }; const handleAddItem = (index: number, row: any) => { + ruleFormRef.value?.resetFields(); if (index === 1) { title.value = "新增设备"; formData.value = reactive({}); - ruleFormRef.value?.resetFields(); } else { title.value = "编辑设备"; formData.value = reactive({ ...row }); @@ -330,10 +331,11 @@ const handleAddItem = (index: number, row: any) => { const deleteAccount = async (params: jxj_User.ResUserList) => { await useHandleData(equipDelete, { id: params.id }, `删除【${params.dname}】`); proTable.value.getTableList(); + getAIengPage(); }; // 获取工程名称分页 const getAIengPage = async () => { - const { result } = await getengineeringPage(pages.value); + const { result } = await getengineeringEquipPage(pages.value); records.value = result.records; pages.value.total = +result.total; }; diff --git a/src/views/enterprise/unmannedVideo/videoData/index.vue b/src/views/enterprise/unmannedVideo/videoData/index.vue index 7e45829..d10bf75 100644 --- a/src/views/enterprise/unmannedVideo/videoData/index.vue +++ b/src/views/enterprise/unmannedVideo/videoData/index.vue @@ -17,7 +17,7 @@
- 影像视频数:{{ data.deviceNum }} + 影像视频数:{{ data.videoNum }}
@@ -29,7 +29,7 @@ - + 查询 - 刷新 + 刷新 新增 @@ -232,16 +231,16 @@ const beforeUpload = file => { }; // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { - 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); + // 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 as ResAiEngineerPage).engineeringSn); @@ -277,7 +276,19 @@ const onCurChange = async (params: number) => { const deleteAccount = async (params: jxj_User.ResUserList) => { await useHandleData(videoDataDelete, { id: params.id }, `删除`); getVideoData(); + getAIengPage(); }; +// 刷新 +const refresh = () => { + form.value = { + title: "", + createTime: "", + startTime: "", + endTime: "" + }; + getVideoData(); +}; +// 查询 const handleSearch = () => { console.log(666); getVideoData(); @@ -290,20 +301,19 @@ const handleEditItem = (index: number, row: any) => { visible.value = true; }; const getVideoData = async () => { - const res = await videoList({ ...pageable.value, ...form.value }); + let requestData = { + ...pageable.value, + ...form.value, + startTime: form.value.createTime ? form.value.createTime[0] : "", + endTime: form.value.createTime ? form.value.createTime[1] : "", + engineeringSn: searchSn.value ? searchSn.value : "" + }; + delete requestData.createTime; + const res = await videoList(requestData); videoData.value.records = res.result.records; console.log(videoData.value); console.log(res); }; -const handleExceed: UploadProps["onExceed"] = files => { - // console.log(1111); - // upload.value!.clearFiles(); - // const file = files[0] as UploadRawFile; - // file.uid = genFileId(); - // // fileList.value = file; - // upload.value!.handleStart(file); - // upload.value?.submit(); -}; const uploadSuccess = (response: any) => { ElMessage.success("上传成功"); @@ -345,6 +355,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { ElMessage.success("保存成功"); visible.value = false; getVideoData(); + getAIengPage(); } } else { console.log("error submit!", fields); @@ -358,11 +369,6 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { }; // 页面的分页 const handleCurrentChange = async (page: number) => {}; -// form日期选择后改变入参 -const onDatePicker = () => { - form.value.startTime = form.value.createTime[0]; - form.value.endTime = form.value.createTime[1]; -}; // 获取工程名称分页 const getAIengPage = async () => { const { result } = await getengineeringPage(pages.value); @@ -370,11 +376,10 @@ const getAIengPage = async () => { pages.value.total = +result.total; }; onMounted(async () => { - getVideoData(); await getAIengPage(); + searchSn.value = (records.value as ResAiProjectPage[])[0].engineeringSn; + searchName.value = (records.value as ResAiProjectPage[])[0].engineeringName; onSearch(records.value[0]); - searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; - searchName.value = (records.value as ResAiProjectPage[])[0].projectName; }); diff --git a/src/views/goverment/qualitySupervision/checkStore/index.vue b/src/views/goverment/qualitySupervision/checkStore/index.vue index c3ba57e..237461b 100644 --- a/src/views/goverment/qualitySupervision/checkStore/index.vue +++ b/src/views/goverment/qualitySupervision/checkStore/index.vue @@ -2,12 +2,12 @@