@zykjcommon/questions 0.0.16 → 0.0.18

package/src/components/questions/Question_Programming.vue

@@ -80,6 +80,10 @@ import {mapActions, mapState} from "vuex";
 export default {
   name: 'Question_Programming',
   props: {
+    isEnterCodeByInit:{
+      type: Boolean,
+      default: false
+    },
     urlQuery:{
       type: String,
       default: ''
@@ -116,6 +120,16 @@ export default {
       immediate:true
     })
   },
+  created() {
+    //设置了后无需点击按钮直接进入编辑器
+    if(this.isEnterCodeByInit){
+      if(this.oss_temp_url){
+        this.startCode('2')
+      }else{
+        this.startCode('1')
+      }
+    }
+  },
   data() {
     return {
       iframe:null,
@@ -253,8 +267,10 @@ export default {
     //关闭iframe并且保存（考试中）
     closeAndSave(res){
       this.saveCodeOnly(res)
-      this.closeIframe()
-      this.$emit('closeAndSave')
+      if(!this.isEnterCodeByInit){
+        this.closeIframe()
+      }
+      this.$emit('closeAndSave',res)
     },
     saveCodeOnly(res){
       let self = this
@@ -267,7 +283,7 @@ export default {
         questionIndex:self.questionInfo.questionIndex - 1,
         answered
       })
-      this.$emit('saveCodeOnly')
+      this.$emit('saveCodeOnly',res)
     },
     uploadCodingFileSuccess(res){
       this.code_file_oss_temp_path = res.codeFileOssTempPath

package/src/components/questions/buildEntry.js

@@ -9,6 +9,7 @@ import Question_Reading from './Question_Reading.vue'
 import Question_BriefAnswer from './Question_BriefAnswer.vue'
 import Question_FillBlank from './Question_FillBlank.vue'
 import Question_Programming from './Question_Programming.vue'
+import Question_Classify from './Question_Classify.vue'
 import {questionMapper} from "./const";
 import fun from "../../assets/js/fun";
 import storeOptions from './store'
@@ -126,13 +127,15 @@ export default function(store){
       Vue.component('Question_BriefAnswer',Question_BriefAnswer)
       Vue.component('Question_FillBlank',Question_FillBlank)
       Vue.component('Question_Programming',Question_Programming)
+      Vue.component('Question_Classify',Question_Classify)
     },
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,
     Question_BriefAnswer,
     Question_FillBlank,
-    Question_Programming
+    Question_Programming,
+    Question_Classify
   }
 }
 

package/src/components/questions/const.js

@@ -11,5 +11,6 @@ export let questionMapper = {
   '7':'Question_BriefAnswer',//简答
   '16':'Question_Programming',//编程
   '11':'Question_Reading',//阅读
-  '4':'Question_FillBlank'//填空
+  '4':'Question_FillBlank',//填空
+  '17':'Question_Classify'//分类
 }

package/src/components/questions/developmentEntry.js

@@ -8,6 +8,7 @@ import Question_Reading from './Question_Reading.vue'
 import Question_BriefAnswer from './Question_BriefAnswer.vue'
 import Question_FillBlank from './Question_FillBlank.vue'
 import Question_Programming from './Question_Programming.vue'
+import Question_Classify from './Question_Classify.vue'
 import {questionMapper} from "./const";
 import fun from "../../assets/js/fun";
 import storeOptions from './store'
@@ -125,12 +126,14 @@ export default function(store){
       Vue.component('Question_BriefAnswer',Question_BriefAnswer)
       Vue.component('Question_FillBlank',Question_FillBlank)
       Vue.component('Question_Programming',Question_Programming)
+      Vue.component('Question_Classify',Question_Classify)
     },
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,
     Question_BriefAnswer,
     Question_FillBlank,
-    Question_Programming
+    Question_Programming,
+    Question_Classify
   }
 }

package/src/components/questions/entry.js

@@ -1,7 +1,8 @@
 /**
  * Created by Allen Liu on 2023/7/19.
  */
