From c6d4c3b276b5899226cbf9cd89f197170b4f06df Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 18 Jul 2023 19:44:37 +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 | 2 +- .../projectMonitoring/progressManagement/index.scss | 7 +++++++ .../projectMonitoring/progressManagement/index.vue | 3 ++- .../siteSupervision/environmentalMonitoring/index.vue | 3 +++ .../huizhou/siteSupervision/videoMonitoring/index.vue | 9 ++++++--- .../hz-project/localeMonitor/realtimeVideo/index.vue | 9 ++++++--- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/api/modules/goverment.ts b/src/api/modules/goverment.ts index b01bda6..58501ca 100644 --- a/src/api/modules/goverment.ts +++ b/src/api/modules/goverment.ts @@ -251,7 +251,7 @@ export const getDustengineeringPage = (params: User.ReqUserParams) => { }; // 统计扬尘设备数据 export const getDuststatistics = () => { - return http.get>(BASEURL + `/gov/environmentDev/statistics`); + return http.get>(BASEURL + `/gov/environmentDev/statistics/2`); }; // 列表查询扬尘设备管理信息 export const getDustMonitorDev = (params: ReqAiMonitorDev) => { diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss index 2b6bea0..bea33d9 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss @@ -4,6 +4,7 @@ width: 100%; height: 100%; .leftMenu { + width: 300px; // width: 290px; // 页面的项目工程 :deep(.item) { @@ -35,7 +36,11 @@ .middleSize { font-size: 18px; color: #c4c4c4; + display: inline-block; + width: 100%; white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } .video { display: flex; @@ -56,12 +61,14 @@ } } .table-box { + width: calc(100% - 300px); height: 100%; .table { margin-left: 20px; height: 100%; :deep(.table-main) { height: calc(100% - 82px); + overflow-x: scroll; } } } diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue index f5481fe..976f2a6 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue @@ -123,6 +123,7 @@ const columns: ColumnProps[] = [ { prop: "name", label: "任务名称", + width: 200, search: { el: "input" } }, // 多级 prop @@ -131,7 +132,7 @@ const columns: ColumnProps[] = [ { prop: "planEndTime", label: "结束日期" }, { prop: "unit", label: "申请单位" }, { prop: "completeRatio", label: "完成百分比(%)", width: 200 }, - { prop: "slippage", label: "逾期情况(天)" }, + { prop: "slippage", label: "逾期情况(天)", width: 200 }, { prop: "payTime", label: "时间筛选", diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue index 341f150..553aa75 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue @@ -87,6 +87,7 @@ const columns: ColumnProps[] = [ { prop: "temperature", label: "温度", + width: 150, render: scoped => { return scoped.row.temperature + "℃"; } @@ -94,6 +95,7 @@ const columns: ColumnProps[] = [ { prop: "windspeed", label: "风速", + width: 150, render: scoped => { return scoped.row.windspeed + "m/s"; } @@ -133,6 +135,7 @@ const columns: ColumnProps[] = [ { prop: "humidity", label: "湿度", + width: 150, render: scoped => { return scoped.row.humidity + "%"; } diff --git a/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue index 4219a47..bab9723 100644 --- a/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue @@ -214,7 +214,9 @@ onMounted(async () => { // 监听scroll事件，使插件窗口尺寸跟随DIV窗口变化 window.addEventListener("scroll", () => { if (myPlugin.value == undefined) { - myPlugin.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + setTimeout(function () { + myPlugin.value.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + }, 500); // setWndCover(); } }); @@ -223,8 +225,9 @@ onMounted(async () => { window.addEventListener("resize", e => { if (myPlugin.value == undefined) { // console.log("wwwww", e); - - myPlugin.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + setTimeout(function () { + myPlugin.value.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + }, 500); // oWebControl.JS_Resize(playWndHeight.value, playWndWidth.value); // setWndCover(); } diff --git a/src/views/hz-project/localeMonitor/realtimeVideo/index.vue b/src/views/hz-project/localeMonitor/realtimeVideo/index.vue index aadd853..4871e70 100644 --- a/src/views/hz-project/localeMonitor/realtimeVideo/index.vue +++ b/src/views/hz-project/localeMonitor/realtimeVideo/index.vue @@ -129,7 +129,9 @@ onMounted(async () => { // 监听scroll事件，使插件窗口尺寸跟随DIV窗口变化 window.addEventListener("scroll", () => { if (myPlugin.value == undefined) { - myPlugin.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + setTimeout(function () { + myPlugin.value.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + }, 500); // setWndCover(); } }); @@ -138,8 +140,9 @@ onMounted(async () => { window.addEventListener("resize", e => { if (myPlugin.value == undefined) { // console.log("wwwww", e); - - myPlugin.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + setTimeout(function () { + myPlugin.value.JS_Resize(tagDomObj?.clientWidth, tagDomObj?.clientHeight); + }, 500); // oWebControl.JS_Resize(playWndHeight.value, playWndWidth.value); // setWndCover(); }