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" /> +