-// import ZYKJQuestionsPlugin from "../../../dist/zykjcommon-questions.umd.min"
+
+import ZYKJQuestionsPlugin from "../../../dist/zykjcommon-questions.umd.min"
 // import ZYKJQuestionsPluginDev from "./developmentEntry.js"
 import fun from "../../assets/js/fun";
 let version = fun.getVueVersion()

package/src/main.ts

@@ -1,9 +1,11 @@
+import ZYKJQuestionsPlugin2 from "@zykjcommon/questions";
+
 window.vm = {}
 import {createApp,h} from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'
-import setRem from '@src/assets/js/rem'
+import {setRem} from '@src/assets/js/rem'
 import Loading from '@src/components/common/Loading.vue'
 import ContentDialog from '@src/components/common/ContentDialog.vue'
 import fun from "@src/assets/js/fun.js";
@@ -172,15 +174,14 @@ vueInstance.use(validationPlugin)
 
 
 
-// import ZYKJQuestionsPlugin from "@src/components/questions/entry.js"
+import ZYKJQuestionsPlugin from "@src/components/questions/developmentEntry.js"
 // vueInstance.use((ZYKJQuestionsPlugin as any)(store))
-// import '../dist/zykjcommon-questions.css';
 
-import ZYKJQuestionsPlugin from "@zykjcommon/questions"
-// import ZYKJQuestionsPlugin from "@src/components/questions/developmentEntry.js"
+// import ZYKJQuestionsPlugin from "../dist/zykjcommon-questions.umd.min"
+// import ZYKJQuestionsPlugin from "@zykjcommon/questions"
 vueInstance.use((ZYKJQuestionsPlugin as any)(store))
-import '@zykjcommon/questions/dist/zykjcommon-questions.css';
-// import '@src/assets/scss/questions/index.scss';
+// import '@zykjcommon/questions/src/assets/scss/questions/index.scss';
+import '@src/assets/scss/questions/index.scss';
 
 // console.log(ZYKJQuestionsPlugin,111);
 

package/src/router/exam.ts

@@ -9,6 +9,8 @@ const ReviewPaper = () =>
     import(/* webpackChunkName: "exam" */ "@src/views/exam/ReviewPaper.vue");
 const ReviewQuestion = () =>
     import(/* webpackChunkName: "exam" */ "@src/views/exam/ReviewQuestion.vue");
+const FullScreen = () =>
+    import(/* webpackChunkName: "exam" */ "@src/views/exam/FullScreen.vue");
 
 export default [
   {
@@ -46,5 +48,14 @@ export default [
       title: "预览试题",
       keepAlive: false
     }
+  },
+  {
+    path: "fullScreen",
+    name: "fullScreen",
+    component: FullScreen,
+    meta: {
+      title: "全屏类型题目",
+      keepAlive: false
+    }
   }
 ]

package/src/views/exam/Exam.vue

