From 9cc6086399170e4f03241a25228f3e4e1494901b Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 14:09:57 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/labelfieldinfo/index.vue | 68 ++++++++++++----------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/src/views/manage/labelfieldinfo/index.vue b/src/views/manage/labelfieldinfo/index.vue index d3177be..c79a4f3 100644 --- a/src/views/manage/labelfieldinfo/index.vue +++ b/src/views/manage/labelfieldinfo/index.vue @@ -885,33 +885,32 @@ export default { }, // 任务类型弹框 clicktype(aitem, index) { - console.log(aitem, '0000000') this.getListType(); this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : ''; this.nnerVisibleindex = index; - this.innertype = true; - this.form.taskPartitionDictName = '请选择任务细分'; - this.form.taskPartitionDictId = ''; + this.innertype = true + }, // 任务细分弹框 clickinnerVisible(aitem, index) { - if (this.taskTypeId == '') { + if (this.taskTypeId == ''|| !aitem.taskTypeId) { this.$modal.msgError("请先选择任务类型"); } else { - this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : ''; this.nnerVisibleindex = index; + this.taskPartitionDictId = aitem.taskPartitionDictId ? aitem.taskPartitionDictId : ''; this.innerVisible = true; } - // this.getListpartit(); + if(aitem.taskTypeId){ + this.queryParamstask.taskTypeId=aitem.taskTypeId + } + this.getListpartit(); }, // 修改任务类型 clicktypexg() { if (this.form.taskTypeId) { this.taskTypeId = this.form.taskTypeId - - } this.getListType(); this.innertype = true; @@ -938,6 +937,7 @@ export default { this.innertype = false; }, nurseclickzx(row) { + this.taskPartitionDictId = row.id if (this.title == '添加标签字段信息') { this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName = row.taskPartitionName; @@ -955,18 +955,23 @@ export default { nurseclicktype(row) { console.log(row, 'row') this.queryParamstask.taskTypeId = row.id - this.taskTypeId=this.queryParamstask.taskTypeId - this.getListpartit() + this.taskTypeId = this.queryParamstask.taskTypeId + // this.getListpartit() if (this.title == '添加标签字段信息') { this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName = row.taskTypeName; this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeId = row.id; + this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName ='请选择任务细分', + this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId = ''; + // this.form.taskPartitionDictName = '请选择任务细分', + this.taskPartitionDictId = ''; + } else if (this.titleup == '修改标签字段信息') { this.form.taskTypeName = row.taskTypeName; - this.form.taskTypeId =row.id; + this.form.taskTypeId = row.id; this.form.taskPartitionDictName = "请选择任务细分"; - this.form.taskPartitionDictId =''; + this.form.taskPartitionDictId = ''; } this.innertype = false; }, @@ -994,6 +999,7 @@ export default { fieldCode: null, }; + this.taskTypeId='' if (this.form.labelFieldInfoList.length == 5) { this.$message.error("最多批量添加5条"); } else { @@ -1059,7 +1065,7 @@ export default { this.handleQuerytask(); }, // 类型 - handleQuerytype(){ + handleQuerytype() { this.queryType.pageNum = 1; this.getListType(); @@ -1078,24 +1084,24 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); - this.taskTypeId='', - this.taskPartitionDictId='', - this.form = { - labelFieldInfoList: [ - { - fieldType: null, - fieldName: null, - fieldRemark: null, - fieldSort: undefined, - taskPartitionDictName: '请选择任务细分', - taskPartitionDictId: '', - taskTypeName: '请选择任务类型', - taskTypeId: '', + this.taskTypeId = '', + this.taskPartitionDictId = '', + this.form = { + labelFieldInfoList: [ + { + fieldType: null, + fieldName: null, + fieldRemark: null, + fieldSort: undefined, + taskPartitionDictName: '请选择任务细分', + taskPartitionDictId: '', + taskTypeName: '请选择任务类型', + taskTypeId: '', - }, - ], - }; + }, + ], + }; this.open = true; this.title = "添加标签字段信息"; }, @@ -1116,7 +1122,6 @@ export default { this.queryParamstask.taskTypeId = this.form.taskTypeId this.getListpartit(); } - this.openup = true; this.titleup = "修改标签字段信息"; }); @@ -1151,7 +1156,6 @@ export default { } }); - console.log(obj, 'obj') // return addLabelfieldinfo(obj).then(response => { this.$modal.msgSuccess("新增成功"); From 094d97226ccb194f2dfdaf4f74d568c84855d136 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 14:12:37 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/components/portrait.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/manage/components/portrait.vue b/src/views/manage/components/portrait.vue index 5df1455..95cda65 100644 --- a/src/views/manage/components/portrait.vue +++ b/src/views/manage/components/portrait.vue @@ -2,7 +2,7 @@
-
+
{{ aitem.taskPartitionDictName }}
Date: Tue, 2 Jul 2024 14:29:35 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E7=94=BB=E5=83=8F=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/Portraitedit/index.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/views/manage/Portraitedit/index.vue b/src/views/manage/Portraitedit/index.vue index 0e32d34..da7a1e8 100644 --- a/src/views/manage/Portraitedit/index.vue +++ b/src/views/manage/Portraitedit/index.vue @@ -349,16 +349,13 @@ export default { } .timelist { width: 25%; + overflow: hidden; + .left { + width: 100%; background-color: #fff; padding: 17px 20px; - height: calc(100% - 56px); - // height: 680px; - // height: calc(100vh - 294px); - overflow-y: scroll; - - .left { height: calc(100vh - 119px); - overflow: hidden; + overflow-y: auto; .name { font-weight: 700; margin-bottom: 10px; From 8020658be99328ca27b77ec90ac93d837a3b4bad Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 14:31:18 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/Portraitedit/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/manage/Portraitedit/index.vue b/src/views/manage/Portraitedit/index.vue index da7a1e8..f810d6f 100644 --- a/src/views/manage/Portraitedit/index.vue +++ b/src/views/manage/Portraitedit/index.vue @@ -354,7 +354,7 @@ export default { width: 100%; background-color: #fff; padding: 17px 20px; - height: calc(100vh - 119px); + height: calc(100vh - 156px); overflow-y: auto; .name { font-weight: 700; From 60e5917016e85fe681ce9950d86d77efa8fe2fe6 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 14:54:51 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E7=BB=86=E5=88=86=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/subdivision/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/subdivision/index.vue b/src/views/system/subdivision/index.vue index b4f873b..95bc14b 100644 --- a/src/views/system/subdivision/index.vue +++ b/src/views/system/subdivision/index.vue @@ -69,7 +69,7 @@ - + From ca922705967be0a4dc188d85ce80956182768539 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 14:56:11 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=AF=B9=E7=85=A7?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/compare/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/compare/index.vue b/src/views/system/compare/index.vue index f8ff138..30a515d 100644 --- a/src/views/system/compare/index.vue +++ b/src/views/system/compare/index.vue @@ -95,7 +95,7 @@ - + - + - + From eadf5284d34286155ffb254f6dc2a90d5bbef667 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 2 Jul 2024 15:17:33 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/servicewaycontent/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index efced5d..5a2f130 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -231,16 +231,16 @@ --> + style="width: 478px"> - - + + - + 数字 @@ -248,12 +248,12 @@
+ placeholder="请输入服务频次数字起始值" style="width:200px"/> ~ + v-model="form.serviceFrequencyEnd" placeholder="请输入服务频次数字结束值" style="width:200px"/>
@@ -265,14 +265,14 @@
+ style="width: 405px" />
+ style="width: 478px" />