From f4da0e5edbe17fa6908e9a1897b41e77178cb90f Mon Sep 17 00:00:00 2001 From: yuekuo Date: Fri, 14 Apr 2023 16:18:19 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E6=B8=B2=E6=9F=93bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/finishProcess.vue | 172 +++++---------- .../userCenter/processCenter/gencyProcess.vue | 149 ++++++------- .../processCenter/monitorProcesses.vue | 174 +++++---------- .../userCenter/processCenter/sentProcess.vue | 204 +++++++----------- 4 files changed, 253 insertions(+), 446 deletions(-) diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index 0205bc6..cc246e0 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -1,129 +1,73 @@ - \ No newline at end of file diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 21ea321..0443f19 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -1,96 +1,73 @@ - \ No newline at end of file diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue index 50609bf..88306e3 100644 --- a/src/views/userCenter/processCenter/monitorProcesses.vue +++ b/src/views/userCenter/processCenter/monitorProcesses.vue @@ -1,130 +1,72 @@ - - \ No newline at end of file diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 4d7e19b..1355989 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -1,145 +1,89 @@ \ No newline at end of file From df4725c8835559ea9a41209b1a23b702833b1b56 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Fri, 14 Apr 2023 16:25:04 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/sentProcess.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 1355989..5b17046 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -28,8 +28,8 @@ - 强制撤回 + > + 强制撤回 From 4ced830d2d9b9fa3ce5d00fea56c9fc2988c609a Mon Sep 17 00:00:00 2001 From: yuekuo Date: Fri, 14 Apr 2023 17:14:41 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter.vue | 7 ++-- .../processCenter/finishProcess.vue | 11 +++++++ .../userCenter/processCenter/gencyProcess.vue | 11 +++++++ .../processCenter/monitorProcesses.vue | 11 +++++++ .../userCenter/processCenter/sentProcess.vue | 11 +++++++ src/views/userCenter/processCenter/tabs.vue | 33 ++++++++++++++++--- 6 files changed, 77 insertions(+), 7 deletions(-) diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue index d9da64b..324ece2 100644 --- a/src/views/userCenter/processCenter.vue +++ b/src/views/userCenter/processCenter.vue @@ -18,7 +18,7 @@
- +
@@ -32,7 +32,8 @@ import tabs from '../userCenter/processCenter/tabs.vue' }, data() { return { - form: {} + form: {}, + tableData:[] } }, created () { @@ -45,10 +46,12 @@ import tabs from '../userCenter/processCenter/tabs.vue' //查询 search() { // this.$api.processCenter.search({}) + this.tableData=[{createTime:'1999-10-1'}] }, //重置 reset(){ this.form={} + this.tableData=[{createTime:'3000-10-1'}] // this.$api.processCenter.reset({}) } }, diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index cc246e0..82d34ed 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -57,6 +57,17 @@ export default { }] } }, + props:{ + secondData:{ + type:Array, + default:[], + } + }, + watch: { + secondData(newValue, oldValue) { + this.tableData=newValue + } + }, methods: { view() { alert(111) diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 0443f19..11cb72d 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -57,6 +57,17 @@ export default { ], }; }, + props:{ + firstData:{ + type:Array, + default:[], + } + }, + watch: { + firstData(newValue, oldValue) { + this.tableData=newValue + } + }, methods: { handle() { alert(111); diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue index 88306e3..b0ee0b6 100644 --- a/src/views/userCenter/processCenter/monitorProcesses.vue +++ b/src/views/userCenter/processCenter/monitorProcesses.vue @@ -56,6 +56,17 @@ export default { }] } }, + props:{ + fourthData:{ + type:Array, + default:[], + } + }, + watch: { + fourthData(newValue, oldValue) { + this.tableData=newValue + } + }, methods: { view() { alert(111) diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 5b17046..08a132f 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -70,6 +70,17 @@ export default { ], }; }, + props:{ + thirdData:{ + type:Array, + default:[], + } + }, + watch: { + thirdData(newValue, oldValue) { + this.tableData=newValue + } + }, methods: { view() { alert(111); diff --git a/src/views/userCenter/processCenter/tabs.vue b/src/views/userCenter/processCenter/tabs.vue index 1f7e23f..3fc4d23 100644 --- a/src/views/userCenter/processCenter/tabs.vue +++ b/src/views/userCenter/processCenter/tabs.vue @@ -2,16 +2,16 @@
- + - + - + - +
@@ -30,11 +30,34 @@ export default { monitorProcesses, sentProcess }, + props:{ + tableData:{ + type:Array, + default:[], + } + }, data() { return { - activeName: 'first' + activeName: 'first', + firstData:[], + secondData:[], + thirdData:[], + fourthData:[], }; }, + watch: { + tableData(newValue, oldValue) { + if(this.activeName == 'first'){ + this.firstData=newValue + }else if(this.activeName == 'second'){ + this.secondData=newValue + }else if(this.activeName == 'third'){ + this.thirdData=newValue + }else{ + this.fourthData=newValue + } + } + }, created () { ; }, From 5f3999194c12c9cdbbbfd814cb0f5711658258a6 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 09:37:54 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BD=93=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=20=E4=B8=8D=E8=83=BD=E5=BC=BA=E5=88=B6=E6=92=A4?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter.vue | 6 +++++- src/views/userCenter/processCenter/sentProcess.vue | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue index 324ece2..4278428 100644 --- a/src/views/userCenter/processCenter.vue +++ b/src/views/userCenter/processCenter.vue @@ -60,6 +60,10 @@ import tabs from '../userCenter/processCenter/tabs.vue' \ No newline at end of file diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue new file mode 100644 index 0000000..32a1b5b --- /dev/null +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file From b93624ad30db9f9e227478227840939d4b7366ac Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 12:26:30 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3tab=E9=A1=B5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E9=97=AA=E5=B1=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/tabs.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/userCenter/processCenter/tabs.vue b/src/views/userCenter/processCenter/tabs.vue index 3fc4d23..31310fd 100644 --- a/src/views/userCenter/processCenter/tabs.vue +++ b/src/views/userCenter/processCenter/tabs.vue @@ -2,16 +2,16 @@
- + - + - + - +
From 6723cf0ab9051417864cc8872128e65dd59179ff Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 13:34:44 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8Fbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/monitorProcesses/monitorModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 9cfa601..ddc7449 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -3,7 +3,7 @@
- + @@ -86,7 +86,7 @@ export default { line-height: 40px; } -:v-deep .el-form-item--mini .el-form-item__label { +::v-deep .el-form-item--mini .el-form-item__label { line-height: 40px !important; } From bf594d4b892be7d9365d2e77f0be8d9fcb0d04b4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 13:42:20 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=97=B6=EF=BC=8C=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/sentProcess.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 46fd344..1db9b09 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -29,7 +29,8 @@ - 强制撤回 + 强制撤回 + @@ -42,6 +43,8 @@ export default { name: "sentProcess", data() { return { + color:'rgb(236, 128, 141)', + icolor:'rgb(119,136,153)', tableData: [ { processId: "2016-05-1", From 93a3e4171034b8c44f97dcc20a3aa7aa1d349a52 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 18 Apr 2023 14:32:12 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/Report/ReportList.vue | 103 +++- src/views/Report/ReportManager.vue | 540 ++++++++++-------- src/views/Report/reportManager/labelModal.vue | 132 +++++ 4 files changed, 532 insertions(+), 244 deletions(-) create mode 100644 src/views/Report/reportManager/labelModal.vue diff --git a/package.json b/package.json index 9fe9a00..5e0eb38 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "vueui": "vue ui" }, "dependencies": { + "@johmun/vue-tags-input": "^2.1.0", "axios": "^0.24.0", "core-js": "^3.19.1", "echarts": "^5.2.2", diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index eaf98bc..00cc597 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -88,7 +88,23 @@
- + + + + + + + + + + + + + + + +
@@ -208,10 +231,77 @@ export default { } }, dialogPreview: false, // 预览 - content: '' + content: '', + filterText:'', + treeData: [ + { + id: 0, + label: '根节点', + children: [ + { + id: 1, + label: '一级 1', + children: [ + { + id: 4, + label: '二级 1-1', + children: [ + { + id: 9, + label: '三级 1-1-1' + }, + { + id: 10, + label: '三级 1-1-2' + } + ] + } + ] + }, + { + id: 2, + label: '一级 2', + children: [ + { + id: 5, + label: '二级 2-1' + }, + { + id: 6, + label: '二级 2-2' + } + ] + }, + { + id: 3, + label: '一级 3', + children: [ + { + id: 7, + label: '二级 3-1' + }, + { + id: 8, + label: '二级 3-2' + } + ] + }, + ] + + } + ], } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, methods: { + filterNode(value, data) { + if (!value) return true; + return data.label.indexOf(value) !== -1; + }, init () { this.labelList() this.reportDateList() @@ -341,6 +431,15 @@ export default { \ No newline at end of file From a4fc250adc710f71b48d05e9191e91cae878e7e7 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 18 Apr 2023 15:01:02 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Report/ReportManager.vue | 543 +++++++++--------- src/views/Report/reportManager/labelModal.vue | 2 +- 2 files changed, 270 insertions(+), 275 deletions(-) diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue index ba7eafa..e283008 100644 --- a/src/views/Report/ReportManager.vue +++ b/src/views/Report/ReportManager.vue @@ -15,19 +15,19 @@ + :placeholder="'请选择' + tagsForm.tags01.name"> + :placeholder="'请选择' + tagsForm.tags02.name"> + :placeholder="'请选择' + tagsForm.tags03.name"> @@ -50,16 +50,20 @@
- + - + - - + + @@ -67,29 +71,25 @@ 编辑 删除 预览 - + - +
+ :close-on-press-escape="false" modal-append-to-body append-to-body>
- + @@ -97,13 +97,8 @@ -
@@ -117,7 +112,8 @@
- +