|
@@ -290,6 +290,17 @@ export default {
|
|
|
return this.$store.state.fileStore.fileobj.filename.indexOf('数据分析-对手透视') != -1
|
|
|
}
|
|
|
},
|
|
|
+ getFileName:{
|
|
|
+ get(){
|
|
|
+ return this.$store.state.fileStore.fileobj.filename
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ watch: {
|
|
|
+ getFileName (val, oldVal) {
|
|
|
+ this.headerSortValue = ''
|
|
|
+ this.isAdesc = 'asc'
|
|
|
+ }
|
|
|
},
|
|
|
created() {
|
|
|
this.$nextTick(() => {
|
|
@@ -613,10 +624,14 @@ export default {
|
|
|
|
|
|
payload.fileId = currentFile.id;
|
|
|
payload.orders = upSearchSortParams.orders;
|
|
|
- payload.values = upSearchSortParams.values;
|
|
|
+ payload.values = upSearchSortParams.values || [];
|
|
|
payload.mode = upSearchSortParams.mode;
|
|
|
|
|
|
this.beforePayload = payload;
|
|
|
+ if(this.isAccountPerspective || this.isOpponentPerspective){
|
|
|
+ payload.values = this.getSearchValuesList()
|
|
|
+ payload.mode = 'and'
|
|
|
+ }
|
|
|
if(this.isOpponentPerspective){
|
|
|
if(this.isOpponentPerspectiveDeleteNameShow){
|
|
|
payload.deleteName = this.relationSearchData.deleteName
|