|
@@ -45,7 +45,7 @@
|
|
|
</span>
|
|
</span>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else-if="scope.column.columnname == 'address'">
|
|
<div v-else-if="scope.column.columnname == 'address'">
|
|
|
- <span :style="{color:scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
|
|
|
|
|
|
|
+ <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
|
|
|
</div>
|
|
</div>
|
|
|
<p
|
|
<p
|
|
|
v-else
|
|
v-else
|
|
@@ -124,7 +124,7 @@ export default {
|
|
|
} else {
|
|
} else {
|
|
|
if (res.total > 0) {
|
|
if (res.total > 0) {
|
|
|
this.list = res.data;
|
|
this.list = res.data;
|
|
|
- this.getFontHighlight(res.data)
|
|
|
|
|
|
|
+ this.tool.getFontHighlight(res.data)
|
|
|
this.total = res.total;
|
|
this.total = res.total;
|
|
|
this.currentPage = res.pageNumber;
|
|
this.currentPage = res.pageNumber;
|
|
|
if (this.siteid == "HY") {
|
|
if (this.siteid == "HY") {
|
|
@@ -310,28 +310,6 @@ export default {
|
|
|
this.listData();
|
|
this.listData();
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- getFontHighlight(data){
|
|
|
|
|
- data.map(item => {
|
|
|
|
|
- item.chars = item.chars.reduce((acc,ite) => ({
|
|
|
|
|
- ...acc,
|
|
|
|
|
- ...ite
|
|
|
|
|
- }),{})
|
|
|
|
|
-
|
|
|
|
|
- item.projectname = item.projectname.split('').map(text => {
|
|
|
|
|
- let projectname = item.chars.projectname.join("") || ''
|
|
|
|
|
- return projectname.includes(text) ? {
|
|
|
|
|
- text,
|
|
|
|
|
- color: 'red'
|
|
|
|
|
- } : {
|
|
|
|
|
- text,
|
|
|
|
|
- color: '#666'
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
- console.log(data,'1111')
|
|
|
|
|
- console.log(item,'item333333')
|
|
|
|
|
- return item
|
|
|
|
|
- })
|
|
|
|
|
- }
|
|
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
|
this.tablecols = this.tool.tabelCol(
|
|
this.tablecols = this.tool.tabelCol(
|