diff --git a/web/components.d.ts b/web/components.d.ts
index 8824b169..1163e3dd 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -11,7 +11,6 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
@@ -25,13 +24,10 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
diff --git a/web/src/management/pages/edit/components/ModuleNavbar.vue b/web/src/management/pages/edit/components/ModuleNavbar.vue
index 8b9de47b..4754af42 100644
--- a/web/src/management/pages/edit/components/ModuleNavbar.vue
+++ b/web/src/management/pages/edit/components/ModuleNavbar.vue
@@ -14,22 +14,21 @@
     </div>
   </div>
 </template>
-
 <script setup lang="ts">
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
+
 import BackPanel from '../modules/generalModule/BackPanel.vue'
 import TitlePanel from '../modules/generalModule/TitlePanel.vue'
 import NavPanel from '../modules/generalModule/NavPanel.vue'
 import HistoryPanel from '../modules/contentModule/HistoryPanel.vue'
 import SavePanel from '../modules/contentModule/SavePanel.vue'
 import PublishPanel from '../modules/contentModule/PublishPanel.vue'
-import { useStore } from 'vuex'
-import { get as _get } from 'lodash-es'
-import { computed } from 'vue'
 
 const store = useStore()
 const title = computed(() => _get(store.state, 'edit.schema.metaData.title'))
 </script>
