From c726db1c0120ce7e7064bafb8b7f3b0d7706811f Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 12 Aug 2023 18:01:52 +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/components/TreeFilter/index.vue | 4 +- .../AIwarning/accessSituation/index.vue | 45 ++- .../subItemManagement/index.vue | 2 +- .../unmannedVideo/equipList/index.vue | 4 +- .../videoMonitor/realtimeVideo/index.vue | 1 + .../AIwarning/accessSituation/index.vue | 20 +- .../goverment/AIwarning/warningMap/index.vue | 5 +- .../divisionsAndISubItems/index.vue | 2 +- src/views/goverment/videoMonitor/index.vue | 1 + .../AIwarning/accessSituation/index.vue | 2 +- .../components/detailsDialog.vue | 258 ++++++++++++++++++ .../acceptanceApply/index.vue | 23 +- .../project/unmannedVideo/equipList/index.vue | 2 +- .../videoMonitor/realtimeVideo/index.vue | 1 + 14 files changed, 322 insertions(+), 48 deletions(-) create mode 100644 src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue diff --git a/src/components/TreeFilter/index.vue b/src/components/TreeFilter/index.vue index 67ee9ab..5130994 100644 --- a/src/components/TreeFilter/index.vue +++ b/src/components/TreeFilter/index.vue @@ -93,10 +93,10 @@ onBeforeMount(async () => { } const res = await props.requestApi!(); console.log(res); - treeData.value = res?.result; + treeData.value = res || []; // treeAllData.value = [{ id: "", [props.label]: "全部" }, ...result]; - treeAllData.value = [...res.result]; + treeAllData.value = res ? [...res] : []; }); watch(filterText, val => { diff --git a/src/views/enterprise/AIwarning/accessSituation/index.vue b/src/views/enterprise/AIwarning/accessSituation/index.vue index 9f12867..35928e1 100644 --- a/src/views/enterprise/AIwarning/accessSituation/index.vue +++ b/src/views/enterprise/AIwarning/accessSituation/index.vue @@ -45,7 +45,7 @@
- + @@ -69,20 +69,22 @@
-
- -
-
{{ item.typeName }}
-
-
- 位置：{{ item.deviceName }} -
-
- 报警时间：{{ item.reportTime }} +
notData
暂无数据
@@ -111,7 +113,7 @@
{{ imgList.typeName }} - 位置：{{ imgList.deviceName }} + 设备名称：{{ imgList.deviceName }} 时间：{{ imgList.createTime }}
@@ -165,8 +167,6 @@ const imgVisible = ref(false); const background = ref(true); const visible = ref(false); -const qusLength = ref([]); - // 项目或者工程名字 const searchName = ref(""); @@ -299,8 +299,8 @@ const handleCurrentChange = async (page: number) => { pageSize: pageable.value.pageSize, engineeringSn: searchSn.value }); - questList.value = res.result; - pageable.value.total = +questList.value.total; + questList.value = res.result.records; + pageable.value.total = +res.result.total; }; const handleSizeChange = async (size: number) => { @@ -309,8 +309,8 @@ const handleSizeChange = async (size: number) => { pageSize: size, engineeringSn: searchSn.value }); - questList.value = res.result; - pageable.value.total = +questList.value.total; + questList.value = res.result.records; + pageable.value.total = +res.result.total; }; // 创建隐患记录的弹窗 const onRecord = () => { @@ -328,8 +328,8 @@ const onDatePicker = () => { // 页面的form搜索 这里 const handSearch = async () => { const res = await getAIQuestionPage({ ...form.value, ...pageable.value, engineeringSn: searchSn.value }); - questList.value = res.result; - pageable.value.total = +questList.value.total; + questList.value = res.result.records; + pageable.value.total = +res.result.total; }; // 页面的项目名称和工程名称的div点击事件 @@ -339,8 +339,7 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }); - questList.value = res.result; - qusLength.value = res.result.records; + questList.value = res.result.records; pageable.value.total = +res.result.total; searchSn.value = (params as ResAiEngineerPage).engineeringSn; searchName.value = (params as ResAiEngineerPage).engineeringName; diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue index 60e4fdb..0af9f42 100644 --- a/src/views/enterprise/progressManagement/subItemManagement/index.vue +++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue @@ -46,7 +46,7 @@ row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > - + diff --git a/src/views/enterprise/unmannedVideo/equipList/index.vue b/src/views/enterprise/unmannedVideo/equipList/index.vue index f99f08e..0cc42e1 100644 --- a/src/views/enterprise/unmannedVideo/equipList/index.vue +++ b/src/views/enterprise/unmannedVideo/equipList/index.vue @@ -23,7 +23,7 @@
--> -
+
{ const { result } = await getvideoEngTreeList({}); engTree.value.treeAllData = result; + return result; }; // 获取视频流 diff --git a/src/views/goverment/AIwarning/accessSituation/index.vue b/src/views/goverment/AIwarning/accessSituation/index.vue index 15a12af..fae76ed 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.vue +++ b/src/views/goverment/AIwarning/accessSituation/index.vue @@ -70,13 +70,13 @@
-
-
+
+
{{ item.typeName }}
-
位置：{{ item.deviceName }}
+
设备名称：{{ item.deviceName }}
报警时间：{{ item.reportTime }}
@@ -109,7 +109,7 @@
{{ imgList.typeName }} - 位置：{{ imgList.deviceName }} + 设备名称：{{ imgList.deviceName }} 时间：{{ imgList.reportTime }}
@@ -176,9 +176,7 @@ const pageable = ref({ const records = ref([]); -const questList = ref({ - records: [] -}); +const questList = ref([]); const form = ref({ code: "", createTime: "", @@ -308,7 +306,7 @@ const handleCurrentChange = async (page: number) => { } ); console.log(result); - questList.value = result; + questList.value = result.records; pageable.value.total = Number(result.total); }; @@ -332,8 +330,8 @@ 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; + questList.value = res.result.records; + pageable.value.total = +res.result.total; }; // 页面的项目名称和工程名称的div点击事件 @@ -347,7 +345,7 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { pageSize: pageable.value.pageSize } ); - questList.value = result; + questList.value = result.records; pageable.value.total = Number(result.total); active.value === 0 ? (searchSn.value = (params as ResAiProjectPage).projectSn) diff --git a/src/views/goverment/AIwarning/warningMap/index.vue b/src/views/goverment/AIwarning/warningMap/index.vue index f5cba45..88779ee 100644 --- a/src/views/goverment/AIwarning/warningMap/index.vue +++ b/src/views/goverment/AIwarning/warningMap/index.vue @@ -320,10 +320,12 @@ watch( await getAIproPage(); await getproList(); onSearch(records.value[0]); + addMarker(); } else { await getAIengPage(); await getengList(); onSearch(records.value[0]); + addMarker(); } }, { @@ -346,13 +348,12 @@ function parse(val) { onMounted(async () => { await mapData(); - getStatisticsList(); getproList(); await getAIproPage(); // getAiMonitorDev({ projectSn: projectPage.value.records[0].projectSn }); onSearch(records.value[0]); - // addMarker(); + addMarker(); }); diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue index eeb8edc..acdabcc 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue @@ -58,7 +58,7 @@ row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > - + diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue index bc985bb..45e3281 100644 --- a/src/views/goverment/videoMonitor/index.vue +++ b/src/views/goverment/videoMonitor/index.vue @@ -310,6 +310,7 @@ const proApi = async () => { const engApi = async () => { const { result } = await getvideoEngTreeList({}); engTree.value.treeAllData = result; + return result; }; const handleEditItem = (row: { diff --git a/src/views/project/AIwarning/accessSituation/index.vue b/src/views/project/AIwarning/accessSituation/index.vue index 7cd0113..93b342f 100644 --- a/src/views/project/AIwarning/accessSituation/index.vue +++ b/src/views/project/AIwarning/accessSituation/index.vue @@ -4,7 +4,7 @@
- + diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue new file mode 100644 index 0000000..58e662c --- /dev/null +++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue index 0de10db..8445cd5 100644 --- a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue @@ -14,7 +14,7 @@ :initParam="initParam" >
+