Commit 4b36064a by 米嘉伟

展开收缩 提示条图标

parent 2cf7a07f
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
......
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -1002,4 +1002,12 @@ export default { ...@@ -1002,4 +1002,12 @@ export default {
.el-table tr { .el-table tr {
height: 55px; height: 55px;
} }
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
</style> </style>
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -1539,4 +1539,12 @@ export default { ...@@ -1539,4 +1539,12 @@ export default {
/deep/.el-table--enable-row-transition .el-table__body td.el-table__cell { /deep/.el-table--enable-row-transition .el-table__body td.el-table__cell {
height: 55px; height: 55px;
} }
/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
</style> </style>
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color:#055FE7;font-size:.9375rem" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择<span style="color:#055FE7">{{multipleSelection.length}}</span>项​ 已选择<span style="color:#055FE7">{{multipleSelection.length}}</span>项​
<!-- <span v-html="'&nbsp;&nbsp;'"></span> --> <!-- <span v-html="'&nbsp;&nbsp;'"></span> -->
......
...@@ -253,8 +253,8 @@ ...@@ -253,8 +253,8 @@
> >
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 15px" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​ <span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
hasChildren: 'hasChildren', hasChildren: 'hasChildren',
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange"
> >
<!-- @expand-change="hadnlExpandChange" --> <!-- @expand-change="hadnlExpandChange" -->
<el-table-column <el-table-column
...@@ -367,7 +368,10 @@ ...@@ -367,7 +368,10 @@
:width="width4" :width="width4"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div
class="ops"
v-if="scope.row.barcode"
>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
...@@ -442,6 +446,7 @@ ...@@ -442,6 +446,7 @@
hasChildren: 'hasChildren', hasChildren: 'hasChildren',
}" }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@expand-change="hadnlExpandChangeBz"
> >
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -553,7 +558,10 @@ ...@@ -553,7 +558,10 @@
:width="width4" :width="width4"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ops"> <div
class="ops"
v-if="scope.row.srcBarcode"
>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
...@@ -780,6 +788,7 @@ export default { ...@@ -780,6 +788,7 @@ export default {
sendTimeEnd: "", // 结束时间 sendTimeEnd: "", // 结束时间
expanded: false, // 展开标志 expanded: false, // 展开标志
expandedBz: false,//展开标志比中关系
...@@ -907,47 +916,100 @@ export default { ...@@ -907,47 +916,100 @@ export default {
} }
}); });
}, },
// // 展开或关闭行 // 展开或关闭行
// hadnlExpandChange (row, expanded) { hadnlExpandChange (row, expanded) {
// // 获取展开标志 console.log(row, expanded, "zhankaiguanbi")
// this.expanded = expanded; // let oldObj = row;
// // 获取下标 // 获取展开标志
// var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber); this.expanded = expanded;
// // var i = this.tableData.findIndex(table => table.id === row.id); // 获取下标
// // //console.log(i); var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// if (expanded) {
// this.list[i] = { // var i = this.tableData.findIndex(table => table.id === row.id);
// qid: row.qid, console.log(i, 112233);
// children: row.children, if (expanded) {
// queryId: row.queryId, this.tableDate1[i] = {
// expanded: true, taskNumber: row.taskNumber,
// }; sequenceNumber: row.sequenceNumber,
// this.$forceUpdate(); pcImportRecordGrandchildren: row.pcImportRecordGrandchildren,
// } else { // qid: row.qid,
// //console.info("折叠时row数据", this.list[i]); // children: row.children,
// this.list[i] = { // queryId: row.queryId,
// qid: row.qid, expanded: true,
// children: row.children, };
// queryId: row.queryId, this.$forceUpdate();
// querylog: row.children[0].querylog, } else {
// expanded: false, //console.info("折叠时row数据", this.list[i]);
// barcode: row.children[0].barcode, this.tableDate1[i] = {
// maxcandidatecnt: row.children[0].maxcandidatecnt, taskNumber: row.taskNumber,
// querytype: row.children[0].querytype, sequenceNumber: row.sequenceNumber,
// queryStateName: row.children[0].queryStateName, barcode: row.pcImportRecordGrandchildren[0].barcode,
// hitpossibility: row.children[0].hitpossibility, dataType: row.pcImportRecordGrandchildren[0].dataType,
// queryclass: row.children[0].queryclass, fileName: row.pcImportRecordGrandchildren[0].fileName,
// affirmtime: row.children[0].affirmtime, statusName: row.pcImportRecordGrandchildren[0].statusName,
// requestdatetime: row.children[0].requestdatetime, logicBatabaseName: row.pcImportRecordGrandchildren[0].logicBatabaseName,
// userdesc: row.children[0].userdesc, pcImportRecordGrandchildren: row.pcImportRecordGrandchildren,
// queryTypeName: row.children[0].queryTypeName,
// removeFlag: row.children[0].removeFlag,
// }; expanded: false,
// //console.log(this.list[i]); };
// this.$forceUpdate(); //console.log(this.list[i]);
// // //console.info("塞完数据的row", this.list[i]); this.$forceUpdate();
// } // //console.info("塞完数据的row", this.list[i]);
// }, }
},
// 展开或关闭行
hadnlExpandChangeBz (row, expanded) {
console.log(row, expanded, "bz")
// let oldObj = row;
// 获取展开标志
this.expanded = expanded;
// 获取下标
var i = this.tableDate2.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// var i = this.tableData.findIndex(table => table.id === row.id);
console.log(i, 112233);
if (expanded) {
this.tableDate2[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
affirmImportRecordGrandchildren: row.affirmImportRecordGrandchildren,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded: true,
};
this.$forceUpdate();
} else {
//console.info("折叠时row数据", this.list[i]);
this.tableDate2[i] = {
taskNumber: row.taskNumber,
sequenceNumber: row.sequenceNumber,
affirmImportRecordGrandchildren: row.affirmImportRecordGrandchildren,
dataTypeName: row.affirmImportRecordGrandchildren[0].dataTypeName,
destbarcode: row.affirmImportRecordGrandchildren[0].destbarcode,
destLogicName: row.affirmImportRecordGrandchildren[0].destLogicName,
destLoginCode: row.affirmImportRecordGrandchildren[0].destLoginCode,
failReason: row.affirmImportRecordGrandchildren[0].failReason,
fileName: row.affirmImportRecordGrandchildren[0].fileName,
id: row.affirmImportRecordGrandchildren[0].id,
importTime: row.affirmImportRecordGrandchildren[0].importTime,
queryType: row.affirmImportRecordGrandchildren[0].queryType,
srcBarcode: row.affirmImportRecordGrandchildren[0].srcBarcode,
srcLogicName: row.affirmImportRecordGrandchildren[0].srcLogicName,
srcLogicCode: row.affirmImportRecordGrandchildren[0].srcLogicCode,
status: row.affirmImportRecordGrandchildren[0].status,
statusName: row.affirmImportRecordGrandchildren[0].statusName,
expanded: false,
};
//console.log(this.list[i]);
this.$forceUpdate();
// //console.info("塞完数据的row", this.list[i]);
}
},
clear () { clear () {
this.taskNumber = ""; // 任务号 this.taskNumber = ""; // 任务号
this.dataType = null; // 人员or案件 this.dataType = null; // 人员or案件
...@@ -1546,6 +1608,15 @@ export default { ...@@ -1546,6 +1608,15 @@ export default {
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #333333; color: #333333;
} }
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #006aff;
border-color: #006aff;
}
</style> </style>
<!--table树--> <!--table树-->
<style scoped lang="scss"> <style scoped lang="scss">
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<el-tag v-show="isShowTip"> <el-tag v-show="isShowTip">
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<i <i
class="el-icon-info" class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i> ></i>
已选择 已选择
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment