From 748f197ed34e7e1f56fa1ba76afca3c11f7a1934 Mon Sep 17 00:00:00 2001 From: "du.meimei" Date: Mon, 17 Mar 2025 20:45:22 +0800 Subject: [PATCH] =?UTF-8?q?update:=E9=97=AE=E5=8D=B7UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 + src/App.vue | 2 +- src/api/common.js | 6 +- src/api/home/index.js | 8 + src/assets/css/public.scss | 5 + src/assets/img/publish/edit.png | Bin 0 -> 6450 bytes src/assets/img/publish/end.png | Bin 0 -> 6633 bytes src/assets/img/publish/publish.png | Bin 0 -> 7232 bytes src/components/YLPicker.vue | 8 +- src/components/contenteditable.vue | 4 +- src/fonts/demo.css | 4 +- src/fonts/moblie/demo.css | 4 +- src/layouts/logic.js | 58 +++--- src/layouts/utils.js | 48 ++--- src/request/api/modules/survey.ts | 4 +- src/request/axios/index.ts | 8 +- src/utils/request.js | 8 +- .../ActionCompoents/OptionAction.vue | 34 ++-- .../QuestionItemAction/RateQuestionAction.vue | 6 +- .../components/Questions/MartrixQuestion.vue | 16 +- .../components/Questions/MatrixQuestion.vue | 114 +++++------ .../components/Questions/paging/Paging.vue | 3 +- src/views/Home/Index.vue | 2 +- .../Home/components/LastSurvey/Index.vue | 2 +- .../Market/components/MarketItem.vue | 2 +- src/views/Market/Index.vue | 4 +- src/views/Survey/Index.vue | 61 +++++- .../views/Preview/components/AnswerViewer.vue | 4 +- .../SceneSurveyViewerPage/Index.vue | 2 +- .../Preview/components/questions/QLast.vue | 52 ++--- .../Preview/components/questions/QRadio.vue | 12 +- .../Preview/components/questions/Question.vue | 12 +- src/views/Survey/views/Preview/js/language.js | 2 +- src/views/Survey/views/Preview/js/logical.js | 130 ++++++------ src/views/Survey/views/Preview/js/mock.js | 4 +- .../Survey/views/Preview/js/questions.js | 192 +++++++++--------- src/views/Survey/views/Publish/Index.vue | 24 +-- src/views/Survey/views/Success/Index.vue | 4 +- 38 files changed, 455 insertions(+), 395 deletions(-) create mode 100644 src/assets/img/publish/edit.png create mode 100644 src/assets/img/publish/end.png create mode 100644 src/assets/img/publish/publish.png diff --git a/components.d.ts b/components.d.ts index bb994ba..a50d18f 100644 --- a/components.d.ts +++ b/components.d.ts @@ -32,6 +32,7 @@ declare module 'vue' { VanGrid: typeof import('vant/es')['Grid'] VanGridItem: typeof import('vant/es')['GridItem'] VanIcon: typeof import('vant/es')['Icon'] + VanList: typeof import('vant/es')['List'] VanNavBar: typeof import('vant/es')['NavBar'] VanPicker: typeof import('vant/es')['Picker'] VanPopup: typeof import('vant/es')['Popup'] diff --git a/src/App.vue b/src/App.vue index 1301bf3..aee81b0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,7 @@ import { onMounted } from 'vue'; import appBridge from '@/assets/js/appBridge'; import utils from '@/assets/js/common'; -onMounted(async() => { +onMounted(async () => { if (utils.getParameter('digitalYiliToken')) { // 隐藏/显示 header appBridge.setHeaderShown(false); diff --git a/src/api/common.js b/src/api/common.js index 1c90620..fc4dfe9 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -85,9 +85,9 @@ export default class CommonApi { }; /* eslint-disable no-useless-escape */ const reg = /\\|\/|\?|\？|\*|"|“|”|'|‘|’|<|>|{|}|\[|\]|\【|\】|：|:|、|\^|\$|!|~|`|\s|\+/g; - name - = name - || getRandomFileName(file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png`); + name = + name || + getRandomFileName(file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png`); const res = await CommonApi.getOssInfo(); /* eslint-enable no-useless-escape */ diff --git a/src/api/home/index.js b/src/api/home/index.js index fc236bb..0dd135f 100644 --- a/src/api/home/index.js +++ b/src/api/home/index.js @@ -65,3 +65,11 @@ export function deleteTemplate(sn) { method: 'delete' }); } +// 保存为模板 +export function saveTemplates(sn, data) { + return request({ + url: `/console/surveys/${sn}/templates`, + method: 'post', + data + }); +} diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss index c1cc89a..db24ef4 100644 --- a/src/assets/css/public.scss +++ b/src/assets/css/public.scss @@ -224,3 +224,8 @@ color: $theme-color; } } +.el-dropdown-menu__item:not(.is-disabled):focus, +.el-dropdown-menu__item:not(.is-disabled):hover { + background-color: #fff !important; + color: #2dc26b !important; +} diff --git a/src/assets/img/publish/edit.png b/src/assets/img/publish/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..7135c4e48ab0d2b46e6d517a3b6256b16e87a5b8 GIT binary patch literal 6450 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 literal 0 HcmV?d00001 diff --git a/src/assets/img/publish/end.png b/src/assets/img/publish/end.png new file mode 100644 index 0000000000000000000000000000000000000000..4da6e51d5af7b279ec25b20ac3d3accaa9b6a409 GIT binary patch literal 6633 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 literal 0 HcmV?d00001 diff --git a/src/assets/img/publish/publish.png b/src/assets/img/publish/publish.png new file mode 100644 index 0000000000000000000000000000000000000000..c9d6a546a96027510a9414b3c17672d76981b7fe GIT binary patch literal 7232 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 literal 0 HcmV?d00001 diff --git a/src/components/YLPicker.vue b/src/components/YLPicker.vue index c5108d0..7e5cf8f 100644 --- a/src/components/YLPicker.vue +++ b/src/components/YLPicker.vue @@ -170,8 +170,8 @@ const getMaxDateLimit = computed(() => { props.format ); const tempStr = '0000-12-31 23:59:59'; - const result - = props.maxDate.length !== 0 && thisMax.length > props.maxDate.length + const result = + props.maxDate.length !== 0 && thisMax.length > props.maxDate.length ? thisMax.slice(0, props.maxDate.length) + tempStr.slice(props.maxDate.length) : thisMax; return result.slice(0, props.format.length); @@ -194,8 +194,8 @@ function onChange({ selectedValues, columnIndex }) { renderMinuteColumns, renderSecondColumns ]; - updateColumns[columnIndex] - && updateColumns[columnIndex](changeValue, getMinDateLimit.value, getMaxDateLimit.value, false); + updateColumns[columnIndex] && + updateColumns[columnIndex](changeValue, getMinDateLimit.value, getMaxDateLimit.value, false); } // 渲染全部列 diff --git a/src/components/contenteditable.vue b/src/components/contenteditable.vue index ca0cbd0..b49a89b 100644 --- a/src/components/contenteditable.vue +++ b/src/components/contenteditable.vue @@ -62,7 +62,7 @@ const functions = { document.execCommand('italic', false, null); }, - uploadImage: async() => { + uploadImage: async () => { // 保存当前光标位置 savedRange.value = saveSelection(); @@ -71,7 +71,7 @@ const functions = { fileInput.click(); - fileInput.onchange = async(e) => { + fileInput.onchange = async (e) => { const [file] = e.target.files; if (!file) return; if (file.size > 2 * 1024 * 1024) { diff --git a/src/fonts/demo.css b/src/fonts/demo.css index 12ec742..18e8077 100644 --- a/src/fonts/demo.css +++ b/src/fonts/demo.css @@ -4,11 +4,11 @@ src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') - format('embedded-opentype'), + format('embedded-opentype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') - format('svg'); + format('svg'); } .logo { diff --git a/src/fonts/moblie/demo.css b/src/fonts/moblie/demo.css index 12ec742..18e8077 100644 --- a/src/fonts/moblie/demo.css +++ b/src/fonts/moblie/demo.css @@ -4,11 +4,11 @@ src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') - format('embedded-opentype'), + format('embedded-opentype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') - format('svg'); + format('svg'); } .logo { diff --git a/src/layouts/logic.js b/src/layouts/logic.js index dd6beaf..c121a41 100644 --- a/src/layouts/logic.js +++ b/src/layouts/logic.js @@ -376,39 +376,39 @@ export function isCross(range1, range2) { const isSibling = isLeft || isRight; // 逻辑包含循环 - const contain - = (isPlainSequence - && (((isNullish(start2) || isSequence(judge, start2, start1)) - && (isNullish(end2) || isSequence(judge, end2, start1))) - || ((isNullish(start2) || isSequence(start1, start2, end1)) - && (isNullish(end2) || isSequence(start1, end2, end1))))) - || (!isPlainSequence - && (judge < start1 - ? ((isNullish(start2) || isSequence(judge, start2, start1)) - && (isNullish(end2) || isSequence(judge, end2, start1))) - || ((isNullish(start2) || isSequence(start1, start2, end1)) - && (isNullish(end2) || isSequence(start1, end2, end1))) - : ((isNullish(start2) || isSequence(start1, start2, judge)) - && (isNullish(end2) || isSequence(start1, end2, judge))) - || ((isNullish(start2) || isSequence(judge, start2, end1)) - && (isNullish(end2) || isSequence(judge, end2, end1))))); + const contain = + (isPlainSequence && + (((isNullish(start2) || isSequence(judge, start2, start1)) && + (isNullish(end2) || isSequence(judge, end2, start1))) || + ((isNullish(start2) || isSequence(start1, start2, end1)) && + (isNullish(end2) || isSequence(start1, end2, end1))))) || + (!isPlainSequence && + (judge < start1 + ? ((isNullish(start2) || isSequence(judge, start2, start1)) && + (isNullish(end2) || isSequence(judge, end2, start1))) || + ((isNullish(start2) || isSequence(start1, start2, end1)) && + (isNullish(end2) || isSequence(start1, end2, end1))) + : ((isNullish(start2) || isSequence(start1, start2, judge)) && + (isNullish(end2) || isSequence(start1, end2, judge))) || + ((isNullish(start2) || isSequence(judge, start2, end1)) && + (isNullish(end2) || isSequence(judge, end2, end1))))); // 循环存在封闭区间，并且循环包含逻辑 - const contained - = !isNullish(start2) - && !isNullish(end2) + const contained = + !isNullish(start2) && + !isNullish(end2) && // [judge, start1, end1]; - && ((isPlainSequence && start2 <= judge && end1 <= end2) + ((isPlainSequence && start2 <= judge && end1 <= end2) || // [judge, start1, end1]; // [start1, judge, end1]; - || (!isPlainSequence && start2 <= start1 && start2 <= judge && end1 <= end2)); + (!isPlainSequence && start2 <= start1 && start2 <= judge && end1 <= end2)); // 循环不存在封闭区间 - const unCircled - = (!isNullish(start2) - && isNullish(end2) - && ((isPlainSequence && start2 === judge) || (!isPlainSequence && judge < start1) + const unCircled = + (!isNullish(start2) && + isNullish(end2) && + ((isPlainSequence && start2 === judge) || (!isPlainSequence && judge < start1) ? start2 === judge - : start2 === start1)) - || (isNullish(start2) && !isNullish(end2) && end2 === end1); + : start2 === start1)) || + (isNullish(start2) && !isNullish(end2) && end2 === end1); return !(isSibling || contain || contained || unCircled); } @@ -428,8 +428,8 @@ function isSequence(s1, s2, s3, equal) { * @param store */ export function updateNewQuestionsByLoopingEffect(quesSaveParam, store) { - const { questionInfoBeforeModified = {}, questionInfo = {} } - = JSON.parse(JSON.stringify(store.state.common)) || {}; + const { questionInfoBeforeModified = {}, questionInfo = {} } = + JSON.parse(JSON.stringify(store.state.common)) || {}; const oldPages = questionInfoBeforeModified.survey.pages; const newQuestions = questionInfo.questions; diff --git a/src/layouts/utils.js b/src/layouts/utils.js index 06fe828..d195998 100644 --- a/src/layouts/utils.js +++ b/src/layouts/utils.js @@ -43,13 +43,13 @@ function showModal(options) { * @param {*} data * @returns */ -const canPlanetPublishPSM = function(data) { +const canPlanetPublishPSM = function (data) { let isFb = true; let message = ''; let title = '题目设置未完成'; const incompleteQuestionList = []; - data.questions - && data.questions.forEach((s) => { + data.questions && + data.questions.forEach((s) => { if (s.question_type === 101 && s.config.price_gradient.length <= 0) { isFb = false; message = 'psm题目未完成设置，请设置价格区间后投放'; @@ -73,15 +73,15 @@ const canPlanetPublishPSM = function(data) { * @param {*} data * @returns */ -const canPlanetPublishMxdAndHotArea = function(data) { +const canPlanetPublishMxdAndHotArea = function (data) { let isFb = true; let message = ''; const qSteams = []; const incompleteQuestionList = []; let type = 0; let title = '题目设置未完成'; - data.questions - && data.questions.forEach((s) => { + data.questions && + data.questions.forEach((s) => { if (s.question_type === 105 && s.config.design_version <= 0) { isFb = false; message = 'maxdiff题目未完成设置，请生成设计后投放'; @@ -120,14 +120,14 @@ const canPlanetPublishMxdAndHotArea = function(data) { * @param {*} data * @returns */ -const canPlanetPublish3D = function(data) { +const canPlanetPublish3D = function (data) { { let canFB = true; let message = ''; const qSteams = []; let title = ''; - data.questions - && data.questions.forEach((s) => { + data.questions && + data.questions.forEach((s) => { if (QUESTION_TYPE.contains(s.question_type)) { try { if (s.config.is_three_dimensions && !s.config.scene) { @@ -157,15 +157,15 @@ const canPlanetPublish3D = function(data) { let message = ''; const qSteams = []; let title = ''; - data.questions - && data.questions.forEach((s) => { + data.questions && + data.questions.forEach((s) => { if (QUESTION_TYPE.contains(s.question_type)) { try { if (s.config.is_three_dimensions && s.config.is_binding_goods) { const wares = []; const _sceneInformation = s.config.scene_information; - const sceneInformation - = typeof _sceneInformation === 'string' + const sceneInformation = + typeof _sceneInformation === 'string' ? JSON.parse(_sceneInformation) : _sceneInformation; sceneInformation.shelves.forEach((shelf) => { @@ -215,14 +215,14 @@ const canPlanetPublish3D = function(data) { * @param {*} data * @returns */ -const canPlanetPublishImage = function(data) { +const canPlanetPublishImage = function (data) { { let canFB = true; let message = ''; const qSteams = []; let title = ''; - data.questions - && data.questions.forEach((s) => { + data.questions && + data.questions.forEach((s) => { if (s.question_type === 13) { try { if (s.options.length <= 0 || s.options.some((y) => y.length <= 0)) { @@ -317,8 +317,8 @@ function canPublishRandom(data, publishType) { if (!isValidated) { errors.push({ message: - field.message - || `请填写"${random.title}"中第${index + 1}组"随机题组"的"${field.name}"` + field.message || + `请填写"${random.title}"中第${index + 1}组"随机题组"的"${field.name}"` }); } }); @@ -397,11 +397,11 @@ function isLoopingLogicValid(data, publishType) { if ( (data?.cycle_pages || []).every((i) => { return ( - i.question_index - && i.relation_type !== undefined - && i.relation_type !== null - && i.first_page - && i.last_page + i.question_index && + i.relation_type !== undefined && + i.relation_type !== null && + i.first_page && + i.last_page ); }) ) { @@ -425,7 +425,7 @@ function isLoopingLogicValid(data, publishType) { * @param sn * @param publishType undefined投放；null投放；0投放；1预览；2投放；3测试 */ -export const canPlanetPublish = async function(sn, publishType) { +export const canPlanetPublish = async function (sn, publishType) { const parsedPublishType = !publishType ? 2 : publishType; const num = window.location.href.indexOf('code='); let code; diff --git a/src/request/api/modules/survey.ts b/src/request/api/modules/survey.ts index 24a3eba..c665a46 100644 --- a/src/request/api/modules/survey.ts +++ b/src/request/api/modules/survey.ts @@ -1,2 +1,2 @@ -export const surveyQuestion - = 'https://yls-api-uat.dctest.digitalyili.com/api/console/surveys/RWNK9BYp/questions'; +export const surveyQuestion = + 'https://yls-api-uat.dctest.digitalyili.com/api/console/surveys/RWNK9BYp/questions'; diff --git a/src/request/axios/index.ts b/src/request/axios/index.ts index bded0ab..9f947d0 100644 --- a/src/request/axios/index.ts +++ b/src/request/axios/index.ts @@ -39,10 +39,10 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if ( - response.status === 200 - || response.status === 201 - || response.status === 202 - || response.status === 204 + response.status === 200 || + response.status === 201 || + response.status === 202 || + response.status === 204 ) { if (response.config.method === 'put') { // message.success('保存中...'); diff --git a/src/utils/request.js b/src/utils/request.js index 9f27953..22eaabf 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -45,10 +45,10 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if ( - response.status === 200 - || response.status === 201 - || response.status === 202 - || response.status === 204 + response.status === 200 || + response.status === 201 || + response.status === 202 || + response.status === 204 ) { if (response.config.method === 'put') { // message.success('保存中...'); diff --git a/src/views/Design/components/ActionCompoents/OptionAction.vue b/src/views/Design/components/ActionCompoents/OptionAction.vue index 46b991b..0042287 100644 --- a/src/views/Design/components/ActionCompoents/OptionAction.vue +++ b/src/views/Design/components/ActionCompoents/OptionAction.vue @@ -134,23 +134,23 @@ const openOptionActionModel = (item, index) => { // 上下移动 const optionMove = (action) => { switch (action.action) { - case 'up': - if (activeIndex.value === 0) { - moveShow.value = false; - return false; - } - // 向上移动 - element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]); - activeIndex.value -= 1; - break; - case 'down': - if (activeIndex.value === element.value.length - 1) { - moveShow.value = false; - return false; - } - element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]); - activeIndex.value += 1; - break; + case 'up': + if (activeIndex.value === 0) { + moveShow.value = false; + return false; + } + // 向上移动 + element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]); + activeIndex.value -= 1; + break; + case 'down': + if (activeIndex.value === element.value.length - 1) { + moveShow.value = false; + return false; + } + element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]); + activeIndex.value += 1; + break; } }; diff --git a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue index 4b9a9e8..4c3be6e 100644 --- a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue +++ b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/RateQuestionAction.vue @@ -108,9 +108,9 @@ function isSurplus() { return false; } else { return ( - parseFloat(((localConfig.value.max - localConfig.value.min) * 1000).toFixed(4, 10)) - % parseFloat((localConfig.value.score_interval * 1000).toFixed(4, 10)) - === 0 + parseFloat(((localConfig.value.max - localConfig.value.min) * 1000).toFixed(4, 10)) % + parseFloat((localConfig.value.score_interval * 1000).toFixed(4, 10)) === + 0 ); } } diff --git a/src/views/Design/components/Questions/MartrixQuestion.vue b/src/views/Design/components/Questions/MartrixQuestion.vue index 0f91776..537389c 100644 --- a/src/views/Design/components/Questions/MartrixQuestion.vue +++ b/src/views/Design/components/Questions/MartrixQuestion.vue @@ -21,14 +21,14 @@ const { element } = toRefs(props); */ const tableInputTypeMapping = (/** regx?: any */) => { switch (element.value.question_type) { - case 8: - return 'text'; - case 9: - return 'radio'; - case 10: - return 'checkbox'; - default: - return 'radio'; + case 8: + return 'text'; + case 9: + return 'radio'; + case 10: + return 'checkbox'; + default: + return 'radio'; } }; diff --git a/src/views/Design/components/Questions/MatrixQuestion.vue b/src/views/Design/components/Questions/MatrixQuestion.vue index d2fb2c5..be7534f 100644 --- a/src/views/Design/components/Questions/MatrixQuestion.vue +++ b/src/views/Design/components/Questions/MatrixQuestion.vue @@ -23,14 +23,14 @@ const matrixAnswer = ref({ */ const tableInputTypeMapping = (/** regx?: any */) => { switch (element.question_type) { - case 8: - return 'text'; - case 9: - return 'radio'; - case 10: - return 'checkbox'; - default: - return 'radio'; + case 8: + return 'text'; + case 9: + return 'radio'; + case 10: + return 'checkbox'; + default: + return 'radio'; } }; @@ -67,55 +67,55 @@ function handleColNameChange(rowOption: string, colOption: string, e: any) { // 不同的 question_type 的 matrix 问卷处理不同的结果 switch (element.question_type) { - case 8: { - // 获取输入框元素 - const inputElement = e.target as HTMLInputElement; - // 如果没有获取到输入框元素，则直接返回 - if (!inputElement) return; - // 将输入框的值保存到 rowRecord 对应位置 - rowRecord[col] = e!.target!.value; - // 清空 matrixAnswer 的 answer 属性 - matrixAnswer.value.answer = {}; - // 遍历所有行选项 - element.options[0].forEach((_, rowIndex) => { - // 获取当前行记录 - const colOptions = rowRecord[rowIndex]; - // 如果当前行有记录，则更新 matrixAnswer 的 answer 属性 - if (colOptions) { - matrixAnswer.value.answer[`R${rowIndex + 1}_C${col + 1}`] = colOptions; - } - }); - break; - } - case 9: - // 将选择的行索引加1后保存到 rowRecord 对应位置 - rowRecord[col] = row + 1; - // 清空 matrixAnswer 的 answer 属性 - matrixAnswer.value.answer = {}; - // 遍历 rowRecord，更新 matrixAnswer 的 answer 属性 - rowRecord.forEach((row, index) => { - matrixAnswer.value.answer[`${index + 1}_${row}`] = 1; - }); - break; - case 10: - // 将选择的行索引加1后添加到 rowRecord 对应位置的数组中 - rowRecord[col] = (rowRecord[col] || []).concat(row + 1); - // 清空 matrixAnswer 的 answer 属性 - matrixAnswer.value.answer = {}; - // 遍历所有行选项 - element.options[0].forEach((rowOption, rowIndex) => { - // 获取当前行记录 - const colOptions = rowRecord[rowIndex]; - // 如果当前行有记录，则更新 matrixAnswer 的 answer 属性 - if (colOptions) { - colOptions.forEach((col: any) => { - matrixAnswer.value.answer[`R${rowIndex + 1}_C${col}`] = true; - }); - } - }); - break; - default: - break; + case 8: { + // 获取输入框元素 + const inputElement = e.target as HTMLInputElement; + // 如果没有获取到输入框元素，则直接返回 + if (!inputElement) return; + // 将输入框的值保存到 rowRecord 对应位置 + rowRecord[col] = e!.target!.value; + // 清空 matrixAnswer 的 answer 属性 + matrixAnswer.value.answer = {}; + // 遍历所有行选项 + element.options[0].forEach((_, rowIndex) => { + // 获取当前行记录 + const colOptions = rowRecord[rowIndex]; + // 如果当前行有记录，则更新 matrixAnswer 的 answer 属性 + if (colOptions) { + matrixAnswer.value.answer[`R${rowIndex + 1}_C${col + 1}`] = colOptions; + } + }); + break; + } + case 9: + // 将选择的行索引加1后保存到 rowRecord 对应位置 + rowRecord[col] = row + 1; + // 清空 matrixAnswer 的 answer 属性 + matrixAnswer.value.answer = {}; + // 遍历 rowRecord，更新 matrixAnswer 的 answer 属性 + rowRecord.forEach((row, index) => { + matrixAnswer.value.answer[`${index + 1}_${row}`] = 1; + }); + break; + case 10: + // 将选择的行索引加1后添加到 rowRecord 对应位置的数组中 + rowRecord[col] = (rowRecord[col] || []).concat(row + 1); + // 清空 matrixAnswer 的 answer 属性 + matrixAnswer.value.answer = {}; + // 遍历所有行选项 + element.options[0].forEach((rowOption, rowIndex) => { + // 获取当前行记录 + const colOptions = rowRecord[rowIndex]; + // 如果当前行有记录，则更新 matrixAnswer 的 answer 属性 + if (colOptions) { + colOptions.forEach((col: any) => { + matrixAnswer.value.answer[`R${rowIndex + 1}_C${col}`] = true; + }); + } + }); + break; + default: + break; } } diff --git a/src/views/Design/components/Questions/paging/Paging.vue b/src/views/Design/components/Questions/paging/Paging.vue index 62d9592..57eb0e1 100644 --- a/src/views/Design/components/Questions/paging/Paging.vue +++ b/src/views/Design/components/Questions/paging/Paging.vue @@ -11,7 +11,8 @@ class="iconfont active-icon" :style="{ marginRight: isLastPage ? '0' : '16px' }" @click="activePage" - > + > diff --git a/src/views/Survey/Index.vue b/src/views/Survey/Index.vue index 758e579..cacd92b 100644 --- a/src/views/Survey/Index.vue +++ b/src/views/Survey/Index.vue @@ -36,7 +36,14 @@
- -{{ item.status_txt }}- + + + +
@@ -59,12 +66,16 @@ 开启投放 - + @@ -77,9 +88,9 @@