hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-07 18:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yuping
2023-01-12 01:37:41 +08:00
parent c04574fc40 e523529a4b
commit e4e6682f62
15 changed files with 140 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Modals/ExportHomeWork.vue
View File

@@ -27,7 +27,7 @@
style="width: 40px; height: 40px; margin-bottom: 16px"
src="../../assets/images/leveladd/success.png"
/>
<span>作业导出完成，请下载本地或去下载中心查看</span>
<span>作业导出完成，请下载到本地或去下载中心查看</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="clostModal">

7
src/components/drawers/ViewAssess.vue
View File

@@ -100,7 +100,7 @@
>
<div class="asstype">描述：</div>
<div style="color: rgba(51, 51, 51, 1); font-size: 14px">
{{ values?.assessmentQaDescribe }}
{{ values?.content }}
</div>
</div>
</div>
@@ -118,8 +118,8 @@
</div>
<div class="lastbox">
<div class="sorcetext">非常不满意</div>
<div class="sorcebox" v-for="(iittem, index) in [1,2,3,4,5,6,7,8,9,10]" :key="index">
<div v-if="iittem >= values.assessmentMinScore && iittem <= values.assessmentMaxScore" :class="index+1 == values.selectAnswer ? 'numbox' : 'numbox1'">{{ iittem }}</div>
<div class="sorcebox" v-for="(iittem, index) in [1,2,3,4,5,6,7,8,9,10] " :key="index">
<div v-if="iittem >= values.assessmentMinScore && iittem <= values.assessmentMaxScore" :class="(iittem + 1 - values.assessmentMinScore) == values.selectAnswer ? 'numbox' : 'numbox1'">{{ iittem }}</div>
</div>
<div class="sorcetext">非常满意</div>
</div>
@@ -225,6 +225,7 @@ export default {
};
},
};
</script>
<style lang="scss">

3
src/components/drawers/project/ProjectEvalManage.vue
View File

@@ -105,10 +105,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
</template>

3
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -108,10 +108,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
<!-- 导出成绩抽屉 -->
<EScore v-model:eScorevisible="eScorevisible" />

9
src/components/drawers/project/ProjectFaceStu.vue
View File

@@ -31,7 +31,7 @@
}}
</div>
<div class="endtime" style="margin-left: 64px">
签到时间：{{ beginTime }}~{{ endTime }}
允许签到时段：{{ beginTime }}~{{ endTime }}
</div>
</div>
@@ -109,7 +109,7 @@
<div class="wz">导出数据</div>
</div>
</div>
<div class="line">
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
@@ -122,7 +122,7 @@
<div class="right" @click="clearLine">清空</div>
</div>
</div>
<!-- <div class="pad"></div> -->
<div class="pad"></div> -->
<div class="tableBox" style="margin-top: 30px">
<a-table
@@ -173,10 +173,11 @@
/>
</div> -->
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
<!-- 二维码签到弹窗 -->

23
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -87,7 +87,7 @@
<div class="wz">导出作业</div>
</div>
</div>
<div class="line">
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
@@ -100,13 +100,15 @@
<div class="right" @click="clearLine">清空</div>
</div>
</div>
-->
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900 }"
:scroll="{ x: 1300 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
@@ -129,10 +131,12 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
-->
</div>
</a-drawer>
<!-- 批量标注完成 -->
@@ -240,11 +244,11 @@ export default {
value: "1",
label: "已完成",
},
{
id: 2,
value: "2",
label: "进行中",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
// },
],
selectedRowKeys: [],
@@ -427,7 +431,7 @@ export default {
);
},
},
{
{/**
title: "操作",
dataIndex: "operation",
key: "operation",
@@ -492,7 +496,8 @@ export default {
</div>
);
},
},
*/ },
],
exportHomeWorkV: false,
downloadUrl: null,

39
src/components/drawers/project/ProjectHomeWorkManage.vue
View File

