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

This commit is contained in:
dongwug
2022-10-26 11:57:13 +08:00
10 changed files with 25 additions and 23 deletions

View File

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

View File

@@ -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 = () => {

View File

@@ -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 {

View File

@@ -812,7 +812,7 @@ export default {
display: flex;
// height: 80%;
margin-bottom: 72px;
overflow-y: auto;
overflow-y: auto;
.left {
width: 65%;
// height: 100%;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -3,7 +3,7 @@
:visible="TaskFaceImpStuvisible"
class="drawerStyle TaskFaceImpStu"
placement="right"
width="40%"
width="700px"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
@@ -82,7 +82,7 @@
</div>
</div>
<div class="curloading">
<div class="cur">55%</div>
<div class="cur">100%</div>
<div class="cancel" style="margin-left: 20px">删除</div>
</div>
</div>
@@ -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 {