From 2da77350ad34814ff910ab5ec4ddd1de02eab331 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sun, 19 May 2024 09:13:54 +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.scss | 22 +++--
.../unitList/components/addCompany.vue | 82 +++++++++++++------
.../components/LeftcentView.vue | 26 ++++++
.../divisionsAndISubItems/index.scss | 1 +
.../engineerInventory/index.scss | 1 +
.../investmentPayment/index.scss | 1 +
.../panoramicPlan/index.scss | 1 +
.../planFinishSituation/index.scss | 1 +
.../progressManagement/index.scss | 1 +
.../qualityControl/index.scss | 1 +
.../safetyManagement/index.scss | 1 +
.../environmentalMonitoring/index.scss | 1 +
.../historyDataAnalysis/index.scss | 1 +
.../videoMonitoring/index.scss | 2 +-
.../goverment/huizhou/unDealList/index.vue | 20 ++++-
.../smartSite/alarmLedger/index.vue | 18 ++--
src/views/loading/index.vue | 8 +-
17 files changed, 142 insertions(+), 46 deletions(-)
diff --git a/src/components/TreeFilter/index.scss b/src/components/TreeFilter/index.scss
index 7af94e3..85ac8c0 100644
--- a/src/components/TreeFilter/index.scss
+++ b/src/components/TreeFilter/index.scss
@@ -30,7 +30,8 @@
background-color: transparent;
color: #c4c4c4;
.el-tree-node__content {
- height: 33px;
+ height: auto;
+ margin-bottom: 5px;
}
.el-tree-node__content:hover {
background: #09405f;
@@ -38,21 +39,28 @@
font-size: 20px;
}
.el-tree-node__label {
- font-size: 20px !important;
+ font-size: 18px !important;
+ line-height: 20px;
+ white-space: wrap;
+ }
+ .el-tree-node__children .el-tree-node__label {
+ font-size: 17px !important;
+ }
+ .el-tree-node__expand-icon {
+ color: white;
+ font-size: 18px;
+ }
+ .el-tree-node__expand-icon.is-leaf {
+ color: transparent;
}
}
:deep(.el-tree--highlight-current) {
.el-tree-node.is-current > .el-tree-node__content {
background-color: #09405f;
.el-tree-node__label {
- font-size: 16px;
color: #0bc4f0;
font-size: 20px;
}
- .el-tree-node__expand-icon {
- color: white;
- font-size: 20px;
- }
.is-leaf {
color: transparent;
font-size: 20px;
diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue
index 6eb57f1..af85dbc 100644
--- a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue
+++ b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue
@@ -127,37 +127,57 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ https://hyjgxt.cn:6090/cockpit/#/login
+
+
+
+
+ 复 制
+
+
+
+
@@ -531,6 +551,18 @@ onMounted(() => {
:deep(.el-dialog) {
position: relative;
}
+ .copy-content-box {
+ border: 2px solid #087ba4;
+ border-radius: 4px;
+ padding: 11px 11px 5px 11px;
+ margin-bottom: 20px;
+ .text-style {
+ font-size: 20px;
+ font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+ font-weight: 400;
+ color: var(--el-menu-text-color);
+ }
+ }
.title-detail {
@include flex;
border-left: 2px solid #0f81ff;
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue
index 46b6778..b7cccc0 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue
@@ -108,6 +108,8 @@
import { ref, onMounted } from "vue";
import * as echarts from "echarts";
import { getProjectInfo } from "@/api/modules/largeScreenTwo";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
//项目信息 --- start
const projectInfo = ref({
importance: 0,
@@ -414,6 +416,18 @@ const myChamainleto = () => {
}
]
});
+ myChart.on("click", val => {
+ console.log(val, 666777);
+ if (val.name == "新建") {
+ router.push("/goverment/huizhou/projectList/index?projectType=1");
+ } else if (val.name == "改建") {
+ router.push("/goverment/huizhou/projectList/index?projectType=2");
+ } else if (val.name == "扩建") {
+ router.push("/goverment/huizhou/projectList/index?projectType=3");
+ } else if (val.name == "合计") {
+ router.push("/goverment/huizhou/projectList/index");
+ }
+ });
};
const myChamainlett = () => {
let myChart = echarts.init(mainlett.value);
@@ -688,6 +702,18 @@ const myChamainlett = () => {
}
]
});
+ myChart.on("click", val => {
+ console.log(val, 666777);
+ if (val.name == "完工") {
+ router.push("/goverment/huizhou/projectList/index?projectType=4");
+ } else if (val.name == "在建") {
+ router.push("/goverment/huizhou/projectList/index?projectType=5");
+ } else if (val.name == "停工") {
+ router.push("/goverment/huizhou/projectList/index?projectType=6");
+ } else if (val.name == "合计") {
+ router.push("/goverment/huizhou/projectList/index");
+ }
+ });
};