diff --git a/src/assets/images/issue1.png b/src/assets/images/issue1.png new file mode 100644 index 0000000..deaaef4 Binary files /dev/null and b/src/assets/images/issue1.png differ diff --git a/src/assets/images/select2.png b/src/assets/images/select2.png new file mode 100644 index 0000000..6859ec3 Binary files /dev/null and b/src/assets/images/select2.png differ diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index d6dcece..84f9b9d 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -92,9 +92,16 @@ export default { ], }; }, + watch: { + $route:{ + handler(newRouter,oldRouter){ + this.routerIndex = newRouter.meta.index + }, + immediate: true, + } + }, methods: { changePath(e, item) { - this.routerIndex = e; this.$router.push(item.path); }, getDrop(e) { diff --git a/src/router/index.js b/src/router/index.js index 603e41d..a34487d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,21 +82,25 @@ export const constantRoutes = [ path: "/home", component: () => import("@/views/yingji/home.vue"), name: "home", + meta:{index:0} }, { path: "/planManage", component: () => import("@/views/yingji/planManage.vue"), name: "planManage", + meta:{index:1} }, { path: "/enforcing", component: () => import("@/views/yingji/enforcing.vue"), name: "enforcing", + meta:{index:2} }, { path: "/enterprise", component: () => import("@/views/yingji/enterprise.vue"), name: "enterprise", + meta:{index:3} }, ], diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index b50a6f9..3605197 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -18,7 +18,7 @@
-
+
选择企业
@@ -343,6 +343,7 @@ export default { align-items: center; justify-content: center; cursor: pointer; + color: #525966; span { font-size: 15px; font-family: 'Alibaba PuHuiTi'; @@ -353,26 +354,26 @@ export default { } } .select { - background-image: url('../../../assets/images/select1.png'); + background-image: url('../../../assets/images/select2.png'); background-size: 100% 100%; margin-right: 10px; } + .issue { + background-image: url('../../../assets/images/issue2.png'); + background-size: 100% 100%; + } .nextStepSelect { - // background-image: url('../../../assets/images/select2.png'); + background-image: url('../../../assets/images/select1.png'); span { color: #2378EC; } } .nextStepIssue { - // background-image: url('../../../assets/images/issue1.png'); + background-image: url('../../../assets/images/issue1.png'); span { color: #2378EC; } } - .issue { - background-image: url('../../../assets/images/issue2.png'); - background-size: 100% 100%; - } } .filtrate { display: flex; @@ -411,12 +412,6 @@ export default { left: 50%; transform: translate(-50%, -50%); } - .el-input__suffix .el-input__suffix-inner .el-select__caret { - width: 22px; - } - .el-input__suffix { - margin-right: 5px; - } } } .input-input { @@ -513,12 +508,6 @@ export default { left: 50%; transform: translate(-50%, -50%); } - .el-input__suffix .el-input__suffix-inner .el-select__caret { - width: 22px; - } - .el-input__suffix { - margin-right: 5px; - } } .input { flex: 1; diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue index 826ab60..e5f2bae 100644 --- a/src/views/yingji/echarts/finishRate.vue +++ b/src/views/yingji/echarts/finishRate.vue @@ -134,7 +134,6 @@ export default { normal: { position: "center", formatter: function (params) { - console.log(params); return `{a|${params.data.pt}%}\n{b|${params.data.name}}`; }, rich: { diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue index db0a50a..a5474af 100644 --- a/src/views/yingji/enforcing.vue +++ b/src/views/yingji/enforcing.vue @@ -1,5 +1,378 @@ + \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue index bc43060..9f17a90 100644 --- a/src/views/yingji/enterprise.vue +++ b/src/views/yingji/enterprise.vue @@ -1,5 +1,383 @@ \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue index c080bd7..4ce90c4 100644 --- a/src/views/yingji/home.vue +++ b/src/views/yingji/home.vue @@ -198,7 +198,7 @@ export default { width: 100%; padding: 20px; .select-nav { - height: 38px; + // height: 38px; display: flex; align-items: center; margin-bottom: 15px; @@ -206,6 +206,25 @@ export default { font-family: "Alibaba-PuHuiTi-Regular.otf"; margin-right: 5px; } + ::v-deep .el-select { + background-color: transparent; + width: 210px; + .el-input__inner { + height: 33px; + } + // border-radius: 2px; + .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-up::before { + content: ""; + background: url(../../assets/images/down2.png) center center no-repeat; + background-size: cover; + position: absolute; + width: 10px; + height: 7px; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } + } } .bodyBox { width: 100%; diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue index 3bdab44..f85e764 100644 --- a/src/views/yingji/planManage.vue +++ b/src/views/yingji/planManage.vue @@ -1,5 +1,394 @@ + \ No newline at end of file + + + + \ No newline at end of file