Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS.SDK/Models/Cosmos/School/Area.cs

@@ -16,5 +16,6 @@ namespace TEAMModelOS.SDK.Models
         public string provName { get; set; }
         public string cityCode { get; set; }
         public string cityName { get; set; }
+        public string standard { get; set; }
     }
 }

TEAMModelOS.SDK/Models/Cosmos/School/School.cs

@@ -71,7 +71,7 @@ namespace TEAMModelOS.SDK.Models
         /// 1 普教，2 高职教
         /// </summary>
         public int type { get; set; }
-      
+        public string standard { get; set; } 
 
     }
     /// <summary>

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

@@ -24,7 +24,7 @@
 					<div class="item-tools-wrap">
 						<!-- <div class="item-tools-t flex-row-center" v-show="isShowTools" @click.stop="handleSetScore(item,exerciseList.indexOf(item),typeItem.list,index)">
 							<Icon type="ios-list-box-outline" />配分</div> -->
-						<div class="item-tools-t flex-row-center" v-if="!item.blob && errorList.indexOf(item) < 0"
+						<div class="item-tools-t flex-row-center"
 							@click.stop="handleToolEdit(typeItem.list,item,index)">
 							<Icon type="ios-brush-outline" />{{$t('evaluation.editItem')}}
 						</div>

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -964,6 +964,7 @@
 			async doSavePaper(list) {
 				sessionStorage.setItem('isSave', 1)
 				console.log('试卷数据', this.evaluationInfo)
+				console.log('试题数据', list)
 				let multipleRule = this.$refs.testPaper.$refs.exList.multipleRule
 				let modifyItems = this.$refs.testPaper.$refs.exList.modifyItems
 				// 将传进来的试题 如果是导入的试题 则需要补充年级学段等信息