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

TEAMModelBI/ClientApp/src/view/schoolServe/school.vue

@@ -264,11 +264,18 @@
                             </el-form-item> -->
               <el-form-item :label="$t(`schoolManages.basicSet.spacesize`)" class="school-form-size">
                 <!-- <el-input-number v-model="nowPitchdata.size" :min="1" :max="1000" /><span>GB</span> -->
-                <div v-if="PowerShow">
-                  <el-slider v-model="nowPitchdata.size" :step="100" show-stops show-input :min='0' :max='1000' />
+                <div v-if="PowerShow" class="sizebox">
+                  <el-slider v-model="nowPitchdata.size" :step="500" show-stops show-input :min='0' :max='10300' />
+                </div>
+                <div v-if="!PowerShow" class="sizebox">
+                  <el-slider v-model="nowPitchdata.size" :step="500" show-stops show-input :min='0' :max='10300' disabled />
                 </div>
-                <div v-if="!PowerShow">
-                  <el-slider v-model="nowPitchdata.size" :step="100" show-stops show-input :min='0' :max='1000' disabled />
+                <div class="siznum">GB</div>
+                <div class="selectsize">
+                  <span>快捷选定：</span>
+                  <el-button size="small" @click="nowPitchdata.size =100">100</el-button>
+                  <el-button size="small" @click="nowPitchdata.size =300">300</el-button>
+                  <el-button size="small" @click="nowPitchdata.size =500">500</el-button>
                 </div>
               </el-form-item>
               <!-- <el-form-item label="学校状态：" class="school-form-state">
@@ -848,6 +855,7 @@ export default {
           }
         }
         tableData.value.push(...res.schoolAssists)
+        tableData.value.forEach((item) => { item.areaName = ''; areaSelect.value.data.forEach((itema) => { item.areaId === itema.id ? item.areaName = itema.name : '' }) })
         tableNexttoken.value = res.continuationToken
       }).catch((error) => {
         ElMessage.error('API异常，获取更多学校数据失败')
@@ -1062,7 +1070,7 @@ export default {
 }
 
 .school-form-size {
-  width: 31%;
+  width: 45%;
   color: #bdc3c7;
 }
 
@@ -1303,6 +1311,22 @@ export default {
   overflow: hidden;
   margin-right: 5px;
 }
+.siznum,.sizebox,.selectsize{
+  display: inline-block;
+  vertical-align: top;
+}
+.sizebox{
+  width:65%;
+}
+.siznum{
+  width:3%;
+  margin-left:2%;
+}
+.selectsize{
+  width:26%;
+  font-size:12px;
+  margin-left:1%;
+}
 </style>
 <style>
 .schoolboxea .el-cascader {

TEAMModelOS/Controllers/School/ArtReviewController.cs

@@ -1,4 +1,4 @@
-namespace TEAMModelOS.Controllers.School
+namespace TEAMModelOS.Controllers
 {
     public class ArtReviewController
     {

TEAMModelOS/Controllers/XTest/TestController.cs

@@ -1047,9 +1047,7 @@ namespace TEAMModelOS.Controllers
         }
         public class TestBatch:CosmosEntity
         {
-            public string id { get; set; }
-           
-            public string code { get; set; }
+         
         
         }
         [HttpPost("export-teacher")]