Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/artexam/Create.vue

@@ -519,7 +519,9 @@ export default {
         let promises = []
         let resourcePaper = []
         for (const setting of baseKn.settings) {
+          debugger
           let apiPapers = await this.getPaperInfo(setting.paper)
+          apiPapers.time = setting.time
           resourcePaper.push(setting.paper)
           let requestData = {
             id: this.$jsFn.uuid(),

TEAMModelOS/ClientApp/src/view/artexam/ExamSetting.vue

@@ -23,17 +23,12 @@
       </RadioGroup>
     </div>
     <!-- 评测时间 -->
-    <!-- <div class="attr-item">
-			<span>评测时间：</span>
-			<DatePicker
-                transfer
-				type="datetimerange"
-				placement="bottom-start"
-				placeholder="请设置评测时间"
-                @on-change="handleSetTime"
-                style="width:400px"
-			></DatePicker>
-		</div> -->
+    <div class="attr-item">
+			<span>作答时长：</span>
+			<InputNumber :min="0" v-model="subjectSetting.time" />
+      分钟 
+      <span style="color:#ff9900">（默认为0，代表不限时）</span>
+		</div>
     <!-- 挑选试卷 -->
     <Modal v-model="sltPaperStatus" :title="$t('ae.ae22')" :width="1000" footer-hide>
       <template v-if="!isPreview">
@@ -123,7 +118,8 @@ export default {
         paper: undefined,
         unorder: 0,
         startTime: 0,
-        endTime: 0
+        endTime: 0,
+        time:0
       },
       isPreview: false,
       sltPaperStatus: false,