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"> @@ -140,36 +139,38 @@ :pagination="false" rowKey="option_index" :scroll="{ y: 500, x:800 }"> + @@ -290,7 +291,7 @@ async function download (type) { } watch(() => props.info, (info) => { - const data = JSON.parse(JSON.stringify(info.raw_data.data)) + const data = JSON.parse(JSON.stringify(info.zero_data.data)) if (!info) return fitChartData.value = info.fit_chart if (typeof info.fit === 'string') { @@ -307,12 +308,12 @@ watch(() => props.info, (info) => { barData.value = barChartData; const _c1 = [].concat(info.raw_data.columns) c1.value = [] - c1.value = _c1.map((item) => { + c1.value = _c1.map((item,index) => { if (item?.children) { - item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) }) + item.children.map((e,index) => { e.dataIndex = e.key;e.index =index; childrenlist.push(e.key) }) } if (item?.children) { - item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) }) + item.children.map((e,index) => { e.dataIndex = e.key;e.index =index;childrenlist.push(e.key) }) } else { item.slots = { customRender: item.key } item.dataIndex = item.key @@ -347,9 +348,9 @@ watch(() => props.info, (info) => { c2.value = [] // 带children的key存进去 - c2.value = _c2.map(item => { + c2.value = _c2.map((item) => { if (item?.children) { - item.children.map((e) => { e.dataIndex = e.key; childrenlist2.push(e.key) }) + item.children.map((e) => { e.dataIndex = e.key;childrenlist2.push(e.key) }) } else { item.slots = { customRender: item.key } item.dataIndex = item.key diff --git a/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue b/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue index 043529f7..f8ec628e 100644 --- a/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue +++ b/src/views/DataAnalyse/kndiagram/questions/components/mxdLcDetail.vue @@ -7,17 +7,31 @@ 导出分析结果 +
+ + + +
+ +
由于样本量较小 暂无分析数据
+
+
-
+
@@ -76,6 +91,7 @@ const responseData = ref({}); const activeKey = ref(""); const tabList = ref([]); const data = ref({}); +const loading =ref(true); const info = ref({ fit: "", fit_chart: [], @@ -188,7 +204,9 @@ function handleExportXlsx (columns, data) { } const getData = () => { +loading.value =true; getAnalyseDetail(props.sn, props.id).then((res) => { + loading.value =false; responseData.value = res.data; const columns = res.data.columns; const _data = res.data.data; @@ -291,7 +309,7 @@ watchEffect(() => { } .empty-text { - color: #4f90ff; + color: $yili-default-color;; } } .daochubtn { diff --git a/src/views/DataAnalyse/kndiagram/questions/mxd.vue b/src/views/DataAnalyse/kndiagram/questions/mxd.vue index 7c2e5416..3a7c558c 100644 --- a/src/views/DataAnalyse/kndiagram/questions/mxd.vue +++ b/src/views/DataAnalyse/kndiagram/questions/mxd.vue @@ -68,7 +68,7 @@
{{ record.title }}
@@ -115,8 +115,9 @@ -
+
@@ -308,7 +308,7 @@ export default { emitInfo(true); }; - /** 添加选项 */ + /** 添加选项 */ const addOptionHandle = () => { const newOption = new Option(); copyInfo.value.last_option_index++; @@ -319,9 +319,11 @@ export default { }; optionList.value.push(newOption); copyInfo.value.options[0] = optionList.value; + copyInfo.value.config.task = Number.parseInt( + (optionList.value.length * 3) / copyInfo.value.config.concept + ); emitInfo(true); }; - const onUpLoadChange = (value) => { console.log("onUpLoadChange", value); value.forEach((element) => { @@ -601,7 +603,7 @@ export default { copyInfo.value.config["first_text"] = props.info.config["first_text"]; copyInfo.value.config["second_text"] = props.info.config["second_text"]; columns.value = getAnswerStyle(config.value.answer_style); - message.error("标题不能相等"); + message.error("标题不能相同"); return; } emitInfo(isupdateV); diff --git a/src/views/planetDesign/Design/questions/maxdiff/MaxdiffConfig.vue b/src/views/planetDesign/Design/questions/maxdiff/MaxdiffConfig.vue index f690059c..9e641aad 100644 --- a/src/views/planetDesign/Design/questions/maxdiff/MaxdiffConfig.vue +++ b/src/views/planetDesign/Design/questions/maxdiff/MaxdiffConfig.vue @@ -165,6 +165,7 @@ import { useRoute } from "vue-router"; import ModelSuccess from "../../components/config/ModelSuccess.vue"; import ModelError from "../../components/config/ModelError.vue"; import { message, Modal } from "ant-design-vue"; +import moment from "moment"; //import Tooltip from "../Tooltip.vue"; export default { props: { @@ -316,7 +317,7 @@ export default { { type: 6, }, - "生成设计模板.xlsx" + "MXD生成设计模板.xlsx" ); }; @@ -400,7 +401,7 @@ export default { url: copyConfig.value.config.file_url, // sn: route.query.sn, // question_index: copyConfig.value.question_index - }); + },`MXD生产设计_${ moment().format("YYYYMMDDHHmmss")}.xlsx`); // infoConfig.value.config.file_name = data.data.config.file_name; // infoConfig.value.config.file_url = data.data.config.file_url; diff --git a/src/views/planetDesign/api/api.js b/src/views/planetDesign/api/api.js index 43535494..7ad2f98f 100644 --- a/src/views/planetDesign/api/api.js +++ b/src/views/planetDesign/api/api.js @@ -186,7 +186,7 @@ export function cbc_shelves_import(params) { /* Maxdiff导出设计*/ -const mxd_export = async (params) => { +const mxd_export = async (params,name) => { const url = params.url; // await request({ // url: `/console/surveys/${params.sn}/questions/${params.question_index}/mxd_export`, @@ -203,7 +203,8 @@ const mxd_export = async (params) => { withCredentials: false, responseType: 'arraybuffer' }) - fileDownload(data, "", 'application/vnd.ms-excel'); + + fileDownload(data, name, 'application/vnd.ms-excel'); }