From 3293f77928e8baa71f73bd3bfa7020395599fa59 Mon Sep 17 00:00:00 2001
From: maojianhui <3605828735@qq.com>
Date: Sun, 13 Oct 2024 21:13:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AD=94=E9=A2=98=E8=BF=9B=E5=BA=A6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/View/checkbox.vue              |  2 +-
 src/pages/View/file.vue                  | 22 +++++++++-----
 src/pages/View/view.vue                  | 37 +++++++++++++++++++-----
 src/stores/index.ts                      |  6 +++-
 src/stores/service/imageStore.ts         | 19 ++++++++++++
 src/stores/service/questionnaireStore.ts | 32 ++++++++++++++++++++
 6 files changed, 100 insertions(+), 18 deletions(-)
 create mode 100644 src/stores/service/imageStore.ts
 create mode 100644 src/stores/service/questionnaireStore.ts

diff --git a/src/pages/View/checkbox.vue b/src/pages/View/checkbox.vue
index 339c39e..2d7ead1 100644
--- a/src/pages/View/checkbox.vue
+++ b/src/pages/View/checkbox.vue
@@ -58,7 +58,7 @@ const localUnique = ref<boolean>(props.unique);
 const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
 const otherAnswer = ref<string>('');
-const answerArr = ref<string[]>([]);
+  const answerArr = ref<string[]>(props.answer ? props.answer.split('┋') : []);
 const emits = defineEmits(['update:answer']);
 const otherAnswerChecked = ref(false)
 const otherCheckbox = ref<HTMLInputElement | null>(null);
diff --git a/src/pages/View/file.vue b/src/pages/View/file.vue
index 06b675b..5fd1453 100644
--- a/src/pages/View/file.vue
+++ b/src/pages/View/file.vue
@@ -36,7 +36,7 @@
 
         <template #file="{ file }">
           <div>
-            <img class="el-upload-list__item-thumbnail" :src="file.url"  />
+            <img class="el-upload-list__item-thumbnail" :src="props.answer"  />
             <span class="el-upload-list__item-actions">
           <span
               class="el-upload-list__item-preview"
@@ -57,7 +57,7 @@
       </el-upload>
 
       <el-dialog v-model="dialogVisible">
-        <img w-full :src="dialogImageUrl" alt="Preview Image" />
+        <img w-full :src="props.answer" alt="Preview Image" />
       </el-dialog>
 
     </div>
@@ -65,26 +65,29 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, defineProps, defineEmits } from 'vue';
+import { ref, watch, defineProps, defineEmits, onMounted } from 'vue';
 import type { UploadFile } from 'element-plus'
 import {ElMessage} from "element-plus";
 import { Delete,  Plus, ZoomIn } from '@element-plus/icons-vue'
+import { useMainStore } from '@/stores';
+
+const imageStore = useMainStore().useImageStore();
 
 const dialogImageUrl = ref('')
 const dialogVisible = ref(false)
 const disabled = ref(false)
 const fileList = ref<UploadFile[]>([])
+fileList.value = imageStore.fileList;
 
 const handlePictureCardPreview = (file: UploadFile) => {
   dialogImageUrl.value = file.url!
   dialogVisible.value = true
 }
 
-// 处理删除
 const handleRemove = (uploadFile: UploadFile) => {
-  fileList.value = [] // 清空列表，确保只显示一张图片
-}
-
+  imageStore.clearFiles(); // 清空 Pinia 文件列表
+  fileList.value = []; // 清空本地列表
+};
 
 
 // 上传成功回调
