Merge branch 'develop5.0-tmd' into develop5.0

TEAMModelOS/ClientApp/src/assets/iconfont/demo_index.html

@@ -54,6 +54,30 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe718;</span>
+                <div class="name">在籍学生</div>
+                <div class="code-name">&amp;#xe718;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe633;</span>
+                <div class="name">icon_icon_ 学生管理</div>
+                <div class="code-name">&amp;#xe633;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe637;</span>
+                <div class="name">教师</div>
+                <div class="code-name">&amp;#xe637;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe630;</span>
+                <div class="name">学生</div>
+                <div class="code-name">&amp;#xe630;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe659;</span>
                 <div class="name">微信 (1)</div>
@@ -786,9 +810,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1623422826606') format('woff2'),
-       url('iconfont.woff?t=1623422826606') format('woff'),
-       url('iconfont.ttf?t=1623422826606') format('truetype');
+  src: url('iconfont.woff2?t=1623427872430') format('woff2'),
+       url('iconfont.woff?t=1623427872430') format('woff'),
+       url('iconfont.ttf?t=1623427872430') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -814,6 +838,42 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-student1"></span>
+            <div class="name">
+              在籍学生
+            </div>
+            <div class="code-name">.icon-student1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-student2"></span>
+            <div class="name">
+              icon_icon_ 学生管理
+            </div>
+            <div class="code-name">.icon-student2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-teacher"></span>
+            <div class="name">
+              教师
+            </div>
+            <div class="code-name">.icon-teacher
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-student"></span>
+            <div class="name">
+              学生
+            </div>
+            <div class="code-name">.icon-student
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-wechat"></span>
             <div class="name">
@@ -1912,6 +1972,38 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-student1"></use>
+                </svg>
+                <div class="name">在籍学生</div>
+                <div class="code-name">#icon-student1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-student2"></use>
+                </svg>
+                <div class="name">icon_icon_ 学生管理</div>
+                <div class="code-name">#icon-student2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-teacher"></use>
+                </svg>
+                <div class="name">教师</div>
+                <div class="code-name">#icon-teacher</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-student"></use>
+                </svg>
+                <div class="name">学生</div>
+                <div class="code-name">#icon-student</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wechat"></use>

TEAMModelOS/ClientApp/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2000444 */
-  src: url('iconfont.woff2?t=1623422826606') format('woff2'),
-       url('iconfont.woff?t=1623422826606') format('woff'),
-       url('iconfont.ttf?t=1623422826606') format('truetype');
+  src: url('iconfont.woff2?t=1623427872430') format('woff2'),
+       url('iconfont.woff?t=1623427872430') format('woff'),
+       url('iconfont.ttf?t=1623427872430') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-student1:before {
+  content: "\e718";
+}
+
+.icon-student2:before {
+  content: "\e633";
+}
+
+.icon-teacher:before {
+  content: "\e637";
+}
+
+.icon-student:before {
+  content: "\e630";
+}
+
 .icon-wechat:before {
   content: "\e659";
 }

TEAMModelOS/ClientApp/src/assets/iconfont/iconfont.json

@@ -5,6 +5,34 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "8827519",
+      "name": "在籍学生",
+      "font_class": "student1",
+      "unicode": "e718",
+      "unicode_decimal": 59160
+    },
+    {
+      "icon_id": "19109549",
+      "name": "icon_icon_ 学生管理",
+      "font_class": "student2",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "8156489",
+      "name": "教师",
+      "font_class": "teacher",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "3904398",
+      "name": "学生",
+      "font_class": "student",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
     {
       "icon_id": "1382584",
       "name": "微信 (1)",

TEAMModelOS/ClientApp/src/components/public/frontEndMain/Index.vue

@@ -97,7 +97,7 @@
             <span class="footer-info-item">&copy; 2021 HABOOK Group 网奕中国 版权所有</span>
             <span class="footer-info-item">
                 <Icon custom="iconfont icon-earth" size="20" />
-                数据中心位置 中国
+                数据中心位置 {{srvAdr == "China" ? "中国" : "全球"}}
             </span>
         </div>
     </div>
@@ -153,6 +153,9 @@ export default {
         // 統一處理預設登入學校
         this.setLoginSchoolCode()
         // this.bgImg = `url(${require('@/assets/login/1-1.jpg')})`             
+    },
+    mounted(){
+
     },
     watch: {
         $route: {

TEAMModelOS/ClientApp/src/view/login/test.vue

@@ -100,14 +100,16 @@
     flex-wrap: nowrap;
     justify-content: space-evenly;
     align-items: center;
-    margin-top: -50px;
+    margin-top: 0px;
 }
 .enter-box {
     width: 150px;
-    // height: 200px;
-    // background-color: #69b0d0;
     border-radius: 4px;
     cursor: pointer;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
 }
 .enter-type-btn {
     width: 136px;
@@ -122,6 +124,11 @@
     color: white;
     text-align: center;
 }
+.icon-to-img {
+    display: block;
+    color: white;
+    font-size: 200px;
+}
 </style>
 
 <template>
@@ -132,12 +139,14 @@
         <div class="login-enter-wrap">
             <div class="enter-box" @click="loginTo('teacher')">
                 <img style="display: block;width: 100%;" src="@/assets/login/1-5.png">
+                <!-- <Icon custom="iconfont icon-teacher" class="icon-to-img"></Icon> -->
                 <p class="enter-type-btn">
                     教师端
                 </p>
             </div>
             <div class="enter-box" @click="loginTo('student')">
                 <img style="display: block;width: 100%;" src="@/assets/login/1-4.png">
+                <!-- <Icon custom="iconfont icon-student1" class="icon-to-img"></Icon> -->
                 <p class="enter-type-btn">
                     学生端
                 </p>