-
 <style lang="scss" scoped>
 .nav {
   width: 100%;
diff --git a/web/src/management/pages/edit/components/SetterField.vue b/web/src/management/pages/edit/components/SetterField.vue
index 9f53717a..365eff41 100644
--- a/web/src/management/pages/edit/components/SetterField.vue
+++ b/web/src/management/pages/edit/components/SetterField.vue
@@ -16,28 +16,28 @@
           :form-config="content"
         >
           <Component
-            :is="content.type"
+            :is="components[content.type]"
             :form-config="content"
             :module-config="moduleConfig"
-            @form-change="onFormChange($event, content)"
+            @form-change="handleFormChange($event, content)"
             :class="content.contentClass"
           />
         </FormItem>
       </template>
       <FormItem v-else :form-config="item">
         <Component
-          :is="item.type"
+          :is="components[item.type]"
           :form-config="item"
           :module-config="moduleConfig"
-          @form-change="onFormChange($event, item)"
+          @form-change="handleFormChange($event, item)"
           :class="item.contentClass"
         />
       </FormItem>
     </div>
   </el-form>
 </template>
-
-<script>
+<script setup lang="ts">
+import { watch, ref, shallowRef } from 'vue'
 import { get as _get, pick as _pick, isFunction as _isFunction } from 'lodash-es'
 
 import FormItem from '@/materials/setters/widgets/FormItem.vue'
@@ -45,8 +45,20 @@ import setterLoader from '@/materials/setters/setterLoader'
 
 import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant'
 
+interface Props {
+  formConfigList: Array<any>
+  moduleConfig: any
+}
+
+interface Emit {
+  (ev: typeof FORM_CHANGE_EVENT_KEY, arg: { key: string; value: any }): void
+}
+
+const props = defineProps<Props>()
+const emit = defineEmits<Emit>()
+
 // 静态配置设置动态值
-const formatValue = ({ item, moduleConfig }) => {
+const formatValue = ({ item, moduleConfig }: any) => {
   if (_isFunction(item.valueAdapter)) {
     const value = item.valueAdapter({ moduleConfig })
 
@@ -65,141 +77,130 @@ const formatValue = ({ item, moduleConfig }) => {
   }
 }
 
-export default {
-  name: 'SettersField',
-  props: {
-    formConfigList: Array, // 对应题型组件的meta.js内容
-    moduleConfig: Object
-  },
-  data() {
-    return {
-      register: {},
-      formFieldData: [],
-      init: true
+const formFieldData = ref<Array<any>>([])
+const init = ref<boolean>(true)
+const components = shallowRef<any>({})
+
+const handleFormChange = (data: any, formConfig: any) => {
+  if (_isFunction(formConfig?.setterAdapter)) {
+    const resultData = formConfig.setterAdapter(data)
+
+    if (Array.isArray(resultData)) {
+      resultData.forEach((item) => {
+        emit(FORM_CHANGE_EVENT_KEY, item)
+      })
+    } else {
+      emit(FORM_CHANGE_EVENT_KEY, resultData)
     }
-  },
-  components: {
-    FormItem
-  },
-  watch: {
-    formConfigList: {
-      deep: true,
-      immediate: true,
-      async handler(newVal) {
-        this.init = true
-        if (!newVal || !newVal.length) {
-          return
-        }
-
-        // 组件注册
-        await this.handleComponentRegister(newVal)
-
-        this.init = false
-        this.formFieldData = this.setValues(this.formConfigList)
+  } else {
+    emit(FORM_CHANGE_EVENT_KEY, data)
+  }
+}
+
+const normalizationValues = (configList: Array<any> = []) => {
+  return configList
+    .filter((item: any) => {
+      // 组件组
+      if (item.type === 'Customed') {
+        item.content = normalizationValues(item.content)
+        return true
+      }
+
+      if (!item.type) {
+        return false
       }
-    },
-    // schema变化联动
-    moduleConfig: {
-      deep: true,
-      async handler() {
-        // 配置变化后初次不监听value变化（如题型切换场景避免多次计算）
-        if (this.init) {
-          return
-        }
-
-        // TODO: 优化，依赖的schema变化时，均会重新计算
-        this.formFieldData = this.setValues(this.formConfigList)
+
+      if (item.hidden) {
+        return false
+      }
+
+      // 动态显隐设置器
+      if (_isFunction(item.relyFunc)) {
+        return item.relyFunc(props.moduleConfig)
+      }
+
+      return true
+    })
+    .map((item: any) => {
+      return {
+        ...item,
+        value: formatValue({ item, moduleConfig: props.moduleConfig }) // 动态复值
       }
+    })
+}
+
+const registerComponents = async (formFieldData: any) => {
+  let innerSetters: Array<any> = []
+
+  const setters = formFieldData.map((item: any) => {
+    if (item.type === 'Customed') {
+      innerSetters.push(...(item.content || []).map((content: any) => content.type))
     }
-  },
-  methods: {
-    setValues(configList = []) {
-      return configList
-        .filter((item) => {
-          // 组件组
-          if (item.type === 'Customed') {
-            item.content = this.setValues(item.content)
-            return true
-          }
-
-          if (!item.type) {
-            return false
-          }
-          if (item.hidden) {
-            return false
-          }
-
-          // 动态显隐设置器
-          if (_isFunction(item.relyFunc)) {
-            return item.relyFunc(this.moduleConfig)
-          }
-
-          return true
-        })
-        .map((item) => {
-          return {
-            ...item,
-            value: formatValue({ item, moduleConfig: this.moduleConfig }) // 动态复值
-          }
-        })
-    },
-    async handleComponentRegister(formFieldData) {
-      let innerSetters = []
-      const setters = formFieldData.map((item) => {
-        if (item.type === 'Customed') {
-          innerSetters.push(...(item.content || []).map((content) => content.type))
-        }
-
-        return item.type
-      })
 
-      const settersSet = new Set([...setters, ...innerSetters])
-      const settersArr = Array.from(settersSet)
-      const allSetters = settersArr.map((item) => {
-        return {
-          type: item,
-          path: item
-        }
-      })
-      try {
-        const comps = await setterLoader.loadComponents(allSetters)
-        for (const comp of comps) {
-          if (!comp) {
-            continue
-          }
-          const { type, component, err } = comp
-          if (!err) {
-            const componentName = component.name
-            if (!this.$options.components) {
-              this.$options.components = {}
-            }
-            this.$options.components[componentName] = component
-            this.register[type] = componentName
-          }
-        }
-      } catch (err) {
-        console.error(err)
+    return item.type
+  })
+
+  const settersSet = new Set([...setters, ...innerSetters])
+  const settersArr = Array.from(settersSet)
+  const allSetters = settersArr.map((item) => ({
+    type: item,
+    path: item
+  }))
+
+  try {
+    const comps = await setterLoader.loadComponents(allSetters)
+
+    for (const comp of comps) {
+      if (!comp) {
+        continue
       }
-    },
-
-    onFormChange(data, formConfig) {
-      if (_isFunction(formConfig?.setterAdapter)) {
-        const resultData = formConfig.setterAdapter(data)
-        if (Array.isArray(resultData)) {
-          resultData.forEach((item) => {
-            this.$emit(FORM_CHANGE_EVENT_KEY, item)
-          })
-        } else {
-          this.$emit(FORM_CHANGE_EVENT_KEY, resultData)
-        }
-      } else {
-        this.$emit(FORM_CHANGE_EVENT_KEY, data)
+
+      const { type, component, err } = comp
+
+      if (!err) {
+        components.value[type] = component
       }
     }
+  } catch (err) {
+    console.error(err)
   }
 }
-</script>
 
+watch(
+  () => props.formConfigList,
+  async (newVal: Array<any>) => {
+    init.value = true
+
+    if (!newVal || !newVal.length) {
+      return
+    }
+
+    await registerComponents(newVal)
+    init.value = false
+    formFieldData.value = normalizationValues(newVal)
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+watch(
+  () => props.moduleConfig,
+  () => {
+    // 配置变化后初次不监听value变化（如题型切换场景避免多次计算）
+    if (init.value) {
+      return
+    }
+
+    // TODO: 优化，依赖的schema变化时，均会重新计算
+    formFieldData.value = normalizationValues(props.formConfigList)
+  },
+  {
+    deep: true
+  }
+)
+</script>
 <style lang="scss" scoped>
 .config-form {
   padding: 15px 0;
diff --git a/web/src/management/pages/edit/index.vue b/web/src/management/pages/edit/index.vue
index e1c4e83d..b1657e23 100644
--- a/web/src/management/pages/edit/index.vue
+++ b/web/src/management/pages/edit/index.vue
@@ -13,42 +13,38 @@
     </div>
   </div>
 </template>
-
-<script>
+<script setup lang="ts">
+import { onMounted } from 'vue'
+import { useStore } from 'vuex'
+import { useRouter, useRoute } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import LeftMenu from '@/management/components/LeftMenu.vue'
-
 import CommonTemplate from './components/CommonTemplate.vue'
 import Navbar from './components/ModuleNavbar.vue'
+
 import { initShowLogicEngine } from '@/management/hooks/useShowLogicEngine'
-export default {
-  name: 'questionEditPage',
-  components: {
-    CommonTemplate,
-    Navbar,
-    LeftMenu
-  },
-  async created() {
-    this.$store.commit('edit/setSurveyId', this.$route.params.id)
-    try {
-      await this.$store.dispatch('edit/init')
-      // await this.$store.dispatch('logic/initShowLogic', this.$store.state.edit.schema.logicConf.showLogicConf || {})
-      await initShowLogicEngine(this.$store.state.edit.schema.logicConf.showLogicConf || {})
-    } catch (error) {
-      ElMessage.error(error.message)
-      // 自动跳转回列表页
-      setTimeout(() => {
-        this.$router.replace({
-          name: 'survey'
-        })
-      }, 1000)
-    }
+
+const store = useStore()
+const router = useRouter()
+const route = useRoute()
+
+onMounted(async () => {
+  store.commit('edit/setSurveyId', route.params.id)
+
+  try {
+    await store.dispatch('edit/init')
+    await initShowLogicEngine(store.state.edit.schema.logicConf.showLogicConf || {})
+  } catch (err: any) {
+    ElMessage.error(err.message)
+
+    setTimeout(() => {
+      router.replace({ name: 'survey' })
+    }, 1000)
   }
-}
+})
 </script>
-
 <style lang="scss" scoped>
 .edit-index {
   height: 100%;
diff --git a/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue b/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
index ef268f5d..094921e7 100644
--- a/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/HistoryPanel.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-popover placement="top" trigger="click" @show="onShow" :width="320">
-    <el-tabs v-model="currentTab" class="custom-tab" v-if="visible" v-loading="paneLoading">
+  <el-popover placement="top" trigger="click" @show="handlePopoverShow" :width="320">
+    <el-tabs v-model="currentTab" class="custom-tab" v-if="visible" v-loading="loading">
       <el-tab-pane label="修改历史" name="daily" class="custom-tab-pane">
         <div class="line" v-for="(his, index) in dailyList" :key="index">
           <span class="operator">{{ his.operator }}</span>
@@ -24,100 +24,77 @@
     </template>
   </el-popover>
 </template>
-
-<script>
-import { getSurveyHistory } from '@/management/api/survey'
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
 import moment from 'moment'
-// 引入中文
 import 'moment/locale/zh-cn'
-// 设置中文
 moment.locale('zh-cn')
 
-import { mapState } from 'vuex'
-import { get as _get } from 'lodash-es'
+import { getSurveyHistory } from '@/management/api/survey'
 
-const getItemData = (item) => ({
+const getItemData = (item: any) => ({
   operator: item?.operator?.username || '未知用户',
   time: moment(item.createDate).format('YYYY-MM-DD HH:mm:ss')
 })
 
-export default {
-  name: 'HistoryPanel',
-  computed: {
-    ...mapState({
-      surveyId: (state) => _get(state, 'edit.surveyId')
-    }),
-    dailyList() {
-      return this.dailyHis.map(getItemData)
-    },
-    publishList() {
-      return this.publishHis.map(getItemData)
+const dailyList = ref<Array<any>>([])
+const publishList = ref<Array<any>>([])
+const currentTab = ref<'daily' | 'publish'>('daily')
+const visible = ref<boolean>(false)
+
+const store = useStore()
+
+const queryHistories = async () => {
+  if (dirtyMonitor.value) {
+    loading.value = true
+    dirtyMonitor.value = false
+
+    const surveyId = _get(store.state, 'edit.surveyId')
+    const [dHis, pHis] = await Promise.all([
+      getSurveyHistory({
+        surveyId,
+        historyType: 'dailyHis'
+      }),
+      getSurveyHistory({
+        surveyId,
+        historyType: 'publishHis'
+      })
+    ]).finally(() => {
+      loading.value = false
+    })
+
+    if ((dHis.data || []).length !== dailyList.value.length) {
+      dailyList.value = (dHis.data || []).map(getItemData)
     }
-  },
-  data() {
-    return {
-      dailyHis: [],
-      publishHis: [],
-      currentTab: 'daily',
-      visible: false,
-      paneLoading: false
+
+    if ((pHis.data || []).length !== publishList.value.length) {
+      publishList.value = (pHis.data || []).map(getItemData)
     }
-  },
-  watch: {
-    visible: {
-      async handler(newVal) {
-        if (this.visible && newVal) {
-          this.fetchHis()
-        }
-      }
-    },
-    currentTab: {
-      immediate: true,
-      async handler(newVal) {
-        if (this.visible && newVal) {
-          this.fetchHis()
-        }
-      }
+  }
+}
+
+const handlePopoverShow = async () => {
+  visible.value = true
+  queryHistories()
+}
+const loading = ref<boolean>(false)
+const dirtyMonitor = ref<boolean>(true)
+const schemaUpdateTime = computed(() => _get(store.state, 'edit.schemaUpdateTime'))
+
+watch(
+  schemaUpdateTime,
+  () => {
+    if (!dirtyMonitor.value) {
+      dirtyMonitor.value = true
     }
   },
-  methods: {
-    onShow() {
-      this.visible = true
-    },
-    fetchHis() {
-      this.paneLoading = true
-      switch (this.currentTab) {
-        case 'daily':
-          getSurveyHistory({
-            surveyId: this.surveyId,
-            historyType: 'dailyHis'
-          })
-            .then((dailyHis) => {
-              this.dailyHis = dailyHis.data || []
-            })
-            .finally(() => {
-              this.paneLoading = false
-            })
-          break
-
-        case 'publish':
-          getSurveyHistory({
-            surveyId: this.surveyId,
-            historyType: 'publishHis'
-          })
-            .then((publishHis) => {
-              this.publishHis = publishHis.data || []
-            })
-            .finally(() => {
-              this.paneLoading = false
-            })
-          break
-      }
-    }
+  {
+    immediate: true
   }
-}
+)
 </script>
-
 <style lang="scss" scoped>
 @import url('@/management/styles/edit-btn.scss');
 
diff --git a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
index b78638c5..622698d5 100644
--- a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
@@ -1,80 +1,81 @@
 <template>
-  <el-button type="primary" :loading="isPublishing" class="publish-btn" @click="onPublish">
+  <el-button type="primary" :loading="isPublishing" class="publish-btn" @click="handlePublish">
     发布
   </el-button>
 </template>
-
-<script>
-import { get as _get } from 'lodash-es'
-import { mapState } from 'vuex'
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useStore } from 'vuex'
+import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
+
 import { publishSurvey, saveSurvey } from '@/management/api/survey'
 import { showLogicEngine } from '@/management/hooks/useShowLogicEngine'
 import buildData from './buildData'
 
-export default {
-  name: 'PublishPanel',
-  data() {
-    return {
-      isPublishing: false
+const isPublishing = ref<boolean>(false)
+const store = useStore()
+const router = useRouter()
+
+const updateLogicConf = () => {
+  if (
+    showLogicEngine.value &&
+    showLogicEngine.value.rules &&
+    showLogicEngine.value.rules.length !== 0
+  ) {
+    showLogicEngine.value.validateSchema()
+    const showLogicConf = showLogicEngine.value.toJson()
+    // 更新逻辑配置
+    store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
+  }
+}
+
+const handlePublish = async () => {
+  if (isPublishing.value) {
+    return
+  }
+
+  isPublishing.value = true
+
+  try {
+    updateLogicConf()
+  } catch (err) {
+    isPublishing.value = false
+    ElMessage.error('请检查逻辑配置是否有误')
+    return
+  }
+
+  const saveData = buildData(store.state.edit.schema)
+  if (!saveData.surveyId) {
+    isPublishing.value = false
+    ElMessage.error('未获取到问卷id')
+    return
+  }
+
+  try {
+    const saveRes: any = await saveSurvey(saveData)
+    if (saveRes.code !== 200) {
+      isPublishing.value = false
+      ElMessage.error(saveRes.errmsg || '问卷保存失败')
+      return
     }
-  },
-  computed: {
-    ...mapState({
-      surveyId: (state) => _get(state, 'edit.surveyId')
-    })
-  },
-  methods: {
-    async onPublish() {
-      try {
-        this.updateLogicConf()
-      } catch (error) {
-        ElMessage.error('请检查逻辑配置是否有误')
-        return
-      }
-      const saveData = buildData(this.$store.state.edit.schema)
-      if (!saveData.surveyId) {
-        ElMessage.error('未获取到问卷id')
-        return
-      }
-      if (this.isPublishing) {
-        return
-      }
 
-      try {
-        this.isPublishing = true
-        const saveRes = await saveSurvey(saveData)
-        if (saveRes.code !== 200) {
-          ElMessage.error(saveRes.errmsg || '问卷保存失败')
-          return
-        }
-        const publishRes = await publishSurvey({ surveyId: this.surveyId })
-        if (publishRes.code === 200) {
-          ElMessage.success('发布成功')
-          this.$store.dispatch('edit/getSchemaFromRemote')
-          this.$router.push({ name: 'publish' })
-        } else {
-          ElMessage.error(`发布失败 ${publishRes.errmsg}`)
-        }
-      } catch (error) {
-        ElMessage.error(`发布失败`)
-      } finally {
-        this.isPublishing = false
-      }
-    },
-    updateLogicConf() {
-      if (showLogicEngine.value) {
-        showLogicEngine.value.validateSchema()
-        const showLogicConf = showLogicEngine.value.toJson()
-        // 更新逻辑配置
-        this.$store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
-      }
+    const publishRes: any = await publishSurvey({ surveyId: saveData.surveyId })
+    if (publishRes.code === 200) {
+      ElMessage.success('发布成功')
+      store.dispatch('edit/getSchemaFromRemote')
+      router.push({ name: 'publish' })
+    } else {
+      ElMessage.error(`发布失败 ${publishRes.errmsg}`)
     }
+  } catch (err) {
+    ElMessage.error(`发布失败`)
+  } finally {
+    isPublishing.value = false
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .publish-btn {
   width: 100px;
diff --git a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
index 3ec009d0..a3f2f3cd 100644
--- a/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/SavePanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="btn" @click="onSave" v-loading="isSaving">
+  <div class="btn" @click="handleSave" v-loading="isSaving">
     <i class="iconfont icon-baocun"></i>
     <span class="btn-txt">保存</span>
     <transition name="fade">
@@ -13,130 +13,126 @@
     </transition>
   </div>
 </template>
-
-<script>
-import { mapState } from 'vuex'
+<script setup lang="ts">
+import { ref, computed, nextTick, watch } from 'vue'
+import { useStore } from 'vuex'
 import { get as _get } from 'lodash-es'
-
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import { saveSurvey } from '@/management/api/survey'
-import buildData from './buildData'
 import { showLogicEngine } from '@/management/hooks/useShowLogicEngine'
+import buildData from './buildData'
 
-export default {
-  components: {},
-  name: 'SavePanel',
-  data() {
-    return {
-      isSaving: false,
-      isShowAutoSave: false,
-      autoSaveStatus: 'succeed'
-    }
-  },
-  computed: {
-    ...mapState({
-      schemaUpdateTime: (state) => _get(state, 'edit.schemaUpdateTime')
-    }),
-    saveText() {
-      const statusMap = {
-        saving: '保存中',
-        succeed: '保存成功',
-        failed: '保存失败'
-      }
-      return statusMap[this.autoSaveStatus]
-    }
-  },
-  watch: {
-    schemaUpdateTime() {
-      this.triggerAutoSave()
+const isSaving = ref<boolean>(false)
+const isShowAutoSave = ref<boolean>(false)
+const autoSaveStatus = ref<'succeed' | 'saving' | 'failed'>('succeed')
+const saveText = computed(
+  () =>
+    ({
+      saving: '保存中',
+      succeed: '保存成功',
+      failed: '保存失败'
+    })[autoSaveStatus.value]
+)
+
+const store = useStore()
+
+const saveData = async () => {
+  const saveData = buildData(store.state.edit.schema)
+
+  if (!saveData.surveyId) {
+    ElMessage.error('未获取到问卷id')
+    return null
+  }
+
+  const res = await saveSurvey(saveData)
+  return res
+}
+
+const updateLogicConf = () => {
+  if (
+    showLogicEngine.value &&
+    showLogicEngine.value.rules &&
+    showLogicEngine.value.rules.length !== 0
+  ) {
+    showLogicEngine.value.validateSchema()
+    const showLogicConf = showLogicEngine.value.toJson()
+    // 更新逻辑配置
+    store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
+  }
+}
+
+const timerHandle = ref<NodeJS.Timeout | number | null>(null)
+const triggerAutoSave = () => {
+  if (autoSaveStatus.value === 'saving') {
+    setTimeout(() => triggerAutoSave(), 1000)
+  } else {
+    if (timerHandle.value) {
+      clearTimeout(timerHandle.value)
+      timerHandle.value = null
     }
-  },
-  methods: {
-    triggerAutoSave() {
-      if (this.autoSaveStatus === 'saving') {
-        // 正在调用接口
-        setTimeout(() => {
-          this.triggerAutoSave()
-        }, 1000)
-      } else {
-        if (this.timer) {
-          clearTimeout(this.timer)
-        }
-        this.timer = setTimeout(() => {
-          this.autoSaveStatus = 'saving'
-          this.isShowAutoSave = true
-          this.$nextTick(() => {
-            this.saveData()
-              .then((res) => {
-                if (res.code === 200) {
-                  this.autoSaveStatus = 'succeed'
-                } else {
-                  this.autoSaveStatus = 'failed'
-                }
-                setTimeout(() => {
-                  this.isShowAutoSave = false
-                  this.timer = null
-                }, 300)
-              })
-              .catch(() => {
-                this.timer = null
-                this.autoSaveStatus = 'failed'
-                this.isShowAutoSave = true
-              })
-          })
-        }, 2000)
-      }
-    },
-    updateLogicConf() {
-      if (showLogicEngine.value) {
-        showLogicEngine.value.validateSchema()
-        const showLogicConf = showLogicEngine.value.toJson()
-        // 更新逻辑配置
-        this.$store.dispatch('edit/changeSchema', { key: 'logicConf', value: { showLogicConf } })
-      }
-    },
-    async saveData() {
-      const saveData = buildData(this.$store.state.edit.schema)
-      if (!saveData.surveyId) {
-        ElMessage.error('未获取到问卷id')
-        return null
-      }
-      const res = await saveSurvey(saveData)
-      return res
-    },
-    async onSave() {
-      if (this.isSaving) {
-        return
-      }
-      this.isShowAutoSave = false
-      try {
-        this.updateLogicConf()
-      } catch (error) {
-        // console.error(error)
-        ElMessage.error('请检查逻辑配置是否有误')
-        return
-      }
-
-      try {
-        this.isSaving = true
-        const res = await this.saveData()
-        if (res.code === 200) {
-          ElMessage.success('保存成功')
-        } else {
-          ElMessage.error(res.errmsg)
+
+    timerHandle.value = setTimeout(() => {
+      autoSaveStatus.value = 'saving'
+      isShowAutoSave.value = true
+      nextTick(async () => {
+        try {
+          const res: any = await saveData()
+          if (res.code === 200) {
+            autoSaveStatus.value = 'succeed'
+          } else {
+            autoSaveStatus.value = 'failed'
+          }
+
+          setTimeout(() => {
+            isShowAutoSave.value = false
+            timerHandle.value = null
+          }, 300)
+        } catch (err) {
+          autoSaveStatus.value = 'failed'
+          isShowAutoSave.value = true
         }
-      } catch (error) {
-        ElMessage.error('保存问卷失败')
-      } finally {
-        this.isSaving = false
-      }
+      })
+    }, 2000)
+  }
+}
+
+const handleSave = async () => {
+  if (isSaving.value) {
+    return
+  }
+
+  isSaving.value = true
+  isShowAutoSave.value = false
+
+  try {
+    updateLogicConf()
+  } catch (error) {
+    isSaving.value = false
+    ElMessage.error('请检查逻辑配置是否有误')
+    return
+  }
+
+  try {
+    const res: any = await saveData()
+    if (res.code === 200) {
+      ElMessage.success('保存成功')
+    } else {
+      ElMessage.error(res.errmsg)
     }
+  } catch (error) {
+    ElMessage.error('保存问卷失败')
+  } finally {
+    isSaving.value = false
   }
 }
-</script>
 
+const schemaUpdateTime = computed(() => _get(store.state, 'edit.schemaUpdateTime'))
+watch(schemaUpdateTime, () => {
+  triggerAutoSave()
+})
+</script>
 <style lang="scss" scoped>
 @import url('@/management/styles/edit-btn.scss');
 
diff --git a/web/src/management/pages/edit/modules/generalModule/BackPanel.vue b/web/src/management/pages/edit/modules/generalModule/BackPanel.vue
index 5a804f9c..60a595dd 100644
--- a/web/src/management/pages/edit/modules/generalModule/BackPanel.vue
+++ b/web/src/management/pages/edit/modules/generalModule/BackPanel.vue
@@ -1,16 +1,12 @@
 <template>
-  <div class="back-btn" @click="onBack">
+  <div class="back-btn" @click="handleNavigateHome">
     <i class="iconfont icon-fanhui"></i>
     <span>返回</span>
   </div>
 </template>
-
 <script setup lang="ts">
-const onBack = () => {
-  window.open('/survey', '_self')
-}
+const handleNavigateHome = () => window.open('/survey', '_self')
 </script>
-
 <style lang="scss" scoped>
 .back-btn {
   height: 100%;
diff --git a/web/src/management/pages/edit/modules/generalModule/NavPanel.vue b/web/src/management/pages/edit/modules/generalModule/NavPanel.vue
index 70e0f6b1..82f33b90 100644
--- a/web/src/management/pages/edit/modules/generalModule/NavPanel.vue
+++ b/web/src/management/pages/edit/modules/generalModule/NavPanel.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="content">
-    <template v-for="btnItem in btnList" :key="btnItem.key">
+    <template v-for="route in routes" :key="route.key">
       <router-link
-        :to="{ name: btnItem.router }"
+        :to="{ name: route.router }"
         replace
         v-slot="{ href, navigate, isActive, isExactActive }"
         custom
@@ -10,25 +10,22 @@
         <div
           :class="[
             'navbar-btn',
-            (isActive && ['skinsettings', 'edit'].includes(btnItem.key)) || isExactActive
+            (isActive && ['skinsettings', 'edit'].includes(route.key)) || isExactActive
               ? 'router-link-exact-active'
               : ''
           ]"
         >
-          <i class="iconfont" :class="[btnItem.icon]"></i>
+          <i class="iconfont" :class="[route.icon]"></i>
           <a :href="href" @click="navigate"
-            ><span>{{ btnItem.text }}</span></a
+            ><span>{{ route.text }}</span></a
           >
         </div>
       </router-link>
     </template>
   </div>
 </template>
-
 <script setup lang="ts">
-import { reactive } from 'vue'
-
-const btnList = reactive([
+const routes = [
   {
     icon: 'icon-wenjuanbianji',
     text: '问卷编辑',
@@ -50,9 +47,8 @@ const btnList = reactive([
     key: 'skinsettings',
     next: true
   }
-])
+]
 </script>
-
 <style lang="scss" scoped>
 .content {
   display: flex;
diff --git a/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue b/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
index aed41bc6..3e3192c6 100644
--- a/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
+++ b/web/src/management/pages/edit/modules/generalModule/TitlePanel.vue
@@ -46,7 +46,6 @@ const hideFullTitle = () => {
   tooltipVisible.value = false
 }
 </script>
-
 <style lang="scss" scoped>
 .title-container {
   position: relative;
diff --git a/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue b/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
index c09d02f6..4de314ea 100644
--- a/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/CatalogPanel.vue
@@ -8,26 +8,14 @@
     </el-tab-pane>
   </el-tabs>
 </template>
+<script setup lang="ts">
+import { ref } from 'vue'
 
-<script>
 import TypeList from './components/TypeList.vue'
 import QuestionCatalog from './components/QuestionCatalog.vue'
 
-export default {
-  name: 'CatalogPanel',
-  data() {
-    return {
-      tabSelected: '0'
-    }
-  },
-  components: {
-    TypeList,
-    QuestionCatalog
-  },
-  methods: {}
-}
+const tabSelected = ref<string>('0')
 </script>
-
 <style lang="scss" scoped>
 .tab-box {
   width: 300px;
diff --git a/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue b/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
index b51bd650..fec4d9a0 100644
--- a/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/questionModule/SetterPanel.vue
@@ -11,47 +11,31 @@
         class="question-config-form"
         :form-config-list="formConfigList"
         :module-config="moduleConfig"
-        @form-change="onFormChange"
+        @form-change="handleFormChange"
       />
     </template>
   </div>
 </template>
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useStore } from 'vuex'
 
-<script>
 import SetterField from '@/management/pages/edit/components/SetterField.vue'
-import { mapGetters } from 'vuex'
 
-export default {
-  name: 'SetterPanel',
-  data() {
-    return {
-      tabSelected: '0'
-    }
-  },
-  computed: {
-    currentEditOne() {
-      return this.$store.state?.edit?.currentEditOne
-    },
-    ...mapGetters({
-      formConfigList: 'edit/formConfigList',
-      moduleConfig: 'edit/moduleConfig',
-      currentEditKey: 'edit/currentEditKey',
-      currentEditMeta: 'edit/currentEditMeta'
-    })
-  },
-  components: {
-    SetterField
-  },
-  methods: {
-    onFormChange(data) {
-      const { key, value } = data
-      const resultKey = `${this.currentEditKey}.${key}`
-      this.$store.dispatch('edit/changeSchema', { key: resultKey, value })
-    }
-  }
+const store = useStore()
+
+const currentEditOne = computed(() => store.state?.edit?.currentEditOne)
+const formConfigList = computed(() => store.getters['edit/formConfigList'])
+const moduleConfig = computed(() => store.getters['edit/moduleConfig'])
+const currentEditKey = computed(() => store.getters['edit/currentEditKey'])
+const currentEditMeta = computed(() => store.getters['edit/currentEditMeta'])
+
+const handleFormChange = (data: any) => {
+  const { key, value } = data
+  const resultKey = `${currentEditKey.value}.${key}`
+  store.dispatch('edit/changeSchema', { key: resultKey, value })
 }
 </script>
-
 <style lang="scss" scoped>
 .setter-wrapper {
   width: 360px;
diff --git a/web/src/management/pages/edit/modules/questionModule/components/CatalogItem.vue b/web/src/management/pages/edit/modules/questionModule/components/CatalogItem.vue
index 9ab8947e..a595477d 100644
--- a/web/src/management/pages/edit/modules/questionModule/components/CatalogItem.vue
+++ b/web/src/management/pages/edit/modules/questionModule/components/CatalogItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="question-catalog-item" @click="onSelect()">
+  <div class="question-catalog-item" @click="handleSelect()">
     <div class="iconfont icon-tuodong draggHandle"></div>
     <div class="catalog-item-body">
       <div class="catalog-item-index" v-if="showIndex">{{ indexNumber }}.</div>
@@ -7,37 +7,29 @@
     </div>
   </div>
 </template>
+<script setup lang="ts">
+interface Props {
+  title: string
+  indexNumber: string | number
+  showIndex: boolean
+}
 
-<script>
-export default {
-  name: 'CatalogItem',
-  data() {
-    return {}
-  },
-  computed: {},
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    indexNumber: {
-      type: [String, Number],
-      default: ''
-    },
-    showIndex: {
-      type: Boolean,
-      default: false
-    }
-  },
-  components: {},
-  methods: {
-    onSelect() {
-      this.$emit('select')
-    }
-  }
+interface Emit {
+  (ev: 'select'): void
 }
-</script>
 
+withDefaults(defineProps<Props>(), {
+  title: '',
+  indexNumber: '',
+  showIndex: false
+})
+
+const emit = defineEmits<Emit>()
+
+const handleSelect = () => {
+  emit('select')
+}
+</script>
 <style lang="scss" scoped>
 .question-catalog-item {
   position: relative;
diff --git a/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue b/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
index 3aff6f08..cff08a4e 100644
--- a/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
+++ b/web/src/management/pages/edit/modules/questionModule/components/QuestionCatalog.vue
@@ -2,7 +2,7 @@
   <div class="question-catalog-wrapper">
     <draggable
       :list="renderData"
-      @end="onDragEnd"
+      @end="handleDragEnd"
       itemKey="field"
       handle=".draggHandle"
       host-class="catalog-item-ghost"
@@ -12,50 +12,43 @@
           :title="element.title"
           :indexNumber="element.indexNumber"
           :showIndex="element.showIndex"
-          @select="onSelect(index)"
+          @select="handleSelect(index)"
         />
       </template>
     </draggable>
   </div>
 </template>
-
-<script>
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useStore } from 'vuex'
 import draggable from 'vuedraggable'
+
 import CatalogItem from './CatalogItem.vue'
 import { filterQuestionPreviewData } from '@/management/utils/index'
 
-export default {
-  name: 'QuestionCatalog',
-  data() {
-    return {}
-  },
-  computed: {
-    questionDataList() {
-      return this.$store.state.edit.schema.questionDataList
-    },
-    renderData() {
-      return filterQuestionPreviewData(this.questionDataList) || []
-    }
-  },
-  components: {
-    draggable,
-    CatalogItem
-  },
-  methods: {
-    onDragEnd(data) {
-      const { newIndex, oldIndex } = data
-      this.$store.dispatch('edit/moveQuestion', {
-        index: oldIndex,
-        range: newIndex - oldIndex
-      })
-    },
-    onSelect(index) {
-      this.$store.commit('edit/setCurrentEditOne', index)
-    }
+const store = useStore()
+const renderData = computed(() => {
+  const questions = store.state.edit.schema.questionDataList
+  return filterQuestionPreviewData(questions) || []
+})
+
+const handleDragEnd = ({ newIndex, oldIndex }: any) => {
+  const currentActivityKey = store.state.edit.currentEditOne
+
+  if (currentActivityKey === oldIndex) {
+    handleSelect(newIndex)
   }
+
+  store.dispatch('edit/moveQuestion', {
+    index: oldIndex,
+    range: newIndex - oldIndex
+  })
 }
-</script>
 
+const handleSelect = (idx: number) => {
+  store.commit('edit/setCurrentEditOne', idx)
+}
+</script>
 <style lang="scss" scoped>
 .question-catalog-wrapper {
   padding-bottom: 400px; // 考试题有个上拉框会盖住，改成和题型一致的
diff --git a/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue b/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
index 025bcf5b..629b713e 100644
--- a/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
@@ -2,7 +2,7 @@
   <div class="question-config">
     <div class="question-config-wrapper">
       <div class="question-config-main">
-        <div v-for="form of renderData" :key="form.key" class="config-item">
+        <div v-for="form of setterList" :key="form.key" class="config-item">
           <div class="config-title">
             <span>
               {{ form.title }}
@@ -16,17 +16,17 @@
           >
             <template v-for="(item, index) in form.formList">
               <FormItem
-                v-if="item.type && !item.hidden && Boolean(register[item.type])"
+                v-if="item.type && !item.hidden && Boolean(registerTypes[item.type])"
                 :key="index"
                 :form-config="item"
                 :style="item.style"
               >
                 <Component
-                  v-if="Boolean(register[item.type])"
-                  :is="item.type"
+                  v-if="Boolean(registerTypes[item.type])"
+                  :is="components[item.type]"
                   :module-config="form.dataConfig"
                   :form-config="item"
-                  @form-change="onFormChange"
+                  @form-change="handleFormChange"
                 />
               </FormItem>
             </template>
@@ -36,92 +36,83 @@
     </div>
   </div>
 </template>
+<script setup lang="ts">
+import { computed, ref, onMounted, shallowRef } from 'vue'
+import { useStore } from 'vuex'
+import { cloneDeep as _cloneDeep, isArray as _isArray, get as _get } from 'lodash-es'
 
-<script>
 import baseConfig from './config/baseConfig'
 import baseFormConfig from './config/baseFormConfig'
 import FormItem from '@/materials/setters/widgets/FormItem.vue'
 import setterLoader from '@/materials/setters/setterLoader'
-import { cloneDeep as _cloneDeep, isArray as _isArray, get as _get } from 'lodash-es'
 
-export default {
-  name: 'SettingPanel',
-  components: {
-    FormItem
-  },
-  data() {
-    return {
-      formConfigList: [],
-      register: {}
-    }
-  },
-  methods: {
-    onFormChange(data) {
-      this.$store.dispatch('edit/changeSchema', {
-        key: data.key,
-        value: data.value
-      })
-    }
-  },
-  computed: {
-    allSetters() {
-      const formList = this.formConfigList.map((item) => item.formList).flat()
-      const typeList = formList.map((item) => ({
-        type: item.type,
-        path: item.path || item.type
-      }))
-
-      return typeList
-    },
-    renderData() {
-      // todo: 1、给formConfig组装value；2、新增dataConfig字段
-      const formConfigList = _cloneDeep(this.formConfigList)
-
-      return formConfigList.map((form) => {
-        const dataConfig = {}
-        for (const formItem of form.formList) {
-          const formKey = formItem.key ? formItem.key : formItem.keys
-          let formValue
-          if (_isArray(formKey)) {
-            formValue = []
-            for (const key of formKey) {
-              const val = _get(this.$store.state.edit.schema, key, formItem.value)
-              formValue.push(val)
-              dataConfig[key] = val
-            }
-          } else {
-            formValue = _get(this.$store.state.edit.schema, formKey, formItem.value)
-            dataConfig[formKey] = formValue
-          }
-          formItem.value = formValue
+const formConfigList = ref<Array<any>>([])
+const components = shallowRef<any>({})
+const registerTypes = ref<any>({})
+const setterList = computed(() => {
+  const list = _cloneDeep(formConfigList.value)
+
+  return list.map((form) => {
+    const dataConfig: any = {}
+
+    for (const formItem of form.formList) {
+      const formKey = formItem.key ? formItem.key : formItem.keys
+      let formValue
+      if (_isArray(formKey)) {
+        formValue = []
+        for (const key of formKey) {
+          const val = _get(store.state.edit.schema, key, formItem.value)
+          formValue.push(val)
+          dataConfig[key] = val
         }
-        form.dataConfig = dataConfig
-        return form
-      })
-    }
-  },
-  async created() {
-    this.formConfigList = baseConfig.map((item) => {
-      return {
-        ...item,
-        formList: item.formList.map((key) => baseFormConfig[key]).filter((config) => !!config)
+      } else {
+        formValue = _get(store.state.edit.schema, formKey, formItem.value)
+        console.log("formVaue:", formValue)
+        dataConfig[formKey] = formValue
       }
-    })
+      formItem.value = formValue
+    }
 
-    const comps = await setterLoader.loadComponents(this.allSetters)
-    for (const comp of comps) {
-      if (!comp) {
-        continue
-      }
-      const { type, component, err } = comp
-      if (!err) {
-        const componentName = component.name
-        this.$options.components[componentName] = component
-        this.register[type] = componentName
-      }
+    form.dataConfig = dataConfig
+    return form
+  })
+})
+
+const store = useStore()
+const handleFormChange = (data: any) => {
+  store.dispatch('edit/changeSchema', {
+    key: data.key,
+    value: data.value
+  })
+}
+
+onMounted(async () => {
+  formConfigList.value = baseConfig.map((item) => ({
+    ...item,
+    formList: item.formList.map((key) => (baseFormConfig as any)[key]).filter((config) => !!config)
+  }))
+
+  const formList = formConfigList.value.map((item) => item.formList).flat()
+  const typeList = formList.map((item) => ({
+    type: item.type,
+    path: item.path || item.type
+  }))
+
+  const comps = await setterLoader.loadComponents(typeList)
+  for (const comp of comps) {
+    if (!comp) {
+      continue
+    }
+
+    const { type, component, err } = comp
+    if (!err) {
+      const componentName = component.name
+
+      components.value[type] = component
+      registerTypes.value[type] = componentName
     }
   }
-}
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/modules/settingModule/components/OverTime.vue b/web/src/management/pages/edit/modules/settingModule/components/OverTime.vue
index 83118c08..95a92c25 100755
--- a/web/src/management/pages/edit/modules/settingModule/components/OverTime.vue
+++ b/web/src/management/pages/edit/modules/settingModule/components/OverTime.vue
@@ -4,24 +4,15 @@
     <p class="title-msg" v-safe-html="resultText"></p>
   </div>
 </template>
+<script setup lang="ts">
+import { computed } from 'vue'
 
-<script>
-export default {
-  name: 'OverTime',
-  props: {
-    moduleConfig: {
-      type: Object,
-      required: true
-    }
-  },
-  computed: {
-    resultText() {
-      return this.moduleConfig?.submitConf?.msgContent?.msg_9001 || '问卷已过期'
-    }
-  }
+interface Props {
+  moduleConfig: any
 }
+const props = defineProps<Props>()
+const resultText = computed(() => props.moduleConfig?.msgContent?.msg_9001 || '问卷已过期')
 </script>
-
 <style lang="scss" scoped>
 .over-time {
   text-align: center;
diff --git a/web/src/management/pages/edit/modules/settingModule/components/SuccessContent.vue b/web/src/management/pages/edit/modules/settingModule/components/SuccessContent.vue
index 439f308e..284b5e74 100644
--- a/web/src/management/pages/edit/modules/settingModule/components/SuccessContent.vue
+++ b/web/src/management/pages/edit/modules/settingModule/components/SuccessContent.vue
@@ -9,24 +9,15 @@
     </div>
   </div>
 </template>
+<script setup lang="ts">
+import { computed } from 'vue'
 
-<script>
-export default {
-  name: 'SuccessContent',
-  props: {
-    moduleConfig: {
-      type: Object,
-      required: true
-    }
-  },
-  computed: {
-    successText() {
-      return this.moduleConfig?.submitConf?.msgContent?.msg_200 || ''
-    }
-  }
+interface Props {
+  moduleConfig: any
 }
+const props = defineProps<Props>()
+const successText = computed(() => props.moduleConfig?.msgContent?.msg_200 || '')
 </script>
-
 <style lang="scss" scoped>
 /*成功页面跳转全屏展示浮层*/
 .suc-page {
diff --git a/web/src/management/pages/edit/modules/settingModule/config/baseConfig.js b/web/src/management/pages/edit/modules/settingModule/config/baseConfig.js
index bdeab24a..6af2a296 100644
--- a/web/src/management/pages/edit/modules/settingModule/config/baseConfig.js
+++ b/web/src/management/pages/edit/modules/settingModule/config/baseConfig.js
@@ -7,6 +7,6 @@ export default [
   {
     title: '提交限制',
     key: 'limitConfig',
-    formList: ['limit_tLimit']
+    formList: ['limit_tLimit', 'limit_breakAnswer', 'limit_backAnswer']
   }
 ]
diff --git a/web/src/management/pages/edit/modules/settingModule/config/baseFormConfig.js b/web/src/management/pages/edit/modules/settingModule/config/baseFormConfig.js
index 59fed0a1..e1556f87 100644
--- a/web/src/management/pages/edit/modules/settingModule/config/baseFormConfig.js
+++ b/web/src/management/pages/edit/modules/settingModule/config/baseFormConfig.js
@@ -21,5 +21,19 @@ export default {
     tip: '问卷仅在指定时间段内可填写',
     type: 'QuestionTimeHour',
     placement: 'top'
+  },
+  limit_breakAnswer: {
+    key: 'baseConf.breakAnswer',
+    label: '允许断点续答',
+    tip: '回填前一次作答中的内容（注：更换设备/浏览器/清除缓存/更改内容重新发布则此功能失效）',
+    type: 'ELSwitch',
+    value: false
+  },
+  limit_backAnswer: {
+    key: 'baseConf.backAnswer',
+    label: '自动填充上次填写内容',
+    tip: '回填前一次提交的内容（注：更换设备/浏览器/清除缓存/更改内容重新发布则此功能失效）',
+    type: 'ELSwitch',
+    value: false
   }
 }
diff --git a/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
index 4aa2125b..4873709b 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/CatalogPanel.vue
@@ -6,7 +6,7 @@
         v-for="(status, index) in statusList"
         :key="index"
         class="status-item"
-        @click="filterDisabledStatus({ type: status.type })"
+        @click="handleChangePreview({ type: status.type })"
       >
         <span>{{ status.title }}</span>
         <div class="preview-item">
@@ -16,41 +16,32 @@
     </div>
   </div>
 </template>
-
-<script>
-import { mapMutations } from 'vuex'
+<script setup lang="ts">
+import { useStore } from 'vuex'
 import { EDIT_STATUS_MAP } from '../enum'
 
-export default {
-  name: 'CatalogPanel',
-  data() {
-    return {
-      statusList: [
-        {
-          type: EDIT_STATUS_MAP.SUCCESS,
-          title: '提交成功',
-          previewImg: '/imgs/icons/success.webp'
-        },
-        {
-          type: EDIT_STATUS_MAP.OVERTIME,
-          title: '问卷过期',
-          previewImg: '/imgs/icons/overtime.webp'
-        }
-      ]
-    }
+const store = useStore()
+const statusList = [
+  {
+    type: EDIT_STATUS_MAP.SUCCESS,
+    title: '提交成功',
+    previewImg: '/imgs/icons/success.webp'
   },
-  computed: {},
-  methods: {
-    ...mapMutations({
-      changeStatusPreview: 'edit/changeStatusPreview'
-    }),
-    filterDisabledStatus(data) {
-      this.changeStatusPreview(data)
-    }
+  {
+    type: EDIT_STATUS_MAP.OVERTIME,
+    title: '问卷过期',
+    previewImg: '/imgs/icons/overtime.webp'
+  }
+]
+
+const handleChangePreview = (data: any) => {
+  const currentStatus = store.state?.edit?.currentEditStatus
+
+  if (currentStatus && currentStatus !== data.type) {
+    store.commit('edit/changeStatusPreview', data)
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .tab-box {
   width: 300px;
diff --git a/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
index ff6c34dc..e1d35a93 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/PreviewPanel.vue
@@ -2,43 +2,35 @@
   <div class="result-config-preview">
     <div class="result-page-wrap">
       <div class="result-page">
-        <component :is="currentEditStatus" :key="currentEditStatus" :module-config="moduleConfig" />
+        <component
+          :is="components[currentEditStatus]"
+          :key="currentEditStatus"
+          :module-config="moduleConfig"
+        />
       </div>
     </div>
   </div>
 </template>
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
 
-<script>
-import { mapState } from 'vuex'
 import SuccessContent from '../components/SuccessContent.vue'
 import OverTime from '../components/OverTime.vue'
 import { EDIT_STATUS_MAP } from '../enum'
-import { get as _get } from 'lodash-es'
 
-export default {
-  name: 'PreviewPanel',
-  props: {},
-  data() {
-    return {}
-  },
-  computed: {
-    ...mapState({
-      currentEditStatus: (state) => state.edit.currentEditStatus,
-      submitConf: (state) => _get(state, 'edit.schema.submitConf')
-    }),
-    moduleConfig() {
-      return {
-        submitConf: this.submitConf
-      }
-    }
-  },
-  components: {
-    [EDIT_STATUS_MAP.SUCCESS]: SuccessContent,
-    [EDIT_STATUS_MAP.OVERTIME]: OverTime
-  }
+const components = {
+  [EDIT_STATUS_MAP.SUCCESS]: SuccessContent,
+  [EDIT_STATUS_MAP.OVERTIME]: OverTime
 }
-</script>
 
+const store = useStore()
+const currentEditStatus = computed(() => store.state?.edit?.currentEditStatus)
+const moduleConfig = computed(() => {
+  return _get(store.state, 'edit.schema.submitConf')
+})
+</script>
 <style lang="scss" scoped>
 .result-config-preview {
   width: 100%;
diff --git a/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue b/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
index b2435875..28c74093 100644
--- a/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/result/SetterPanel.vue
@@ -4,134 +4,98 @@
       {{ currentEditText }}
     </div>
     <el-form class="question-config-form" label-position="top" @submit.prevent>
-      <template v-for="(item, index) in formFieldData" :key="index">
+      <template v-for="(item, index) in formFields" :key="index">
         <FormItem
-          v-if="item.type && !item.hidden && Boolean(register[item.type])"
+          v-if="item.type && !item.hidden && Boolean(registerTypes[item.type])"
           :form-config="item"
           :style="item.style"
         >
           <Component
-            v-if="Boolean(register[item.type])"
-            :is="item.type"
+            v-if="Boolean(registerTypes[item.type])"
+            :is="components[item.type]"
             :module-config="moduleConfig"
             :form-config="item"
-            @form-change="onFormChange"
+            @form-change="handleFormChange"
           />
         </FormItem>
       </template>
     </el-form>
   </div>
 </template>
+<script setup lang="ts">
+import { computed, ref, shallowRef } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
 
-<script>
 import FormItem from '@/materials/setters/widgets/FormItem.vue'
 import setterLoader from '@/materials/setters/setterLoader'
 import statusConfig from '../config/statusConfig'
-import { mapState } from 'vuex'
-import { get as _get, pick as _pick } from 'lodash-es'
 
 const textMap = {
   Success: '提交成功页面配置',
   OverTime: '问卷过期页面配置'
 }
 
-export default {
-  name: 'SetterPanel',
-  components: {
-    FormItem
-  },
-  data() {
+const store = useStore()
+
+const components = shallowRef<any>({})
+const registerTypes = ref<any>({})
+const moduleConfig = computed(() => _get(store.state, 'edit.schema.submitConf'))
+const currentEditText = computed(() => (textMap as any)[store.state.edit.currentEditStatus])
+const formFields = computed(() => {
+  const currentStatus = store.state.edit.currentEditStatus
+  const formList = (statusConfig as any)[currentStatus] || []
+  const list = formList.map((item: any) => {
+    const value = _get(moduleConfig.value, item.key, item.value)
+
+    return { ...item, value }
+  })
+
+  registerComponents(list)
+
+  return list
+})
+
+const handleFormChange = ({ key, value }: any) => {
+  store.dispatch('edit/changeSchema', {
+    key: `submitConf.${key}`,
+    value
+  })
+}
+
+const registerComponents = async (formFieldData: any) => {
+  const setters = formFieldData.map((item: any) => item.type)
+  const settersSet = new Set(setters)
+  const settersArr = Array.from(settersSet)
+  const allSetters = settersArr.map((item) => {
     return {
-      register: {}
+      type: item,
+      path: item
     }
-  },
-  computed: {
-    formFieldData() {
-      const formList = statusConfig[this.currentEditStatus] || []
-      return formList.map((item) => {
-        const value = _get(this.moduleConfig, item.key, item.value)
-        return {
-          ...item,
-          value
-        }
-      })
-    },
-    currentEditText() {
-      return textMap[this.currentEditStatus] || ''
-    },
-    ...mapState({
-      currentEditStatus: (state) => state.edit.currentEditStatus,
-      submitConf: (state) => _get(state, 'edit.schema.submitConf')
-    }),
-    moduleConfig() {
-      return this.submitConf
-    }
-  },
-  watch: {
-    formFieldData: {
-      immediate: true,
-      handler(newVal) {
-        if (Array.isArray(newVal)) {
-          this.handleComponentRegister(newVal)
-        }
-      }
-    }
-  },
-  methods: {
-    async handleComponentRegister(formFieldData) {
-      const setters = formFieldData.map((item) => item.type)
-      const settersSet = new Set(setters)
-      const settersArr = Array.from(settersSet)
-      const allSetters = settersArr.map((item) => {
-        return {
-          type: item,
-          path: item
-        }
-      })
-      try {
-        const comps = await setterLoader.loadComponents(allSetters)
-        for (const comp of comps) {
-          if (!comp) {
-            continue
-          }
-          const { type, component, err } = comp
-          if (!err) {
-            const componentName = component.name
-            this.$options.components[componentName] = component
-            this.register[type] = componentName
-          }
-        }
-      } catch (err) {
-        console.error(err)
-      }
-    },
-    getValueFromModuleConfig(item) {
-      const { key, keys } = item
-      const moduleConfig = this.moduleConfig
-      let result = item
-      if (key) {
-        result = {
-          ...item,
-          value: _get(moduleConfig, key, item.value)
-        }
+  })
+
+  try {
+    const comps = await setterLoader.loadComponents(allSetters)
+
+    for (const comp of comps) {
+      if (!comp) {
+        continue
       }
-      if (keys) {
-        result = {
-          ...item,
-          value: _pick(moduleConfig, keys)
-        }
+
+      const { type, component, err } = comp
+
+      if (!err) {
+        const componentName = component.name
+
+        components.value[type] = component
+        registerTypes.value[type] = componentName
       }
-      return result
-    },
-    onFormChange(data) {
-      const { key, value } = data
-      const resultKey = `submitConf.${key}`
-      this.$store.dispatch('edit/changeSchema', { key: resultKey, value })
     }
+  } catch (err) {
+    console.error(err)
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .question-edit-form {
   width: 360px;
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index cc789e9b..7f663cd6 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -8,7 +8,7 @@
           :class="[groupName === item.value ? 'current' : '', 'tag']"
           type="info"
           :key="item.value"
-          @click="() => changeGroup(item.value)"
+          @click="() => handleChangeGroup(item.value)"
         >
           {{ item.label }}
         </el-tag>
@@ -25,75 +25,63 @@
     </div>
   </div>
 </template>
-<script>
-import { mapActions } from 'vuex'
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useStore } from 'vuex'
 
 import skinPresets from '@/management/config/skinPresets.js'
-export default {
-  name: 'CatalogPanel',
-  data() {
-    return {
-      skinPresets: [],
-      groupName: 'temp'
-    }
-  },
-  computed: {
-    bannerList() {
-      return this.$store?.state?.bannerList || []
-    },
-    groupList() {
-      return Object.keys(this.bannerList).map((key) => {
-        return {
-          label: this.bannerList[key].name,
-          value: key
-        }
-      })
-    },
-    currentBannerList() {
-      const arr = Object.keys(this.bannerList)
-        .map((key) => {
-          return this.bannerList[key]
-        })
-        .map((data) => {
-          return data.list.map((item) => {
-            item.group = data.key
-            return item
-          })
-        })
-      const allbanner = arr.reduce((acc, curr) => {
-        return acc.concat(curr)
-      }, [])
-      return allbanner.filter((item) => {
-        if (this.groupName === 'temp') {
-          return true
-        } else {
-          return item.group === this.groupName
-        }
+
+const store = useStore()
+const groupName = ref<string>('temp')
+const bannerList = computed(() => store?.state?.bannerList || [])
+const groupList = computed(() =>
+  Object.keys(bannerList.value).map((key) => ({
+    label: bannerList.value[key].name,
+    value: key
+  }))
+)
+const currentBannerList = computed(() => {
+  const arr = Object.keys(bannerList.value)
+    .map((key) => {
+      return bannerList.value[key]
+    })
+    .map((data) => {
+      return data.list.map((item: any) => {
+        item.group = data.key
+        return item
       })
-    }
-  },
-  mounted() {},
-  methods: {
-    ...mapActions({
-      changeThemePreset: 'edit/changeThemePreset'
-    }),
-    changeGroup(value) {
-      this.groupName = value
-    },
-    changePreset(banner) {
-      const name = banner.group + '-' + banner.title
-      let presets = {
-        'bannerConf.bannerConfig.bgImage': banner.src,
-        'skinConf.themeConf.color': '#FAA600',
-        'skinConf.backgroundConf.color': '#fff'
-      }
-      if (skinPresets[name]) {
-        presets = Object.assign(presets, skinPresets[name])
-      }
+    })
+
+  const allbanner = arr.reduce((acc, curr) => {
+    return acc.concat(curr)
+  }, [])
 
-      this.changeThemePreset(presets)
+  return allbanner.filter((item: any) => {
+    if (groupName.value === 'temp') {
+      return true
+    } else {
+      return item.group === groupName.value
     }
+  })
+})
+
+const handleChangeGroup = (value: string) => {
+  groupName.value = value
+}
+
+const changePreset = (banner: any) => {
+  const name = banner.group + '-' + banner.title
+  let presets = {
+    'bannerConf.bannerConfig.bgImage': banner.src,
+    'skinConf.themeConf.color': '#FAA600',
+    'skinConf.backgroundConf.color': '#fff'
   }
+
+  if ((skinPresets as any)[name]) {
+    presets = Object.assign(presets, (skinPresets as any)[name])
+  }
+
+  store.dispatch('edit/changeThemePreset', presets)
 }
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
index d5314353..2a6be08d 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/SetterPanel.vue
@@ -14,7 +14,7 @@
             :module-config="_get(schema, collapse.key, {})"
             @form-change="
               (key) => {
-                onFormChange(key, collapse.key)
+                handleFormChange(key, collapse.key)
               }
             "
           />
@@ -23,37 +23,24 @@
     </div>
   </div>
 </template>
-<script>
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useStore } from 'vuex'
+import { get as _get } from 'lodash-es'
+
 import skinConfig from '@/management/config/setterConfig/skinConfig'
 import SetterField from '@/management/pages/edit/components/SetterField.vue'
-import { mapState } from 'vuex'
-import { get as _get } from 'lodash-es'
-export default {
-  name: 'SetterPanel',
-  components: {
-    SetterField
-  },
-  data() {
-    return {
-      collapse: '',
-      skinConfig
-    }
-  },
-  computed: {
-    ...mapState({
-      skinConf: (state) => _get(state, 'edit.schema.skinConf'),
-      schema: (state) => _get(state, 'edit.schema')
-    })
-  },
-  methods: {
-    _get,
-    onFormChange(data, collapse) {
-      const { key, value } = data
-      const currentEditKey = `${collapse}`
-      const resultKey = `${currentEditKey}.${key}`
-      this.$store.dispatch('edit/changeSchema', { key: resultKey, value })
-    }
-  }
+
+const store = useStore()
+const collapse = ref<string>('')
+const schema = computed(() => _get(store.state, 'edit.schema'))
+
+const handleFormChange = (data: any, collapse: string) => {
+  const { key, value } = data
+  const currentEditKey = `${collapse}`
+  const resultKey = `${currentEditKey}.${key}`
+
+  store.dispatch('edit/changeSchema', { key: resultKey, value })
 }
 </script>
 <style lang="scss" scoped>
diff --git a/web/src/management/pages/edit/pages/edit/LogicEditPage.vue b/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
index 966ebc2c..8d2d63f8 100644
--- a/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
+++ b/web/src/management/pages/edit/pages/edit/LogicEditPage.vue
@@ -5,15 +5,18 @@
 </template>
 <script setup lang="ts">
 import { computed, provide } from 'vue'
-import RulePanel from '../../modules/logicModule/RulePanel.vue'
-import { filterQuestionPreviewData } from '@/management/utils/index'
 import { useStore } from 'vuex'
 import { cloneDeep } from 'lodash-es'
+
+import RulePanel from '../../modules/logicModule/RulePanel.vue'
+import { filterQuestionPreviewData } from '@/management/utils/index'
+
 const store = useStore()
 
 const questionDataList = computed(() => {
   return store.state.edit.schema.questionDataList
 })
+
 const renderData = computed(() => {
   return filterQuestionPreviewData(cloneDeep(questionDataList.value))
 })
diff --git a/web/src/management/pages/edit/pages/edit/QuestionEditPage.vue b/web/src/management/pages/edit/pages/edit/QuestionEditPage.vue
index 234a64d3..a06df329 100644
--- a/web/src/management/pages/edit/pages/edit/QuestionEditPage.vue
+++ b/web/src/management/pages/edit/pages/edit/QuestionEditPage.vue
@@ -11,20 +11,11 @@
     </template>
   </CommonTemplate>
 </template>
-<script>
+<script setup lang="ts">
 import CommonTemplate from '../../components/CommonTemplate.vue'
 import CatalogPanel from '../../modules/questionModule/CatalogPanel.vue'
 import PreviewPanel from '../../modules/questionModule/PreviewPanel.vue'
 import SetterPanel from '../../modules/questionModule/SetterPanel.vue'
-export default {
-  name: 'editIndex',
-  components: {
-    CommonTemplate,
-    CatalogPanel,
-    PreviewPanel,
-    SetterPanel
-  }
-}
 </script>
 <style lang="scss" scoped>
 .navbar {
diff --git a/web/src/management/pages/edit/pages/edit/index.vue b/web/src/management/pages/edit/pages/edit/index.vue
index 61915934..3565a758 100644
--- a/web/src/management/pages/edit/pages/edit/index.vue
+++ b/web/src/management/pages/edit/pages/edit/index.vue
@@ -3,45 +3,46 @@
     <div class="navbar-tab">
       <el-radio-group v-model="activeRouter">
         <el-radio-button
-          v-for="btnItem in btnList"
-          :key="btnItem.router"
-          :label="btnItem.text"
-          :value="btnItem.router"
+          v-for="item in routes"
+          :key="item.router"
+          :label="item.text"
+          :value="item.router"
         />
       </el-radio-group>
     </div>
     <router-view></router-view>
   </div>
 </template>
-<script>
-export default {
-  name: 'QuestionPage',
-  props: {},
-  data() {
-    return {
-      activeRouter: this.$route.name,
-      btnList: [
-        {
-          text: '内容设置',
-          router: 'QuestionEditIndex',
-          key: 'questionEdit'
-        },
-        {
-          text: '逻辑设置',
-          router: 'LogicIndex',
-          key: 'logicEdit'
-        }
-      ]
-    }
+<script setup lang="ts">
+import { watch, ref } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+
+const routes = [
+  {
+    text: '内容设置',
+    router: 'QuestionEditIndex',
+    key: 'questionEdit'
   },
-  watch: {
-    activeRouter: {
-      handler(val) {
-        this.$router.push({ name: val })
-      }
-    }
+  {
+    text: '逻辑设置',
+    router: 'LogicIndex',
+    key: 'logicEdit'
   }
-}
+]
+
+const router = useRouter()
+const route = useRoute()
+const activeRouter = ref(route.name)
+
+watch(
+  activeRouter,
+  (val: any) => {
+    router.push({ name: val })
+  },
+  {
+    immediate: true
+  }
+)
 </script>
 <style lang="scss" scoped>
 .question-content {
diff --git a/web/src/management/pages/edit/pages/setting/index.vue b/web/src/management/pages/edit/pages/setting/index.vue
index 9212f087..765ca26a 100644
--- a/web/src/management/pages/edit/pages/setting/index.vue
+++ b/web/src/management/pages/edit/pages/setting/index.vue
@@ -3,17 +3,9 @@
     <SettingPanel></SettingPanel>
   </div>
 </template>
-
-<script>
+<script setup lang="ts">
 import SettingPanel from '../../modules/settingModule/SettingPanel.vue'
-export default {
-  name: 'SettingPage',
-  components: {
-    SettingPanel
-  }
-}
 </script>
-
 <style lang="scss" scoped>
 .setting-page {
   width: 100%;
diff --git a/web/src/management/pages/edit/pages/skin/ContentPage.vue b/web/src/management/pages/edit/pages/skin/ContentPage.vue
index 35f91128..5960d677 100644
--- a/web/src/management/pages/edit/pages/skin/ContentPage.vue
+++ b/web/src/management/pages/edit/pages/skin/ContentPage.vue
@@ -11,24 +11,20 @@
     </template>
   </CommonTemplate>
 </template>
-<script>
+<script setup lang="ts">
+import { onMounted } from 'vue'
+import { useStore } from 'vuex'
+
 import CommonTemplate from '../../components/CommonTemplate.vue'
 import CatalogPanel from '../../modules/settingModule/skin/CatalogPanel.vue'
 import PreviewPanel from '../../modules/settingModule/skin/PreviewPanel.vue'
 import SetterPanel from '../../modules/settingModule/skin/SetterPanel.vue'
 
-export default {
-  name: 'ContentPage',
-  components: {
-    CommonTemplate,
-    CatalogPanel,
-    PreviewPanel,
-    SetterPanel
-  },
-  created() {
-    this.$store.dispatch('getBannerData')
-  }
-}
+const store = useStore()
+
+onMounted(() => {
+  store.dispatch('getBannerData')
+})
 </script>
 <style lang="scss" scoped>
 .navbar {
diff --git a/web/src/management/pages/edit/pages/skin/ResultPage.vue b/web/src/management/pages/edit/pages/skin/ResultPage.vue
index 9a475145..fbaa46b0 100644
--- a/web/src/management/pages/edit/pages/skin/ResultPage.vue
+++ b/web/src/management/pages/edit/pages/skin/ResultPage.vue
@@ -11,20 +11,9 @@
     </template>
   </CommonTemplate>
 </template>
-
-<script>
+<script setup lang="ts">
 import CommonTemplate from '../../components/CommonTemplate.vue'
 import ResultCatalog from '../../modules/settingModule/result/CatalogPanel.vue'
 import ResultPreview from '../../modules/settingModule/result/PreviewPanel.vue'
 import ResultSetter from '../../modules/settingModule/result/SetterPanel.vue'
-
-export default {
-  name: 'ResultPage',
-  components: {
-    CommonTemplate,
-    ResultCatalog,
-    ResultPreview,
-    ResultSetter
-  }
-}
 </script>
diff --git a/web/src/management/pages/edit/pages/skin/index.vue b/web/src/management/pages/edit/pages/skin/index.vue
index 2b4df480..24085c1f 100644
--- a/web/src/management/pages/edit/pages/skin/index.vue
+++ b/web/src/management/pages/edit/pages/skin/index.vue
@@ -3,46 +3,47 @@
     <div class="navbar-tab">
       <el-radio-group v-model="activeRouter">
         <el-radio-button
-          v-for="btnItem in btnList"
-          :key="btnItem.router"
-          :label="btnItem.text"
-          :value="btnItem.router"
+          v-for="item in routes"
+          :key="item.router"
+          :label="item.text"
+          :value="item.router"
         />
       </el-radio-group>
     </div>
     <router-view></router-view>
   </div>
 </template>
-<script>
-export default {
-  name: 'skinPage',
-  props: {},
-  data() {
-    return {
-      activeRouter: this.$route.name,
-      btnList: [
-        {
-          text: '内容页',
-          router: 'QuestionSkinSetting',
-          key: 'skinsettings',
-          next: true
-        },
-        {
-          text: '结果页',
-          router: 'QuestionEditResultConfig',
-          key: 'status'
-        }
-      ]
-    }
+<script setup lang="ts">
+import { watch, ref } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+
+const routes = [
+  {
+    text: '内容页',
+    router: 'QuestionSkinSetting',
+    key: 'skinsettings',
+    next: true
   },
-  watch: {
-    activeRouter: {
-      handler(val) {
-        this.$router.push({ name: val })
-      }
-    }
+  {
+    text: '结果页',
+    router: 'QuestionEditResultConfig',
+    key: 'status'
   }
-}
+]
+
+const router = useRouter()
+const route = useRoute()
+const activeRouter = ref(route.name)
+
+watch(
+  activeRouter,
+  (val: any) => {
+    router.push({ name: val })
+  },
+  {
+    immediate: true
+  }
+)
 </script>
 <style lang="scss" scoped>
 .skin-content {
diff --git a/web/src/management/store/edit/state.js b/web/src/management/store/edit/state.js
index 1927e24a..42730268 100644
--- a/web/src/management/store/edit/state.js
+++ b/web/src/management/store/edit/state.js
@@ -42,7 +42,9 @@ export default {
       tLimit: 0,
       answerBegTime: '',
       answerEndTime: '',
-      answerLimitTime: 0
+      answerLimitTime: 0,
+      breakAnswer: false,
+      backAnswer: false
     },
     submitConf: {
       submitTitle: '',
diff --git a/web/src/materials/setters/widgets/ELSwitch.vue b/web/src/materials/setters/widgets/ELSwitch.vue
new file mode 100644
index 00000000..10347939
--- /dev/null
+++ b/web/src/materials/setters/widgets/ELSwitch.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-switch
+    v-model="modelValue"
+    class="ml-2"
+    style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+    active-text="是"
+    inactive-text="否"
+    @change="handleInputChange"
+  />
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant'
+
+interface Props {
+  formConfig: any
+  moduleConfig: any
+}
+
+interface Emit {
+  (ev: typeof FORM_CHANGE_EVENT_KEY, arg: { key: string; value: boolean }): void
+}
+
+const emit = defineEmits<Emit>()
+const props = defineProps<Props>()
+const modelValue = ref(props.formConfig.value)
+
+const handleInputChange = (value: boolean) => {
+  const key = props.formConfig.key
+
+  modelValue.value = value
+
+  emit(FORM_CHANGE_EVENT_KEY, { key, value })
+}
+</script>
+
+  
\ No newline at end of file
diff --git a/web/src/render/components/BackAnswerDialog.vue b/web/src/render/components/BackAnswerDialog.vue
new file mode 100644
index 00000000..630308c2
--- /dev/null
+++ b/web/src/render/components/BackAnswerDialog.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="mask" v-show="visible">
+      <div class="box">
+        <div class="title">{{ title }}</div>
+        <div class="btn-box">
+          <div class="btn cancel" @click="handleCancel">{{ cancelBtnText }}</div>
+          <div class="btn confirm" @click="handleConfirm">{{ confirmBtnText }}</div>
+        </div>
+      </div>
+    </div>
+  </template>
+  <script setup lang="ts">
+  interface Props {
+    visible?: boolean
+    cancelBtnText?: string
+    confirmBtnText?: string
+    title?: string
+  }
+  
+  interface Emit {
+    (ev: 'confirm', callback: () => void): void
+    (ev: 'close'): void
+  }
+  
+  const emit = defineEmits<Emit>()
+  
+  withDefaults(defineProps<Props>(), {
+    visible: false,
+    cancelBtnText: '取消',
+    confirmBtnText: '确定',
+    title: ''
+  })
+  
+  const handleConfirm = () => {
+    emit('confirm', () => {
+      emit('close')
+    })
+  }
+  
+  const handleCancel = () => {
+    emit('cancel', () => {
+        emit('close')
+    })
+  }
+  </script>
+  <style lang="scss" scoped>
+  @import url('../styles/dialog.scss');
+  
+  .btn-box {
+    padding: 20px 0 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  
+    .btn {
+      width: 48%;
+      font-size: 0.28rem;
+      border-radius: 0.04rem;
+      text-align: center;
+      padding: 0.16rem 0;
+      line-height: 0.4rem;
+      cursor: pointer;
+  
+      &.cancel {
+        background: #fff;
+        color: #92949d;
+        border: 1px solid #e3e4e8;
+      }
+  
+      &.confirm {
+        background-color: #4a4c5b;
+        border: 1px solid #4a4c5b;
+        color: #fff;
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/web/src/render/pages/IndexPage.vue b/web/src/render/pages/IndexPage.vue
index 7f02b5cd..669d852c 100644
--- a/web/src/render/pages/IndexPage.vue
+++ b/web/src/render/pages/IndexPage.vue
@@ -79,6 +79,18 @@ const normalizationRequestBody = () => {
     clientTime: Date.now()
   }
 
+  //浏览器缓存数据
+  localStorage.removeItem(surveyPath + "_questionData")
+  localStorage.removeItem("isSubmit")
+
+  //数据加密
+  var formData  = Object.assign({}, store.state.formValues)
+    for(const key in formData){
+      formData[key] = encodeURIComponent(formData[key])
+    }
+  localStorage.setItem(surveyPath + "_questionData", JSON.stringify(formData))
+  localStorage.setItem('isSubmit', JSON.stringify(true))
+
   if (encryptInfo?.encryptType) {
     result.encryptType = encryptInfo?.encryptType
     result.data = encrypt[result.encryptType as 'rsa']({
@@ -100,6 +112,7 @@ const submitSurver = async () => {
     const params = normalizationRequestBody()
     console.log(params)
     const res: any = await submitForm(params)
+
     if (res.code === 200) {
       store.commit('setRouter', 'successPage')
     } else {
diff --git a/web/src/render/store/actions.js b/web/src/render/store/actions.js
index 3438ebea..34958c1e 100644
--- a/web/src/render/store/actions.js
+++ b/web/src/render/store/actions.js
@@ -6,6 +6,9 @@ moment.locale('zh-cn')
 import adapter from '../adapter'
 import { queryVote, getEncryptInfo } from '@/render/api/survey'
 import { RuleMatch } from '@/common/logicEngine/RulesMatch'
+import state from './state'
+import useCommandComponent from '../hooks/useCommandComponent'
+import BackAnswerDialog from '../components/BackAnswerDialog.vue'
 /**
  * CODE_MAP不从management引入，在dev阶段，会导致B端 router被加载，进而导致C端路由被添加 baseUrl: /management
  */
@@ -15,12 +18,13 @@ const CODE_MAP = {
   NO_AUTH: 403
 }
 const VOTE_INFO_KEY = 'voteinfo'
+const confirm = useCommandComponent(BackAnswerDialog)
 
 export default {
   // 初始化
-  init({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
+  init({ commit, dispatch },{ bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf}) {
     commit('setEnterTime')
-    const { begTime, endTime, answerBegTime, answerEndTime } = baseConf
+    const { begTime, endTime, answerBegTime, answerEndTime, breakAnswer, backAnswer} = baseConf
     const { msgContent } = submitConf
     const now = Date.now()
     if (now < new Date(begTime).getTime()) {
@@ -53,33 +57,73 @@ export default {
         return
       }
     }
-    commit('setRouter', 'indexPage')
 
-    // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
-    const { questionData, questionSeq, rules, formValues } = adapter.generateData({
-      bannerConf,
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf
-    })
+    //回填，断点续填
+    const localData = JSON.parse(localStorage.getItem(state.surveyPath + "_questionData"))
 
-    // 将数据设置到state上
-    commit('assignState', {
-      questionData,
-      questionSeq,
-      rules,
-      bannerConf,
-      baseConf,
-      bottomConf,
-      dataConf,
-      skinConf,
-      submitConf,
-      formValues
-    })
-    // 获取已投票数据
-    dispatch('initVoteData')
+    //数据解密
+    for(const key in localData){
+      localData[key] = decodeURIComponent(localData[key])
+    }
+
+    const isSubmit = JSON.parse(localStorage.getItem('isSubmit'))
+    if(localData) {
+      if(isSubmit){
+        if(!backAnswer) {
+          clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf })
+        } else {
+          confirm({
+            title: "您之前已提交过问卷，是否要回填？",
+            onConfirm: async () => {
+              try {
+                loadFormData({ commit, dispatch }, {bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }, localData)
+              } catch (error) {
+                console.log(error)
+              } finally {
+                confirm.close()
+              }
+            },
+            onCancel: async() => {
+              try {
+                clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf })
+              } catch (error) {
+                console.log(error)
+              } finally {
+                confirm.close()
+              }
+            }
+          })
+        }
+      } else{
+        if(!breakAnswer) {
+          clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf })
+        } else {
+          confirm({
+            title: "您之前已填写部分内容, 是否要继续填写?",
+            onConfirm: async () => {
+              try {
+                loadFormData({ commit, dispatch }, {bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }, localData)
+              } catch (error) {
+                console.log(error)
+              } finally {
+                confirm.close()
+              }
+            },
+            onCancel: async() => {
+              try {
+                clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf })
+              } catch (error) {
+                console.log(error)
+              } finally {
+                confirm.close()
+              }
+            }
+          })
+        }
+      }
+    } else {
+      clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf })
+    }
   },
   // 用户输入或者选择后，更新表单数据
   changeData({ commit }, data) {
@@ -175,3 +219,71 @@ export default {
     commit('setRuleEgine', ruleEngine)
   }
 }
+
+  // 加载上次填写过的数据到问卷页
+  function loadFormData({ commit, dispatch }, {bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }, formData) {
+    commit('setRouter', 'indexPage')
+
+    // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
+    const { questionData, questionSeq, rules, formValues } = adapter.generateData({
+      bannerConf,
+      baseConf,
+      bottomConf,
+      dataConf,
+      skinConf,
+      submitConf
+    })
+    console.log("formdata", formData)
+
+    for(const key in formData){
+      formValues[key] = formData[key]
+      console.log("formValues",formValues)
+    }
+
+    // 将数据设置到state上
+    commit('assignState', {
+      questionData,
+      questionSeq,
+      rules,
+      bannerConf,
+      baseConf,
+      bottomConf,
+      dataConf,
+      skinConf,
+      submitConf,
+      formValues
+    })
+    // 获取已投票数据
+    dispatch('initVoteData')
+  }
+
+  // 加载空白页面
+  function clearFormData({ commit, dispatch }, { bannerConf, baseConf, bottomConf, dataConf, skinConf, submitConf }) {
+    commit('setRouter', 'indexPage')
+
+    // 根据初始的schema生成questionData, questionSeq, rules, formValues, 这四个字段
+    const { questionData, questionSeq, rules, formValues } = adapter.generateData({
+      bannerConf,
+      baseConf,
+      bottomConf,
+      dataConf,
+      skinConf,
+      submitConf
+    })
+
+    // 将数据设置到state上
+    commit('assignState', {
+      questionData,
+      questionSeq,
+      rules,
+      bannerConf,
+      baseConf,
+      bottomConf,
+      dataConf,
+      skinConf,
+      submitConf,
+      formValues
+    })
+    // 获取已投票数据
+    dispatch('initVoteData')
+  }
diff --git a/web/src/render/store/mutations.js b/web/src/render/store/mutations.js
index 33bc69f0..7ba6ab41 100644
--- a/web/src/render/store/mutations.js
+++ b/web/src/render/store/mutations.js
@@ -20,8 +20,19 @@ export default {
   },
   changeFormData(state, data) {
     let { key, value } = data
-    // console.log('formValues', key, value)
     set(state, `formValues.${key}`, value)
+
+    //数据加密
+    var formData = Object.assign({}, state.formValues);
+    for(const key in formData){
+      formData[key] = encodeURIComponent(formData[key])
+    }
+
+    //浏览器存储
+    localStorage.removeItem(state.surveyPath + "_questionData")
+    localStorage.setItem(state.surveyPath + "_questionData", JSON.stringify(formData))
+    localStorage.setItem('isSubmit', JSON.stringify(false))
+
   },
   changeSelectMoreData(state, data) {
     const { key, value, field } = data