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

TEAMModelOS/ClientApp/src/view/signupActivity/createActivity.less

@@ -15,7 +15,7 @@
 }
 
 .create-box {
-    margin: 30px;
+    padding: 30px;
     height: calc(100% - 100px);
 
     .create-form {

TEAMModelOS/ClientApp/src/view/signupActivity/createActivity.vue

@@ -126,7 +126,7 @@
                                 <Checkbox v-for="(item, index) in tabList" :key="index" :label="item.name">{{ item.label }}</Checkbox>
                             </CheckboxGroup>
                             <Tabs v-model="tabName">
-                                <div style="width: 85%; margin-top: 30px;">
+                                <div style="width: 85%; margin: auto; margin-top: 30px;">
                                     <EmptyData v-if="!tabListShow.length" :textContent="$t('activity.prompt.field4')"></EmptyData>
                                 </div>
                                 <TabPane v-for="(item,index) in tabListShow" :key="index" :label="item.label" :name="item.name">

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

@@ -34,7 +34,7 @@
                         </div> -->
                     </div>
                     <div style="margin-bottom: 10px; display: flex; justify-content: space-between;">
-                        <Input v-model="tmdID" search @on-search="searchTmd()" placeholder="搜索醍摩豆ID" style="width: 300px; margin-right: 10px;" />
+                        <Input v-special-char v-model="tmdID" search @on-search="searchTmd()" placeholder="搜索醍摩豆ID" style="width: 300px; margin-right: 10px;" />
                         <Button type="success" @click="getTeacherList()" v-show="actInfo.joinMode === 'invite' && !isArea">邀请老师</Button>
                     </div>
                     <Table :columns="applicationColumns" :data="applicationListShow" stripe row-key="id">
@@ -150,7 +150,7 @@
                             </div>
                             <div>
                                 <p>统计作品公布方式</p>
-                                <p>{{ contestInfo.score.showType ? '按等级分布' : '按分数公布' }}</p>
+                                <p>{{ contestInfo.score.showType ? '按等级分布' : '按分数排名公布' }}</p>
                             </div>
                             <div v-show="!contestInfo.score.showType">
                                 <p>统计公布成绩范围</p>
@@ -1240,7 +1240,7 @@ export default {
         },
         scoreLevelChange(info) {
             this.contestInfo.score = info
-            this.getLevelScore()
+            this.getScore()
             this.awardsShow = false
         },
         changeScore(row) {

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

@@ -12,20 +12,20 @@
                 </RadioGroup>
             </FormItem>
             <FormItem label="成绩公布说明：">
-                <Input v-model="scoreInfo.attention" placeholder="请输入" />
+                <Input v-special-char v-model="scoreInfo.attention" placeholder="请输入" />
             </FormItem>
             <FormItem label="统计作品公布方式：">
                 <RadioGroup v-model="scoreInfo.showType">
                     <Radio :label="0">
-                        <span>按分数公布</span>
+                        <span>按分数排名公布</span>
                     </Radio>
                     <Radio :label="1">
                         <span>按等级分布</span>
                     </Radio>
                 </RadioGroup>
             </FormItem>
-            <FormItem label="统计公布成绩范围：" v-show="!scoreInfo.showType">
-                <InputNumber :min="1" v-model="scoreInfo.top" />
+            <FormItem label="统计公布排名：" v-show="!scoreInfo.showType">
+                前<InputNumber :min="1" v-model="scoreInfo.top" />名
                 <span>
                     <Icon type="ios-alert-outline" color="#ffad16" size="18" />
                     不填则表示公布所有
@@ -44,7 +44,7 @@
             <FormItem label="等级分数设置：" v-show="scoreInfo.showType">
                 <Alert type="warning" show-icon v-show="!scoreInfo.levelType">各等级的最小值要与上一级的最大值一致，否则会保存失败</Alert>
                 <div>
-                    <Input v-model="levelInfo.lable" placeholder="请输入等级标签" style="width: 200px;" />
+                    <Input v-special-char v-model="levelInfo.lable" placeholder="请输入等级标签" style="width: 200px;" />
                     <InputNumber :max="100" :min="0" v-model="levelInfo.min" v-show="!scoreInfo.levelType" placeholder="最小值" style="width: 70px; margin-left: 10px;" />
                     <InputNumber :max="100" :min="1" v-model="levelInfo.max" v-show="!scoreInfo.levelType" placeholder="最大值" style="width: 70px; margin-left: 10px;" />
                     <InputNumber :max="100" :min="1" v-model="levelInfo.top" v-show="scoreInfo.levelType" placeholder="数量" style="width: 70px; margin-left: 10px;" />

TEAMModelOS/ClientApp/src/view/signupActivity/setActivity.vue

@@ -22,7 +22,7 @@
                         </template> -->
                         <template #name="{row}">
                             <div v-if="row.isEdit" class="website-name-edit">
-                                <Input v-model="row.name" placeholder="default size" style="width: 80%" />
+                                <Input v-special-char v-model="row.name" placeholder="default size" style="width: 80%" />
                                 <!-- <div>
                                     <Icon size="20" color="#78ba20" type="md-checkmark-circle" />
                                     <Icon size="20" color="#8f8f8f" type="md-close-circle" />
@@ -51,13 +51,13 @@
                 <template v-else>
                     <Form :model="websitInfo" :label-width="120" style="width: 98%;" v-if="websitInfo">
                         <FormItem label="授权单位/组织">
-                            <Input v-model="websitInfo.name" placeholder="请输入..." :disabled="!editType"></Input>
+                            <Input v-special-char v-model="websitInfo.name" placeholder="请输入..." :disabled="!editType"></Input>
                         </FormItem>
                         <!-- <FormItem label="分站代码">
                             <Input v-model="websitInfo.code" placeholder="请输入..." :disabled="!editType"></Input>
                         </FormItem> -->
                         <FormItem label="分站路由">
-                            <Input v-model="websitInfo.route" placeholder="暂无路由" disabled></Input>
+                            <Input v-special-char v-model="websitInfo.route" placeholder="暂无路由" disabled></Input>
                         </FormItem>
                         <FormItem>
                             <Button @click="editType = true" v-show="!editType">更改</Button>
@@ -103,13 +103,13 @@
                 <TabPane label="新建首页展示" name="form">
                     <Form :model="awardsData" :label-width="80">
                         <FormItem label="标题" prop="title">
-                            <Input v-model="awardsData.title" placeholder="Enter something..."></Input>
+                            <Input v-special-char v-model="awardsData.title" placeholder="Enter something..."></Input>
                         </FormItem>
                         <FormItem label="副标题">
-                            <Input v-model="awardsData.subtitle" placeholder="Enter something..."></Input>
+                            <Input v-special-char v-model="awardsData.subtitle" placeholder="Enter something..."></Input>
                         </FormItem>
                         <FormItem label="跳转地址">
-                            <Input v-model="awardsData.url" placeholder="Enter something..."></Input>
+                            <Input v-special-char v-model="awardsData.url" placeholder="Enter something..."></Input>
                         </FormItem>
                         <FormItem label="展示时间" prop="time">
                             <DatePicker @on-change="getShowTime" transfer type="daterange" :options="beforeToday" placeholder="Select date" />
@@ -549,7 +549,7 @@ export default {
 <style lang="less">
 .setting {
     .ivu-input[disabled],
-    fieldset[disabled]{
+    .fieldset[disabled]{
         color: #4e4e4e;
     }
 

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -3270,6 +3270,7 @@ namespace TEAMModelOS.Controllers
                 TeacherEnroll teacherEnroll = _teacherEnroll.ToObject<TeacherEnroll>();
                 teacherEnroll.id=tmdid;
                 teacherEnroll.code="TeacherEnroll";
+                teacherEnroll.pk="TeacherEnroll";
                 await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).UpsertItemAsync(teacherEnroll, new PartitionKey("TeacherEnroll"));
                 return Ok(new { code = 200, teacherEnroll });
             }
@@ -3279,6 +3280,7 @@ namespace TEAMModelOS.Controllers
                 Azure.Response responseTeacherEnroll= await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemStreamAsync(tmdid, new PartitionKey("TeacherEnroll"));
                 if (responseTeacherEnroll.Status==200)
                 {
+                    teacherEnroll= JsonDocument.Parse(responseTeacherEnroll.Content).RootElement.ToObject<TeacherEnroll>();
                     return Ok(new { code = 200, teacherEnroll });
                 }
                 else {