mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-11 11:56:46 +08:00
Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage
This commit is contained in:
@@ -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 {
|
||||||
|
|||||||
@@ -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 = () => {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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%;
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user