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

TEAMModelBI/ClientApp/src/view/product/index.vue

@@ -355,6 +355,15 @@ let columns = ref([
     // sortable: true,
     headerClass: 'general',
   },
+  {
+    key: "date",
+    dataKey: "date",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
+    title: "時間",//显示在单元格表头的文本
+    width: 100,//当前列的宽度，必须设置
+    fixed: false,//是否固定列
+     sortable: true,
+    headerClass: 'general',
+  },
   {
     key: "schoolId",
     dataKey: "schoolId",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
@@ -983,7 +992,7 @@ function dataInit () {
     }
   }).catch((err) => {
     ElMessage.error('API异常,数据获取失败')
-  })
+  })  
 }
 function timeChange (value) {
   console.log(value, productData.value.timevalue)

TEAMModelBI/ClientApp/src/view/userInquire/idIncrement.vue

@@ -1088,7 +1088,7 @@ function FilterData () {
   }
   .data-tables {
     width: 93%;
-    padding: 10px 20px;
+    padding: 0px 20px;
     height: 100%;
   }
   .select-result {

TEAMModelOS/ClientApp/src/view/classrecord/eventchart/PopQues.vue

@@ -17,7 +17,7 @@
                 <!-- 如果有设置正确答案的正确率统计 -->
                 <CorrectRate :correctData="correctData" v-if="hasAnswer"></CorrectRate>
                 <!-- 问答题（文字、图片、音频） -->
-                <SubjectiveAns v-else-if="quType === 'subjective'" :answer="answerData" :students="students" :recordInfo="recordInfo" :blobInfo="blobInfo" :answerType="irsData.question.exercise.answerType" />
+                <SubjectiveAns v-else-if="quType === 'subjective'" :answer="answerData" :students="students" :recordInfo="recordInfo" :blobInfo="blobInfo" :answerType="answerType" />
             </div>
             <div v-else>
                 <p v-for="key in Object.keys(optionData)" :key="key">
@@ -97,6 +97,11 @@ export default {
     components: {
         OptionCount, CorrectRate, TeacherClient, CompleteAns, SubjectiveAns
     },
+    computed: {
+        answerType() {
+            return this.irsData.question?.exercise?.answerType
+        },
+    },
     watch: {
         irsData: {
             deep: true,

TEAMModelOS/ClientApp/src/view/signupActivity/infoComponent/editContest.vue

@@ -17,7 +17,7 @@
                 <FormItem :label="$t('activity.timeList.upload')" prop="uploadEtime">
                     <DatePicker v-model="actAllTime[1]" ref="workPicker" :editable="false" @on-open-change="(type) => dateOpenChange(type, 1)" @on-change="(data, type) => getCreateTime(data, type, 1)" type="datetimerange" :options="beforeToday" format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('train.create.timeHolder')" style="width: 500px"></DatePicker>
                 </FormItem>
-                <FormItem :label="$t('studentWeb.homework.table3')" v-if="uploadInfo.fileType" prop="fileType">
+                <FormItem :label="$t('studentWeb.homework.table3')" v-if="uploadInfo && uploadInfo.fileType" prop="fileType">
                     <div class="tab-check">
                         <div v-for="(item, index) in fileType" :key="index" class="file-box">
                             <Checkbox v-model="item.isCheck">

TEAMModelOS/ClientApp/src/view/signupActivity/infoComponent/skContent.vue

@@ -253,14 +253,17 @@
             </div>
         </Drawer>
         <Drawer :title="$t('activity.modal.text8')" :width="25" v-model="workDrawer">
-            <div v-for="(item, index) in processList[proIndex].uploads" :key="item.id" style="font-size: 18px; margin-bottom: 10px;">
-                {{ item.name }}
-                <span v-show="item.score != -1">
-                    <span style="color: #00b457; margin-right: 2px;">({{ item.score }}分)</span>
-                    <Icon type="md-checkmark-circle" color="#189718" v-show="item.score != -1" />
-                </span>
-                <Icon type="md-brush" @click="manualAssignChange(index, true)" v-show="item.score === -1" />
-            </div>
+            <template v-if="processList[proIndex].uploads">
+                <div v-for="(item, index) in processList[proIndex].uploads" :key="item.id" style="font-size: 18px; margin-bottom: 10px;">
+                    {{ item.name }}
+                    <span v-show="item.score != -1">
+                        <span style="color: #00b457; margin-right: 2px;">({{ item.score }}分)</span>
+                        <Icon type="md-checkmark-circle" color="#189718" v-show="item.score != -1" />
+                    </span>
+                    <Icon type="md-brush" @click="manualAssignChange(index, true)" v-show="item.score === -1" />
+                </div>
+            </template>
+            <div v-else>暂无可评审作品</div>
         </Drawer>
         <Modal v-model="teacherModal" :title="$t('activity.inviteTea')" width="650" :footer-hide="true">
             <Table :columns="teacherCloumns" :data="showTeachers" height="500" @on-selection-change="getSelTea">