From afc9de76cc9931559c5def0b74c49db9bb6d09b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=9A=E5=86=89?= Date: Mon, 26 Aug 2024 20:38:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=9B=E5=BB=BA=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Concept/ConceptTesting.vue | 21 ++++++++++++---- .../Concept/components/ConceptConfig.vue | 2 +- .../Concept/components/ConceptLayout.vue | 24 +++++++++++-------- .../Concept/components/ConceptSetItem.vue | 2 +- src/views/ProjectManage/create/Index.vue | 2 +- .../TempMarket/fragment/NewTableList.vue | 6 ++--- 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/views/Concept/ConceptTesting.vue b/src/views/Concept/ConceptTesting.vue index 0d8c30b7..0d04c7e5 100644 --- a/src/views/Concept/ConceptTesting.vue +++ b/src/views/Concept/ConceptTesting.vue @@ -8,7 +8,8 @@ width="100%" wrapClassName="my-concept-full-modal" > - + + @@ -22,14 +23,21 @@ import { Modal } from 'ant-design-vue' const modalVisible = ref(false); const testType = ref(1) -const openModal = (type) => { + +const tempalteSn = ref('') + +const openModal = (type, sn) => { + console.log('sn', sn); + + tempalteSn.value = sn + if(type) { testType.value = type } modalVisible.value = true; }; -const closeModal = () => { +const closeConcept = () => { Modal.confirm({ title: '确定退出？', content: '退出后当前方案配置无法恢复！', @@ -37,13 +45,16 @@ const closeModal = () => { okText: '确 定', class: 'custom-modal custom-modal-title-confirm-notice', onOk: () => { - modalVisible.value = false; - + closeModal(); }, onCancel: () => {} }) }; + +const closeModal = () => { + modalVisible.value = false; +} defineExpose({ openModal, }); diff --git a/src/views/Concept/components/ConceptConfig.vue b/src/views/Concept/components/ConceptConfig.vue index 84873394..2c488dcc 100644 --- a/src/views/Concept/components/ConceptConfig.vue +++ b/src/views/Concept/components/ConceptConfig.vue @@ -417,7 +417,7 @@ const getConceptInfo = () => { } if(ruleFormSet.testType === 3) { - + params.concept_indexes = []; params.concepts = testThreeConcepts.value.map(item => item.data); } diff --git a/src/views/Concept/components/ConceptLayout.vue b/src/views/Concept/components/ConceptLayout.vue index e8d96dd3..e2b646e9 100644 --- a/src/views/Concept/components/ConceptLayout.vue +++ b/src/views/Concept/components/ConceptLayout.vue @@ -34,13 +34,17 @@ import { defineEmits, ref } from 'vue' import ConceptTemplate from './ConceptTemplate.vue' import ConceptConfig from './ConceptConfig.vue' +import { useRouter } from "vue-router"; + import { Modal, message } from 'ant-design-vue' import { postTemplates } from '../api' -const props = defineProps(["testType"]); +const props = defineProps(["testType", "sn"]); -const emits = defineEmits(["closeConceptModal"]); +const emits = defineEmits(["closeConceptModal", "closeModal"]); + +const router = useRouter(); const quitConcept = () => { emits('closeConceptModal') @@ -59,19 +63,19 @@ const onSubmit = async(params) => { okText: '确 定', class: 'custom-modal custom-modal-title-confirm-notice', onOk: async() => { - return - const res = await postTemplates(sn, params) + const res = await postTemplates(props.sn, params) console.log('res', res); - if(res.code === 200) { + if(res.code === 0) { console.log('成功了'); - - // router.push({ - // path: "/survey/planet/design", - // query: { sn: data.sn }, - // }); + emits('closeModal') + + router.push({ + path: "/survey/planet/design", + query: { sn: res.data.sn }, + }); } }, onCancel: () => {} diff --git a/src/views/Concept/components/ConceptSetItem.vue b/src/views/Concept/components/ConceptSetItem.vue index c4b72f2d..9f1b57ad 100644 --- a/src/views/Concept/components/ConceptSetItem.vue +++ b/src/views/Concept/components/ConceptSetItem.vue @@ -160,7 +160,7 @@ function checkConceptType(arr) { // 失焦校验 const onBlur = () => { - console.log('proos', props.allItem); + console.log('props', props.allItem); // return const names = props.allItem.map(item => item.data.concept_name); diff --git a/src/views/ProjectManage/create/Index.vue b/src/views/ProjectManage/create/Index.vue index df615fd1..8b1cbec7 100644 --- a/src/views/ProjectManage/create/Index.vue +++ b/src/views/ProjectManage/create/Index.vue @@ -420,7 +420,7 @@ function createProfessionalSurvey(record) { return createSurveySellRef.value.openModal(); } else if ([36, 37, 38].includes(record.code)) { - return conceptTestingRef.value.openModal(); + return conceptTestingRef.value.openModal(0, record.sn); } else{ Modal.confirm({ diff --git a/src/views/TempMarket/fragment/NewTableList.vue b/src/views/TempMarket/fragment/NewTableList.vue index fe904378..8ae95932 100644 --- a/src/views/TempMarket/fragment/NewTableList.vue +++ b/src/views/TempMarket/fragment/NewTableList.vue @@ -565,11 +565,11 @@ export default defineComponent({ } else if (+record.type === 1) { createSurveySellRef.value.openModal(); } else if (record.type === 300) { - conceptTestingRef.value.openModal(1); + conceptTestingRef.value.openModal(1, record.sn); } else if (record.type === 301) { - conceptTestingRef.value.openModal(2); + conceptTestingRef.value.openModal(2, record.sn); } else if (record.type === 302) { - conceptTestingRef.value.openModal(3); + conceptTestingRef.value.openModal(3, record.sn); } else { groupInfo.value.sn = ""; groupInfo.value.group_id = 0;