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

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -1407,7 +1407,7 @@ namespace TEAMModelBI.Controllers.BITest
             //        }
             //    }
             //}
-            var (an, saveUrl) = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _ipSearcher, _dingDing, $"{path}", BIConst.LogChina, timeType: $"{jTimeType}");
+            var (an, saveUrl) = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _dingDing, $"{path}", BIConst.LogChina, timeType: $"{jTimeType}");
 
             return Ok(new { state = RespondCode.Ok, cnt = filename.Count, filename, an, saveUrl });
         }
@@ -1433,7 +1433,7 @@ namespace TEAMModelBI.Controllers.BITest
 
 
             string path = $"resourceId=/SUBSCRIPTIONS/73B7F9EF-D8B7-4444-9E8D-D80B43BF3CD4/RESOURCEGROUPS/TEAMMODELCHENGDU/PROVIDERS/MICROSOFT.NETWORK/APPLICATIONGATEWAYS/OSFIREWARE/y={y}/m={m}/d={d}/h={h}/m=00/PT1H.json";
-            var retn = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _ipSearcher, _dingDing, path, BIConst.LogChina);
+            var retn = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _dingDing, path, BIConst.LogChina);
             if (retn.recCnts.IsNotEmpty())
             {
                 //https://teammodelos.blob.core.chinacloudapi.cn/0-public/pie-borderRadius.html
@@ -1469,7 +1469,7 @@ namespace TEAMModelBI.Controllers.BITest
                 var ptD = pastTime.Day >= 10 ? $"{pastTime.Day}" : $"0{pastTime.Day}";
 
                 string dayPath = $"resourceId=/SUBSCRIPTIONS/73B7F9EF-D8B7-4444-9E8D-D80B43BF3CD4/RESOURCEGROUPS/TEAMMODELCHENGDU/PROVIDERS/MICROSOFT.NETWORK/APPLICATIONGATEWAYS/OSFIREWARE/y={ptY}/m={ptM}/d={ptD}";
-                var dayRetn = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _ipSearcher, _dingDing, dayPath, BIConst.LogChina, timeType: "Day");
+                var dayRetn = await BILogAnalyseService.GetPathAnalyse(_azureStorage, _dingDing, dayPath, BIConst.LogChina, timeType: "Day");
 
                 if (dayRetn.recCnts.IsNotEmpty())
                 {

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePaperItemPicker.vue

@@ -32,6 +32,8 @@
             <div class="question-list" v-if="questionList.length">
               <div :class="[ 'question-item',checkList.find(i => i.id === item.id) ? 'question-item-active' : 'question-item' ]" v-for="(item,index) in questionList" @click="onQuestionClick(item,index)">
                 <div class="question-stem">
+                  <Tag>{{ exersicesType[item.type] }}</Tag>
+                  <!-- <Tag v-if="item.type === 'subjective'">{{ item.answerType }}</Tag> -->
                   <span>{{ index + 1 }}.</span>
                   <span v-html="item.question">{{  }}</span>
                 </div>
@@ -71,6 +73,7 @@ export default {
       questionList: [],
       checkList: [],
       originQuestionList: [],
+      exersicesType: this.$GLOBAL.EXERCISE_TYPES(),
     }
   },
   created() {

TEAMModelOS/ClientApp/src/view/iot/areaiot.vue

@@ -811,7 +811,7 @@ export default {
           key: ['month', 'schoolName', 'schoolCode', 'classRoom', 'teachNum', 'classTotal', 'classTime', 'studentParticipation', 'studentTime', 'taskNum', 'worksNum', 'subjectNum', 'interactionNum', 'cooperation', 'interaction', 'task', 'differentiation', 'test'],
           data: item.data,
           autoWidth: true,
-          filename: item.month + '月'
+          filename: item.month + this.$t('schoolBaseInfo.monthHolder')
         };
         sheets.push(schoolSheet);
       })