@@ -92,6 +95,8 @@ const handleUploadSuccess = (response: any, file: UploadFile) => {
   if(response.code == 200) {
     ElMessage.success('上传成功！')
     fileList.value = [{ ...file, url: response.data }]
+    const uploadedFile: UploadFile = { ...file, url: response.data };
+    imageStore.addFile(uploadedFile); // 将文件推入 Pinia 存储
     localAnswer.value = response.data
   } else {
     ElMessage.error(response.msg)
@@ -109,6 +114,7 @@ const props = defineProps({
   answer: String,
 });
 
+
 const handleExceed = () => {
   ElMessage.warning('最多只能上传一张图片！');
 }
@@ -126,7 +132,7 @@ const emits = defineEmits(['update:answer']);
 const localAnswer = ref(props.answer);
 
 watch(localAnswer, (newAnswer) => {
-  console.log(newAnswer)
+  // console.log(newAnswer)
   emits('update:answer', newAnswer);
 });
 
diff --git a/src/pages/View/view.vue b/src/pages/View/view.vue
index f4e4586..99cf7d0 100644
--- a/src/pages/View/view.vue
+++ b/src/pages/View/view.vue
@@ -111,7 +111,7 @@
   </template>
 
   <script lang="ts" setup>
-  import {onMounted, ref,} from "vue";
+  import {onMounted, ref, watch } from "vue";
   import {useRequest} from "vue-hooks-plus";
   import {getUserAPI, setUserSubmitAPI} from "@/apis";
   import {ElNotification} from "element-plus";
@@ -143,6 +143,8 @@
   const allowSend = ref(true)
   const isOutDate = ref(false)
 
+  const questionnaireStore = useMainStore().useQuetionnaireStore(); 
+
   onMounted(() => {
     loginStore.setShowHeader(false);
     let idParam = route.query.id as string | undefined;
@@ -150,6 +152,7 @@
       // 解密 ID
       idParam = idParam.replace(/ /g, "+");
       decryptedId.value = decryptId(idParam) as string | null;
+      // console.log(decryptedId.value)
       if (decryptedId.value === ""){
         ElNotification.error("无效的问卷id")
       }
@@ -157,6 +160,15 @@
     getQuestionnaireView();
   });
 
+  watch(question, (newQuestions) => {
+      newQuestions.forEach(q => {
+          if (q.answer) {
+              questionnaireStore.updateAnswer(q.id, q.serial_num, q.answer);
+              // console.log(questionnaireStore.userAnswer)
+          }
+      });
+  }, { deep: true });
+
   const decryptId = (encryptedId) => {
     try {
       const bytes = CryptoJS.AES.decrypt(encryptedId, Key);
@@ -176,13 +188,19 @@
             question.value = formData.value.questions;
             time.value = formData.value.time.replace("T", " ").split("+")[0].split(".")[0]
             submitData.value.id = res.data.id;
-            question.value.forEach((q) => {
-              if(q.question_type === 1){
-                q.answer = ' '
-              } else {
-                q.answer = '';
+            //获取已存储的答案
+            question.value.forEach(q => {
+              const storedAnswer = questionnaireStore.searchAnswer(q.id,q.serial_num)
+              // console.log("222")
+              if (storedAnswer) {
+                  // console.log("111")
+                  q.answer = storedAnswer.answer;
+              }else if (q.question_type===1){
+                q.answer = " ";
+              }else {
+                  q.answer = "";
               }
-            });
+            })
             loading.value = false
           } else if (res.code === 200509){
             isOutDate.value = true
@@ -236,10 +254,13 @@
       onBefore: () => startLoading(),
       onSuccess(res) {
         if (res.code === 200 && res.msg === 'OK') {
+          const imageStore = useMainStore().useImageStore()
           ElNotification.success('提交成功');
+          questionnaireStore.deleteAnswer()
+          imageStore.clearFiles()
           router.push('/Thank');
         } else {
-          ElNotification.error(res.msg );
+          ElNotification.error(res.msg);
         }
       },
       onError(e) {
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 95798a9..edb375b 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 import useLoginStore from './service/loginStore'
 import useTempStore from './service/tempStore'
 import useDarkModeStore from './service/darkStore'
+import useQuetionnaireStore from './service/questionnaireStore'
+import { useImageStore } from './service/imageStore'
 
 export const useMainStore = defineStore(
   'main',
@@ -9,7 +11,9 @@ export const useMainStore = defineStore(
     return {
       useLoginStore,
       useTempStore,
-      useDarkModeStore
+      useDarkModeStore,
+      useQuetionnaireStore,
+      useImageStore
     }
   },
   { persist: true }
diff --git a/src/stores/service/imageStore.ts b/src/stores/service/imageStore.ts
new file mode 100644
index 0000000..186b51c
--- /dev/null
+++ b/src/stores/service/imageStore.ts
@@ -0,0 +1,19 @@
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+import type { UploadFile } from 'element-plus';
+
+export const useImageStore = defineStore('image', () => {
+    const fileList = ref<UploadFile[]>([]); // 用于存储上传的文件列表
+
+    const addFile = (file: UploadFile) => {
+        fileList.value.push(file); // 添加文件到列表
+    };
+
+    const clearFiles = () => {
+        fileList.value = []; // 清空文件列表
+    };
+
+
+    return { fileList, addFile, clearFiles };
+}, { persist: true });
+
diff --git a/src/stores/service/questionnaireStore.ts b/src/stores/service/questionnaireStore.ts
new file mode 100644
index 0000000..a3ea417
--- /dev/null
+++ b/src/stores/service/questionnaireStore.ts
@@ -0,0 +1,32 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+
+const useQuestionnaireStore = defineStore("questionnaires", () => {
+    const userAnswer = ref([])
+    const searchAnswer = (id: number, serial_num: number) => {
+        return userAnswer.value.find(question => question.id === id && question.serial_num === serial_num)
+    }
+    const updateAnswer = (id: number, serial_num: number, answer: any,) => {
+        const question = userAnswer.value.find(question => question.id === id && question.serial_num === serial_num)
+        if (question) {
+            question.answer = answer
+        } else {
+            userAnswer.value.push({
+                id: id,
+                serial_num: serial_num,
+                answer: answer
+            })
+        }
+    }
+    const deleteAnswer = () => {
+        userAnswer.value = []
+    }
+    return {
+        userAnswer,
+        searchAnswer,
+        updateAnswer,
+        deleteAnswer
+    }
+}, { persist: true });
+
+export default useQuestionnaireStore;
\ No newline at end of file

From 4b670ddc1267ff07edcc7e340fdea2aeb941bea1 Mon Sep 17 00:00:00 2001
From: maojianhui <3605828735@qq.com>
Date: Tue, 15 Oct 2024 09:11:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E5=85=B6=E4=BB=96=E9=80=89=E9=A1=B9=E6=9C=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/View/checkbox.vue       | 13 +++++++++++--
 src/pages/View/radio.vue          |  8 +++++++-
 src/pages/View/view.vue           | 15 ++++++++-------
 src/stores/index.ts               |  4 +++-
 src/stores/service/optionStore.ts | 30 ++++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 src/stores/service/optionStore.ts

diff --git a/src/pages/View/checkbox.vue b/src/pages/View/checkbox.vue
index 2d7ead1..0c6e19f 100644
--- a/src/pages/View/checkbox.vue
+++ b/src/pages/View/checkbox.vue
@@ -37,8 +37,12 @@
 </template>
 
 <script setup lang="ts">
+import { useMainStore } from '@/stores';
 import { ref, watch, defineProps, defineEmits, computed } from 'vue'
 
+const optionStore = useMainStore().useOptionStore()
+
+
 const props = defineProps<{
   serial_num: number,
   title?: string,
@@ -57,8 +61,9 @@ const props = defineProps<{
 const localUnique = ref<boolean>(props.unique);
 const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
-const otherAnswer = ref<string>('');
-  const answerArr = ref<string[]>(props.answer ? props.answer.split('┋') : []);
+const otherAnswer = ref<string>(optionStore.search(props.serial_num));
+const answerArr = ref<string[]>(props.answer ? props.answer.split('┋') : []);
+console.log(answerArr)
 const emits = defineEmits(['update:answer']);
 const otherAnswerChecked = ref(false)
 const otherCheckbox = ref<HTMLInputElement | null>(null);
@@ -93,7 +98,11 @@ watch(filteredAnswerArr, () => {
   emits('update:answer', combinedAnswers);
 });
 
+
 watch(otherAnswer, (newOtherAnswer, oldOtherAnswer) => {
+  if(newOtherAnswer){
+    optionStore.update(props.serial_num,newOtherAnswer)
+  }
   if (newOtherAnswer !== oldOtherAnswer && otherCheckbox.value && otherCheckbox.value.checked) {
     const otherIndex = answerArr.value.indexOf(oldOtherAnswer);
     if (otherIndex !== -1) {
diff --git a/src/pages/View/radio.vue b/src/pages/View/radio.vue
index e1300a7..00c36b9 100644
--- a/src/pages/View/radio.vue
+++ b/src/pages/View/radio.vue
@@ -33,8 +33,11 @@
 </template>
 
 <script setup lang="ts">
+import { useMainStore } from '@/stores';
 import { ref, watch, defineProps, defineEmits } from 'vue';
 
+const optionStore = useMainStore().useOptionStore()
+
 const props = defineProps<{
   serial_num: number,
   title?: string,
@@ -53,12 +56,15 @@ const props = defineProps<{
 const localUnique = ref<boolean>(props.unique);
 const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
-const otherAnswer = ref<string>('');
+const otherAnswer = ref<string>(optionStore.search(props.serial_num));
 const emits = defineEmits(['update:answer']);
 const localAnswer = ref(props.answer);
 
 
 watch([localAnswer, otherAnswer], ([newLocalAnswer, newOtherAnswer]) => {
+  if(newOtherAnswer){
+    optionStore.update(props.serial_num,newOtherAnswer)
+  }//更新optionStore
   if (localOtherOption.value && newLocalAnswer === newOtherAnswer) {
     emits('update:answer', newOtherAnswer);
   } else {
diff --git a/src/pages/View/view.vue b/src/pages/View/view.vue
index 99cf7d0..5b2ea2d 100644
--- a/src/pages/View/view.vue
+++ b/src/pages/View/view.vue
@@ -142,8 +142,9 @@
   const decryptedId = ref<string | null>()
   const allowSend = ref(true)
   const isOutDate = ref(false)
-
-  const questionnaireStore = useMainStore().useQuetionnaireStore(); 
+  
+  const optionStore = useMainStore().useOptionStore()
+  const questionnaireStore = useMainStore().useQuetionnaireStore();
 
   onMounted(() => {
     loginStore.setShowHeader(false);
@@ -164,7 +165,7 @@
       newQuestions.forEach(q => {
           if (q.answer) {
               questionnaireStore.updateAnswer(q.id, q.serial_num, q.answer);
-              // console.log(questionnaireStore.userAnswer)
+              console.log(questionnaireStore.userAnswer)
           }
       });
   }, { deep: true });
@@ -188,12 +189,11 @@
             question.value = formData.value.questions;
             time.value = formData.value.time.replace("T", " ").split("+")[0].split(".")[0]
             submitData.value.id = res.data.id;
-            //获取已存储的答案
+            console.log("问卷id:"+submitData.value.id)
             question.value.forEach(q => {
+              //获取已存储的答案
               const storedAnswer = questionnaireStore.searchAnswer(q.id,q.serial_num)
-              // console.log("222")
               if (storedAnswer) {
-                  // console.log("111")
                   q.answer = storedAnswer.answer;
               }else if (q.question_type===1){
                 q.answer = " ";
@@ -258,13 +258,14 @@
           ElNotification.success('提交成功');
           questionnaireStore.deleteAnswer()
           imageStore.clearFiles()
+          optionStore.options.values = []
           router.push('/Thank');
         } else {
           ElNotification.error(res.msg);
         }
       },
       onError(e) {
-        ElNotification.error( e.message);
+        ElNotification.error(e.message);
       },
       onFinally: () => {
         showModal('QuestionnaireSubmit', true);
diff --git a/src/stores/index.ts b/src/stores/index.ts
index edb375b..24a6e84 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -4,6 +4,7 @@ import useTempStore from './service/tempStore'
 import useDarkModeStore from './service/darkStore'
 import useQuetionnaireStore from './service/questionnaireStore'
 import { useImageStore } from './service/imageStore'
+import useOptionStore from './service/optionStore'
 
 export const useMainStore = defineStore(
   'main',
@@ -13,7 +14,8 @@ export const useMainStore = defineStore(
       useTempStore,
       useDarkModeStore,
       useQuetionnaireStore,
-      useImageStore
+      useImageStore,
+      useOptionStore
     }
   },
   { persist: true }
diff --git a/src/stores/service/optionStore.ts b/src/stores/service/optionStore.ts
new file mode 100644
index 0000000..9782f83
--- /dev/null
+++ b/src/stores/service/optionStore.ts
@@ -0,0 +1,30 @@
+//存储单选和多选的
+import { defineStore } from "pinia";
+import { ref } from "vue";
+
+const useOptionStore = defineStore('OptionStore', () => {
+    const options = ref([])
+    const search = (serial_num: number) => {
+        const optionSearched = options.value.find(q => q.serial_num === serial_num)
+        console.log(optionSearched)
+        return optionSearched ? optionSearched.option : ''
+    }
+    const update = (serial_num: number, option: string) => {
+        const tempOption = options.value.find(q => q.serial_num === serial_num)
+        if (tempOption) {
+            tempOption.option = option
+        } else {
+            options.value.push({
+                serial_num: serial_num,
+                option: option
+            })
+        }
+    }
+    return {
+        options,
+        search,
+        update
+    }
+}, { persist: true })
+
+export default useOptionStore
\ No newline at end of file

From b618a636de0773712d506ac7d002ed0a21365eb2 Mon Sep 17 00:00:00 2001
From: maojianhui <3605828735@qq.com>
Date: Tue, 15 Oct 2024 15:18:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E5=8B=BE=E9=80=89=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/View/checkbox.vue | 21 ++++++++++++++++-----
 src/pages/View/view.vue     |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pages/View/checkbox.vue b/src/pages/View/checkbox.vue
index 0c6e19f..ab78440 100644
--- a/src/pages/View/checkbox.vue
+++ b/src/pages/View/checkbox.vue
@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="flex gap-10 mt-10" v-if="localOtherOption">
-        <input ref="otherCheckbox" type="checkbox" :name="props.serial_num" class="my-5" style="zoom: 140%" :value="otherAnswer"  @click='otherAnswerChecked = !otherAnswerChecked'/>
+        <input ref="otherCheckbox" type="checkbox" :name="props.serial_num" class="my-5" style="zoom: 140%" :value="otherAnswer" v-model="otherAnswerChecked"/>
         <input type="text" class="input-sm w-150" placeholder="其他" v-model="otherAnswer" @input="updateOtherAnswer"  />
       </div>
     </div>
@@ -38,7 +38,7 @@
 
 <script setup lang="ts">
 import { useMainStore } from '@/stores';
-import { ref, watch, defineProps, defineEmits, computed } from 'vue'
+import { ref, watch, defineProps, defineEmits, computed, onMounted } from 'vue'
 
 const optionStore = useMainStore().useOptionStore()
 
@@ -63,11 +63,22 @@ const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
 const otherAnswer = ref<string>(optionStore.search(props.serial_num));
 const answerArr = ref<string[]>(props.answer ? props.answer.split('┋') : []);
-console.log(answerArr)
+// console.log(answerArr)
 const emits = defineEmits(['update:answer']);
 const otherAnswerChecked = ref(false)
 const otherCheckbox = ref<HTMLInputElement | null>(null);
 
+// console.log(answerArr.value + ' '+ otherAnswer.value)
+
+onMounted(() => {
+    if(answerArr.value.includes(otherAnswer.value)){
+      // console.log("111")
+      otherAnswerChecked.value = true
+    }
+  }
+)
+
+// console.log(otherAnswerChecked.value)
 const deleteOldAnswer = () => {
   const otherIndex = answerArr.value.indexOf(otherAnswer.value);
   if (otherIndex !== -1) {
@@ -92,8 +103,8 @@ watch(filteredAnswerArr, () => {
   if (otherCheckbox.value && otherCheckbox.value.checked && !answerArr.value.includes(otherAnswer.value)) {
     answerArr.value.push(otherAnswer.value)
   }
-  console.log(filteredAnswerArr.value)
-  console.log(otherAnswerChecked.value)
+  // console.log(filteredAnswerArr.value)
+  // console.log(otherAnswerChecked.value)
   const combinedAnswers = filteredAnswerArr.value.join('┋');
   emits('update:answer', combinedAnswers);
 });
diff --git a/src/pages/View/view.vue b/src/pages/View/view.vue
index 5b2ea2d..9ab9334 100644
--- a/src/pages/View/view.vue
+++ b/src/pages/View/view.vue
@@ -258,7 +258,7 @@
           ElNotification.success('提交成功');
           questionnaireStore.deleteAnswer()
           imageStore.clearFiles()
-          optionStore.options.values = []
+          optionStore.options = []
           router.push('/Thank');
         } else {
           ElNotification.error(res.msg);

From 51a99268fab5cd966834a2039efdd8ee67dc71a8 Mon Sep 17 00:00:00 2001
From: maojianhui <3605828735@qq.com>
Date: Tue, 15 Oct 2024 16:08:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=A4=9A?=
 =?UTF-8?q?=E4=BB=BD=E9=97=AE=E5=8D=B7=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E4=BC=9A=E7=9B=B8=E4=BA=92=E5=BD=B1=E5=93=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/View/checkbox.vue              |  5 +++--
 src/pages/View/radio.vue                 |  5 +++--
 src/pages/View/view.vue                  | 14 +++++++-------
 src/stores/service/optionStore.ts        | 17 ++++++++++++-----
 src/stores/service/questionnaireStore.ts |  9 +++++----
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/pages/View/checkbox.vue b/src/pages/View/checkbox.vue
index ab78440..9e3234f 100644
--- a/src/pages/View/checkbox.vue
+++ b/src/pages/View/checkbox.vue
@@ -44,6 +44,7 @@ const optionStore = useMainStore().useOptionStore()
 
 
 const props = defineProps<{
+  questionnaireID:string
   serial_num: number,
   title?: string,
   required: boolean,
@@ -61,7 +62,7 @@ const props = defineProps<{
 const localUnique = ref<boolean>(props.unique);
 const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
-const otherAnswer = ref<string>(optionStore.search(props.serial_num));
+const otherAnswer = ref<string>(optionStore.search(props.questionnaireID,props.serial_num));
 const answerArr = ref<string[]>(props.answer ? props.answer.split('┋') : []);
 // console.log(answerArr)
 const emits = defineEmits(['update:answer']);
@@ -112,7 +113,7 @@ watch(filteredAnswerArr, () => {
 
 watch(otherAnswer, (newOtherAnswer, oldOtherAnswer) => {
   if(newOtherAnswer){
-    optionStore.update(props.serial_num,newOtherAnswer)
+    optionStore.update(props.questionnaireID,props.serial_num,newOtherAnswer)
   }
   if (newOtherAnswer !== oldOtherAnswer && otherCheckbox.value && otherCheckbox.value.checked) {
     const otherIndex = answerArr.value.indexOf(oldOtherAnswer);
diff --git a/src/pages/View/radio.vue b/src/pages/View/radio.vue
index 00c36b9..7e48cc8 100644
--- a/src/pages/View/radio.vue
+++ b/src/pages/View/radio.vue
@@ -39,6 +39,7 @@ import { ref, watch, defineProps, defineEmits } from 'vue';
 const optionStore = useMainStore().useOptionStore()
 
 const props = defineProps<{
+  questionnaireID:string,
   serial_num: number,
   title?: string,
   required: boolean,
@@ -56,14 +57,14 @@ const props = defineProps<{
 const localUnique = ref<boolean>(props.unique);
 const localOtherOption = ref<boolean>(props.otherOption);
 const localOptions = ref(props.options ? [...props.options] : []);
-const otherAnswer = ref<string>(optionStore.search(props.serial_num));
+const otherAnswer = ref<string>(optionStore.search(props.questionnaireID,props.serial_num));
 const emits = defineEmits(['update:answer']);
 const localAnswer = ref(props.answer);
 
 
 watch([localAnswer, otherAnswer], ([newLocalAnswer, newOtherAnswer]) => {
   if(newOtherAnswer){
-    optionStore.update(props.serial_num,newOtherAnswer)
+    optionStore.update(props.questionnaireID,props.serial_num,newOtherAnswer)
   }//更新optionStore
   if (localOtherOption.value && newLocalAnswer === newOtherAnswer) {
     emits('update:answer', newOtherAnswer);
diff --git a/src/pages/View/view.vue b/src/pages/View/view.vue
index 9ab9334..ba20e7d 100644
--- a/src/pages/View/view.vue
+++ b/src/pages/View/view.vue
@@ -49,7 +49,7 @@
               <!-- 根据问题类型渲染组件 -->
               <div v-if="q.question_type === 1">
                 <el-skeleton animated :loading="loading">
-                  <radio v-model:answer="q.answer" v-model:title="q.subject" v-model:options="q.options" v-model:serial_num="q.serial_num" v-model:unique="q.unique" v-model:required="q.required" v-model:other-option="q.other_option" v-model:describe="q.describe"></radio>
+                  <radio v-model:answer="q.answer" v-model:title="q.subject" v-model:options="q.options" v-model:serial_num="q.serial_num" v-model:unique="q.unique" v-model:required="q.required" v-model:other-option="q.other_option" v-model:describe="q.describe" v-model:questionnaireID = "decryptedId"></radio>
                 </el-skeleton>
               </div>
               <div v-if="q.question_type === 2">
@@ -58,7 +58,7 @@
                     <skeleton-card></skeleton-card>
                   </template>
                   <template #default>
-                <checkbox v-model:answer="q.answer" v-model:title="q.subject" v-model:options="q.options" v-model:serial_num="q.serial_num"  v-model:unique="q.unique" v-model:required="q.required" v-model:other-option="q.other_option" v-model:describe="q.describe"></checkbox>
+                <checkbox v-model:answer="q.answer" v-model:title="q.subject" v-model:options="q.options" v-model:serial_num="q.serial_num"  v-model:unique="q.unique" v-model:required="q.required" v-model:other-option="q.other_option" v-model:describe="q.describe" v-model:questionnaireID = "decryptedId"></checkbox>
                   </template>
                 </el-skeleton>
               </div>
@@ -164,7 +164,7 @@
   watch(question, (newQuestions) => {
       newQuestions.forEach(q => {
           if (q.answer) {
-              questionnaireStore.updateAnswer(q.id, q.serial_num, q.answer);
+              questionnaireStore.updateAnswer(decryptedId.value, q.serial_num, q.answer);
               console.log(questionnaireStore.userAnswer)
           }
       });
@@ -189,10 +189,10 @@
             question.value = formData.value.questions;
             time.value = formData.value.time.replace("T", " ").split("+")[0].split(".")[0]
             submitData.value.id = res.data.id;
-            console.log("问卷id:"+submitData.value.id)
+            // console.log("问卷id:"+submitData.value.id)
             question.value.forEach(q => {
               //获取已存储的答案
-              const storedAnswer = questionnaireStore.searchAnswer(q.id,q.serial_num)
+              const storedAnswer = questionnaireStore.searchAnswer(decryptedId.value,q.serial_num)
               if (storedAnswer) {
                   q.answer = storedAnswer.answer;
               }else if (q.question_type===1){
@@ -256,9 +256,9 @@
         if (res.code === 200 && res.msg === 'OK') {
           const imageStore = useMainStore().useImageStore()
           ElNotification.success('提交成功');
-          questionnaireStore.deleteAnswer()
+          questionnaireStore.deleteAnswer(decryptedId.value)
           imageStore.clearFiles()
-          optionStore.options = []
+          optionStore.deleteOption(decryptedId.value)
           router.push('/Thank');
         } else {
           ElNotification.error(res.msg);
diff --git a/src/stores/service/optionStore.ts b/src/stores/service/optionStore.ts
index 9782f83..e404896 100644
--- a/src/stores/service/optionStore.ts
+++ b/src/stores/service/optionStore.ts
@@ -4,26 +4,33 @@ import { ref } from "vue";
 
 const useOptionStore = defineStore('OptionStore', () => {
     const options = ref([])
-    const search = (serial_num: number) => {
-        const optionSearched = options.value.find(q => q.serial_num === serial_num)
+    const search = (id: any, serial_num: number) => {
+        const optionSearched = options.value.find(q => q.id === id && q.serial_num === serial_num)
         console.log(optionSearched)
         return optionSearched ? optionSearched.option : ''
     }
-    const update = (serial_num: number, option: string) => {
-        const tempOption = options.value.find(q => q.serial_num === serial_num)
+    const update = (id: any, serial_num: number, option: string) => {
+        const tempOption = options.value.find(q => q.id === id && q.serial_num === serial_num)
         if (tempOption) {
             tempOption.option = option
         } else {
             options.value.push({
+                id: id,
                 serial_num: serial_num,
                 option: option
             })
         }
     }
+
+    const deleteOption = (id: any) => {
+        options.value = options.value.filter(o => o.id !== id)
+    }
+
     return {
         options,
         search,
-        update
+        update,
+        deleteOption
     }
 }, { persist: true })
 
diff --git a/src/stores/service/questionnaireStore.ts b/src/stores/service/questionnaireStore.ts
index a3ea417..9334069 100644
--- a/src/stores/service/questionnaireStore.ts
+++ b/src/stores/service/questionnaireStore.ts
@@ -3,10 +3,10 @@ import { ref } from "vue";
 
 const useQuestionnaireStore = defineStore("questionnaires", () => {
     const userAnswer = ref([])
-    const searchAnswer = (id: number, serial_num: number) => {
+    const searchAnswer = (id: any, serial_num: number) => {
         return userAnswer.value.find(question => question.id === id && question.serial_num === serial_num)
     }
-    const updateAnswer = (id: number, serial_num: number, answer: any,) => {
+    const updateAnswer = (id: any, serial_num: number, answer: any,) => {
         const question = userAnswer.value.find(question => question.id === id && question.serial_num === serial_num)
         if (question) {
             question.answer = answer
@@ -18,8 +18,9 @@ const useQuestionnaireStore = defineStore("questionnaires", () => {
             })
         }
     }
-    const deleteAnswer = () => {
-        userAnswer.value = []
+    console.log(userAnswer.value)
+    const deleteAnswer = (id: any) => {
+        userAnswer.value = userAnswer.value.filter(a => a.id !== id)
     }
     return {
         userAnswer,