hiteach資料結構與調整UI和資料的連動 #259

TEAMModelOS/ClientApp/src/mock/index.js

@@ -232,6 +232,32 @@ export default {
               'http://icons.iconarchive.com/icons/google/noto-emoji-people-face/256/10135-boy-light-skin-tone-icon.png',
               'http://icons.iconarchive.com/icons/google/noto-emoji-people-face/256/10147-adult-light-skin-tone-icon.png'
           ]
-      }
+      },
+      //Osbert-classroom的假資料
+      'hiteachSetting|20': [{
+        'id|+1': 1234567,
+        'serial': '12DLT43F-EE20-4775-93F5-6BCC',
+        'prodGroup': 'HiTeach 5',
+        'prodName|1' : ['PRO', 'TBL','STD'],
+        'deviceMax': '@natural(1, 10)', // 可綁定最大值，如只有一則回傳單一
+        'DateDate|1': [0, 1, 1602691199], //已到期，無限期或有一個結束時間
+        'aprule': {
+          'sokapp|1': true, // 蘇格拉底議課
+          'sokvdo|1': true, // 蘇格拉底報告
+          'ezs|1': true, // 錄播系統
+
+          // 目前沒有的
+          'remoteSys|1': true, // 遠距教室服務
+          'sokDestop|1': true, // 蘇格拉底桌面
+          'sokreport|1': true, // 蘇格拉底報告
+        },
+        "deviceBound|5": [{
+          'uuid': "@name",
+          'ip': '@ip',
+          'classId': 'hbcn0101',
+          'computer': "Microsoft Winfows NT 10.0.18883.0 | Intel(R Core(TM i7-10700 CPU @ 2.9Ghz",
+          'deveiceId': '12DLT43F-EE20-4775-93F5-6BCC'
+        }]
+      }],
   })
 }

TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue

@@ -196,8 +196,8 @@
                         </div>
                         <div class="hiteach-code-wrap-list">
                             <vuescroll>
-                                <div @click="stdFlag = !stdFlag" class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;cursor: pointer;">
-                                    <div class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
+                                <div class="hiteach-collapse" style="border-bottom: 1px solid #424242;position: relative;cursor: pointer;">
+                                    <div @click="stdFlag = !stdFlag" class="hiteach-collapse-main" style="display: flex;align-items: center;padding: 20px 0 20px 20px;">
 
                                         <Icon :type="stdFlag ? 'ios-arrow-up' : 'ios-arrow-down'" size="30" color="white" style="position: absolute;right: 5px;top: 20px;"/>
 
@@ -235,7 +235,7 @@
                                                         <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>
+                                                        <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;">
@@ -254,7 +254,7 @@
                                                         <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>
+                                                        <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;">
@@ -614,6 +614,10 @@
             }
         },
         computed: {
+            ...mapGetters({
+                periods: 'user/getPeriods', // 學制s
+                classes: 'user/getClasses', // 教室ID
+            }),
             filterPeriodName: function(){
                 let pId = this.filterPeriod
                 let name = ''
@@ -689,7 +693,6 @@
                         })
                         break;
                 }
-                console.log(data)
                 return data
             },
             filterByPeriod() {
@@ -1030,17 +1033,17 @@
                 })
 
             },
-            getClassroom() {
-                this.isListLoading = true
+            getClassroom(data) {
+                // this.isListLoading = true
                 //直接读取登录成功拿到得学校基础信息
-                this.classroomList = this.$store.state.user.schoolProfile.school_classes
+                this.classroomList = data
                 if (this.classroomList.length > 0) {
                     this.updateBefore = JSON.stringify(this.classroomList[0])
                 }
                 this.filterClassname()
-                setTimeout(() => {
-                    this.isListLoading = false
-                },500)
+                // setTimeout(() => {
+                //     this.isListLoading = false
+                // },500)
                 /*this.$store.dispatch('schoolBaseInfo/getClassroom').then(
                     (res) => {
                         if (res.code == 1 || res.code == 3) {
@@ -1301,10 +1304,21 @@
             }
         },
         watch: {
+            classes: {
+                handler(newValue) {
+                    this.getClassroom(newValue)
+                },
+                // 深度观察监听
+                deep: true,
+                //立即执行
+                immediate: true
+            }
         },
         created() {
+
+console.log(this.$Mock.data.hiteachSetting, '324324234')
+
             this.editStatus = this.noStatus
-            this.getClassroom()
             this.$store.dispatch('teachers/getTeacherList').then(res => { })
         }
     }