Merge branch 'TPE/develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into TPE/develop

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

@@ -216,7 +216,7 @@
                                         <template v-if="item.deviceBound.length >0">
                                             <div v-for="(dbItem, dbIndex) in item.deviceBound" :key="dbIndex" class="hiteach-collapse-sub gradient" :class="{'linked': dbItem.classId != '' && dbItem.classId != null && classroomListShow[curClassIndex].id != dbItem.classId}" @click="pushCheckbox(dbItem, (dbItem.classId && classroomListShow[curClassIndex].id != dbItem.classId), classroomListShow[curClassIndex].id, dbIndex)">
                                                 <!-- 被關聯 disabled -->
-                                                <Checkbox :id="'checkbox-' + dbIndex" @on-change="watchUpdate" style="margin-right: 70px;" v-model="dbItem.hiteachLink" :disabled="dbItem.classId != '' && dbItem.classId != null && classroomListShow[curClassIndex].id != dbItem.classId" ></Checkbox>
+                                                <Checkbox :id="'checkbox-' + (dbItem.uuid + dbItem.uuid2)" @on-change="watchUpdate" style="margin-right: 70px;" v-model="dbItem.hiteachLink" :disabled="dbItem.classId != '' && dbItem.classId != null && classroomListShow[curClassIndex].id != dbItem.classId" ></Checkbox>
 
                                                 <div class="hiteach-collapse-sub-detail" >
                                                     <ul>
@@ -1364,7 +1364,7 @@
             },
             pushCheckbox(item, disabled, classId, index){
                 if(!disabled){
-                    document.getElementById('checkbox-' + index).click()
+                    document.getElementById('checkbox-' + item.uuid + item.uuid2).click()
 
                     // let arrayIndex = null
                     // this.updHiteachLink.forEach( (item, index) => {