From 2a74174d93133a57d2a05d80e7f38fdc65479b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Wed, 18 Nov 2020 11:38:04 +0800 Subject: [PATCH] youhua --- src/style/common.less | 4 +- src/utils/elementConfig.js | 2 + src/views/kpi/assessment/goals/index.vue | 5 +- .../performance/components/table.vue | 48 ++- src/views/kpi/report/detail/index.vue | 1 - .../edit/components/basis copy.vue | 387 ++++++++++++++++++ 6 files changed, 421 insertions(+), 26 deletions(-) create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/basis copy.vue diff --git a/src/style/common.less b/src/style/common.less index b18639b..f95d5c4 100644 --- a/src/style/common.less +++ b/src/style/common.less @@ -69,7 +69,7 @@ ::-webkit-scrollbar { width: 2px; - height: 2px; + height: 8px; background: #409EFF; } @@ -84,7 +84,7 @@ /*定义滑块 内阴影+圆角*/ ::-webkit-scrollbar-thumb { - border-radius: 1px; + border-radius:4px; -webkit-box-shadow: inset 0 0 2px #409EFF; background: #409EFF; } \ No newline at end of file diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js index 0e1e3e5..e023c11 100644 --- a/src/utils/elementConfig.js +++ b/src/utils/elementConfig.js @@ -35,6 +35,7 @@ import { MenuItem, Loading, Image, + Transfer, Avatar } from 'element-ui' @@ -43,6 +44,7 @@ Vue.prototype.$message = Message Vue.prototype.$confirm = MessageBox.confirm Vue.prototype.$alert = MessageBox.alert +Vue.use(Transfer) Vue.use(Tabs) Vue.use(TabPane) Vue.use(Cascader) diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue index b5039dd..73261d0 100644 --- a/src/views/kpi/assessment/goals/index.vue +++ b/src/views/kpi/assessment/goals/index.vue @@ -176,6 +176,7 @@ export default { }, async handleGetNext () { const arr = this.handleFilter(this.obj.recortModelDtos) + console.log('arr: ', arr) for (let i in arr) { if (arr[i].detailDtos.length > 0 && !arr[i].isTrue) { this.$message.error(arr[i].name + '维度内的权重和必须为' + Math.round((arr[i].weight * 100) * 1000) / 1000) @@ -185,14 +186,12 @@ export default { let res1 = await apiSaveDetail(this.obj) if (res1.code !== 200) { this.$message.error(res1.msg) - return } const obj = {status: 1, menuName: '制定了目标'} const params = Object.assign({}, {resultRecordId: this.$route.query.id || ''}, obj) let res = await apiSaveapproval(params) if (res.code !== 200) { this.$message.error(res.msg || '出错了 ') - return } this.$message({ message: res.msg, @@ -214,7 +213,7 @@ export default { num += i.isDelete !== 1 ? i.checkWeight : 0 return num }, 0) - arr.isTrue = weight === arr.weight + arr.isTrue = (Math.round((weight * 100) * 1000) / 1000) === (Math.round((arr.weight * 100) * 1000) / 1000) return Math.round((weight * 100) * 1000) / 1000 }, async handleSaveDetail (params = this.obj) { diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index 21337c0..4389fcc 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -3,13 +3,15 @@
维度
-
名称
-
考核标准
-
结果值
-
权重({{obj.weight*100}}%)
-
上级评分
-
得分
-
评分说明
+
+
名称
+
考核标准
+
结果值
+
权重({{obj.weight*100}}%)
+
上级评分
+
得分
+
评分说明
+
@@ -23,7 +25,7 @@
{{child.target || ''}}
-
+ 
                     {{child.keyResult || ''}}
@@ -51,7 +53,7 @@
{{child.scoreDtos[child.scoreDtos.length-1].acquireScore || '--'}}
-
+
{{child.scoreComment || '--'}}
@@ -60,7 +62,7 @@
-
+
@@ -72,13 +74,13 @@
-
+
-
+
@@ -90,7 +92,7 @@
{{score.lastScore}}
-
+
@@ -249,12 +251,14 @@ export default { flex: none !important; } .name{ + .center(); flex: none !important; width: 60px !important; } .kaohe{ width: 300px !important; display: block; + flex: none; pre{ white-space:pre-line; word-wrap: break-word; @@ -271,25 +275,28 @@ export default { border-bottom: 1px solid @borderColor; } .table-list{ + overflow: auto; border: 1px solid @borderColor; border-bottom: none; } .table-header{ display: flex; - background: #f5f5f5; - justify-content: space-between; - border-bottom: 1px solid @borderColor;; + + // justify-content: space-between; + // border: 1px solid @borderColor; >div{ - padding: 10px; + background: #f5f5f5; + // padding: 10px; + border-bottom: 1px solid @borderColor;; border-right: 1px solid @borderColor;; } >div:last-child{ border-right: none; } &-flex{ - flex: 1; + // flex: 1; // .center(); } } @@ -321,7 +328,8 @@ export default { // justify-content: space-between; // align-items: center; >div{ - flex: 1; + // flex: 1; + height: 100%; border-bottom: 1px solid @borderColor;; } >div:last-child{ @@ -342,7 +350,7 @@ export default { // flex: 1; display: flex; >div{ - flex: 1; + // flex: 1; // .center(); } } diff --git a/src/views/kpi/report/detail/index.vue b/src/views/kpi/report/detail/index.vue index f47a672..f68bfda 100644 --- a/src/views/kpi/report/detail/index.vue +++ b/src/views/kpi/report/detail/index.vue @@ -94,7 +94,6 @@ export default { this.departmentIds = list.value this.personnelList = list this.handleDetailReq() - console.log('list: ', list) this.showDialogDepart = false }, handlePush (item) { diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis copy.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis copy.vue new file mode 100644 index 0000000..7b5f3dd --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis copy.vue @@ -0,0 +1,387 @@ + + + + + +