Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-03-08 17:01:25 +08:00
13 changed files with 76 additions and 76 deletions

View File

@@ -90,7 +90,7 @@
<div class="btn btn1" @click="signQR">
<div class="wz">签到二维码</div>
</div>
<div class="btn btn2" @click="showqdModal">
<div class="btn btn1" @click="showqdModal">
<div class="wz">批量签到</div>
</div>
<div class="btn btn1" @click="exportTaskStu">
@@ -1157,7 +1157,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../assets/images/courseManage/reset1.png);
background-image: url(../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -1170,9 +1170,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -546,7 +546,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -558,9 +558,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -587,7 +587,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -599,9 +599,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -549,7 +549,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -562,9 +562,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -594,7 +594,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -607,9 +607,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -533,7 +533,7 @@
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -546,9 +546,9 @@
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -578,7 +578,7 @@
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -591,9 +591,9 @@
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -747,7 +747,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -760,9 +760,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -792,7 +792,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -805,9 +805,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -644,7 +644,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -656,9 +656,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -685,7 +685,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -697,9 +697,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -568,7 +568,7 @@
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -580,9 +580,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -609,7 +609,7 @@
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -621,9 +621,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -638,7 +638,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -650,9 +650,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -679,7 +679,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -691,9 +691,9 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -537,7 +537,7 @@
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -550,9 +550,9 @@
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -582,7 +582,7 @@
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -595,9 +595,9 @@
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -542,7 +542,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -555,9 +555,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -587,7 +587,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -600,9 +600,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -675,7 +675,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -688,9 +688,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -720,7 +720,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -733,9 +733,9 @@ export default {
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
margin-right: 20px;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -598,7 +598,7 @@
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -610,9 +610,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -639,7 +639,7 @@
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -651,9 +651,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}

View File

@@ -578,7 +578,7 @@
.img2 {
width: 16px;
height: 18px;
background-image: url(../../../assets/images/courseManage/reset1.png);
background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -590,9 +590,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
@@ -619,7 +619,7 @@
.img2 {
width: 17px;
height: 16px;
background-image: url(../../../assets/images/coursewareManage/export.png);
background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -631,9 +631,9 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
background: #4ea6ff;
color: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}