From e36cf79e82359f7d714a659609764e252596bc5e Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 21 Nov 2021 14:48:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E6=9C=89=E7=82=B9?= =?UTF-8?q?=E6=8C=A4=EF=BC=8C=E5=8D=8F=E8=B0=83=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c81555022..f7c4e410a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2791,7 +2791,7 @@ border-radius: 6px; box-sizing: border-box; width: 360px; - height: 75px; + height: 90px; text-align: center; position: relative; overflow: hidden; @@ -2806,7 +2806,7 @@ white-space: inherit; } /deep/ .el-upload-dragger .el-icon-upload { - margin: 0; + margin: 10px 0 0 0; } /deep/.el-drawer__container { .prc-content-border { From b1285e5163b25f57ebb31e498bc8eabf452e91b4 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 21 Nov 2021 14:55:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=B8=94=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=B3=8A=E7=AD=9B=E9=80=89?= =?UTF-8?q?=EF=BC=88=E8=BE=93=E5=85=A5=E9=A6=96=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E5=87=BA=E7=9B=B8=E5=85=B3=E9=80=89=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E4=BE=9B=E9=80=89=E6=8B=A9=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index f7c4e410a..0cfdaa0bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -596,7 +596,7 @@ - + Date: Sun, 21 Nov 2021 15:00:05 +0800 Subject: [PATCH 3/4] commit --- src/pages/localTool/standardWarning.vue | 123 +++++++++++++++--------- 1 file changed, 76 insertions(+), 47 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 074d1edef..b55aa66a9 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -12,51 +12,78 @@
实施预警
- - - - - - - - - - - - - - - - - -
- - 查询 - - - 清空 - -
- + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 查询 + + + 清空 + + + + + + + + + + + + + + + + +
+ + +
新车型实施日期预警 @@ -602,7 +629,8 @@ export default { //标准名称 standName: this.dynamic.standName, //实施日期 - putTime: this.dynamic.putTime, + putTime: this.dynamic.putTime[0], + lastTime: this.dynamic.putTime[1], //适用车型 applyType: this.dynamic.applyType }, { @@ -1043,6 +1071,7 @@ export default { } .more { + width: 100%; margin-top: 30px; /deep/ .el-input__inner { width: 155px; @@ -1050,7 +1079,7 @@ export default { .choose-time-area { /deep/ .el-input__inner { - width: 170px; + width: 220px; } } From f4e39d5ac216c0ae5f3464c8987977cc05f5669e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 21 Nov 2021 15:33:04 +0800 Subject: [PATCH 4/4] commit --- src/components/roleTree/index.vue | 32 +++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 7434afef8..c521386bf 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -26,6 +26,7 @@ style="height: 100%; overflow: auto;" class="filter-tree tree-line" :class="treeClass" + @check-change="checkChange" :data="treeData" :props="defaultProps" :default-checked-keys="nodeList" @@ -116,15 +117,25 @@ } }, methods: { + checkChange (row, type, c) { + if (!type) { + if (this.nodeList.length > 0) { + for (let a = 0; a < this.nodeList.length; a ++) { + if (row.id === this.nodeList[a]) { + this.nodeList.splice(a, 1) + } + } + } + } + }, treeClass () { - }, handleTreeDrawerCancel () { this.filterText = '' this.isVisible2 = false }, saveUserInfo () { - if (this.nodeList.length) { + if (this.nodeList.length > 0) { let ids = '' this.nodeList.forEach(item => { if (ids.length > 0) { @@ -134,18 +145,27 @@ ids = item } }) - let oldList = [] this.$http.get('SarInstitution/institution/getNextById', { ids: ids }, { _this: this }, res => { - oldList = res + let oldList2 = res.concat(this.roleList) + let result = [] + let obj = {} + for(let i = 0; i < oldList2.length; i++){ + if(!obj[oldList2[i].id]){ + result.push(oldList2[i]); + obj[oldList2[i].id] = true; + } + } + this.isVisible2 = false + this.$emit('checkedRole', result) }) } else { + this.isVisible2 = false + this.$emit('checkedRole', this.roleList) } - this.isVisible2 = false - this.$emit('checkedRole', this.roleList) }, drawerCheck (data) { if (this.checkBox) {