From 6710a2b00de65a141ff89e87ef904190040f27a2 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 15 Aug 2023 19:28:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/goverment.ts | 4 ++ .../progressManagement/ganttChart/index.vue | 2 +- .../globalPlanManagement/index.vue | 6 ++- .../subItemManagement/index.vue | 1 + .../unmannedVideo/videoData/index.vue | 14 ++++-- .../goverment/approve/engineering/index.vue | 5 +- .../divisionsAndISubItems/index.vue | 6 ++- .../unmannedVideo/accessSituation/index.vue | 47 +++++-------------- src/views/goverment/videoMonitor/index.vue | 8 +++- .../progressManagement/ganttChart/index.vue | 2 +- .../subItemManagement/index.vue | 1 + .../supervision/ProjectSupervision/duty.ts | 3 +- .../ProjectSupervision/overview.ts | 12 ++--- .../ProjectSupervision/overview.vue | 6 +-- .../project/unmannedVideo/equipList/index.vue | 1 + .../project/unmannedVideo/videoData/index.vue | 14 ++++-- 16 files changed, 72 insertions(+), 60 deletions(-) diff --git a/src/api/modules/goverment.ts b/src/api/modules/goverment.ts index bcfdb0e..3ff1a53 100644 --- a/src/api/modules/goverment.ts +++ b/src/api/modules/goverment.ts @@ -49,6 +49,10 @@ export const editCompanyApprove = (params: { enterpriseId: string; suggest: numb export const getEngineeringApproveList = (params: User.ReqUserParams) => { return http.post>(BASEURL + `/gov/engineering/page`, params); }; +// 工程审批new！！！！！！！！！！！！！！！！！！ +export const getNewEngineeringApproveList = (params: User.ReqUserParams) => { + return http.post>(BASEURL + `/gov/engineering/examinePage`, params); +}; // 通过id查询项目工程详细信息 export const getIdEngApproveList = (params: { id: string }) => { diff --git a/src/views/enterprise/progressManagement/ganttChart/index.vue b/src/views/enterprise/progressManagement/ganttChart/index.vue index c4036f8..eb93336 100644 --- a/src/views/enterprise/progressManagement/ganttChart/index.vue +++ b/src/views/enterprise/progressManagement/ganttChart/index.vue @@ -452,7 +452,7 @@ const handleHover = (e: any, item: any) => { display: "block" }; tooltipContent.value = { - day: item.delay, + day: item.slippage, name: item.commander }; } diff --git a/src/views/enterprise/progressManagement/globalPlanManagement/index.vue b/src/views/enterprise/progressManagement/globalPlanManagement/index.vue index 368ee6a..5885e4e 100644 --- a/src/views/enterprise/progressManagement/globalPlanManagement/index.vue +++ b/src/views/enterprise/progressManagement/globalPlanManagement/index.vue @@ -430,7 +430,11 @@ const getTableList = (params: any) => { newParams.realCompleteTime_end = newParams.realCompleteTime[1]; delete newParams.realCompleteTime; } - newParams.engineeringSn = searchSn.value; + if (searchSn.value) { + newParams.engineeringSn = searchSn.value; + } else { + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; + } return globalPlanList(newParams); }; diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue index cae4359..758a5d1 100644 --- a/src/views/enterprise/progressManagement/subItemManagement/index.vue +++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue @@ -486,6 +486,7 @@ const handleAddSubItem = (row: any) => { }; const importData = () => {}; const handleAddItem = () => { + ruleFormRef.value?.resetFields(); childrenFormData.value = reactive({ name: "", buildAddress: "", diff --git a/src/views/enterprise/unmannedVideo/videoData/index.vue b/src/views/enterprise/unmannedVideo/videoData/index.vue index 6f4fe68..a8f4ed0 100644 --- a/src/views/enterprise/unmannedVideo/videoData/index.vue +++ b/src/views/enterprise/unmannedVideo/videoData/index.vue @@ -52,7 +52,7 @@
- +
{{ item.title }} @@ -321,7 +321,7 @@ const handleEditItem = (index: number, row: any) => { title.value = "编辑录像"; formData.value = { ...row }; console.log(formData.value); - fileList.value = reactive([{ name: "文件", url: row.videoUrl }]); + fileList.value = row.videoUrl ? [row.videoUrl] : []; visible.value = true; }; const getVideoData = async () => { @@ -334,14 +334,19 @@ const getVideoData = async () => { }; delete requestData.createTime; const res = await videoList(requestData); - videoData.value.records = res.result.records; + if (res.result && res.result.records.length > 0) { + res.result.records.map(item => { + item.videoUrl = JSON.parse(item.videoUrl); + }); + videoData.value.records = res.result.records; + } console.log(videoData.value); console.log(res); }; const uploadSuccess = (response: any) => { ElMessage.success("上传成功"); - formData.value.videoUrl = response.result.url; + formData.value.videoUrl = { name: response.result.originalFilename, url: response.result.url }; fileList.value = [{ name: response.result.originalFilename, url: response.result.downloadPath }]; ruleFormRef.value.validateField("videoUrl"); }; @@ -369,6 +374,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { console.log(666); console.log(searchSn.value); formData.value.engineeringSn = searchSn.value; + form.videoUrl = JSON.stringify(form.videoUrl); if (formData.value.id) { const res = await videoDataEdit(form); ElMessage.success("编辑成功"); diff --git a/src/views/goverment/approve/engineering/index.vue b/src/views/goverment/approve/engineering/index.vue index 0ef036d..658f8c4 100644 --- a/src/views/goverment/approve/engineering/index.vue +++ b/src/views/goverment/approve/engineering/index.vue @@ -507,7 +507,7 @@ import { useRoute } from "vue-router"; import { ColumnProps } from "@/components/ProTable/interface"; import ProTable from "@/components/ProTable/index.vue"; import { - getEngineeringApproveList, + getNewEngineeringApproveList, editProjectApprove, getIdEngApproveList, getIdEngApprovettable, @@ -679,8 +679,7 @@ const getTableList = (params: any) => { newParams.createTime_end = newParams.createTime[1]; delete newParams.createTime; } - - return getEngineeringApproveList(newParams); + return getNewEngineeringApproveList(newParams); }; const onSee = async row => { diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue index 8dd4a30..1439291 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue @@ -177,7 +177,11 @@ placeholder="请选择时间" /> - + -->
-
-
+
+
- +
{{ item.title }}
@@ -161,9 +161,7 @@ const pageable = ref({ const records = ref([]); -const questList = ref({ - records: [] -}); +const questList = ref([]); const form = ref({ title: "", createTime: "", @@ -279,21 +277,7 @@ const onShowImg = (params: any) => { // 页面的分页 const handleCurrentChange = async (page: number) => { - const { result } = await getUnmannedPage( - active.value === 0 - ? { - pageNo: page, - pageSize: pageable.value.pageSize, - projectSn: searchSn.value - } - : { - pageNo: page, - pageSize: pageable.value.pageSize, - engineeringSn: searchSn.value - } - ); - console.log(result); - questList.value = result; + handSearch(); pageable.value.total = Number(result.total); }; @@ -326,22 +310,17 @@ const handSearch = async () => { ? { ...form.value, ...pageable.value, projectSn: searchSn.value } : { ...form.value, ...pageable.value, engineeringSn: searchSn.value } ); - questList.value = res.result; - pageable.value.total = +questList.value.total; + if (res.result && res.result.records.length > 0) { + res.result.records.map(item => { + item.videoUrl = JSON.parse(item.videoUrl); + }); + questList.value = res.result.records; + } + pageable.value.total = +res.result.total; }; // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { - const { result } = await getUnmannedPage( - 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 - } - ); - questList.value = result; - pageable.value.total = Number(result.total); + handSearch(); active.value === 0 ? (searchSn.value = (params as ResAiProjectPage).projectSn) : (searchSn.value = (params as ResAiEngineerPage).engineeringSn); diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue index 45e3281..dc41e9d 100644 --- a/src/views/goverment/videoMonitor/index.vue +++ b/src/views/goverment/videoMonitor/index.vue @@ -110,7 +110,12 @@ /> - + + @@ -303,6 +308,7 @@ const changeTreeFilter = async (item: { const proApi = async () => { const { result } = await getvideoProTreeList({}); proTree.value.treeAllData = result; + return result; // cameraIndexCode.value = proTree.value.treeAllData[5].children[0].code; // console.log(cameraIndexCode.value); }; diff --git a/src/views/project/progressManagement/ganttChart/index.vue b/src/views/project/progressManagement/ganttChart/index.vue index 6b93bed..835d447 100644 --- a/src/views/project/progressManagement/ganttChart/index.vue +++ b/src/views/project/progressManagement/ganttChart/index.vue @@ -452,7 +452,7 @@ const handleHover = (e: any, item: any) => { display: "block" }; tooltipContent.value = { - day: item.delay, + day: item.slippage, name: item.commander }; } diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue index 3dd613a..01098cd 100644 --- a/src/views/project/progressManagement/subItemManagement/index.vue +++ b/src/views/project/progressManagement/subItemManagement/index.vue @@ -481,6 +481,7 @@ const handleAddSubItem = (row: any) => { }; const importData = () => {}; const handleAddItem = () => { + ruleFormRef.value?.resetFields(); childrenFormData.value = reactive({ name: "", buildAddress: "", diff --git a/src/views/project/supervision/ProjectSupervision/duty.ts b/src/views/project/supervision/ProjectSupervision/duty.ts index 5bf6cd7..c6b2ecf 100644 --- a/src/views/project/supervision/ProjectSupervision/duty.ts +++ b/src/views/project/supervision/ProjectSupervision/duty.ts @@ -74,7 +74,8 @@ export const rules = ref({ creditCode: { type: "string", required: true, - message: "请输入统一社会信用代码" + message: "请输入统一社会信用代码", + trigger: "blur" }, contractType: { type: "string", diff --git a/src/views/project/supervision/ProjectSupervision/overview.ts b/src/views/project/supervision/ProjectSupervision/overview.ts index e88dfb7..d163764 100644 --- a/src/views/project/supervision/ProjectSupervision/overview.ts +++ b/src/views/project/supervision/ProjectSupervision/overview.ts @@ -121,8 +121,8 @@ export const rules = ref({ trigger: "blur" }, { - type: "number", - message: "请输入数字", + pattern: /^[0-9\.]+$/, + message: "请输入整数或小数", trigger: "blur" } ], @@ -133,8 +133,8 @@ export const rules = ref({ trigger: "blur" }, { - type: "number", - message: "请输入数字", + pattern: /^[0-9\.]+$/, + message: "请输入整数或小数", trigger: "blur" } ], @@ -145,8 +145,8 @@ export const rules = ref({ trigger: "blur" }, { - type: "number", - message: "请输入数字", + pattern: /^[0-9\.]+$/, + message: "请输入整数或小数", trigger: "blur" } ], diff --git a/src/views/project/supervision/ProjectSupervision/overview.vue b/src/views/project/supervision/ProjectSupervision/overview.vue index 214f95f..b1a1fef 100644 --- a/src/views/project/supervision/ProjectSupervision/overview.vue +++ b/src/views/project/supervision/ProjectSupervision/overview.vue @@ -30,15 +30,15 @@ - +
- + - +
diff --git a/src/views/project/unmannedVideo/equipList/index.vue b/src/views/project/unmannedVideo/equipList/index.vue index e35e74c..332fad7 100644 --- a/src/views/project/unmannedVideo/equipList/index.vue +++ b/src/views/project/unmannedVideo/equipList/index.vue @@ -216,6 +216,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { if (!formEl) return; await formEl.validate(async (valid, fields) => { if (valid) { + form.engineeringSn = searchSn.value; if (formData.value.id) { const res = await equipEdit(form); ElMessage.success("编辑成功"); diff --git a/src/views/project/unmannedVideo/videoData/index.vue b/src/views/project/unmannedVideo/videoData/index.vue index e7936d3..8b3b708 100644 --- a/src/views/project/unmannedVideo/videoData/index.vue +++ b/src/views/project/unmannedVideo/videoData/index.vue @@ -29,7 +29,7 @@
- +
{{ item.title }} @@ -240,7 +240,7 @@ const handleEditItem = (index: number, row: any) => { title.value = "编辑录像"; formData.value = { ...row }; console.log(formData.value); - fileList.value = reactive([{ name: "文件", url: row.videoUrl }]); + fileList.value = row.videoUrl ? [row.videoUrl] : []; visible.value = true; }; const getVideoData = async () => { @@ -253,7 +253,12 @@ const getVideoData = async () => { }; delete requestData.createTime; const res = await videoList(requestData); - videoData.value.records = res.result.records; + if (res.result && res.result.records.length > 0) { + res.result.records.map(item => { + item.videoUrl = JSON.parse(item.videoUrl); + }); + videoData.value.records = res.result.records; + } console.log(videoData.value); console.log(res); }; @@ -269,7 +274,7 @@ const handleExceed: UploadProps["onExceed"] = files => { const uploadSuccess = (response: any) => { ElMessage.success("上传成功"); - formData.value.videoUrl = response.result.url; + formData.value.videoUrl = { name: response.result.originalFilename, url: response.result.url }; fileList.value = [{ name: response.result.originalFilename, url: response.result.downloadPath }]; ruleFormRef.value.validateField("videoUrl"); }; @@ -295,6 +300,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => { await formEl.validate(async (valid, fields) => { if (valid) { formData.value.engineeringSn = searchSn.value; + form.videoUrl = JSON.stringify(form.videoUrl); if (formData.value.id) { const res = await videoDataEdit(form); ElMessage.success("编辑成功");