Browse Source

完成右邊Hiteach UI #259

osbert 4 years ago
parent
commit
041c9d2b50

File diff suppressed because it is too large
+ 0 - 2
TEAMModelOS/ClientApp/src/icons/svg/hiOutline.svg


File diff suppressed because it is too large
+ 1 - 0
TEAMModelOS/ClientApp/src/icons/svg/hiteach_pro.svg


File diff suppressed because it is too large
+ 1 - 0
TEAMModelOS/ClientApp/src/icons/svg/hiteach_std.svg


File diff suppressed because it is too large
+ 1 - 0
TEAMModelOS/ClientApp/src/icons/svg/hiteach_tbl.svg


File diff suppressed because it is too large
+ 1 - 1
TEAMModelOS/ClientApp/src/icons/svg/htc.svg


+ 2 - 2
TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.less

@@ -302,10 +302,10 @@
             // margin-top: 15px;
 
             li {
-                color: white;
+                color: #dbdbdb;
                 display: flex;
                 align-items: center;
-                margin-bottom: 12px;
+                margin-bottom: 5px;
                 // span {
                 //     text-overflow: ellipsis;
                 //     overflow: hidden;

+ 246 - 58
TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue

@@ -74,7 +74,7 @@
                             <p class="class-name">{{item.id}}, {{item.name}}</p>
                             <!-- <p class="class-hiteach-code second-text-color">{{item.sn}}</p> -->
                             <p class="class-type">
-                                <template v-if="item.style == 'smart'">
+                                <template v-if="item.style != 'smart'">
                                     <div class="iconHi" >
                                         <v-icon iconClass="hi" style="color:#333;" />
                                     </div>
@@ -186,9 +186,6 @@
                                             <DropdownItem name="Standard">{{ '僅顯示Hiteach Standard版本' }}</DropdownItem>
                                             <DropdownItem name="Pro">{{ '僅顯示Hiteach Pro版本' }}</DropdownItem>
                                             <DropdownItem name="TBL">{{ '僅顯示Hiteach TBL版本' }}</DropdownItem>
-                                            <DropdownItem name="Mobile">{{ '僅顯示Hiteach Mobile版本' }}</DropdownItem>
-                                            <DropdownItem name="IRS">{{ '僅顯示Hiteach IRS版本' }}</DropdownItem>
-                                            <DropdownItem name="TA">{{ '僅顯示Hiteach TA版本' }}</DropdownItem>
                                         </DropdownMenu>
                                     </Dropdown>
                                     <div class="dark-iview-input" style="padding-right:10px;">
@@ -199,46 +196,210 @@
                         </div>
                         <div class="hiteach-code-wrap-list">
                             <vuescroll>
-                                <Collapse class="hiteach-collapse" v-model="Collapsetest1" simple>
-                                    <Panel name="1">
-                                        <div style="display: flex;align-items: center;">
-                                            <div style="display: flex;flex-direction: column;margin-right: 30px;align-items: center;">
-                                                <div class="iconHi" style="width: 53px;height: 53px;background-color: white;margin-right: 0;">
-                                                    <v-icon iconClass="hi" style="color:#333;font-size: 39px;" />
-                                                </div>
-                                                <div class="icon-text" style="line-height: 20px;height: 20px;color: white;font-size: 12px;font-weight: bolder;">STD</div>
+                                <div class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;">
+                                    <div class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
+
+                                        <Icon @click="stdFlag = !stdFlag" :type="stdFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
+
+                                        <v-icon style="width: 60px;height: 60px;margin-right: 30px;" iconClass="hiteach_std" />
+                                        <div style="font-size: 12px;letter-spacing: 1px;">
+                                            <ul>
+                                                <li>
+                                                    <h1 class="title" style="display: inline-block;margin-right: 12px;font-size: 16px;font-weight: 500;color: #bdbdbd;color:white;">HiTeach 5 STD</h1>
+                                                    <span style="margin-right: 12px;padding: 2px 5px;background: #1cc0f3;border-radius: 3px;color: white;;">大量</span>
+                                                    <span style="color: #1cc0f3;font-size:12px">2/2</span>
+                                                </li>
+                                                <li><span style="color: #1cc0f3;">3222IAVN-FJ4Y-F5EG-S3OI-4P1A</span></li>
+                                                <li>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底議課</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底報告</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底桌面</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底影片</Tag>
+                                                    <Tag type="border" color="#1cc0f3">遠距教室服務</Tag>
+                                                    <Tag type="border" color="#1cc0f3">錄播系統</Tag>
+                                                </li>
+                                                <li><sapn style="color: #8d8d8d;">序號到期日: </sapn>無到期日</li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                    <div v-if="stdFlag">
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
+                                                <ul>
+                                                    <!-- 被關聯要變色 -->
+                                                    <li style="color: #888888;">
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
+                                                </ul>
+                                                <span style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
+                                            </div>
+                                        </div>
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;"></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
+                                                <ul>
+                                                    <li>
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li>
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li>
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
+                                                </ul>
+                                                <span v-if="false" style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;">
+                                    <div class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
+
+                                        <Icon @click="tblFlag = !tblFlag" :type="tblFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
+
+                                        <v-icon style="width: 60px;height: 60px;margin-right: 30px;" iconClass="hiteach_tbl" />
+                                        <div style="font-size: 12px;letter-spacing: 1px;">
+                                            <ul>
+                                                <li>
+                                                    <h1 class="title" style="display: inline-block;margin-right: 12px;font-size: 16px;font-weight: 500;color: #bdbdbd;color:white;">HiTeach 5 STD</h1>
+                                                    <span style="margin-right: 12px;padding: 2px 5px;background: #1cc0f3;border-radius: 3px;color: white;;">大量</span>
+                                                    <span style="color: #1cc0f3;font-size:12px">2/2</span>
+                                                </li>
+                                                <li><span style="color: #1cc0f3;">3222IAVN-FJ4Y-F5EG-S3OI-4P1A</span></li>
+                                                <li>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底議課</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底報告</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底桌面</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底影片</Tag>
+                                                    <Tag type="border" color="#1cc0f3">遠距教室服務</Tag>
+                                                    <Tag type="border" color="#1cc0f3">錄播系統</Tag>
+                                                </li>
+                                                <li><sapn style="color: #8d8d8d;">序號到期日: </sapn>無到期日</li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                    <div v-if="tblFlag">
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
+                                                <ul>
+                                                    <!-- 被關聯要變色 -->
+                                                    <li style="color: #888888;">
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
+                                                </ul>
+                                                <span style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
                                             </div>
-                                            <div style="line-height: 1;">
+                                        </div>
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;"></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
                                                 <ul>
+                                                    <li>
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li>
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li>
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
+                                                </ul>
+                                                <span v-if="false" style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;">
+                                    <div class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
+
+                                        <Icon @click="proFlag = !proFlag" :type="proFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
+
+                                        <v-icon style="width: 60px;height: 60px;margin-right: 30px;" iconClass="hiteach_pro" />
+                                        <div style="font-size: 12px;letter-spacing: 1px;">
+                                            <ul>
                                                 <li>
-                                                    <h1 class="title" style="display: inline-block;margin-right: 12px;">HiTeach 5 Standard</h1>
-                                                    <Tag color="#1cc0f3" style="margin-right: 12px;">大量</Tag>
-                                                    <span style="color: #1cc0f3;">2 / 2</span>
+                                                    <h1 class="title" style="display: inline-block;margin-right: 12px;font-size: 16px;font-weight: 500;color: #bdbdbd;color:white;">HiTeach 5 STD</h1>
+                                                    <span style="margin-right: 12px;padding: 2px 5px;background: #1cc0f3;border-radius: 3px;color: white;;">大量</span>
+                                                    <span style="color: #1cc0f3;font-size:12px">2/2</span>
                                                 </li>
-                                                <li><span style="color: #1cc0f3;font-size: 16px;">3222IAVN-FJ4Y-F5EG-S3OI-4P1A</span></li>
+                                                <li><span style="color: #1cc0f3;">3222IAVN-FJ4Y-F5EG-S3OI-4P1A</span></li>
                                                 <li>
-                                                    <Tag type="border" color="#999">蘇格拉底議課</Tag>
-                                                    <Tag type="border" color="#999">蘇格拉底報告</Tag>
-                                                    <Tag type="border" color="#999">蘇格拉底桌面</Tag>
-                                                    <Tag type="border" color="#999">蘇格拉底影片</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底議課</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底報告</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底桌面</Tag>
+                                                    <Tag type="border" color="#8d8d8d">蘇格拉底影片</Tag>
                                                     <Tag type="border" color="#1cc0f3">遠距教室服務</Tag>
                                                     <Tag type="border" color="#1cc0f3">錄播系統</Tag>
                                                 </li>
-                                                <li><sapn style="color: #999;">序號到期日: </sapn>無到期日</li>
+                                                <li><sapn style="color: #8d8d8d;">序號到期日: </sapn>無到期日</li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                    <div v-if="proFlag">
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;" v-model="test1" disabled></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
+                                                <ul>
+                                                    <!-- 被關聯要變色 -->
+                                                    <li style="color: #888888;">
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li style="color: #888888;">
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
                                                 </ul>
+                                                <span style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
                                             </div>
                                         </div>
-                                        <p slot="content">乔纳森·伊夫是一位工业设计师,现任Apple公司设计师兼资深副总裁,英国爵士。他曾参与设计了iPod,iMac,iPhone,iPad等众多苹果产品。除了乔布斯,他是对苹果那些著名的产品最有影响力的人。</p>
-                                    </Panel>
-                                    <Panel name="2">
-                                        斯蒂夫·盖瑞·沃兹尼亚克
-                                        <p slot="content">斯蒂夫·盖瑞·沃兹尼亚克(Stephen Gary Wozniak),美国电脑工程师,曾与史蒂夫·乔布斯合伙创立苹果电脑(今之苹果公司)。斯蒂夫·盖瑞·沃兹尼亚克曾就读于美国科罗拉多大学,后转学入美国著名高等学府加州大学伯克利分校(UC Berkeley)并获得电机工程及计算机(EECS)本科学位(1987年)。</p>
-                                    </Panel>
-                                    <Panel name="3">
-                                        乔纳森·伊夫
-                                        <p slot="content">乔纳森·伊夫是一位工业设计师,现任Apple公司设计师兼资深副总裁,英国爵士。他曾参与设计了iPod,iMac,iPhone,iPad等众多苹果产品。除了乔布斯,他是对苹果那些著名的产品最有影响力的人。</p>
-                                    </Panel>
-                                </Collapse>
+                                        <div class="hiteach-collapse-sub testclass" style="display: flex;align-items: center;border-top: 1px solid rgb(66, 66, 66);margin-left: 20px;letter-spacing: 1px;font-size: 12px;padding: 20px;">
+                                            <Checkbox style="margin-right: 70px;"></Checkbox>
+                                            <div style="display: flex;justify-content: space-between;align-items: center;width: 100%;">
+                                                <ul>
+                                                    <li>
+                                                        <h3>USER-PCCA062992</h3>
+                                                    </li>
+                                                    <li>
+                                                        <span>192.168.256 | 84FJID3LKSD88 </span>
+                                                    </li>
+                                                    <li>
+                                                        <span>Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz))</span>
+                                                    </li>
+                                                </ul>
+                                                <span v-if="false" style="color: #1cc0f3;padding: 0 15px;">
+                                                    已被關聯
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <!-- <ul>
                                     <li v-for="(item,index) in hiTeachsShow" :key="index" @click.stop="chooseHiTeach(index)" :class="item.using > 0 ? 'fourth-text-color':''" :title="item.code">
                                         <span>{{item.code}}</span>
