From 7a66d7f17131f5000f63c953f1befedf80af423b Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 12 Aug 2023 00:51:55 +0800 Subject: [PATCH] update code --- src/pages/index.vue | 1435 ++++++++++++++++-------------- src/pages/index/indexDlg2.vue | 82 +- src/pages/progress/indexDlg1.vue | 62 +- src/pages/progress/indexDlg3.vue | 48 +- src/pages/projectProgress.vue | 4 +- src/pages/style/index.less | 40 + 6 files changed, 884 insertions(+), 787 deletions(-) diff --git a/src/pages/index.vue b/src/pages/index.vue index 7836836..3830191 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,162 +1,230 @@ - + diff --git a/src/pages/index/indexDlg2.vue b/src/pages/index/indexDlg2.vue index 49ab5df..5aab8fa 100644 --- a/src/pages/index/indexDlg2.vue +++ b/src/pages/index/indexDlg2.vue @@ -9,24 +9,34 @@
- - - - - - - - - -
+ + + + + + + + + + + + + + + +
@@ -52,16 +62,7 @@ 目前进展:
{{ it.date }}
- - - 滞后事项: -
{{ it.porgress }}
- - - 存在问题: -
{{ it.question }}
- - +
@@ -117,15 +118,7 @@
{{ it.date}}
-
-
- 目前进展: -
{{ it.porgress }}
-
-
- 目前存在问题: -
{{ it.question }}
-
+
@@ -361,20 +354,7 @@ export default { position: absolute; top: -40px; right: 100px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - *{ - fill: #fff; - } - &.active{ - *{ - fill: aqua; - } - } - } + } } .popup-project-introduction-min { diff --git a/src/pages/progress/indexDlg1.vue b/src/pages/progress/indexDlg1.vue index 2734201..504ceac 100644 --- a/src/pages/progress/indexDlg1.vue +++ b/src/pages/progress/indexDlg1.vue @@ -4,24 +4,34 @@
- - - - - - - - - -
+ + + + + + + + + + + + + + + +
@@ -176,21 +186,7 @@ export default { .font-size-tools { position: absolute; top: -40px; - right: 100px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - *{ - fill: #fff; - } - &.active{ - *{ - fill: aqua; - } - } - } + right: 100px; } } diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue index c392128..d2647ff 100644 --- a/src/pages/progress/indexDlg3.vue +++ b/src/pages/progress/indexDlg3.vue @@ -2,7 +2,7 @@
- + + - - - + + + + - + + + + d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z" + fill="#fff" p-id="3687"> +
+
@@ -126,6 +132,7 @@
暂无数据
+
@@ -273,19 +280,6 @@ export default { position: absolute; top: 18px; right: 400px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - - &.active { - * { - fill: aqua; - } - } - - } } .popup-project-introduction-details { diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue index 8304635..dba0c39 100644 --- a/src/pages/projectProgress.vue +++ b/src/pages/projectProgress.vue @@ -335,11 +335,11 @@ export default { this.init() }, mounted() { - this.$bus.$on("projectChange",res=>{ + this.$bus.$on("projectChange",res=>{ this.loadProjectConstructionProgress(); }); this.$bus.$on("loadProjects",prjs=>{ - this.projects=prjs; + this.projects=prjs; }) this.$bus.$on("deptChange",dept=>{ this.$api.quarterlyAssess.currentListByDept(dept.id).then(d=>{ diff --git a/src/pages/style/index.less b/src/pages/style/index.less index 552d6c0..6d35e22 100644 --- a/src/pages/style/index.less +++ b/src/pages/style/index.less @@ -1,3 +1,43 @@ .el-tooltip__popper{ max-width: 50%; +} +.font-size-tools{ +.set-font-size{ + cursor: pointer; + position: relative; + + &.active{ + color: aqua; + .svg-icon{ + *{ + fill: aqua; + } + } + } + .svg-icon{ + width: 40px !important; + height: 40px !important; + } + &.font-size2{ + &::after{ + content: "+"; + font-style: normal; + right: 0px; + font-weight: bold; + position: absolute; + font-size: 16px !important; + } + margin-right:4px; + } + &.font-size0{ + &::after{ + content: "-"; + font-style: normal; + right: 0px; + font-weight: bold; + position: absolute; + font-size: 16px !important; + } + } +} } \ No newline at end of file