Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
宋文超
2022-11-23 18:25:55 +08:00
30 changed files with 2127 additions and 2286 deletions

View File

@@ -794,7 +794,7 @@
<div class="line"></div>
<div class="search">
<div class="left">
<div class="name">
<!-- <div class="name">
<div class="text">姓名</div>
<a-input
v-model:value="valueName"
@@ -806,7 +806,7 @@
margin-left: 5px;
"
/>
</div>
</div> -->
<div class="time">
<div class="text">选择时间</div>
<a-range-picker
@@ -864,7 +864,7 @@
<div class="rank">
<div class="rankhead">
<div class="inhead">
<div class="left">分排行 Top10</div>
<div class="left">分排行 Top10</div>
<div class="right">
<a-select
v-model:value="valuestu3"
@@ -889,7 +889,7 @@
<div class="rank">
<div class="rankhead">
<div class="inhead">
<div class="left">排行 Top10</div>
<div class="left">排行 Top10</div>
<div class="right">
<a-select
v-model:value="valuestu4"
@@ -1766,16 +1766,25 @@ export default {
// projectId:"", //项目任务id
projectTaskId: "", //项目任务任务id
//进度排行学员
rankjindu: [{ value: "学员", label: "学员" }],
rankjindu: [
{ value: "学员", label: "学员" },
{ value: "小组", label: "小组" },
],
valuestu1: "学员",
//进度排行阶段
rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
valuestu2: "第一阶段",
//分排行
rankxuefen: [{ value: "学员", label: "学员" }],
//分排行
rankxuefen: [
{ value: "学员", label: "学员" },
{ value: "小组", label: "小组" },
],
valuestu3: "学员",
//学排行
rankxueshi: [{ value: "学员", label: "学员" }],
//学排行
rankxueshi: [
{ value: "学员", label: "学员" },
{ value: "小组", label: "小组" },
],
valuestu4: "学员",
visible: false, //时间管理
FaceVisivle: false, //面授管理
@@ -1962,53 +1971,53 @@ export default {
{
rank: "1",
name: "哈哈",
jd: "80%",
jd: "80",
},
{
rank: "2",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "3",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "4",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "5",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "6",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "7",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "8",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "9",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "10",
name: "哈哈",
jd: "70%",
jd: "7",
},
],
xuefentablecolumns: [
@@ -2056,7 +2065,7 @@ export default {
},
{
title: "进度",
title: "积分",
dataIndex: "jd",
key: "jd",
width: 50,
@@ -2064,58 +2073,58 @@ export default {
className: "h",
},
],
//学排行表
//学排行表
xueshitabledata: [
{
rank: "1",
name: "哈哈",
jd: "80%",
jd: "8",
},
{
rank: "2",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "3",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "4",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "5",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "6",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "7",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "8",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "9",
name: "哈哈",
jd: "70%",
jd: "70",
},
{
rank: "10",
name: "哈哈",
jd: "70%",
jd: "70",
},
],
xueshitablecolumns: [
@@ -2163,7 +2172,7 @@ export default {
},
{
title: "进度",
title: "时长",
dataIndex: "jd",
key: "jd",
width: 50,