@@ -295,8 +456,12 @@
 
 <script>
     import { mapGetters } from 'vuex'
-    import '@/icons/svg/hi.svg'
-    import '@/icons/svg/board.svg'    
+    import '@/icons/svg/htc.svg'
+    import '@/icons/svg/hiteach_pro.svg'
+    import '@/icons/svg/hiteach_std.svg'
+    import '@/icons/svg/hiteach_tbl.svg'
+    import '@/icons/svg/board.svg'
+    
     export default {
         data() {
             // 验证只能是字母和数字
@@ -312,7 +477,10 @@
                 }
             }
             return {
-                Collapsetest1: '1',
+                tblFlag: false,
+                stdFlag: false,
+                proFlag: false,                
+                test1: true,
                 orderBy: 'id',
                 updateBefore:'',
                 filterPeriod: undefined,
@@ -458,7 +626,7 @@
                 let name = ''
                 if(pId !== ''){
                     let temp = this.$store.state.schoolBaseInfo.schoolBaseInfo.period.filter( item => {
-                        return parseInt(pId) == parseInt(item.id)
+                        return pId == item.id
                     })
                     if(temp.length >0 ) name = temp[0].name
                 }
@@ -1216,8 +1384,27 @@
     .school-plan-wrap .ivu-upload-list {
         display: none;
     }
+
+    
+
+        
+        
 </style>
 <style lang="less">
+.testclass{
+    @keyframes Itemfadein {
+          0% {
+            opacity: 0;
+            transform: translate(-40px);
+          }
+          100% {
+            opacity: 1;
+            transform: translate(0px);
+          }
+        }
+        animation: 0.5s Itemfadein;
+}
+
 .sort-dropdown{
     .title{
         color: #dcdee2;
@@ -1244,31 +1431,32 @@
     }
 }
 .hiteach-collapse{
-    background: transparent;
-    color: white;
-    border-top: none;
-    .ivu-collapse-item{
-        .ivu-collapse-header{
-            height: 200px;
-            line-height: 200px;
-            display: flex;
-            align-items: center;
-            padding-left: 15px;
+//     background: transparent;
+//     color: white;
+//     border-top: none;
+//     .ivu-collapse-item{
+//         .ivu-collapse-header{
+//             height: 200px;
+//             line-height: 200px;
+//             display: flex;
+//             align-items: center;
+//             padding-left: 15px;
             .ivu-tag-border{
                 background: transparent!important;
                 margin-right: 10px;
                 border-radius: 5px;
+                letter-spacing: 1px;
             }
-            .ivu-icon-ios-arrow-forward{
-                position: absolute;
-                right: 2px;
-                font-size: 30px;
-                color: white;
-            }
-        }
-        .ivu-collapse-content{
-            background: transparent;
-        }
-    }
+//             .ivu-icon-ios-arrow-forward{
+//                 position: absolute;
+//                 right: 2px;
+//                 font-size: 30px;
+//                 color: white;
+//             }
+//         }
+//         .ivu-collapse-content{
+//             background: transparent;
+//         }
+//     }
 }    
 </style>