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

TEAMModelOS/ClientApp/src/view/homepage/MinTable.vue

@@ -247,6 +247,7 @@ export default {
                         SUN: ''
                     }))
                     let tmw = this.getNextDay()
+                    console.log('今天',tmw)
                     // let tmw = 'WED'
                     this.fullCus.forEach((cusItem) => {
                         cusItem.schedule.forEach(schedItem => {
@@ -284,9 +285,10 @@ export default {
         },
         getNextDay() {
             let today = new Date().getDay()
+            console.log('今天是',today)
             let tomorrow
             if (today < 7) {
-                tomorrow = today++
+                tomorrow = ++today
             } else {
                 tomorrow = 1
             }

TEAMModelOS/ClientApp/src/view/login/page/Student.vue

@@ -11,11 +11,13 @@
     height: 400px;
     display: flex;
     align-items: center;
-    box-shadow: 2px 0px 15px 0px rgba(75, 113, 136, 0.9);
+    justify-content: center;
+    flex-direction: column;
+    box-shadow: 2px 0px 15px 5px rgba(35, 57, 71, 0.3);
 }
 .right-box {
     padding: 40px 120px;
-    box-shadow: -2px 0px 15px 0px rgba(75, 113, 136, 0.9);
+    // box-shadow: -2px 0px 15px 0px rgba(75, 113, 136, 0.9);
     display: flex;
     height: 400px;
     min-width: 600px;
@@ -43,6 +45,8 @@
 .form-bottom {
     color: white;
     font-size: 12px;
+    margin-top: -12px;
+    padding: 0px 5px;
 }
 .form-bottom-link {
     float: right;
@@ -71,6 +75,13 @@
 .tmd-login-box {
     margin-right: 35px;
 }
+.client-label {
+    color: white;
+    font-size: 30px;
+    text-align: center;
+    margin-top: -20px;
+    margin-left: -7px;
+}
 </style>
 
 <style lang="less">
@@ -158,6 +169,7 @@
         <div class="left-box">
             <!-- 这张图片需要裁剪顶部 -->
             <img src="@/assets/login/2-1.png" class="student-login-img" style="margin-top:-30px">
+            <p class="client-label">学生端</p>
         </div>
         <div class="right-box">
             <div v-show="!qrloginFlag" class="tmd-login-box">

TEAMModelOS/ClientApp/src/view/login/page/Teacher.vue

@@ -8,16 +8,19 @@
 }
 .left-box {
     padding: 0px 55px;
-    height: 400px;
+    height: 370px;
     display: flex;
+    flex-direction: column;
+    justify-content: center;
     align-items: center;
-    box-shadow: 2px 0px 15px 0px rgba(75, 113, 136, 0.9);
+    box-shadow: 2px 0px 15px 5px rgba(35, 57, 71, 0.3);
+    // border-right: 1px solid rgba(35, 57, 71, 0.1);
 }
 .right-box {
-    padding: 40px 150px;
-    width: 600px;
-    height: 400px;
-    box-shadow: -2px 0px 15px 0px rgba(75, 113, 136, 0.9);
+    padding: 30px 160px;
+    // width: 600px;
+    height: 370px;
+    // box-shadow: -2px 0px 15px 5px rgba(35, 57, 71, 0.5);
 }
 .teacher-login-title {
     color: white;
@@ -32,7 +35,7 @@
 }
 .loginForm {
     margin: auto;
-    margin-top: 30px;
+    margin-top: 20px;
     width: 300px;
 }
 .formItem {
@@ -41,6 +44,8 @@
 .form-bottom {
     color: white;
     font-size: 12px;
+    margin-top: -15px;
+    padding: 0px 5px;
 }
 .form-bottom-link {
     float: right;
@@ -63,6 +68,13 @@
     font-size: 50px;
     display: block;
 }
+.client-label {
+    color: white;
+    font-size: 30px;
+    text-align: center;
+    margin-top: -20px;
+    margin-left: -7px;
+}
 </style>
 
 <style lang="less">
@@ -149,6 +161,7 @@
         <div class="left-box">
             <!-- 这张图片需要裁剪顶部 -->
             <img src="@/assets/login/3-2.png" class="teacher-login-img" style="margin-top:-30px">
+            <p class="client-label">教师端</p>
         </div>
         <div class="right-box" v-show="!qrloginFlag">
             <p class="teacher-login-title">醍摩豆账号登录</p>

TEAMModelOS/Controllers/Item/ItemController.cs

@@ -95,6 +95,7 @@ namespace TEAMModelOS.Controllers
                         }
                         else
                         {
+                          // itemInfo.periodId
                             itemInfo = await client.GetContainer("TEAMModelOS", "School").CreateItemAsync(itemInfo, new PartitionKey($"{itemInfo.code}"));
                         }
                     }

TEAMModelOS/Controllers/Syllabus/ShareController.cs

@@ -85,7 +85,7 @@ namespace TEAMModelOS.Controllers
                             syllabusAuths.ForEach(x => {
                                 syllabusD.auth.Remove(x);
                             });
-                            await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<Syllabus>(syllabusD, request.volumeId, new PartitionKey($"Syllabus-{request.volumeId}"));
+                            await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<Syllabus>(syllabusD, request.syllabusId, new PartitionKey($"Syllabus-{request.volumeId}"));
                             request.tmdInfo.ForEach(async x => {
                                 await client.GetContainer("TEAMModelOS", "Teacher").DeleteItemAsync<Share>(request.syllabusId, new PartitionKey($"Share-{x.tmdid}"));
                             });

TEAMModelOS/Properties/ServiceDependencies/teammodelos-dep - Web Deploy/profile.arm.json

@@ -1,113 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "metadata": {
-    "_dependencyType": "appService.windows"
-  },
-  "parameters": {
-    "resourceGroupName": {
-      "type": "string",
-      "defaultValue": "TEAMModelChengdu",
-      "metadata": {
-        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
-      }
-    },
-    "resourceGroupLocation": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "Location of the resource group. Resource groups could have different location than resources, however by default we use API versions from latest hybrid profile which support all locations for resource types we support."
-      }
-    },
-    "resourceName": {
-      "type": "string",
-      "defaultValue": "dep",
-      "metadata": {
-        "description": "Name of the main resource to be created by this template."
-      }
-    },
-    "resourceLocation": {
-      "type": "string",
-      "defaultValue": "[parameters('resourceGroupLocation')]",
-      "metadata": {
-        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
-      }
-    }
-  },
-  "variables": {
-    "appServicePlan_name": "[concat('Plan', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
-    "appServicePlan_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/serverFarms/', variables('appServicePlan_name'))]"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/resourceGroups",
-      "name": "[parameters('resourceGroupName')]",
-      "location": "[parameters('resourceGroupLocation')]",
-      "apiVersion": "2019-10-01"
-    },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
-      "resourceGroup": "[parameters('resourceGroupName')]",
-      "apiVersion": "2019-10-01",
-      "dependsOn": [
-        "[parameters('resourceGroupName')]"
-      ],
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": [
-            {
-              "location": "[parameters('resourceLocation')]",
-              "name": "[parameters('resourceName')]",
-              "type": "Microsoft.Web/sites",
-              "apiVersion": "2015-08-01",
-              "tags": {
-                "[concat('hidden-related:', variables('appServicePlan_ResourceId'))]": "empty"
-              },
-              "dependsOn": [
-                "[variables('appServicePlan_ResourceId')]"
-              ],
-              "kind": "app",
-              "properties": {
-                "name": "[parameters('resourceName')]",
-                "kind": "app",
-                "httpsOnly": true,
-                "reserved": false,
-                "serverFarmId": "[variables('appServicePlan_ResourceId')]",
-                "siteConfig": {
-                  "metadata": [
-                    {
-                      "name": "CURRENT_STACK",
-                      "value": "dotnetcore"
-                    }
-                  ]
-                }
-              },
-              "identity": {
-                "type": "SystemAssigned"
-              }
-            },
-            {
-              "location": "[parameters('resourceLocation')]",
-              "name": "[variables('appServicePlan_name')]",
-              "type": "Microsoft.Web/serverFarms",
-              "apiVersion": "2015-08-01",
-              "sku": {
-                "name": "S1",
-                "tier": "Standard",
-                "family": "S",
-                "size": "S1"
-              },
-              "properties": {
-                "name": "[variables('appServicePlan_name')]"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ]
-}

TEAMModelOS/TEAMModelOS.csproj

@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <Folder Include="logfile\" />
-    <Folder Include="wwwroot\" />
   </ItemGroup>
 
   <ItemGroup>