@zykjcommon/questions 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykjcommon/questions",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "main": "src/components/questions/entry.js",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,7 +12,7 @@
     "build:lib": "vue-cli-service build --target lib src/components/questions/buildEntry.js --name zykjcommon-questions"
   },
   "dependencies": {
-    "@zykjcommon/questions": "^0.0.24",
+    "@zykjcommon/questions": "^0.0.27",
     "alife-logger": "^1.8.30",
     "axios": "^0.26.0",
     "cookie": "^0.4.1",

package/src/assets/js/rem.js

@@ -32,17 +32,15 @@ export let setRem = function(){
 //动态设置html的font-size ----end
 }
 
-export let setRemFixedHeight = function(designWidth=1440,repairH = 0,scale=1){
+export let setRemFixedHeight = function(designWidth=1440,repairH = 0,scale=1,parent){
   let baseNum = 100;
   let winWidth = document.documentElement.clientWidth || document.body.clientWidth;
   let winHeight = document.documentElement.clientHeight || document.body.clientHeight;
   winHeight = winHeight - repairH
   let html = document.getElementsByTagName('html')[0];
-  let frameBili = 4 / 3
+  let frameBili = 4.3 / 3
   let b = frameBili / (winWidth / winHeight)
   let realW = parseInt(winWidth * b)
-  let parent = document.querySelector('.zykjcommon-question')
   parent.style.fontSize = (realW / designWidth) * baseNum * scale + 'px';
-  // html.style.fontSize = (realW / designWidth) * baseNum * scale + 'px';
   console.log(html.style.fontSize);
 }

package/src/assets/scss/questions/zykjcommon-questions.scss

@@ -16,7 +16,6 @@ $greenItemFontSize:0.14em;
   }
   .question-type{
     font-size: 18px;
-    font-family: PingFang-SC-Medium, PingFang-SC;
     font-weight: bold;
     color: #000000;
     margin-bottom: 20px;
@@ -26,6 +25,11 @@ $greenItemFontSize:0.14em;
       font-weight: normal;
     }
   }
+  .question-hint{
+    margin-bottom: 20px;
+    font-size: 16px;
+    color: #333333;
+  }
   .question-box{
     padding-left: 30px;
   }

package/src/components/questions/Question_BriefAnswer.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div v-if="!isSub" class="question-type">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <!--      <div class="question-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-html="questionInfo.htmlContent"></div>
 
       <!--      <div class="editor-tit">样例输入</div>
@@ -74,6 +74,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Classify.vue

