diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index c07d534b..98880036 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -934,9 +934,9 @@ export default { > td { background: #f6f9fd; } - .opa { - // background-color: #bfa; - } + // .opa { + // background-color: #bfa; + // } } // .tab { // .ant-table-thead > tr > th { diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index d277baac..93ad2825 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -216,6 +216,7 @@ display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 98c35cb1..4d29f924 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -72,7 +72,7 @@ :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -156,7 +156,7 @@ :data-source="tabledata1" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -246,7 +246,7 @@ :data-source="tabledata2" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 500, y: 560 }" + :scroll="{ x: 500 }" @expand="expandTable" :pagination="false" :row-selection="{ @@ -1014,11 +1014,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; const getMousePosition = () => { diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue index a4c117dc..1e1ca238 100644 --- a/src/components/drawers/ManageRight.vue +++ b/src/components/drawers/ManageRight.vue @@ -800,11 +800,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index d90561a3..43c6248c 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -754,11 +754,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { @@ -812,7 +812,7 @@ export default { display: flex; // height: 80%; margin-bottom: 72px; - overflow-y: auto; + overflow-y: auto; .left { width: 65%; // height: 100%; diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue index d25072b0..60d1f0d8 100644 --- a/src/components/drawers/Ownership.vue +++ b/src/components/drawers/Ownership.vue @@ -755,11 +755,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index 8f297843..1fa2662e 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -755,11 +755,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue index f4742451..2b27532d 100644 --- a/src/components/drawers/ProjManagePower.vue +++ b/src/components/drawers/ProjManagePower.vue @@ -755,11 +755,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue index 4fb99c0b..8c52f026 100644 --- a/src/components/drawers/ProjectOwn.vue +++ b/src/components/drawers/ProjectOwn.vue @@ -755,11 +755,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 9d7d77bc..94f7eccc 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -491,8 +491,6 @@ export default { cursor: pointer; } } - .ant-table-tbody{ - .pa { margin-top: 15px; // height: 20px; @@ -501,9 +499,6 @@ export default { justify-content: center; // bottom: 20px; } - } - - } .scorelist { diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue index 11e4a5df..e3fa04dc 100644 --- a/src/components/drawers/QueryRight.vue +++ b/src/components/drawers/QueryRight.vue @@ -755,11 +755,11 @@ export default { }; const onSelectChange1 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys1 = selectedRowKeys; }; const onSelectChange2 = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); - state.selectedRowKeys = selectedRowKeys; + state.selectedRowKeys2 = selectedRowKeys; }; return { diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index fef6efa1..caf2d364 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -15,6 +15,7 @@ @click="closeDrawer" /> +
@@ -40,11 +41,11 @@
+
- @@ -213,7 +214,6 @@ .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-x: scroll; display: flex; flex-direction: column; .header { @@ -236,17 +236,11 @@ .main { width: 100%; height: 100%; - - // background-color: #bfa; - // overflow-y: auto; .endtime { font-size: 16px; font-weight: 500; color: #333333; } - - - .tableBox { padding-bottom: 100px; .ant-table-selection-column { diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue index babf1784..fa14b9bf 100644 --- a/src/components/drawers/TaskFaceIn.vue +++ b/src/components/drawers/TaskFaceIn.vue @@ -3,7 +3,7 @@ :visible="TaskFaceImpStuvisible" class="drawerStyle TaskFaceImpStu" placement="right" - width="40%" + width="700px" @after-visible-change="afterVisibleChange" >
@@ -82,7 +82,7 @@
-
55%
+
100%
删除
@@ -145,6 +145,7 @@ export default { align-items: center; // background-color: red; margin-bottom: 20px; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; @@ -154,6 +155,7 @@ export default { } } .main { + overflow-y: auto; .minatitl { display: flex; .up1 { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index d4602bed..265233ec 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1503,6 +1503,7 @@ :closable="closableQR" wrapClassName="recgradeModal" style="margin-top: 400px" + @cancel="rg_exit" >
@@ -1552,6 +1553,7 @@ :closable="closableQR" wrapClassName="graModal" style="margin-top: 400px" + @cancel="graduate_exit" >
- +
提示 -
+
-
+
请确定是否同意此学员学习此课程
-
-
-
-
取消
-
-
-
确定
-
-
-
-
- - - - -
-
-
-
-
- 提示 -
-
-
-
+
请确定是否拒绝此学员学习此课程
-
取消
+
取消
-
确定
+
确定
- +
- + @@ -2419,6 +2389,7 @@ export default defineComponent({ closableQR: false, rg_hs: false, graduate_hs: false, + agreereject_hs:false, agreestudy_hs: false, rejectstudy_hs: false, delete_hs: false, @@ -2806,6 +2777,7 @@ export default defineComponent({
{ + state.agreereject_hs = true; state.agreestudy_hs = true; }} > @@ -2816,6 +2788,7 @@ export default defineComponent({
{ + state.agreereject_hs = true; state.rejectstudy_hs = true; }} > @@ -3155,9 +3128,6 @@ export default defineComponent({ const ftsr_exit = () => { state.om_ckxq = false; }; - // const gpm_exit = () => { - // state.gpm_hs = false; - // }; const stm_exit = () => { state.stm_hs = false; }; @@ -3213,10 +3183,9 @@ export default defineComponent({ const graduate_exit = () => { state.graduate_hs = false; }; - const agreestudy_exit = () => { + const agreereject_exit = () => { + state.agreereject_hs = false; state.agreestudy_hs = false; - }; - const rejectstudy_exit = () => { state.rejectstudy_hs = false; }; const delete_exit = () => { @@ -3281,8 +3250,7 @@ export default defineComponent({ qr_exit, rg_exit, graduate_exit, - agreestudy_exit, - rejectstudy_exit, + agreereject_exit, delete_exit, onSelectChange, faceManageChange, @@ -4008,21 +3976,24 @@ export default defineComponent({ } .agrstudyModal { .ant-modal { + width:429px !important; + height:258px !important; .ant-modal-content { - // width:679px !important; + width:429px !important; + height:258px !important; .ant-modal-body { + width:429px !important; + height:258px !important; + padding:0px !important; .agreestudy { z-index: 9999; - width: 679px; + width: 429px; + height:258px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); - position: absolute; - left: 50%; - top: 10%; - transform: translate(-50%, -50%); .agree_header { position: absolute; - width: calc(100%); + width: 100%; height: 40px; background: linear-gradient( rgba(78, 166, 255, 0.2) 0%, @@ -4056,13 +4027,11 @@ export default defineComponent({ } } .agreem_body { - .body_box { - display: flex; - justify-content: center; - align-items: center; + display: flex; + justify-content: center; + align-items: center; width: 100%; - margin: 20px auto; - } + margin: 45px auto 62px auto; } .qrm_btnbox { display: flex; @@ -5188,7 +5157,7 @@ export default defineComponent({ width: 424px !important; .ant-modal-body { .delete { - z-index: 9999; + z-index: 99999; width: 424px; background: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index af1450b8..95120310 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1192,12 +1192,13 @@ :closable="close" wrapClassName="canclestu" centered="true" + @cancel="closeModal1" >
-
+
提示
@@ -1482,6 +1483,7 @@ :closable="closableQR" wrapClassName="DelModal" style="margin-top: 400px" + @cancel="delete_exit" >
@@ -2771,7 +2773,7 @@ export default { padding-top: 20px; padding-left: 26px; font-size: 16px; - .icon { + .icon1 { width: 16px; height: 16px; margin-right: 10px; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 8c6c4732..309d5096 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -148,7 +148,7 @@ export default defineComponent({
查看{" "} - | + |
@@ -164,14 +164,14 @@ export default defineComponent({
发布 - | + |
查看 - | + |
@@ -237,6 +237,7 @@ export default defineComponent({ align-items: center; justify-content: center; margin-left: 14px; + cursor: pointer; flex-shrink: 0; .search { background-size: 100%;