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

TEAMModeBI/ClientApp/src/until/inspect.js

@@ -5,6 +5,7 @@ export default {
         let pwoerData = userStatus.permissions.split(",")
         let result = pwoerData.includes(modelName)
         console.log(result, '状态值')
+        userStatus.roles === "admin" ? result = true : ''
         return result
     }
 }

TEAMModeBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -432,13 +432,12 @@ namespace TEAMModeBI.Controllers.DingDingStruc
                         item.roles = "assist";
                     }
 
+                    string tempPermissions = "";
                     foreach (var itemPer in listper)
                     {
-                        if (!item.permissions.Contains($"{itemPer}"))
-                        {
-                            item.permissions += !string.IsNullOrEmpty($"{item.permissions}") ? $",{itemPer}" : $"{itemPer}";
-                        }
+                        tempPermissions += !string.IsNullOrEmpty($"{tempPermissions}") ? $",{itemPer}" : $"{itemPer}";
                     }
+                    item.permissions = tempPermissions;
                     ddUserInfo.Add(item);
 
                     roles = !string.IsNullOrEmpty($"{item.roles}") ? new List<string>(item.roles.Split(",")) : new List<string>();

TEAMModelOS/ClientApp/src/common/UploadModal.vue

@@ -58,8 +58,7 @@
                         </Checkbox>
                         <Progress style="top:-10px;" v-if="item.status == 0" :percent="item.progress" status="active" stroke-color="#1CC0F3" :stroke-width="2" hide-info />
                     </div>
-                    <!-- 暂时去掉删除功能 -->
-                    <div class="upload-item-right">
+                    <div class="upload-item-right" v-show="!textLoading">
                         <Icon type="ios-close" class="delete-btn" color="red" size="30" style="float:right;" @click="listDelFile(index)" />
                     </div>
                 </div>

TEAMModelOS/Controllers/Common/LessonRecordController.cs

@@ -125,7 +125,7 @@ namespace TEAMModelOS.Controllers
             {
                 dict.Add("periodId", periodId);
             }
-            if (request.TryGetProperty("subjectId", out JsonElement subjectId) )
+            if (request.TryGetProperty("subjectId", out JsonElement subjectId))
             {
                 dict.Add("subjectId[*]", subjectId);
             }
@@ -151,7 +151,7 @@ namespace TEAMModelOS.Controllers
                 dict.Add(">=.discuss", 1);
             }
 
-            if (request.TryGetProperty("name", out JsonElement name))
+            if (request.TryGetProperty("name", out JsonElement name) && !string.IsNullOrWhiteSpace($"{name}"))
             {
                 dict.Add("$.name", name);
             }

TEAMModelOS/Controllers/XTest/TestController.cs

@@ -585,11 +585,12 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
-        [HttpPost("get-data")]
+        [HttpPost("get-bind-data")]
         public async Task<IActionResult> GetData(JsonElement request)
         {
-           
-            return Ok();
+            var areaId =request.GetProperty("areaId");
+            List<ScTeacher> teachers = await _azureStorage.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" }, { "areaId", $"{areaId}" } });
+            return Ok(teachers.Select(x =>new  {x.areaId,x.PXID,x.TID,x.TeacherName,x.tmdid,x.SchoolName,x.DisName }));
         }
     }