From fc2568c61100bf4f150957adb3b0c76eba68847e Mon Sep 17 00:00:00 2001 From: wam <525987762@qq.com> Date: Thu, 1 Dec 2022 22:01:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=AD=E5=93=A5?= =?UTF-8?q?=E8=AF=B4=E7=9A=84=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Answer/questions/components/viewer.utils.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/Answer/questions/components/viewer.utils.scss b/src/views/Answer/questions/components/viewer.utils.scss index 35be237e..c5b7d7d3 100644 --- a/src/views/Answer/questions/components/viewer.utils.scss +++ b/src/views/Answer/questions/components/viewer.utils.scss @@ -42,13 +42,13 @@ .pc .pageNext::before{ content: "下一页"; padding-right: 10px; - line-height: 52px; + line-height: 50px; vertical-align: top; } .pc .pagePre::after{ content: "上一页"; padding-left: 10px; - line-height: 52px; + line-height: 50px; vertical-align: top; } @@ -174,14 +174,14 @@ .mobile .pageNext::before{ content: "下一页"; padding-right: 10px; - line-height: 42px; + line-height: 43px; vertical-align: top; } .mobile .pagePre::after{ content: "上一页"; padding-left: 10px; - line-height: 42px; + line-height: 43px; vertical-align: top; } From 6ce278181e835a48d572421b6d02f17fccc7031e Mon Sep 17 00:00:00 2001 From: wam <525987762@qq.com> Date: Thu, 1 Dec 2022 23:27:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20bug=20=E5=9B=BE=E6=96=87=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E5=AE=9A=E6=97=B6=E5=99=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Answer/questions/components/AnswerViewer.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/Answer/questions/components/AnswerViewer.vue b/src/views/Answer/questions/components/AnswerViewer.vue index ac1b5a1a..e0ebcab9 100644 --- a/src/views/Answer/questions/components/AnswerViewer.vue +++ b/src/views/Answer/questions/components/AnswerViewer.vue @@ -195,10 +195,13 @@ export default defineComponent({ } } }, + + showTimeTimeoutId: 0, }; }, beforeUnmount() { this.pager.clear(); + if(this.showTimeTimeoutId) clearTimeout(this.showTimeTimeoutId); }, async mounted() { @@ -220,7 +223,10 @@ export default defineComponent({ this.shopData = buildShopDataDemo(this.scene); if(this.config.is_show_time && this.config.show_time){ - setTimeout(() => this.$emit("next"), this.config.show_time * 1000) + this.showTimeTimeoutId = setTimeout(() => { + this.showTimeTimeoutId = 0; + this.$emit("next"); + }, this.config.show_time * 1000) } if(this.config.is_three_dimensions) { From 9b1b59122eab97a24e47add537c6a8a984d2f271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=9A=E5=86=89?= Date: Fri, 2 Dec 2022 11:53:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix=EF=BC=9Akano=E5=88=86=E6=9E=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=B1=A1=E9=99=90=E5=9B=BE=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataAnalyse/kndiagram/components/chartOption.js | 7 ++++++- src/views/DataAnalyse/kndiagram/components/chartPage.vue | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/DataAnalyse/kndiagram/components/chartOption.js b/src/views/DataAnalyse/kndiagram/components/chartOption.js index 5ce3ae58..5bfd4f28 100644 --- a/src/views/DataAnalyse/kndiagram/components/chartOption.js +++ b/src/views/DataAnalyse/kndiagram/components/chartOption.js @@ -56,7 +56,12 @@ const option = { formatter: (params) => { // console.log(params); if (params.value.length > 1) { - return `${params.name}:
Worse${params.value[0]}Better${params.value[1]}`; + const list = option?.series?.[0]?.data?.filter( + (i) => i.value?.[0] === params.value[0] && i.value?.[1] === params.value[1] + ); + const name = list.map((i) => i.name || '').join(', ') || params.name || ''; + return `${name}:
Worse${params.value[0]}Better${params.value[1]}`; + // return `${params.name}:
Worse${params.value[0]}Better${params.value[1]}`; } return false; }, diff --git a/src/views/DataAnalyse/kndiagram/components/chartPage.vue b/src/views/DataAnalyse/kndiagram/components/chartPage.vue index 27a3b150..96e8d86b 100644 --- a/src/views/DataAnalyse/kndiagram/components/chartPage.vue +++ b/src/views/DataAnalyse/kndiagram/components/chartPage.vue @@ -110,14 +110,14 @@ if(newData[3])newData[3].itemStyle ={color: '#E24D4D'} newData.forEach(el=>{ data.forEach(cel => { - if(cel.max===el.max){ + // if(cel.max===el.max){ let dataInfo = { name: cel.title, value: [cel.Worse,cel.Better] } el.data.push(dataInfo) dataArr.push(dataInfo) - } + // } }) }) option.series= [...newData,...xy] From 881b3a8a18e4e93d1f311ddfc439ab3b3a59bfa1 Mon Sep 17 00:00:00 2001 From: steven <844541199@qq.com> Date: Fri, 2 Dec 2022 13:37:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/TempMarket/components/CreateSurveyProduct.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/TempMarket/components/CreateSurveyProduct.vue b/src/views/TempMarket/components/CreateSurveyProduct.vue index fa122e8b..245d3eb2 100644 --- a/src/views/TempMarket/components/CreateSurveyProduct.vue +++ b/src/views/TempMarket/components/CreateSurveyProduct.vue @@ -544,16 +544,16 @@ export default defineComponent({ product_title: item.packName, taste_title: item.packType, })); - params.shelves_cover_picture = packingData.value.stackImgs.urls; - params.package_shelves_test_list = packingData.value.stack + params.shelves_cover_picture = packingData.value.shelvesImgs.urls; + params.package_shelves_test_list = packingData.value.shelves .filter((item) => !item.status) .map((item) => ({ product_picture: item.packImg, product_title: item.packName, taste_title: item.packType, })); - params.package_cover_picture = packingData.value.shelvesImgs.urls; - params.package_pile_test_list = packingData.value.shelves + params.package_cover_picture = packingData.value.stackImgs.urls; + params.package_pile_test_list = packingData.value.stack .filter((item) => !item.status) .map((item) => ({ product_picture: item.packImg, From 0d8ed3d4f15d2eab8fd39400794c69c6b876345f Mon Sep 17 00:00:00 2001 From: steven <844541199@qq.com> Date: Fri, 2 Dec 2022 13:38:10 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/TempMarket/components/CreateSurveyProduct.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/TempMarket/components/CreateSurveyProduct.vue b/src/views/TempMarket/components/CreateSurveyProduct.vue index 245d3eb2..34f8c599 100644 --- a/src/views/TempMarket/components/CreateSurveyProduct.vue +++ b/src/views/TempMarket/components/CreateSurveyProduct.vue @@ -136,7 +136,7 @@ :key="index" >
- + Date: Fri, 2 Dec 2022 13:57:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=EF=BC=9Akano=E5=88=86=E6=9E=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8E=BB=E6=8E=89x=E3=80=81y=E8=BD=B4=E7=82=B9?= =?UTF-8?q?=EF=BC=8Cpsm=E8=AE=BE=E8=AE=A1=E5=9B=BE=E7=89=87=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kndiagram/components/chartPage.vue | 15 ++++++++------- .../planetDesign/Design/questions/psm/Psm.vue | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/DataAnalyse/kndiagram/components/chartPage.vue b/src/views/DataAnalyse/kndiagram/components/chartPage.vue index 96e8d86b..d888b02a 100644 --- a/src/views/DataAnalyse/kndiagram/components/chartPage.vue +++ b/src/views/DataAnalyse/kndiagram/components/chartPage.vue @@ -60,7 +60,7 @@ const xy = [{ type: 'scatter', data: [[(worse.avg-0),0 ]], - itemStyle: {color: '#1C6FFF'}, + itemStyle: {color: '#70b936', opacity: 0}, markLine: { symbol:'none', silent:true, @@ -76,7 +76,7 @@ { type: 'scatter', data: [[0,(better.avg-0)]], - itemStyle: {color: '#1C6FFF'}, + itemStyle: {color: '#70b936', opacity: 0}, markLine: { symbol:'none', silent:true, @@ -92,7 +92,7 @@ const optionData = { max:el, type: 'scatter', - itemStyle: {}, + itemStyle: {color: '#70b936'}, data: [], label:{ show:true, @@ -104,10 +104,11 @@ } newData.push(optionData) }) - if(newData[0])newData[0].itemStyle ={color: '#33A6C7'} - if(newData[1])newData[1].itemStyle ={color: '#F59646'} - if(newData[2])newData[2].itemStyle ={color: '#397ADC'} - if(newData[3])newData[3].itemStyle ={color: '#E24D4D'} + console.log('newData========',newData); + // if(newData[0])newData[0].itemStyle ={color: '#33A6C7'} + // if(newData[1])newData[1].itemStyle ={color: '#F59646'} + // if(newData[2])newData[2].itemStyle ={color: '#397ADC'} + // if(newData[3])newData[3].itemStyle ={color: '#E24D4D'} newData.forEach(el=>{ data.forEach(cel => { // if(cel.max===el.max){ diff --git a/src/views/planetDesign/Design/questions/psm/Psm.vue b/src/views/planetDesign/Design/questions/psm/Psm.vue index 1edd7130..8107c2f9 100644 --- a/src/views/planetDesign/Design/questions/psm/Psm.vue +++ b/src/views/planetDesign/Design/questions/psm/Psm.vue @@ -14,6 +14,7 @@ >
Date: Fri, 2 Dec 2022 16:30:14 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E6=A0=BC=E5=A4=B4=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=A2=98=E8=BF=87=E9=95=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataAnalyse/components/CustomTableHeaderCell.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/DataAnalyse/components/CustomTableHeaderCell.vue b/src/views/DataAnalyse/components/CustomTableHeaderCell.vue index b43ee1da..924a2105 100644 --- a/src/views/DataAnalyse/components/CustomTableHeaderCell.vue +++ b/src/views/DataAnalyse/components/CustomTableHeaderCell.vue @@ -7,7 +7,7 @@
-
+
{{ content }}
下载全部附件