From aba6f3ec29d877a63a80138729d796704f38a5a2 Mon Sep 17 00:00:00 2001 From: zhujida Date: Fri, 15 Jan 2021 18:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BA=93=EF=BC=9A=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E5=BC=B9=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PopupRadio/index.vue | 83 ++++++++++++ src/components/TargetFiltrate/index.vue | 160 ++++++++++++++++++++++++ src/icons/svg/radiodef.svg | 7 ++ src/icons/svg/radioselected.svg | 7 ++ src/style/common.less | 67 +++++----- src/utils/elementConfig.js | 4 +- src/views/kpi/set/index.vue | 4 +- src/views/kpi/set/target/index.vue | 26 +++- src/views/kpi/workbench/home/index.vue | 137 +++++++++++++------- 9 files changed, 413 insertions(+), 82 deletions(-) create mode 100644 src/components/PopupRadio/index.vue create mode 100644 src/components/TargetFiltrate/index.vue create mode 100644 src/icons/svg/radiodef.svg create mode 100644 src/icons/svg/radioselected.svg diff --git a/src/components/PopupRadio/index.vue b/src/components/PopupRadio/index.vue new file mode 100644 index 0000000..a8619af --- /dev/null +++ b/src/components/PopupRadio/index.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/components/TargetFiltrate/index.vue b/src/components/TargetFiltrate/index.vue new file mode 100644 index 0000000..48bc2ac --- /dev/null +++ b/src/components/TargetFiltrate/index.vue @@ -0,0 +1,160 @@ + + + diff --git a/src/icons/svg/radiodef.svg b/src/icons/svg/radiodef.svg new file mode 100644 index 0000000..6a98b1f --- /dev/null +++ b/src/icons/svg/radiodef.svg @@ -0,0 +1,7 @@ + + + 默认 + + + + \ No newline at end of file diff --git a/src/icons/svg/radioselected.svg b/src/icons/svg/radioselected.svg new file mode 100644 index 0000000..561fd9f --- /dev/null +++ b/src/icons/svg/radioselected.svg @@ -0,0 +1,7 @@ + + + 选中 + + + + \ No newline at end of file diff --git a/src/style/common.less b/src/style/common.less index 1e7040c..ce5e15b 100644 --- a/src/style/common.less +++ b/src/style/common.less @@ -1,6 +1,8 @@ @borderColor: #ebebeb; @fontBlue: #3ba1ff; @headerHeight: 60px; +@mianBlue: #3995fb; +@mainBgColor: #f2f2f2; .boderAndRadius { border: 1px solid @borderColor; @@ -12,21 +14,29 @@ font-size: 14px; color: #52575b; } -.add{ + +.add { cursor: pointer; } -.pre{ + +.pre { line-height: 20px; - pre{ - overflow:hidden; + + pre { + overflow: hidden; line-height: 20px; // white-space:pre-line; // word-wrap: break-word; - white-space: pre-line; /* css-3 */ - white-space: -moz-pre-line; /* Mozilla, since 1999 */ - white-space: -pre-line; /* Opera 4-6 */ - white-space: -o-pre-line; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ + white-space: pre-line; + /* css-3 */ + white-space: -moz-pre-line; + /* Mozilla, since 1999 */ + white-space: -pre-line; + /* Opera 4-6 */ + white-space: -o-pre-line; + /* Opera 7 */ + word-wrap: break-word; + /* Internet Explorer 5.5+ */ word-break: break-all; } } @@ -73,25 +83,22 @@ /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/ -::-webkit-scrollbar -{ - width: 2px; - height: 8px; - background: #409EFF; -} - -/*定义滚动条轨道 内阴影+圆角*/ -::-webkit-scrollbar-track -{ - -webkit-box-shadow: inset 0 0 2px rgba(231, 231, 231, 0.3); - border-radius: 1px; - background-color: #F5F5F5; -} - -/*定义滑块 内阴影+圆角*/ -::-webkit-scrollbar-thumb -{ - border-radius:4px; - -webkit-box-shadow: inset 0 0 2px #409EFF; +::-webkit-scrollbar { + width: 2px; + height: 8px; background: #409EFF; -} \ No newline at end of file +} + +/*定义滚动条轨道 内阴影+圆角*/ +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 2px rgba(231, 231, 231, 0.3); + border-radius: 1px; + background-color: #F5F5F5; +} + +/*定义滑块 内阴影+圆角*/ +::-webkit-scrollbar-thumb { + border-radius: 4px; + -webkit-box-shadow: inset 0 0 2px #409EFF; + background: #409EFF; +} diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js index 887d20d..7d1834b 100644 --- a/src/utils/elementConfig.js +++ b/src/utils/elementConfig.js @@ -41,7 +41,8 @@ import { Drawer, Slider, ButtonGroup, - Notification + Notification, + RadioButton } from 'element-ui' Vue.prototype.$notify = Notification Vue.prototype.$loading = Loading @@ -80,6 +81,7 @@ Vue.use(Row) Vue.use(Col) Vue.use(Checkbox) Vue.use(Radio) +Vue.use(RadioButton) Vue.use(Dropdown) Vue.use(DropdownMenu) Vue.use(DropdownItem) diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue index 0203439..89e2f44 100644 --- a/src/views/kpi/set/index.vue +++ b/src/views/kpi/set/index.vue @@ -58,9 +58,9 @@ export default { this.activeIndex = '' } if (this.auth.evaluationSet && this.auth.roleSet) { - this.activeIndex = this.$route.query.activeIndex || '0' - } else { this.activeIndex = this.$route.query.activeIndex + } else { + this.activeIndex = this.$route.query.activeIndex || '0' } }, beforeMount () { }, diff --git a/src/views/kpi/set/target/index.vue b/src/views/kpi/set/target/index.vue index b567c7c..dcf1670 100644 --- a/src/views/kpi/set/target/index.vue +++ b/src/views/kpi/set/target/index.vue @@ -28,7 +28,7 @@ size="small" >新增指标 移动到 @@ -93,6 +93,7 @@ :data="tableData" height="400px" :header-cell-style="{background:'#f5f4f5'}" + @selection-change="handleSelectionChange" >
+ + +