feat:合并

This commit is contained in:
李晓鸽
2022-10-11 18:44:46 +08:00
12 changed files with 1580 additions and 142 deletions

View File

@@ -45,6 +45,7 @@ LevelAddDetail.vue:创建关卡页面
ProjectManage.vue:项目页面 ProjectManage.vue:项目页面
ProjectAdd.vue:创建项目页面 ProjectAdd.vue:创建项目页面
TaskPage.vue:任务页面 TaskPage.vue:任务页面
TaskAdd.vue:创建任务页面
TemplateLibrary.vue:模板页面 TemplateLibrary.vue:模板页面
``` ```

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

View File

@@ -580,19 +580,20 @@
<div class="gpm_inputbtn"> <div class="gpm_inputbtn">
<a-input <a-input
v-model:value="value" v-model:value="value"
style="width: 270px; height: 40px; border-radius: 8px;margin-right: 14px;" style="width: 270px; height: 40px; border-radius: 8px; margin-right: 14px;"
placeholder="请输入姓名"
/> />
<div class="gpm_btn btn1"> <div class="gpm_btn btn1">
<div class="search"></div> <div class="search"></div>
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="gpm_btn btn2"> <div class="gpm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
</div> </div>
<div class="gpm_notice"> <div class="gpm_notice">
<div class="th_icon"><div class="th_text">i</div></div> <div class="th_icon"></div>
<div class="textarea">已选择 <span style="color: #4EA6FF;">1</span> </div> <div class="textarea">已选择 <span style="color: #4EA6FF;">1</span> </div>
<div class="textarea"><span style="color:#999BA3;">列表选项总计</span><span>5</span></div> <div class="textarea"><span style="color:#999BA3;">列表选项总计</span><span>5</span></div>
</div> </div>
@@ -628,7 +629,7 @@
</template> </template>
</a-table> </a-table>
</div> </div>
</div>
</div> </div>
<!--操作授权页面 --> <!--操作授权页面 -->
@@ -665,12 +666,12 @@
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="stm_btn btn2"> <div class="stm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
<div class="stm_btn btn3" style="width: 130px;"> <div class="stm_btn3 btn3" >
<div class="search"></div> <div class="add"></div>
<div class="btnText" @click="createkk">新建开课</div> <div class="btnText" @click="createkk"><span style="color:#ffffff;">新建开课</span> </div>
</div> </div>
</div> </div>
<div class="stm_table"> <div class="stm_table">
@@ -707,10 +708,7 @@
<!--开课页面 --> <!--开课页面 -->
<!--新建开课页面 --> <!--新建开课页面 -->
<div <div class="createschooltime" :style="{ display: cstm_hs ? 'block' : 'none' }">
class="createschooltime"
:style="{ display: cstm_hs ? 'block' : 'none' }"
>
<div class="cst_header"></div> <div class="cst_header"></div>
<div class="cst_main"> <div class="cst_main">
<div class="cstm_header"> <div class="cstm_header">
@@ -864,7 +862,7 @@
<div class="btnText">搜索</div> <div class="btnText">搜索</div>
</div> </div>
<div class="stmm_btn btn2"> <div class="stmm_btn btn2">
<div class="search"></div> <div class="reset"></div>
<div class="btnText">重置</div> <div class="btnText">重置</div>
</div> </div>
</div> </div>
@@ -915,7 +913,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!--新建开课学员管理页面页面 --> <!--新建开课学员管理页面页面 -->
</div> </div>
</template> </template>
@@ -1580,38 +1577,180 @@ export default defineComponent({
const getTableDate = () => { const getTableDate = () => {
let data = state.tableData; let data = state.tableData;
// data.map((value) => { data.map((value) => {
// value.operation = ( {
// // value.courseform === '面授' ? //单层项目
// <div class="op_box"> value.operation = (
// <div class="operation"> <div class="operation">
// <span class={value.courseform === '面授' ? "activecls" : "errorCls"} style={{ "margin-left": "25px" }} >开课</span> <div class="nSelect">
// <span class={value.ynuse === '停用' ? "activecls" : "errorCls"} style={{ "margin-left": "25px" }} >停用</span> {value.status === "已审核" ? (
// <span class={value.status === '未提交' || value.status === '审核未通过' ? "activecls" : "errorCls"} style={{ "margin-left": "25px" }} >编辑</span> <div class="nselect">
// <span onClick={() => {}} class={value.status === '已审核' ? "activecls" : "errorCls"} style={{ "margin-left": "25px" }} >管理</span> <router-link to="/leveladd">
// <span class={value.status === '待审核' ? "errorCls" : "activecls"} style={{ "margin-left": "25px" }} >复制</span> <div class="jc">开课</div>
// <span style={{ "margin-left": "25px" }} class="more"> </router-link>
// <span>授权</span>
// <div class="moreArrow"></div> <router-link to="/leveladd">
// <div class="moreItems"> <div class="jc">管理</div>
// <span style="color:#4EA6FF;">权限名单</span> </router-link>
// <div class="mitems1">归属权</div>
// <div class="mitems2">管理权</div> <div class="jc">复制</div>
// <div class="mitems3">查看权</div>
// </div> <a-select
// </span> style="width: 50px;margin-top:2px;margin-left:25px"
// <span value="授权"
// style={{ "margin-left": "21px", "margin-right": "30px" }} // options={state.projectNameList}
// class="more" dropdownClassName="tabledropdown"
// > >
// <span>更多</span> <a-select-option value="权限名单" label="权限名单">
// <div class="moreArrow"></div> <div>权限名单</div>
// <div class="moreItems"></div> </a-select-option>
// </span> <a-select-option value="归属权" label="归属权">
// </div> <div
// </div> onClick={() => {
// ); console.log("点击了");
// }); }}
>
归属权
</div>
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div>查看权</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div>管理权</div>
</a-select-option>
</a-select>
<a-select
style="width: 50px;margin-top:2px;margin-left:25px"
value="更多"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option
value="复制"
label="复制"
style="padding-left:35px"
>
<div>复制</div>
</a-select-option>
<a-select-option
value="取消"
label="取消"
style="padding-left:35px"
>
<div
onClick={() => {
console.log("点击了");
}}
>
取消
</div>
</a-select-option>
</a-select>
</div>
) : (
<div></div>
)}
{value.status === "待审核" ? (
<div class="nselect">
<router-link to="/leveladd">
<div class="jc">开课</div>
</router-link>
<div class="jc">撤回</div>
<a-select
style="width: 50px;margin-top:2px;margin-left:25px"
value="授权"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="权限名单" label="权限名单">
<div>权限名单</div>
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了");
}}
>
归属权
</div>
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div>查看权</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div>管理权</div>
</a-select-option>
</a-select>
</div>
) : (
<div></div>
)}
{value.status === "未提交" ? (
<div class="nselect">
<router-link to="/leveladd">
<div class="jc">开课</div>
</router-link>
<div class="jc">编辑</div>
<div class="jc">复制</div>
</div>
) : (
<div></div>
)}
{value.status === "审核未通过" ? (
<div class="nselect">
<router-link to="/leveladd">
<div class="jc">开课</div>
</router-link>
<div class="jc">编辑</div>
<div class="jc">复制</div>
<a-select
style="width: 50px;margin-top:2px;margin-left:25px"
value="授权"
// options={state.projectNameList}
dropdownClassName="tabledropdown"
>
<a-select-option value="权限名单" label="权限名单">
<div>权限名单</div>
</a-select-option>
<a-select-option value="归属权" label="归属权">
<div
onClick={() => {
console.log("点击了");
}}
>
归属权
</div>
</a-select-option>
<a-select-option value="查看权" label="查看权">
<div>查看权</div>
</a-select-option>
<a-select-option value="管理权" label="管理权">
<div>管理权</div>
</a-select-option>
</a-select>
<div class="jc">删除</div>
</div>
) : (
<div></div>
)}
</div>
</div>
);
}
});
state.tableData = data; state.tableData = data;
}; };
getTableDate(); getTableDate();
@@ -2207,48 +2346,72 @@ export default defineComponent({
.op_box { .op_box {
display: flex; display: flex;
justify-content: right; justify-content: right;
.opacation { // .opacation {
font-size: 14px; // font-size: 14px;
font-weight: 400; // font-weight: 400;
color: #4ea6ff; // color: #4ea6ff;
// line-height: 36px; // // line-height: 36px;
.activecls { // .activecls {
display: inline-block; // display: inline-block;
} // }
.errorCls { // .errorCls {
display: none; // display: none;
} // }
.more { // .more {
position: relative; // position: relative;
.moreArrow { // .moreArrow {
width: 13px; // width: 13px;
height: 7px; // height: 7px;
display: inline-block; // display: inline-block;
background-image: url("@/assets/images/navtop/down.png"); // background-image: url("@/assets/images/navtop/down.png");
background-size: 100%; // background-size: 100%;
margin: 2px; // margin: 2px;
margin-left: 7px; // margin-left: 7px;
} // }
.moreItems { // .moreItems {
width: 80px; // width: 80px;
// height: 70px; // // height: 70px;
display: none; // display: none;
background: #ffffff; // background: #ffffff;
box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05); // box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
border-radius: 3px; // border-radius: 3px;
border: 0px solid #dcdcdc; // border: 0px solid #dcdcdc;
align-items: center; // align-items: center;
position: absolute; // position: absolute;
left: 0px; // left: 0px;
top: 18px; // top: 18px;
z-index: 9999 !important; // z-index: 9999 !important;
// }
// }
// .more:hover .moreArrow {
// background-image: url("@/assets/images/navtop/up.png");
// }
// .more:hover .moreItems {
// display: block;
// }
// }
}
.operation {
display: flex;
justify-content: right;
.nSelect {
.nselect {
display: flex;
.jc {
color: #4ea6ff;
font-size: 14px;
margin-left: 20px;
} }
} }
.more:hover .moreArrow { }
background-image: url("@/assets/images/navtop/up.png"); .tableSelect {
} margin-right: 20px;
.more:hover .moreItems { display: flex;
display: block; align-items: center;
justify-content: right;
.g1 {
color: #4ea6ff;
font-size: 14px;
} }
} }
} }
@@ -2499,32 +2662,82 @@ export default defineComponent({
background-size: 100% 100%; background-size: 100% 100%;
} }
} }
.b_sub { .gpm_inputbtn{
width: 90%;
margin: 20px auto;
display: flex; display: flex;
margin-bottom: 10px; .gpm_btn {
.bs_type { width: 100px;
color: #999ba3; height: 40px;
margin-right: 14px;
background: #ffffff;
border: 1px solid #4EA6FF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
color: #4EA6FF;
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
} }
.bs_left { .btn1 {
color: #999ba3; .search {
margin-left: 35px; width: 15px;
height: 17px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/search1.png");
}
} }
.bs_right { .btn2 {
color: #4f5156; .reset {
width: 16px;
height: 18px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: #4EA6FF;
.search {
background-image: url("@/assets/images/coursewareManage/search0.png");
}
.btnText {
color: #ffffff;
}
}
.btn2:hover {
background: #4EA6FF;
.reset {
background-image: url("@/assets/images/coursewareManage/reset0.png");
}
.btnText {
color: #ffffff;
}
} }
} }
.b_menu { .gpm_notice{
width: calc(100%);
}
.b_menunav {
display: flex; display: flex;
margin-top: 20px; background: rgba(78,166,255,0.25);
margin-bottom: 20px; border: 1px solid #4EA6FF;
.bm_select { width: 90%;
margin-right: 20px; height: 62px;
margin:20px auto;
align-items: center;
line-height: 64px;
.th_icon{
width: 16px;
height: 16px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
margin: auto 13px auto 37px;
} }
.bm_input { .textarea{
margin-right: 20px; margin-right: 33px;
} }
} }
.gpm_table{ .gpm_table{
@@ -2605,52 +2818,64 @@ export default defineComponent({
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
background-image: url("../../assets/images/courseManage/search1.png"); margin-right: 6px;
background-image: url("@/assets/images/coursewareManage/search1.png");
} }
} }
.btn2 { .btn2 {
.search { .reset {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); margin-right: 6px;
} background-image: url("@/assets/images/coursewareManage/reset1.png");
}
.btn3 {
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add1.png");
margin-right: 5px;
} }
} }
.btn1:hover { .btn1:hover {
background: rgba(64, 158, 255, 1); background: #4EA6FF;
.search { .search {
background-image: url("../../assets/images/courseManage/search0.png"); background-image: url("@/assets/images/coursewareManage/search0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 1); background: #4EA6FF;
.search { .reset {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("@/assets/images/coursewareManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
} }
.btnText { .btnText {
color: #ffffff; color: #ffffff;
} }
} }
} }
.stm_btn3{
width: 130px;
height: 40px;
border: 1px solid #4EA6FF;
background-color: #4EA6FF;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
cursor: pointer;
.btnText {
font-size: 14px;
font-weight: 400;
line-height: 40px;
}
.btn3 {
.add {
width: 17px;
height: 18px;
background-image: url("@/assets/images/coursewareManage/add0.png");
background-size: 100% 100%;
margin-right: 6px;
}
}
}
.stm_table{ .stm_table{
width: 90%; width: 90%;
margin:30px auto; margin:30px auto;
@@ -2891,13 +3116,15 @@ export default defineComponent({
.search { .search {
width: 15px; width: 15px;
height: 17px; height: 17px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/search1.png"); background-image: url("../../assets/images/courseManage/search1.png");
} }
} }
.btn2 { .btn2 {
.search { .reset {
width: 16px; width: 16px;
height: 18px; height: 18px;
margin-right: 6px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset1.png");
} }
} }
@@ -2912,7 +3139,7 @@ export default defineComponent({
} }
.btn2:hover { .btn2:hover {
background: rgba(64, 158, 255, 1); background: rgba(64, 158, 255, 1);
.search { .reset {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText { .btnText {

File diff suppressed because it is too large Load Diff

View File

@@ -20,7 +20,7 @@
<div class="end"> <div class="end">
<div style="margin-top: 20px;margin-left: 10px"> <div style="margin-top: 20px;margin-left: 10px">
<img class="endimg" src="../../assets/images/leveladd/more.png"/> <img class="endimg" src="../../assets/images/leveladd/more.png"/>
<div class="tableSelect" style="margin-left: 10px"> <div class="tableSelect" style="margin-left: 10px;margin-right: 20px">
<a-select <a-select
style="width: 50px; color: #7096E3" style="width: 50px; color: #7096E3"
value="更多" value="更多"
@@ -40,12 +40,11 @@
</div> </div>
</div> </div>
<div class="end"> <div class="end">
<div style="margin-top: 20px;margin-left: 10px"> <div style="margin-top: 20px;margin-left: 10px;margin-right:30px">
<img class="ending" src="../../assets/images/leveladd/back.png" /> <img class="ending" src="../../assets/images/leveladd/back.png" />
<span class="endtext" style="color:#4EA6FF">返回</span> <span class="endtext" style="color:#4EA6FF">返回</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="split"></div> <div class="split"></div>
@@ -258,10 +257,11 @@
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; //position: relative;
.header { .header {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap;
.box { .box {
border: 12px solid #E7F2FF; border: 12px solid #E7F2FF;
margin: 16px 0 16px 19px; margin: 16px 0 16px 19px;
@@ -270,12 +270,13 @@
} }
.imgfor { .imgfor {
display: flex; display: flex;
flex: 1;
flex-direction: column; flex-direction: column;
margin-top: 38px; margin-top: 38px;
//margin-left: 15px; margin-left: 15px;
//float: left; //float: left;
position: absolute; //position: absolute;
left: 210px; //left: 210px;
.forz { .forz {
font-size: 16px; font-size: 16px;
color: #363636; color: #363636;
@@ -289,9 +290,9 @@
} }
.right { .right {
display: flex; display: flex;
position: absolute; //position: absolute;
right: 10px; //right: 10px;
top: 5px; //top: 5px;
//float: right; //float: right;
.end { .end {
border-left: 1px solid #E8EFFA; border-left: 1px solid #E8EFFA;

View File

@@ -278,6 +278,7 @@
margin-bottom: 14px; margin-bottom: 14px;
.btn { .btn {
display: flex; display: flex;
margin-bottom: 20px;
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
} }