Merge branch 'feature-creative-center-revert' into uat

src/views/DataAnalyse/index.vue

@@ -66,11 +66,11 @@ export default defineComponent({
           //   name: "市场模拟",
           //   path: "/survey/analyse/kndiagram/index",
           // }
-          // {
+          {
-          //   name: '3D场景分析',
+            name: '3D场景分析',
-          //   icon:'',
+            icon:'',
-          //   path: '/survey/analyse/kndiagram/q3d'
+            path: '/survey/analyse/kndiagram/q3d'
-          // },
+          },
         ]
       },
       {

src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue

@@ -122,7 +122,7 @@
         </div>
       </ConfigBaseItem>
       <!-- 3D 相关配置 -->
-      <!-- <Config3D :key="copyConfig.question_index&&copyConfig.question_type" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type" :question="copyConfig"/> -->
+      <Config3D :key="copyConfig.question_index&&copyConfig.question_type" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type" :question="copyConfig"/>
         
       <ConfigRequire
         title="选项随机"
@@ -139,16 +139,14 @@ import { computed, reactive } from "@vue/reactivity";
 import ConfigTitle from "../../components/config/ConfigTitle.vue";
 import ConfigRequire from "../../components/config/ConfigRequire.vue";
 import ConfigBaseItem from "../../components/config/ConfigBaseItem.vue";
-// import Config3D from "../../components/config/Config3D.vue";
+import Config3D from "../../components/config/Config3D.vue";
 import { useStore } from "vuex";
 import { newQuesConfig } from "../../mode/index";
 import ConfigOptionCount from "../../components/config/ConfigOptionCount.vue";
 import { quickQuesTypeList } from "../../../../../utils/common.js";
 export default {
   name: "ChoiceConfig",
-  components: { ConfigTitle, ConfigRequire, ConfigBaseItem, ConfigOptionCount, 
+  components: { ConfigTitle, ConfigRequire, ConfigBaseItem, ConfigOptionCount, Config3D },
-    // Config3D 
-  },
   emits: ["update"],
   props: {
     config: {

src/views/planetDesign/Design/questions/completion/CompletionConfig.vue

@@ -89,7 +89,7 @@
         />
 
         <!-- 3D 相关配置 -->
-        <!-- <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/> -->
+        <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
         
         <ConfigTextCount
           v-if="![5, 6, 7].includes(text_type)"
@@ -195,7 +195,7 @@ import ConfigContentType from "../../components/config/ConfigContentType.vue";
 import ConfigTextCount from "../../components/config/ConfigTextCount.vue";
 import ConfigInputVertical from "../../components/config/ConfigInputVertical.vue";
 import { quickQuesTypeList } from "../../../../../utils/common.js";
-// import Config3D from "../../components/config/Config3D.vue";
+import Config3D from "../../components/config/Config3D.vue";
 
 export default defineComponent({
   name: "CompletionConfig",
@@ -206,7 +206,7 @@ export default defineComponent({
     ConfigContentType,
     ConfigTextCount,
     ConfigInputVertical,
-    // Config3D,
+    Config3D,
   },
   props: {
     config: {

src/views/planetDesign/Design/questions/hotArea/hotAreaConfig.vue

@@ -12,7 +12,7 @@
       />
       
       <!-- 3D 相关配置 -->
-      <!-- <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/> -->
+      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
 
       <ConfigBaseItem class="block">
         <div>
@@ -131,7 +131,7 @@ import ConfigBaseItem from "../../components/config/ConfigBaseItem.vue";
 import { reactive, computed } from "vue";
 import { useStore } from "vuex";
 import ConfigTitle from "../../components/config/ConfigTitle.vue";
-// import Config3D from "../../components/config/Config3D.vue";
+import Config3D from "../../components/config/Config3D.vue";
 import { message } from 'ant-design-vue';
 import { isNumber } from 'element-plus/lib/utils';
 
@@ -140,7 +140,7 @@ export default {
     ConfigTitle,
     ConfigRequire,
     ConfigBaseItem,
-    // Config3D,
+    Config3D,
   },
   props: {
     config: {

src/views/planetDesign/Design/questions/imgTextExplain/ImgTextExplainConfig.vue

@@ -3,7 +3,7 @@
     <ConfigTitle :quiz-index="copyConfig?.title || ''" title="图文说明题" />
     <div class="quiz-config-content">
       <!-- 3D 相关配置 -->
-      <!-- <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/> -->
+      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
     </div>
   </div>
 </template>
@@ -11,12 +11,12 @@
 <script>
 import { reactive, computed } from "vue";
 import ConfigTitle from "../../components/config/ConfigTitle.vue";
-// import Config3D from "../../components/config/Config3D.vue";
+import Config3D from "../../components/config/Config3D.vue";
 
 export default {
   components: {
     ConfigTitle,
-    // Config3D,
+    Config3D,
   },
   props: {
     config: {

src/views/planetDesign/Design/questions/matrix/MatrixConfig.vue

@@ -45,7 +45,7 @@
       </ConfigBaseItem>
       
       <!-- 3D 相关配置 -->
-      <!-- <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/> -->
+      <Config3D :key="copyConfig.question_index" v-model:config="copyConfig.config" @changeConfig="() => updateConfig(copyConfig)" :questionType="copyConfig.question_type"/>
 
       <ConfigRequire
         title="选项随机"
@@ -209,7 +209,7 @@ import RateSelect from "../../../../../components/RateSelect.vue";
 import { computed, reactive } from "@vue/runtime-core";
 import { useStore } from "vuex";
 import { newQuesConfig } from "../../mode/index.js";
-// import Config3D from "../../components/config/Config3D.vue";
+import Config3D from "../../components/config/Config3D.vue";
 export default {
   name: "MatrixConfig",
   components: {
@@ -222,7 +222,7 @@ export default {
     ConfigOptionCount,
     ConfigGrade,
     RateSelect,
-    // Config3D,
+    Config3D,
   },
   props: {
     config: {