From f6aaeb008b3f57630665545b9ab7239b7016277c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sun, 8 Oct 2023 10:50:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B8=83=E5=B1=80BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/LeftMenu/leftMenu.scss | 13 +++++
src/components/LeftMenuPlus/leftMenu.scss | 13 +++++
.../components/detailsDialog.vue | 20 +++----
src/views/enterprise/monthlyReport/index.vue | 8 +--
src/views/goverment/dustManagement/index.scss | 5 ++
src/views/goverment/dustManagement/index.vue | 7 ++-
.../components/detailsDialog.vue | 18 +++----
.../acceptancePlan/index.vue | 6 +--
.../liftSupervision/operatingData/index.scss | 10 +++-
src/views/goverment/monthlyReport/index.vue | 8 +--
.../operatingData/index.scss | 8 ++-
.../unmannedVideo/accessSituation/index.scss | 4 ++
.../unmannedVideo/alarmRecord/index.scss | 54 ++++++++++---------
.../unmannedVideo/alarmRecord/index.vue | 1 +
.../components/detailsDialog.vue | 20 +++----
src/views/project/monthlyReport/index.vue | 8 +--
16 files changed, 129 insertions(+), 74 deletions(-)
diff --git a/src/components/LeftMenu/leftMenu.scss b/src/components/LeftMenu/leftMenu.scss
index 71da24f..c91d05d 100644
--- a/src/components/LeftMenu/leftMenu.scss
+++ b/src/components/LeftMenu/leftMenu.scss
@@ -85,7 +85,20 @@
.isActive {
background-color: #e1eeff;
border-left: 3px solid #0e7eff;
+ // position: relative;
}
+// .isActive::before {
+// position: absolute;
+// top: 0px;
+// bottom: 0;
+// left: 0;
+// width: 3px;
+// height: 78px;
+// content: "";
+// background: #0e7eff;
+// border-bottom-right-radius: 12px;
+// border-top-right-radius: 12px;
+// }
:deep(.btn-prev) {
border: 1px solid #e5e5e5;
}
diff --git a/src/components/LeftMenuPlus/leftMenu.scss b/src/components/LeftMenuPlus/leftMenu.scss
index f6de156..08e9639 100644
--- a/src/components/LeftMenuPlus/leftMenu.scss
+++ b/src/components/LeftMenuPlus/leftMenu.scss
@@ -69,7 +69,20 @@
.isActive {
background-color: #e1eeff;
border-left: 3px solid #0e7eff;
+ // position: relative;
}
+// .isActive::before {
+// position: absolute;
+// top: 0px;
+// bottom: 0;
+// left: 0;
+// width: 3px;
+// height: 78px;
+// content: "";
+// background: #0e7eff;
+// border-bottom-right-radius: 12px;
+// border-top-right-radius: 12px;
+// }
:deep(.btn-prev) {
border: 1px solid #e5e5e5;
}
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 325242e..cc37658 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -65,8 +65,8 @@
:header-cell-style="{ backgroundColor: '#F5F7FA', textAlign: 'center', height: '40px' }"
:cell-style="{ textAlign: 'center', height: '40px' }"
>
-
-
+
+
@@ -75,7 +75,7 @@
{{ row.singleProject || singleEngText(row.singleId) }}
-
+
{{ row.planCheckDate }}
-
+
{{ row.startFlag }}
-
+
{{ row.endFlag }}
-
+
{{ row.headPerson }}
-
+
validatorPhone(e, $index)" />
{{ row.headPersonPhone }}
@@ -119,13 +119,13 @@
{{ row.type1 }}
-->
-
+
{{ row.remark }}
-
+
@@ -170,7 +170,7 @@
:cell-style="{ height: '40px', textAlign: 'center' }"
>
-
+
{{ row.annexName }}
diff --git a/src/views/enterprise/monthlyReport/index.vue b/src/views/enterprise/monthlyReport/index.vue
index 294b6ae..f8fb03a 100644
--- a/src/views/enterprise/monthlyReport/index.vue
+++ b/src/views/enterprise/monthlyReport/index.vue
@@ -151,10 +151,6 @@ const columns: ColumnProps[] = [
prop: "createByName",
label: "填写人"
},
- {
- prop: "annexFile",
- label: "附件"
- },
{
prop: "createTime",
label: "创建时间",
@@ -168,6 +164,10 @@ const columns: ColumnProps[] = [
}
}
},
+ {
+ prop: "annexFile",
+ label: "附件"
+ },
{ prop: "operation", align: "left", label: "操作", fixed: "right", width: 260 }
];
const submitForm = async (formEl: FormInstance | undefined, form: any) => {
diff --git a/src/views/goverment/dustManagement/index.scss b/src/views/goverment/dustManagement/index.scss
index a28ec94..8e5bafb 100644
--- a/src/views/goverment/dustManagement/index.scss
+++ b/src/views/goverment/dustManagement/index.scss
@@ -205,7 +205,12 @@
}
.leftMenu_item {
.middleSize {
+ display: inline-block;
+ width: 80%;
font-size: 12px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
img {
margin: 0 4px;
diff --git a/src/views/goverment/dustManagement/index.vue b/src/views/goverment/dustManagement/index.vue
index 1582afe..6ac4b88 100644
--- a/src/views/goverment/dustManagement/index.vue
+++ b/src/views/goverment/dustManagement/index.vue
@@ -17,10 +17,13 @@
(data as ResAiProjectPage).projectName || (data as ResAiEngineerPage).engineeringName
}}