From 26b66013c7d93bca3eae51bc909bb8beea38d9ce Mon Sep 17 00:00:00 2001 From: limingtao <@ming_tao_li> Date: Fri, 2 Aug 2024 16:37:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=AB=98=E5=B3=B0=E6=97=B6=E6=AE=B5?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/investigation/task.vue | 47 +++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue index ad523ed..a0e5643 100644 --- a/pages/investigation/task.vue +++ b/pages/investigation/task.vue @@ -65,13 +65,13 @@ {{sectionName}} - + - {{ formData.roadType?formData.roadType:'请选择道路类型' }} + {{ formData.roadType?formData.roadType:'请选择道路类型' }} {{ formData.roadType }} @@ -143,7 +143,8 @@ @confirm="pickerxqConfirm"> - + @@ -171,8 +172,12 @@ - + + {{ formData.peakHours?formData.peakHours:'请选择高峰时段' }} + + {{ formData.peakHours }} @@ -546,6 +551,16 @@ value: "" }, ], + columnstimePicker: [ + ['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时', + '15时', '16时', '17时', + '18时', '19时', '20时', '21时', '22时', '23时', '24' + ], + ['0时', '1时', '2时', '3时', '4时', '5时', '6时', '7时', '8时', '9时', '10时', '11时', '12时', '13时', '14时', + '15时', '16时', '17时', + '18时', '19时', '20时', '21时', '22时', '23时', '24时' + ], + ], investigationDetailTitle: "title", isEdit: false, isEditStep2: false, @@ -732,7 +747,7 @@ series: [] }, chartData4: { - categories:["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"], + categories: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"], series: [{ name: "总量", legendShape: "line", @@ -797,6 +812,7 @@ ], showdlPicker: false, + showtimePicker: false, columnsdlPicker: [ ], @@ -957,13 +973,20 @@ // this.$set(this.formData, 'xqname', e.value[0].xqname) }, - pickerdlConfirm(e){ + pickerdlConfirm(e) { this.showdlPicker = false this.$set(this.formData, 'roadType', e.value[0].label) }, pickerdlCancel(e) { this.showdlPicker = false }, + pickertimeConfirm(e) { + this.showtimePicker = false + this.$set(this.formData, 'peakHours', e.value[0] + ' - ' + e.value[1]) + }, + pickertimeCancel(e) { + this.showtimePicker = false + }, openPicker() { this.showPicker = true @@ -1571,10 +1594,10 @@ let res = { categories: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22", "24"], series: [{ - name: "总量", - legendShape: "line", - data: [], - }], + name: "总量", + legendShape: "line", + data: [], + }], }; this.chartData2 = JSON.parse(JSON.stringify(res)); }, From 2448374289e8a20ad17617113048ae4594503fb5 Mon Sep 17 00:00:00 2001 From: zhangqun <179111901@qq.com> Date: Fri, 2 Aug 2024 17:06:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AEundefined=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/detail.vue | 2 ++ pages/knowledge/index.vue | 3 +++ 2 files changed, 5 insertions(+) diff --git a/pages/index/detail.vue b/pages/index/detail.vue index d9aeddc..6ed5fe8 100644 --- a/pages/index/detail.vue +++ b/pages/index/detail.vue @@ -525,6 +525,8 @@ console.log({ // 更新列表信息 changeMsgList(answerId, data, optionType, answerOptions) { let id = 1; + data = data.replace("undefined", '') + data = data.replace("null", '') if (this.msgList.length > 0) { id = this.msgList[this.msgList.length - 1].id + 1; } diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue index c8fbc72..086db30 100644 --- a/pages/knowledge/index.vue +++ b/pages/knowledge/index.vue @@ -218,6 +218,8 @@ }, // 更新列表信息 changeMsgList(answerId, data) { + data = data.replace("undefined", '') + data = data.replace("null", '') let id = 1; if (this.msgList.length > 0) { id = this.msgList[this.msgList.length - 1].id + 1; @@ -273,6 +275,7 @@ this.scrollTop = this.scrollTop + 100; }); } + }, handlePlus() { this.isExpanded = !this.isExpanded; From 9b360854f9ac9aece14203cb371d9b9950be3dd3 Mon Sep 17 00:00:00 2001 From: limingtao <@ming_tao_li> Date: Fri, 2 Aug 2024 17:28:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tabbar.vue | 7 ++-- pages/index/index.vue | 16 +++++---- pages/investigation/index.vue | 67 ++++++++++++++++++++++++++++++----- 3 files changed, 71 insertions(+), 19 deletions(-) diff --git a/components/tabbar.vue b/components/tabbar.vue index 124ef44..c72845a 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -77,6 +77,7 @@ methods: { to(item, index) { this.value = index + this.$.setData('pageType', 1) uni.switchTab({ url: item.pagePath }) @@ -116,12 +117,12 @@ } for (let i in this.list) { if ('/pages/' + this.path + '/index' == this.list[i].pagePath) { - // console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i) - // this.value = Number(i) + // console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i) + // this.value = Number(i) } } // console.log('/pages/'+this.path+'/index') - // console.log('/pages/' + this.path + '/index') + // console.log('/pages/' + this.path + '/index') } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index ece0606..a3fa113 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -27,13 +27,13 @@ - + - 本月上报 + 个人上报 {{ totalData.MonthReport }} - + 已完成 @@ -180,13 +180,13 @@ }, handleClick(row) { if (row.pcType == 2) { - this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '§ionId=' + row.sectionCode + + this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '§ionId=' + row.sectionCode + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + - '&pcType' + row.pcType+'§ionName='+row.sectionName+'§ionCode='+row.sectionCode); + '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row.sectionCode); } else { this.$.open('/pages/map/index?businessId=' + row.businessId + '§ionId=' + row.sectionCode + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + - '&pcType' + row.pcType+'§ionName='+row.sectionName+'§ionCode='+row.sectionCode) + '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row.sectionCode) } }, konw() { @@ -196,12 +196,14 @@ skipPage(even) { // this.$.open(even) }, - jump(v) { + jump(v, type) { if (v == 1) { this.$.setData('pageStatus', 1) + this.$.setData('pageType', 1) } if (v == 2) { this.$.setData('pageStatus', 3) + this.$.setData('pageType', type) } this.$.openTab('/pages/investigation/index') diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue index 9d93bda..3fc9733 100644 --- a/pages/investigation/index.vue +++ b/pages/investigation/index.vue @@ -11,7 +11,7 @@ --> - + @@ -31,6 +31,20 @@ {{ totalData.InGovernance }} + + + 全部 + + + + 人工上报 + + + + 系统下发 + + + @@ -95,7 +109,9 @@ }, status: '10', search: '', - tabbarShow: true + tabbarShow: true, + queryType: '1', + pageStatus: '' } }, @@ -108,6 +124,8 @@ // tabFun.tabbar() this.getData() let pageStatus = this.$.getData('pageStatus') + this.pageStatus = pageStatus + this.queryType = this.$.getData('pageType') if (pageStatus == 1) { this.handleTabClick(1) this.$.setData('pageStatus', '0') @@ -205,24 +223,28 @@ console.log(row) if (this.tab === 1) { if (row.pcType == 2) { - this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '§ionId=' + row.sectionCode + - '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + - '&pcType' + row.pcType+'§ionName='+row.sectionName+'§ionCode='+row.sectionCode); + this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '§ionId=' + row + .sectionCode + + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + + '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row + .sectionCode); } else { this.$.open('/pages/map/index?businessId=' + row.businessId + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&pcType=' + row.pcType + - '&type=' + (this.tab == 1 ? 'edit' : 'view')+'§ionName='+row.sectionName+'§ionCode='+row.sectionCode) + '&type=' + (this.tab == 1 ? 'edit' : 'view') + '§ionName=' + row.sectionName + + '§ionCode=' + row.sectionCode) // this.$.open('/pages/map/index?businessId=' + row.businessId) } } else { // this.$.open('/pages/investigation/complete?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : // 'view')) - this.$.open("/pages/investigation/complete" + "?id=" + row.businessId+ '§ionId=' + row.sectionCode + - '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + - '&pcType' + row.pcType+'§ionName='+row.sectionName+'§ionCode='+row.sectionCode); + this.$.open("/pages/investigation/complete" + "?id=" + row.businessId + '§ionId=' + row + .sectionCode + + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + + '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row.sectionCode); } }, @@ -362,6 +384,33 @@ } } + .query-form2 { + height: 146px; + + .type-box { + display: flex; + align-items: center; + justify-content: space-between; + width: calc(100% - 100rpx); + padding: 0 50rpx; + height: 108rpx; + .type-item{ + width: 28%; + border-radius: 200rpx; + height: 50rpx; + text-align: center; + line-height: 50rpx; + font-size: 26rpx; + border: #999999 solid 1rpx; + margin-top: 15rpx; + } + .type-active{ + border: #3c6dc3 solid 1rpx; + color:#3c6dc3; + } + } + } + .Box { padding-top: var(--status-bar-height);