From 9cbdf5367562bbba74b4aaa65f94d88d3112cf26 Mon Sep 17 00:00:00 2001 From: xcool <2350444842@qq.com> Date: Thu, 13 Oct 2022 00:02:03 +0800 Subject: [PATCH 01/26] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/components/LeftMenuBar.vue | 29 ++++++- .../kndiagram/components/maxdiff/lctable.vue | 83 ++++++++++--------- .../questions/components/mxdLcDetail.vue | 22 ++++- .../DataAnalyse/kndiagram/questions/mxd.vue | 81 ++++++++++++++---- .../Design/fragement/footer/MaxdiffFooter.vue | 3 +- src/views/planetDesign/Design/mode/index.js | 4 +- .../Design/questions/maxdiff/Index.vue | 10 ++- .../questions/maxdiff/MaxdiffConfig.vue | 5 +- src/views/planetDesign/api/api.js | 5 +- 10 files changed, 172 insertions(+), 72 deletions(-) diff --git a/.env.dev b/.env.dev index d953bf63..a6c33e62 100644 --- a/.env.dev +++ b/.env.dev @@ -8,4 +8,4 @@ VUE_APP_DELiVERY_BASEURL='https://javaxq.test.automark.cc/' VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.dcin-test.digitalyili.com/apigtech/message-send-center/'; VUE_APP_SOCKETURL = 'wss://ylst-api-uat.dctest.digitalyili.com/survey_sync' -VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' +VUE_APP_JSONPURL = 'https://iam-uat.dctest.digitalyili.com/idp/restful/getIDPToken' \ No newline at end of file diff --git a/src/components/LeftMenuBar.vue b/src/components/LeftMenuBar.vue index 1bb075b4..c16c9cd1 100644 --- a/src/components/LeftMenuBar.vue +++ b/src/components/LeftMenuBar.vue @@ -41,12 +41,14 @@ v-for="(child, childIndex) in item.children" :key="childIndex" > -
+ @@ -189,7 +192,9 @@ function menusStatusToFalsefather(menus) { font-size: 13px; z-index: 99999; &-item { + position: relative; width: 220px; + z-index: 99; background: rgba(245, 245, 245, 0.6); &-child { background-color: #ffffff; @@ -275,4 +280,24 @@ function menusStatusToFalsefather(menus) { position: relative; z-index: 99; } +.menu-bar-item-child{ +height: 50px; + display: block; + position: relative; + top: 0; + left: 0; + /* background: #ffffff; */ + z-index: 999; +} +.menu-bar-item-parent{ + height: 50px; + position: absolute; + z-index: 999; + left: 0; + top: 0; + background: #ffffff; + opacity: 1; + z-index: 100; + height: 50px; +} diff --git a/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue b/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue index 35783e3d..8c0327c0 100644 --- a/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue +++ b/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue @@ -97,35 +97,34 @@ rowKey="option_index"> + #[col.key]="data">选项${index1}
`; @@ -385,7 +385,7 @@ export function newQuesType (type, param) { }; result.options[0].push(maxdiff_option_config2); } - result.last_option_index = 2; + result.last_option_index = 4; } const init3D = () => { result.last_option_index = 0; diff --git a/src/views/planetDesign/Design/questions/maxdiff/Index.vue b/src/views/planetDesign/Design/questions/maxdiff/Index.vue index 4c3c9786..78af9516 100644 --- a/src/views/planetDesign/Design/questions/maxdiff/Index.vue +++ b/src/views/planetDesign/Design/questions/maxdiff/Index.vue @@ -139,7 +139,7 @@