@@ -99,7 +99,7 @@
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900 }"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
@@ -122,10 +122,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
</div>
</div>-->
</div>
</a-drawer>
@@ -204,11 +205,11 @@ export default {
value: "0",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 3,
value: "1",
@@ -257,7 +258,7 @@ export default {
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "left",
align: "center",
className: "h head",
customRender: (text) => {
return (
@@ -393,15 +394,15 @@ export default {
);
},
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
width: 100,
align: "center",
ellipsis: true,
className: "h",
},
// {
// title: "操作",
// dataIndex: "operation",
// key: "operation",
// width: 100,
// align: "center",
// ellipsis: true,
// className: "h",
// },
],
exportHomeWorkV: false,
downloadUrl: null,
@@ -602,8 +603,8 @@ export default {
.then((res) => {
console.log("导出作业", JSON.parse(res.data).data);
if (JSON.parse(res.data).code === 200) {
message.destroy();
message.success("导出作业成功");
// message.destroy();
//message.success("导出作业成功");
state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data;
}

13
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -122,10 +122,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
</template>
@@ -182,11 +183,11 @@ export default {
value: "0",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 3,
value: "1",

11
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -121,10 +121,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
</template>
@@ -183,10 +184,10 @@ export default {
label: "未开始",
},
//{
// id: 2,
//value: "2",
// label: "进行中",
// },
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 3,
value: "1",

13
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -104,10 +104,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
</template>
@@ -164,11 +165,11 @@ export default {
value: "0",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
//{
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 3,
value: "1",

3
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -107,10 +107,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
<!-- 导出成绩抽屉 -->
<EScore v-model:eScorevisible="eScorevisible" />

9
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -25,7 +25,7 @@
{{ datasource && datasource.endTime ? datasource.endTime : "-" }}
</div>
<div class="endtime" style="margin-left: 64px">
签到时间：{{ beginTime }}~{{ endTime }}
允许签到时段：{{ beginTime }}~{{ endTime }}
</div>
</div>
@@ -103,7 +103,7 @@
<div class="wz">导出数据</div>
</div>
</div>
<div class="line">
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
@@ -116,7 +116,7 @@
<div class="right" @click="clearLine">清空</div>
</div>
</div>
<!-- <div class="pad"></div> -->
<div class="pad"></div> -->
<div class="tableBox" style="margin-top: 30px">
<a-table
@@ -167,10 +167,11 @@
/>
</div> -->
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
<!-- 二维码签到弹窗 -->

38
src/components/drawers/router/RouterFaceTeachManage.vue
View File

@@ -81,7 +81,7 @@
<div class="wz">导出作业</div>
</div>
</div>
<div class="line">
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
@@ -93,14 +93,14 @@
</div>
<div class="right" @click="clearLine">清空</div>
</div>
</div>
</div>-->
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900 }"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
@@ -123,10 +123,10 @@
</div>
</div>
</div>
<div class="btnn">
<!-- <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
<!-- 批量标注完成 -->
@@ -223,11 +223,11 @@ export default {
value: "1",
label: "已完成",
},
{
id: 2,
value: "2",
label: "进行中",
},
//{
// id: 2,
// value: "2",
// label: "进行中",
// },
],
selectedRowKeys: [],
@@ -429,15 +429,15 @@ export default {
);
},
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
width: 100,
align: "center",
ellipsis: true,
className: "h",
},
// {
// title: "操作",
// dataIndex: "operation",
// key: "operation",
// width: 100,
// align: "center",
// ellipsis: true,
// className: "h",
// },
],
exportHomeWorkV: false,
downloadUrl: null,

60
src/components/drawers/router/RouterHomeworkManage.vue
View File

@@ -94,7 +94,7 @@
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 900 }"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
@@ -117,10 +117,11 @@
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>-->
</div>
</a-drawer>
@@ -199,11 +200,11 @@ export default {
value: "0",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
//},
{
id: 3,
value: "1",
@@ -251,7 +252,7 @@ export default {
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "left",
align: "center",
className: "h",
ellipsis: true,
customRender: (text) => {
@@ -322,26 +323,7 @@ export default {
);
},
},
{
title: "所属小组",
dataIndex: "studentOrgName",
key: "studentOrgName",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.studentOrgName
? text.record.studentOrgName
: "-"}
</span>
</div>
);
},
},
{
title: "成绩",
dataIndex: "workScore",
@@ -406,15 +388,15 @@ export default {
);
},
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
width: 100,
align: "center",
ellipsis: true,
className: "h",
},
// {
// title: "操作",
// dataIndex: "operation",
// key: "operation",
// width: 100,
// align: "center",
// ellipsis: true,
// className: "h",
// },
],
exportHomeWorkV: false,
downloadUrl: null,
@@ -612,8 +594,8 @@ export default {
.then((res) => {
console.log("导出作业", JSON.parse(res.data).data);
if (JSON.parse(res.data).code === 200) {
message.destroy();
message.success("导出作业成功");
// message.destroy();
// message.success("导出作业成功");
state.exportHomeWorkV = true;
state.downloadUrl = JSON.parse(res.data).data;
}

72
src/views/courselibrary/CoursewareManage.vue
View File

@@ -94,11 +94,11 @@
<div class="btns">
<!-- 2022-11-30注释 后面放开 -->
<div
class="btn btn3"
class="btn btn2"
@click="openMessage"
style="margin-right: 14px"
>
<div class="search"></div>
<div class="img2"></div>
<div class="btnText">导出</div>
</div>
<div class="btn btn3" @click="of_hShow">
@@ -5839,8 +5839,8 @@ export default defineComponent({
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
@@ -5850,18 +5850,18 @@ export default defineComponent({
color: #ffffff;
}
}
/**
.btn1:active {
background: #0982ff;
}
.btn2:hover {
.btn2 {
background: rgba(64, 158, 255, 0.1);
}
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
}*/
}
.btns {
@@ -5894,31 +5894,22 @@ export default defineComponent({
}
}
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}
@@ -6940,7 +6931,7 @@ export default defineComponent({
}
}
.btn1:hover {
.btn1 {
background: rgba(64, 158, 255, 1);
.search {
@@ -6960,7 +6951,7 @@ export default defineComponent({
}
}
.btn2:hover {
.btn2{
background: rgba(64, 158, 255, 1);
.search {
@@ -7352,7 +7343,7 @@ export default defineComponent({
}
}
.btn1:hover {
.btn1 {
background: #4ea6ff;
.search {
@@ -7364,7 +7355,7 @@ export default defineComponent({
}
}
.btn2:hover {
.btn2 {
background: #4ea6ff;
.reset {
@@ -7580,8 +7571,8 @@ export default defineComponent({
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.btn1{
.search {
background-image: url("../../assets/images/courseManage/search0.png");
@@ -7591,7 +7582,7 @@ export default defineComponent({
color: #ffffff;
}
}
/**
.btn1:active {
background: #0982ff;
}
@@ -7603,7 +7594,7 @@ export default defineComponent({
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
*/
.btns {
display: flex;
@@ -7632,33 +7623,20 @@ export default defineComponent({
line-height: 36px;
margin-left: 5px;
}
}
.btn3 {
.btn2 {
margin-right: 0px;
.search {
.img2 {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
background-image: url(../../assets/images/coursewareManage/export1.png);
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}