瀏覽代碼

iview 版本升級 與畫面調整 #134

Pull 的時候 service 有更新
osbert 5 年之前
父節點
當前提交
4421bf2076

+ 5 - 0
TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -665,6 +665,11 @@
             文件类型
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Learn.ProcessRes.sha1Code">
+            <summary>
+            唯一编码
+            </summary>
+        </member>
         <member name="T:TEAMModelOS.Service.Models.Learn.Target">
             <summary>
             发布对象

+ 1 - 1
TEAMModelOS/ClientApp/package.json

@@ -37,7 +37,7 @@
         "qrcodejs2": "0.0.2",
         "videojs-contrib-hls": "^5.15.0",
         "videojs-contrib-hls.js": "^3.2.0",
-        "view-design": "^4.0.1",
+        "view-design": "^4.2.0",
         "vue": "^2.6.10",
         "vue-ckeditor5": "^0.4.1",
         "vue-count-to": "^1.0.13",

+ 9 - 3
TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.less

@@ -30,12 +30,13 @@
         }
         .details{
             &-box{
-                padding-left: 20px;
+                padding-left: 40px;
                 .detail{
-                    padding: 20px 20px 20px 5px;
+                    padding: 20px 40px 20px 5px;
                     border-bottom: 1px solid #464646;
                     display: flex;                
                     &-info{
+                        height: 75px;
                         width: 75%;
                         .title{
                             width: 90%;
@@ -57,15 +58,20 @@
                         }
                     }
                     &-ctr{
+                        height: 75px;
                         width: 25%;
                         .time{
+                            text-align: right;
                             color: #777777;
                             font-size: 12px;
                             height: 25px;
                             line-height: 25px;
                         }
                         .btns{
-
+                            display: flex;
+                            justify-content: flex-end;
+                            align-items: center;
+                            height: 50px;
                         }
                     }
                 }

+ 51 - 5
TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.vue

@@ -51,22 +51,68 @@
                                     <icon class="icon" icon="file-alt" /> {{'教師申請加入'}}
                                 </div>
                             </span>
+                        </div>
+                        <div class="detail-ctr">
+                            <div class="time">
+                                2009.9.5 AM 10:49
+                            </div>
+                            <div class="btns">
+                                <i-circle :percent="80" :trail-width="9" :stroke-width="10" :size="32" stroke-color="#adadad" trail-color="#545454">
+                                    <Icon size="20" color="#545454" type="md-notifications" />                                    
+                                </i-circle>                                
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="detail">
+                        <div class="detail-info">
+                            <div class="title ellipsis">
+                                {{ 'mia_spoelstra#3927' }}
+                            </div>
+                            <span class="sub-title">
+                                {{ 'Erilk Jon spcelstra' }}
+                                <div class="typeInfo">
+                                    <icon class="icon" icon="file-alt" /> {{'教師申請加入'}}
+                                </div>
+                            </span>
+                        </div>
+                        <div class="detail-ctr">
+                            <div class="time">
+                                2009.9.5 AM 10:49
+                            </div>
+                            <div class="btns">
+                                <i-circle :percent="100" :trail-width="9" :stroke-width="10" :size="32" stroke-color="#adadad" trail-color="#545454">
+                                    <Icon size="20" color="#adadad" type="md-notifications" />                                    
+                                </i-circle>                                
+                            </div>
+                        </div>
+                    </div>
 
+                    <div class="detail">
+                        <div class="detail-info">
+                            <div class="title ellipsis">
+                                {{ 'mia_spoelstra#3927' }}
+                            </div>
+                            <span class="sub-title">
+                                {{ 'Erilk Jon spcelstra' }}
+                                <div class="typeInfo">
+                                    <icon class="icon" icon="file-alt" /> {{'教師申請加入'}}
+                                </div>
+                            </span>
                         </div>
                         <div class="detail-ctr">
                             <div class="time">
                                 2009.9.5 AM 10:49
                             </div>
-                            <div calss="btns">
-                                <div>
-                                    <div>
-                                        sdf
-                                    </div>
+                            <div class="btns">
+                                <div style="width: 32px;">
+                                    <Icon :size="20" type="md-checkmark" />
                                 </div>
                             </div>
                         </div>
                     </div>
 
+
                 </div>
             </div>
         </div>