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

This commit is contained in:
岳佳鑫
2022-10-26 11:59:07 +08:00
16 changed files with 73 additions and 109 deletions

View File

@@ -934,9 +934,9 @@ export default {
> td { > td {
background: #f6f9fd; background: #f6f9fd;
} }
.opa { // .opa {
// background-color: #bfa; // background-color: #bfa;
} // }
} }
// .tab { // .tab {
// .ant-table-thead > tr > th { // .ant-table-thead > tr > th {

View File

@@ -216,6 +216,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;

View File

@@ -72,7 +72,7 @@
:data-source="tabledata" :data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 500, y: 560 }" :scroll="{ x: 500 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
@@ -156,7 +156,7 @@
:data-source="tabledata1" :data-source="tabledata1"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 500, y: 560 }" :scroll="{ x: 500 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
@@ -246,7 +246,7 @@
:data-source="tabledata2" :data-source="tabledata2"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
:scroll="{ x: 500, y: 560 }" :scroll="{ x: 500 }"
@expand="expandTable" @expand="expandTable"
:pagination="false" :pagination="false"
:row-selection="{ :row-selection="{
@@ -1014,11 +1014,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
const getMousePosition = () => { const getMousePosition = () => {

View File

@@ -800,11 +800,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -754,11 +754,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {
@@ -812,7 +812,7 @@ export default {
display: flex; display: flex;
// height: 80%; // height: 80%;
margin-bottom: 72px; margin-bottom: 72px;
overflow-y: auto; overflow-y: auto;
.left { .left {
width: 65%; width: 65%;
// height: 100%; // height: 100%;

View File

@@ -755,11 +755,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -755,11 +755,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -755,11 +755,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -755,11 +755,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -491,8 +491,6 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.ant-table-tbody{
.pa { .pa {
margin-top: 15px; margin-top: 15px;
// height: 20px; // height: 20px;
@@ -501,9 +499,6 @@ export default {
justify-content: center; justify-content: center;
// bottom: 20px; // bottom: 20px;
} }
}
} }
.scorelist { .scorelist {

View File

@@ -755,11 +755,11 @@ export default {
}; };
const onSelectChange1 = (selectedRowKeys) => { const onSelectChange1 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys1 = selectedRowKeys;
}; };
const onSelectChange2 = (selectedRowKeys) => { const onSelectChange2 = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys); console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys2 = selectedRowKeys;
}; };
return { return {

View File

@@ -15,6 +15,7 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="contentMain">
<div class="main"> <div class="main">
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px"> <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
@@ -40,11 +41,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="btnn"> <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button> <button class="btn2" @click="closeDrawer">确定</button>
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
</template> </template>
@@ -213,7 +214,6 @@
.drawerMain { .drawerMain {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: scroll;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
@@ -236,17 +236,11 @@
.main { .main {
width: 100%; width: 100%;
height: 100%; height: 100%;
// background-color: #bfa;
// overflow-y: auto;
.endtime { .endtime {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.tableBox { .tableBox {
padding-bottom: 100px; padding-bottom: 100px;
.ant-table-selection-column { .ant-table-selection-column {

View File

@@ -3,7 +3,7 @@
:visible="TaskFaceImpStuvisible" :visible="TaskFaceImpStuvisible"
class="drawerStyle TaskFaceImpStu" class="drawerStyle TaskFaceImpStu"
placement="right" placement="right"
width="40%" width="700px"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<div class="curloading"> <div class="curloading">
<div class="cur">55%</div> <div class="cur">100%</div>
<div class="cancel" style="margin-left: 20px">删除</div> <div class="cancel" style="margin-left: 20px">删除</div>
</div> </div>
</div> </div>
@@ -145,6 +145,7 @@ export default {
align-items: center; align-items: center;
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -154,6 +155,7 @@ export default {
} }
} }
.main { .main {
overflow-y: auto;
.minatitl { .minatitl {
display: flex; display: flex;
.up1 { .up1 {

View File

@@ -1503,6 +1503,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="recgradeModal" wrapClassName="recgradeModal"
style="margin-top: 400px" style="margin-top: 400px"
@cancel="rg_exit"
> >
<div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }"> <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
<div class="rg_header"></div> <div class="rg_header"></div>
@@ -1552,6 +1553,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="graModal" wrapClassName="graModal"
style="margin-top: 400px" style="margin-top: 400px"
@cancel="graduate_exit"
> >
<div <div
class="graduate" class="graduate"
@@ -1611,78 +1613,46 @@
</div> </div>
</a-modal> </a-modal>
<!--结业页面 --> <!--结业页面 -->
<!--请确定是否同意此学员学习此课程弹窗 --> <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
<a-modal <a-modal
v-model:visible="agreestudy_hs" v-model:visible="agreereject_hs"
:footer="null" :footer="null"
:closable="closableQR" :closable="closableQR"
wrapClassName="agrstudyModal" wrapClassName="agrstudyModal"
style="margin-top: 400px" centered="true"
@cancel="agreereject_exit"
> >
<div <div
class="agreestudy" class="agreestudy"
:style="{ display: agreestudy_hs ? 'block' : 'none' }" :style="{ display: agreereject_hs ? 'block' : 'none' }"
> >
<div class="agree_header"></div> <div class="agree_header"></div>
<div class="agree_main"> <div class="agree_main">
<div class="agreem_header"> <div class="agreem_header">
<div class="agreem_icon"></div> <div class="agreem_icon"></div>
<span>提示</span> <span>提示</span>
<div class="close_exit" @click="agreestudy_exit"></div> <div class="close_exit" @click="agreereject_exit"></div>
</div> </div>
<div class="agreem_body"> <div class="agreem_body">
<div class="body_box"> <div class="body_box" :style="{ display: agreestudy_hs ? 'block' : 'none' }">
<div>请确定是否同意此学员学习此课程</div> <div>请确定是否同意此学员学习此课程</div>
</div> </div>
</div> <div class="body_box" :style="{ display: rejectstudy_hs ? 'block' : 'none' }">
<div class="qrm_btnbox">
<div class="qrm_btn btn1">
<div class="btnText" @click="agreestudy_exit">取消</div>
</div>
<div class="qrm_btn btn2">
<div class="btnText" @click="agreestudy_exit">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
<!--请确定是否同意此学员学习此课程弹窗 -->
<!--请确定是否拒绝此学员学习此课程弹窗 -->
<a-modal
v-model:visible="rejectstudy_hs"
:footer="null"
:closable="closableQR"
wrapClassName="agrstudyModal"
style="margin-top: 400px"
>
<div
class="agreestudy"
:style="{ display: rejectstudy_hs ? 'block' : 'none' }"
>
<div class="agree_header"></div>
<div class="agree_main">
<div class="agreem_header">
<div class="agreem_icon"></div>
<span>提示</span>
<div class="close_exit" @click="rejectstudy_exit"></div>
</div>
<div class="agreem_body">
<div class="body_box">
<div>请确定是否拒绝此学员学习此课程</div> <div>请确定是否拒绝此学员学习此课程</div>
</div> </div>
</div> </div>
<div class="qrm_btnbox"> <div class="qrm_btnbox">
<div class="qrm_btn btn1"> <div class="qrm_btn btn1">
<div class="btnText" @click="rejectstudy_exit">取消</div> <div class="btnText" @click="agreereject_exit">取消</div>
</div> </div>
<div class="qrm_btn btn2"> <div class="qrm_btn btn2">
<div class="btnText" @click="rejectstudy_exit">确定</div> <div class="btnText" @click="agreereject_exit">确定</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</a-modal> </a-modal>
<!--请确定是否拒绝此学员学习此课程弹窗 --> <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
<!--删除 复制 停用弹窗 --> <!--删除 复制 停用弹窗 -->
<a-modal <a-modal
v-model:visible="delete_hs" v-model:visible="delete_hs"
@@ -1738,7 +1708,7 @@
</div> </div>
</div> </div>
</a-modal> </a-modal>
<!--删除弹窗 --> <!--删除 复制 停用弹窗 -->
<!-- 学员管理课程库-归属权抽屉 --> <!-- 学员管理课程库-归属权抽屉 -->
<own-power v-model:ownpowervisible="ownpowervisible" /> <own-power v-model:ownpowervisible="ownpowervisible" />
<!-- 学员管理课程库-归属权抽屉 --> <!-- 学员管理课程库-归属权抽屉 -->
@@ -2419,6 +2389,7 @@ export default defineComponent({
closableQR: false, closableQR: false,
rg_hs: false, rg_hs: false,
graduate_hs: false, graduate_hs: false,
agreereject_hs:false,
agreestudy_hs: false, agreestudy_hs: false,
rejectstudy_hs: false, rejectstudy_hs: false,
delete_hs: false, delete_hs: false,
@@ -2806,6 +2777,7 @@ export default defineComponent({
<div <div
class="jc" class="jc"
onClick={() => { onClick={() => {
state.agreereject_hs = true;
state.agreestudy_hs = true; state.agreestudy_hs = true;
}} }}
> >
@@ -2816,6 +2788,7 @@ export default defineComponent({
<div <div
class="jc" class="jc"
onClick={() => { onClick={() => {
state.agreereject_hs = true;
state.rejectstudy_hs = true; state.rejectstudy_hs = true;
}} }}
> >
@@ -3155,9 +3128,6 @@ export default defineComponent({
const ftsr_exit = () => { const ftsr_exit = () => {
state.om_ckxq = false; state.om_ckxq = false;
}; };
// const gpm_exit = () => {
// state.gpm_hs = false;
// };
const stm_exit = () => { const stm_exit = () => {
state.stm_hs = false; state.stm_hs = false;
}; };
@@ -3213,10 +3183,9 @@ export default defineComponent({
const graduate_exit = () => { const graduate_exit = () => {
state.graduate_hs = false; state.graduate_hs = false;
}; };
const agreestudy_exit = () => { const agreereject_exit = () => {
state.agreereject_hs = false;
state.agreestudy_hs = false; state.agreestudy_hs = false;
};
const rejectstudy_exit = () => {
state.rejectstudy_hs = false; state.rejectstudy_hs = false;
}; };
const delete_exit = () => { const delete_exit = () => {
@@ -3281,8 +3250,7 @@ export default defineComponent({
qr_exit, qr_exit,
rg_exit, rg_exit,
graduate_exit, graduate_exit,
agreestudy_exit, agreereject_exit,
rejectstudy_exit,
delete_exit, delete_exit,
onSelectChange, onSelectChange,
faceManageChange, faceManageChange,
@@ -4008,21 +3976,24 @@ export default defineComponent({
} }
.agrstudyModal { .agrstudyModal {
.ant-modal { .ant-modal {
width:429px !important;
height:258px !important;
.ant-modal-content { .ant-modal-content {
// width:679px !important; width:429px !important;
height:258px !important;
.ant-modal-body { .ant-modal-body {
width:429px !important;
height:258px !important;
padding:0px !important;
.agreestudy { .agreestudy {
z-index: 9999; z-index: 9999;
width: 679px; width: 429px;
height:258px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
position: absolute;
left: 50%;
top: 10%;
transform: translate(-50%, -50%);
.agree_header { .agree_header {
position: absolute; position: absolute;
width: calc(100%); width: 100%;
height: 40px; height: 40px;
background: linear-gradient( background: linear-gradient(
rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0.2) 0%,
@@ -4056,13 +4027,11 @@ export default defineComponent({
} }
} }
.agreem_body { .agreem_body {
.body_box { display: flex;
display: flex; justify-content: center;
justify-content: center; align-items: center;
align-items: center;
width: 100%; width: 100%;
margin: 20px auto; margin: 45px auto 62px auto;
}
} }
.qrm_btnbox { .qrm_btnbox {
display: flex; display: flex;
@@ -5188,7 +5157,7 @@ export default defineComponent({
width: 424px !important; width: 424px !important;
.ant-modal-body { .ant-modal-body {
.delete { .delete {
z-index: 9999; z-index: 99999;
width: 424px; width: 424px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

View File

@@ -1192,12 +1192,13 @@
:closable="close" :closable="close"
wrapClassName="canclestu" wrapClassName="canclestu"
centered="true" centered="true"
@cancel="closeModal1"
> >
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
<div class="del_main"> <div class="del_main">
<div class="header"> <div class="header">
<div class="icon"></div> <div class="icon1"></div>
<span>提示</span> <span>提示</span>
</div> </div>
<div class="body"> <div class="body">
@@ -1482,6 +1483,7 @@
:closable="closableQR" :closable="closableQR"
wrapClassName="DelModal" wrapClassName="DelModal"
style="margin-top: 400px" style="margin-top: 400px"
@cancel="delete_exit"
> >
<div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }"> <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
<div class="del_header"></div> <div class="del_header"></div>
@@ -2771,7 +2773,7 @@ export default {
padding-top: 20px; padding-top: 20px;
padding-left: 26px; padding-left: 26px;
font-size: 16px; font-size: 16px;
.icon { .icon1 {
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-right: 10px; margin-right: 10px;

View File

@@ -148,7 +148,7 @@ export default defineComponent({
<router-link to="/libraryadd"> <router-link to="/libraryadd">
<div class="jc"> <div class="jc">
查看{" "} 查看{" "}
<span style="color:#E9E9E9;margin-left:8px;">|</span> <span style="color:#E9E9E9;margin-left:15px;">|</span>
</div> </div>
</router-link> </router-link>
</div> </div>
@@ -164,14 +164,14 @@ export default defineComponent({
<div class="ops1"> <div class="ops1">
<div class="jc"> <div class="jc">
发布 发布
<span style="color:#E9E9E9;margin-left:8px;">|</span> <span style="color:#E9E9E9;margin-left:15px;">|</span>
</div> </div>
</div> </div>
<div class="ops2"> <div class="ops2">
<router-link to="/libraryadd"> <router-link to="/libraryadd">
<div class="jc"> <div class="jc">
查看 查看
<span style="color:#E9E9E9;margin-left:8px;">|</span> <span style="color:#E9E9E9;margin-left:15px;">|</span>
</div> </div>
</router-link> </router-link>
</div> </div>
@@ -237,6 +237,7 @@ export default defineComponent({
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 14px; margin-left: 14px;
cursor: pointer;
flex-shrink: 0; flex-shrink: 0;
.search { .search {
background-size: 100%; background-size: 100%;