@@ -60,7 +60,7 @@ export default {
     },
     screenScale:{
       type: Number,
-      default: 0
+      default: 1
     }
   },
   created() {
@@ -203,7 +203,7 @@ export default {
     },
     setRootFontSize() {
       // setRemFixedHeight(1000,140,1.08)
-      setRemFixedHeight(1000,this.screenRepairH,this.screenScale)
+      setRemFixedHeight(1000,this.screenRepairH,this.screenScale,this.$el)
     },
     unmountedDo(){
       window.removeEventListener('resize',this.setRootFontSize)

package/src/components/questions/Question_FillBlank.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint :questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content"
            style="line-height: 40px;"
            v-if="questionInfo.htmlContent" v-html="questionInfo.htmlContent"></div>
@@ -53,6 +54,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_MultipleChoice.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <!--      <div class="question-stem" v-if="!isSub">{{questionInfo.hint}}</div>-->
-      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-if="!isSub" v-html="questionInfo.htmlContent"></div>
+
+      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
       <div class="editor-content" style="display: flex" v-if="isSub">
         <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex:1;" v-html="questionInfo.htmlContent"></div>
       </div>
-      <div class="question-option-list">
+
+      <div class="question-option-list" :style="(!questionInfo.htmlContent && !questionInfo.hint)?{'margin-top':0}:{}">
         <div class="question-option" v-for="(item,index) in exam_options_data">
           <div class="checkbox-box" :class="{'checked':checkboxList.indexOf(item.index) > -1}">
             <input type="checkbox"
@@ -95,6 +97,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Programming.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <!--      <div class="question-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
       <div class="editor-content" v-html="questionInfo.htmlContent"></div>
       <button class="bcdt-btn"
               v-if="(mode==='exam' && !oss_temp_url) || mode==='review'"
@@ -103,6 +103,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/Question_Reading.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <!--      <div class="question-stem">{{questionInfo.hint}}</div>-->
+      <div class="question-hint" v-if="questionInfo.hint">{{ questionInfo.hint }}</div>
       <div class="editor-content editor-content-bor" v-html="questionInfo.htmlContent"></div>
       <div class="question-tabs">
         <div class="question-tab-item"
@@ -63,6 +63,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   created() {

package/src/components/questions/Question_SingleChoice.vue

@@ -1,15 +1,19 @@
 <template>
   <div class="zykjcommon-question">
-    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{questionInfo.hint ? questionInfo.hint : questionInfo.question_type_str}}<span v-if="questionInfo.score!=='null'"><!--（{{questionInfo.score}}分）--></span>
+    <div class="question-type" v-if="!isSub">{{questionInfo.questionIndex}}、{{ questionInfo.question_type_str }}<span v-if="questionInfo.score!=='null' && showScore">（{{questionInfo.score}}分）</span>
       <span class="score fr" v-if="mode==='analysis'">得分：{{questionInfo.answerMap ? questionInfo.answerMap.user_score : '-'}}分</span>
     </div>
     <div class="question-box">
-      <!--      <div class="question-stem" v-if="questionInfo.hint">{{questionInfo.hint}}</div>-->
-      <!--      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>-->
-      <div class="editor-content" v-if="questionInfo.htmlContent" v-html="questionInfo.htmlContent"></div>
-      <!--      <div class="editor-content" style="display: flex" v-if="isSub">
-              <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex: 1;" v-html="questionInfo.htmlContent"></div>
-            </div>-->
+      <div class="question-hint" v-if="questionInfo.hint && !isSub">{{ questionInfo.hint }}</div>
+      <div class="editor-content" v-if="!isSub" v-html="questionInfo.htmlContent"></div>
+
+      <div class="question-stem" v-if="isSub"><span v-if="questionInfo.hint">{{questionInfo.questionIndex2}}、</span>{{questionInfo.hint}}</div>
+      <div class="editor-content" style="display: flex" v-if="isSub">
+        <span v-if="!questionInfo.hint">{{questionInfo.questionIndex2}}、</span><div style="display: inline-block;flex:1;" v-html="questionInfo.htmlContent"></div>
+      </div>
+
+
+
       <div class="question-option-list" :style="(!questionInfo.htmlContent && !questionInfo.hint)?{'margin-top':0}:{}">
         <div class="question-option" v-for="(item,index) in exam_options_data">
           <div class="radio-box" :class="{'checked':radio == item.index}">
@@ -67,7 +71,7 @@
     v-model:visible="visible"
     -->
     <MediaLooker :visible.sync="visible"
-                  v-model:visible="visible"
+                 v-model:visible="visible"
                  v-if="visible"
                  :mediaCount="curMediaCount"
                  :mediaLookerList="mediaLookerList"></MediaLooker>
@@ -101,6 +105,10 @@ export default {
     mode: {
       type: String,
       default: 'exam'
+    },
+    showScore: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {

package/src/components/questions/buildEntry.js

@@ -129,6 +129,7 @@ export default function(store){
       Vue.component('Question_Programming',Question_Programming)
       Vue.component('Question_Classify',Question_Classify)
     },
+    questionMapper,
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,

package/src/components/questions/developmentEntry.js

@@ -128,6 +128,7 @@ export default function(store){
       Vue.component('Question_Programming',Question_Programming)
       Vue.component('Question_Classify',Question_Classify)
     },
+    questionMapper,
     Question_SingleChoice,
     Question_MultipleChoice,
     Question_Reading,

package/src/main.ts

@@ -179,7 +179,7 @@ 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 '@zykjcommon/questions/dist/zykjcommon-questions.css';
 // import '@zykjcommon/questions/src/assets/scss/questions/zykjcommon-questions.scss';
 // import '@src/assets/scss/questions/zykjcommon-questions.scss';
 

package/src/views/exam/FullScreen.vue

@@ -7,7 +7,6 @@
                  :questionInfo="responsiveObj.curQuestionInfo"
                  :screenRepairH="140"
                  @getIsAnswered="getIsAnswered"
-                 :screenScale="1.08"
                  :ref="'question'"/>
     </div>
     <div class="footer" @click="submit">{{isAnswered}}</div>
@@ -117,40 +116,6 @@ 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\":\"1、准备工作\"},{\"<>\":\"p\",\"text\":\" (1) 选择背景 Desert,Galaxy；\"},{\"<>\":\"p\",\"text\":\" (2) 选择角色 Rocketship。\"},{\"<>\":\"p\",\"text\":\" 2、功能实现\"},{\"<>\":\"p\",\"text\":\" (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert；\"},{\"<>\":\"p\",\"text\":\" (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型；\"},{\"<>\":\"p\",\"text\":\" (3)当火箭达到舞台顶端时，背景切换为 Galaxy；\"},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"text\":\" (4)火箭最后移到舞台下端的位置（初始位置），造型不限。\"}]},{\"<>\":\"p\",\"html\":[{\"<>\":\"span\",\"style\":\"\",\"html\":[{\"<>\":\"img\",\"src\":\"https://dev-resource.thedeer.cn/pre/resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\",\"width\":\"89\",\"height\":\"89\",\"base_src\":\"resource-testing/image/3ae47ad6586554f0cd57b4858b800034qve9a1g4zs6twrc5.jpg\"}]}]}]",
-                "correct_subjective_answer": "",
-                "auto_check": false,
-                "options_data": [],
-                "score": "30.00",
-                "sub_questions": [],
-                "style_type": "CODING",
-                "template_file_full_url": "https://dev-resource.thedeer.cn/pre/resource-testing/coding/d489ef8637c0198c9905b9628536ef875jsskgofnaulimvh.sb3",
-                "question_name": "1、准备工作 (1) 选择背景 Desert,Galaxy； (2) 选择角色 Rocketship。 2、功能实现 (1)火箭初始造型为 rocketship-a,初始位置为舞台下端，初始背景为 Dessert； (2)点击绿旗，火箭垂直向上移动，一直移动到舞台顶端，并在移动过 程中切换造型； (3)当火箭达到舞台顶端时，背景切换为 Galaxy； (4)火箭最后移到舞台下端的位置（初始位置），造型不限。",
-                "correct_rate": "",
-                "knowledge_name": "",
-                "page_location_list": [],
-                "code_type": 1,
-                "difficulty_level": "2",
-                "question_index": "",
-                "correct_single_index": 0,
-                "question_type": "16",
-                "media_resources": [],
-                "analysis": "",
-                "question_id": "12918",
-                "difficulty_level_str": "困难",
-                "update_date": "2023-05-13 10:09:59",
-                "exam_options_data": [],
-                "exam_link_answer_data": [],
-                "reference_file_full_url": "",
-                "correct_multiple_index_set": [],
-                "hint": "飞向太空",
-                "knowledge_id": ""
-              },
               {
                 "question_type_str": "分类题",
                 "is_need_judge": "",