@@ -138,6 +138,126 @@ export default defineComponent({
             "have_not_auto_check_question": false,
             "size": 23,
             "question_list": [
+              {
+                "question_type_str": "分类题",
+                "data_mode": 1,
+                "correct_judge": "",
+                "is_auto_check": "",
+                "content": "[{\"<>\":\"p\",\"text\":\"He arrived here ________. The teacher felt ________.\"}]",
+                "correct_subjective_answer": "",
+                "auto_check": true,
+                "options_data": [
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "late, angry"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "lately, angrily"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": " late, angrily"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "lately, angry"
+                  }
+                ],
+                "score": "1.00",
+                "sub_questions": [],
+                "style_type": "SELECT_R-T",
+                "template_file_full_url": "",
+                "question_name": "He arrived here ________. The teacher felt ________.",
+                "correct_rate": "",
+                "knowledge_name": "词汇",
+                "page_location_list": [],
+                "code_type": 0,
+                "difficulty_level": "1",
+                "question_index": "",
+                "correct_single_index": 0,
+                "question_type": "17",
+                "media_resources": [],
+                "analysis": "",
+                "question_id": "13091",
+                "difficulty_level_str": "简单",
+                "update_date": "",
+                "exam_options_data": [
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "late, angry"
+                    },
+                    "index": 1
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "lately, angrily"
+                    },
+                    "index": 2
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": " late, angrily"
+                    },
+                    "index": 3
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "lately, angry"
+                    },
+                    "index": 4
+                  }
+                ],
+                "exam_link_answer_data": [],
+                "reference_file_full_url": "",
+                "correct_multiple_index_set": [],
+                "hint": "Multiple choice.1",
+                "knowledge_id": "2"
+              },
               {
                 "question_type_str": "编程题",
                 "data_mode": 1,

package/src/views/exam/FullScreen.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="exam">
+    <QuestionHeader></QuestionHeader>
+    <div class="content-outter" style="overflow: inherit">
+      <component :is="responsiveObj.curQuestionInfo.questionComponent"
+                 :bus="eventBus"
+                 :questionInfo="responsiveObj.curQuestionInfo"
+                 :ref="'question'"/>
+    </div>
+    <div class="footer"></div>
+  </div>
+</template>
+
+<script lang="ts">
+import {defineComponent, ref, toRefs, reactive, watch, computed, onMounted,getCurrentInstance} from 'vue'
+// import QuestionReader from '@src/components/questions/QuestionReader.js'
+// import zykj_question_plugin from '@src/components/questions/entry.js'
+import QuestionCard from '@src/components/exam/QuestionCard.vue'
+import QuestionHeader from '@src/components/exam/QuestionHeader.vue'
+import TimeCounter from '@src/components/exam/TimeCounter.vue'
+import { useState as rootUseState } from 'vuex-composition-helpers'
+import {createNamespacedHelpers} from 'vuex-composition-helpers';
+import {useRouter,useRoute} from 'vue-router'
+import fun from "@/assets/js/fun";
+import bus from "@/assets/js/bus";
+import {questionMapper} from '@src/common/const.ts'
+// import zykj_question_plugin from "../../../dist/zykjcommon-questions.umd.min"
+// console.log(zykj_question_plugin,99);
+
+interface dataInterface{
+  showBlur:boolean,
+  examInfo:any,
+  warnVisible:boolean,
+  autoSubmitTimer:any,
+  routeName:string,
+  loading:boolean,
+  warnText:string,
+  eventBus:any,
+  token:string
+}
+
+interface responsiveData{
+  questionList:Array<any>,
+  resData:any,
+  curQuestionInfo:any
+}
+
+
+export default defineComponent({
+  components: {
+    // ...zykj_question_plugin,
+    // ...QuestionReader,
+    QuestionCard,
+    QuestionHeader,
+    TimeCounter,
+    // Question_SingleChoice:(zykj_question_plugin as any).Question_SingleChoice
+  },
+  setup(props,context) {
+    const {useState, useActions,useMutations} = createNamespacedHelpers('exam'); // specific module name
+    const {getExamPaperActions,resetExamActions} = useActions(['getExamPaperActions','resetExamActions'])
+    const {token} = rootUseState(['token'])
+    let {examInfo,userId} = useState(['examInfo','userId'])
+    let route = useRoute()
+    let router = useRouter()
+    const currentInstance:any = getCurrentInstance()
+    let _this = currentInstance.proxy
+    //不需要响应式或者写死的数据放里面
+    let data:dataInterface = reactive({
+      eventBus:bus,
+      showBlur:false,
+      examInfo,
+      autoSubmitTimer:null,
+      warnVisible:false,
+      routeName:route.name as string,
+      loading:false,
+      warnText:'',
+      token
+    })
+
+    //需要响应式放里面
+    let responsiveObj:{value:responsiveData} = ref({
+      questionList:[],
+      resData:{},
+      curQuestionInfo:{}
+    })
+
+
+
+    onMounted(()=>{
+      // resetExamActions({examId:29})
+      getExamPaper()
+    })
+
+
+    bus.$on('showBlur',()=>{
+      data.showBlur = true
+    })
+
+
+    function quitQuestion(){
+      fun.postMessageByType('close')
+    }
+
+    function getExamPaper(){
+      let res = {
+        "data": {
+          "examination_paper": {
+            "have_not_auto_check_question": false,
+            "size": 23,
+            "question_list": [
+              {
+                "question_type_str": "分类题",
+                "data_mode": 1,
+                "correct_judge": "",
+                "is_auto_check": "",
+                "content": "[{\"<>\":\"p\",\"text\":\"He arrived here ________. The teacher felt ________.\"}]",
+                "correct_subjective_answer": "",
+                "auto_check": true,
+                "options_data": [
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "late, angry"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "lately, angrily"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": " late, angrily"
+                  },
+                  {
+                    "file_url": "",
+                    "content_type": 1,
+                    "file_type": 0,
+                    "name": "",
+                    "id": 0,
+                    "thumbnail_url": "",
+                    "option_content": "lately, angry"
+                  }
+                ],
+                "score": "1.00",
+                "sub_questions": [],
+                "style_type": "SELECT_R-T",
+                "template_file_full_url": "",
+                "question_name": "He arrived here ________. The teacher felt ________.",
+                "correct_rate": "",
+                "knowledge_name": "词汇",
+                "page_location_list": [],
+                "code_type": 0,
+                "difficulty_level": "1",
+                "question_index": "",
+                "correct_single_index": 0,
+                "question_type": "17",
+                "media_resources": [],
+                "analysis": "",
+                "question_id": "13091",
+                "difficulty_level_str": "简单",
+                "update_date": "",
+                "exam_options_data": [
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "late, angry"
+                    },
+                    "index": 1
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "lately, angrily"
+                    },
+                    "index": 2
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": " late, angrily"
+                    },
+                    "index": 3
+                  },
+                  {
+                    "data": {
+                      "file_url": "",
+                      "content_type": 1,
+                      "file_type": 0,
+                      "name": "",
+                      "id": 0,
+                      "thumbnail_url": "",
+                      "option_content": "lately, angry"
+                    },
+                    "index": 4
+                  }
+                ],
+                "exam_link_answer_data": [],
+                "reference_file_full_url": "",
+                "correct_multiple_index_set": [],
+                "hint": "Multiple choice.1",
+                "knowledge_id": "2"
+              }
+            ],
+            "examination_duration": 5400,
+            "examination_id": 495,
+            "examination_name": "校招考试（仿真数据，勿调整）",
+            "examination_record_id": 47288,
+            "skin_type": 1
+          },
+          "online_exam_name": "校招考试（仿真数据，勿调整）",
+          "remain_second": 59920,
+          "exam_description": "",
+          "applicant_simple_info": {
+            "applicant_id": "154",
+            "phone": "12345678905",
+            "applicant_name": "李老丹"
+          },
+          "answer_map": {}
+        },
+        "error_code": 0,
+        "message": "success",
+        "tid": "8f4f6e7b2287471fbc22ff5a3f4182e5.1822.16892350452200069",
+        "ts": 1689235045453
+      }
+      let {examination_paper,answer_map,remain_second} = res.data
+      let {question_list} = examination_paper
+
+      //todo 测试数据
+      responsiveObj.value.resData = res.data
+      responsiveObj.value.resData.remain_second = responsiveObj.value.resData.remain_second * 1000
+      // responsiveObj.value.resData.remain_second = 0
+      _this.parseQuestionListItem('exam',question_list,answer_map)
+      // responsiveObj.value.questionList = question_list.slice(0,1)
+      responsiveObj.value.questionList = question_list
+      responsiveObj.value.curQuestionInfo = question_list[0]
+    }
+
+
+    return {
+      ...toRefs(data),
+      responsiveObj,
+      quitQuestion
+    }
+  }
+})
+</script>
+<style lang="scss" scoped>
+.showBlur{
+  filter:blur(5px);
+}
+.white-mask{
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left:0;
+  top:0;
+  z-index:666;
+}
+.footer{
+  width: 100%;
+  height: 60px;
+  background: rgb(252, 120, 38);
+}
+</style>