|
@@ -12,7 +12,7 @@
|
|
<img class="teachimg" :src="teachImg" />
|
|
<img class="teachimg" :src="teachImg" />
|
|
<p class="teachname">{{ teachname }}</p>
|
|
<p class="teachname">{{ teachname }}</p>
|
|
</div>
|
|
</div>
|
|
- <div class="total-studentnum" @click='isShowStudentList=true'><svg-icon icon-class="students" class="students-icon" />{{ students.length }}</div>
|
|
|
|
|
|
+ <div class="total-studentnum" @click="isShowStudentList = true"><svg-icon icon-class="students" class="students-icon" />{{ students.length }}</div>
|
|
<div class="percentage-studentanswer" @click="popuphd()">
|
|
<div class="percentage-studentanswer" @click="popuphd()">
|
|
<q-circular-progress show-value font-size="8px" :value="StudentPercentage" size="45px" :thickness="0.22" color="teal" track-color="grey-3" class="q-ma-md"> {{ StudentPercentage }}% </q-circular-progress>
|
|
<q-circular-progress show-value font-size="8px" :value="StudentPercentage" size="45px" :thickness="0.22" color="teal" track-color="grey-3" class="q-ma-md"> {{ StudentPercentage }}% </q-circular-progress>
|
|
</div>
|
|
</div>
|
|
@@ -70,9 +70,9 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<!--挑人-->
|
|
<!--挑人-->
|
|
- <div class="drag-wrap" v-drag v-if="toolIndexList.indexOf(1) > -1">
|
|
|
|
- <Icon type="md-close-circle" class="tool-icon-close" @click="handleCloseTool(1)" />
|
|
|
|
- <BasePick></BasePick>
|
|
|
|
|
|
+ <div class="drag-wrap picker-drag" v-drag v-if="toolIndexList.indexOf(1) > -1">
|
|
|
|
+ <div class="tool-icon-close" @click="handleCloseTool(1)"><svg-icon icon-class="Close" class="close-icon" /></div>
|
|
|
|
+ <TurnTable />
|
|
</div>
|
|
</div>
|
|
<!--定时器-->
|
|
<!--定时器-->
|
|
<div class="drag-wrap timer-drag" v-drag v-if="toolIndexList.indexOf(2) > -1" @mousedown="stickDown($event)" @touchmove="stickDown($event)">
|
|
<div class="drag-wrap timer-drag" v-drag v-if="toolIndexList.indexOf(2) > -1" @mousedown="stickDown($event)" @touchmove="stickDown($event)">
|
|
@@ -183,22 +183,21 @@
|
|
</div>
|
|
</div>
|
|
<!--作品收集end-->
|
|
<!--作品收集end-->
|
|
<!--學生名單彈窗-->
|
|
<!--學生名單彈窗-->
|
|
- <div class='student-List' v-show='isShowStudentList == true'>
|
|
|
|
- <h5>目前加入教室的學生名單</h5>
|
|
|
|
- <div class="student-group">
|
|
|
|
- <div v-for="item in students" :key="item.id" class='student-card'>
|
|
|
|
- <div class="student-leftimg">
|
|
|
|
- <div class="student-idnumber">{{item.sort}}</div>
|
|
|
|
- <div class="student-portrait"><img :src="item.headImg" /></div>
|
|
|
|
-
|
|
|
|
- </div>
|
|
|
|
- <div class="student-rightname">{{item.studentName}}</div>
|
|
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
- <div class="noData" v-show="students.length == 0">
|
|
|
|
- <p>暂无数据</p>
|
|
|
|
|
|
+ <div class="student-List" v-show="isShowStudentList == true">
|
|
|
|
+ <h5>目前加入教室的學生名單</h5>
|
|
|
|
+ <div class="student-group">
|
|
|
|
+ <div v-for="item in students" :key="item.id" class="student-card">
|
|
|
|
+ <div class="student-leftimg">
|
|
|
|
+ <div class="student-idnumber">{{ item.sort }}</div>
|
|
|
|
+ <div class="student-portrait"><img :src="item.headImg" /></div>
|
|
|
|
+ </div>
|
|
|
|
+ <div class="student-rightname">{{ item.studentName }}</div>
|
|
</div>
|
|
</div>
|
|
- <div class="close-btn" @click="isShowStudentList = false"> <svg-icon icon-class="Close" class="close-icon" /></div>
|
|
|
|
|
|
+ </div>
|
|
|
|
+ <div class="noData" v-show="students.length == 0">
|
|
|
|
+ <p>暂无数据</p>
|
|
|
|
+ </div>
|
|
|
|
+ <div class="close-btn" @click="isShowStudentList = false"><svg-icon icon-class="Close" class="close-icon" /></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -216,6 +215,7 @@ import Pop from '../components/ColorPop/ColorPicker.vue'
|
|
import shapes from '../components/ColorPop/Shapes.vue'
|
|
import shapes from '../components/ColorPop/Shapes.vue'
|
|
import BaseTimer from '../components/Tools/BaseTimer.vue'
|
|
import BaseTimer from '../components/Tools/BaseTimer.vue'
|
|
import BasePick from '../components/Tools/BasePick.vue'
|
|
import BasePick from '../components/Tools/BasePick.vue'
|
|
|
|
+import TurnTable from '../components/Tools/TurnTable'
|
|
import PDFJS from 'pdfjs-dist'
|
|
import PDFJS from 'pdfjs-dist'
|
|
import RenderContent from '../assets/test/test.json'
|
|
import RenderContent from '../assets/test/test.json'
|
|
import { drawRect, drawArc, drawEllipse, drawImage, drawPath, drawLine, drawTable, drawEchart, drawMath } from '../plugin/PublicRenderer.js'
|
|
import { drawRect, drawArc, drawEllipse, drawImage, drawPath, drawLine, drawTable, drawEchart, drawMath } from '../plugin/PublicRenderer.js'
|
|
@@ -240,7 +240,8 @@ export default {
|
|
Pop,
|
|
Pop,
|
|
shapes,
|
|
shapes,
|
|
BaseTimer,
|
|
BaseTimer,
|
|
- BasePick
|
|
|
|
|
|
+ BasePick,
|
|
|
|
+ TurnTable
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -412,7 +413,7 @@ export default {
|
|
|
|
|
|
//停止收集的icon和文字
|
|
//停止收集的icon和文字
|
|
workinfo: { icon: 'stop', text: '停止收集' },
|
|
workinfo: { icon: 'stop', text: '停止收集' },
|
|
- isShowStudentList:false
|
|
|
|
|
|
+ isShowStudentList: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -455,8 +456,10 @@ export default {
|
|
localStorage.removeItem('fileType')
|
|
localStorage.removeItem('fileType')
|
|
localStorage.removeItem('slide')
|
|
localStorage.removeItem('slide')
|
|
},
|
|
},
|
|
- studentList(){
|
|
|
|
- this.$store.state.students.forEach(item=>{console.log(item.studentName)})
|
|
|
|
|
|
+ studentList() {
|
|
|
|
+ this.$store.state.students.forEach(item => {
|
|
|
|
+ console.log(item.studentName)
|
|
|
|
+ })
|
|
},
|
|
},
|
|
handleUploadSuc(response, file, i) {
|
|
handleUploadSuc(response, file, i) {
|
|
//this.beginPdfshowLoading()
|
|
//this.beginPdfshowLoading()
|
|
@@ -3050,9 +3053,9 @@ export default {
|
|
localStorage.setItem('stageInfo', JSON.stringify(this.saveArr))
|
|
localStorage.setItem('stageInfo', JSON.stringify(this.saveArr))
|
|
this.$store.state.oldSlide = 1
|
|
this.$store.state.oldSlide = 1
|
|
this.$store.state.carouselSlide = 1
|
|
this.$store.state.carouselSlide = 1
|
|
- this.$store.state.imgArrOld.splice(1, this.$store.state.imgArr.length-1)
|
|
|
|
- this.$store.state.imgArr.splice(1, this.$store.state.imgArr.length-1)
|
|
|
|
- this.$store.state.imgArr.idArr.splice(1, this.$store.state.imgArr.length-1)
|
|
|
|
|
|
+ this.$store.state.imgArrOld.splice(1, this.$store.state.imgArr.length - 1)
|
|
|
|
+ this.$store.state.imgArr.splice(1, this.$store.state.imgArr.length - 1)
|
|
|
|
+ this.$store.state.imgArr.idArr.splice(1, this.$store.state.imgArr.length - 1)
|
|
this.$store.state.imgArr.splice(0, 1, this.whiteBG)
|
|
this.$store.state.imgArr.splice(0, 1, this.whiteBG)
|
|
this.$store.state.imgArrOld.splice(0, 1, this.whiteBG)
|
|
this.$store.state.imgArrOld.splice(0, 1, this.whiteBG)
|
|
console.log(this.$store.state.imgArr)
|
|
console.log(this.$store.state.imgArr)
|
|
@@ -4146,7 +4149,16 @@ li {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+.picker-drag{
|
|
|
|
+ background: transparent !important;
|
|
|
|
+ border:none !important;
|
|
|
|
+ box-shadow:none !important;
|
|
|
|
+ .tool-icon-close {
|
|
|
|
+ right: 120px !important;
|
|
|
|
+ top:120px !important;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+}
|
|
.drag-wrap {
|
|
.drag-wrap {
|
|
position: relative;
|
|
position: relative;
|
|
border: 1px solid #ccc;
|
|
border: 1px solid #ccc;
|
|
@@ -4158,24 +4170,22 @@ li {
|
|
padding: 30px 50px;
|
|
padding: 30px 50px;
|
|
box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
|
|
box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
-}
|
|
|
|
-
|
|
|
|
-.drag-wrap:hover {
|
|
|
|
- cursor: move;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-.drag-wrap .tool-icon-close {
|
|
|
|
- position: absolute;
|
|
|
|
- right: -16px;
|
|
|
|
- top: -16px;
|
|
|
|
- font-size: 32px;
|
|
|
|
- z-index: 999;
|
|
|
|
- color: #9e9e9e;
|
|
|
|
- cursor: pointer;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-.drag-wrap .tool-icon-close:hover {
|
|
|
|
- font-size: 36px;
|
|
|
|
|
|
+ &:hover {
|
|
|
|
+ cursor: move;
|
|
|
|
+ }
|
|
|
|
+ .tool-icon-close {
|
|
|
|
+ position: absolute;
|
|
|
|
+ right: -16px;
|
|
|
|
+ top: -16px;
|
|
|
|
+ font-size: 20px;
|
|
|
|
+ width: 30px;
|
|
|
|
+ height: 30px;
|
|
|
|
+ border-radius: 50%;
|
|
|
|
+ text-align: center;
|
|
|
|
+ z-index: 999;
|
|
|
|
+ background: #d8d8d8;
|
|
|
|
+ cursor: pointer;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
.timer-drag {
|
|
.timer-drag {
|