|
|
@@ -68,9 +68,9 @@
|
|
|
<el-scrollbar style="height: 100%" :horizontal="false">
|
|
|
<div v-for="(item,index) in catchOptions" :key="index">
|
|
|
<div style="cursor: pointer;" class="flex">
|
|
|
- <span class="AdvancedQuery_list_text">{{ item.itemKey }}</span>
|
|
|
- <el-popconfirm :title="'确定删除'+item.itemKey+'吗？'">
|
|
|
- <span slot="reference" class="el-icon-error"></span>
|
|
|
+ <span @click="queryRecover(item)" class="AdvancedQuery_list_text">{{ item.itemKey }}</span>
|
|
|
+ <el-popconfirm @confirm="queryConfirm(item,index)" :title="'确定删除'+item.itemKey+'吗？'">
|
|
|
+ <el-button slot="reference" type="text">删除</el-button>
|
|
|
</el-popconfirm>
|
|
|
</div>
|
|
|
<el-divider v-if="catchOptions.length != index+1"></el-divider>
|
|
|
@@ -133,7 +133,7 @@ export default {
|
|
|
return {
|
|
|
queryContent: [],
|
|
|
catchOptions: JSON.parse(localStorage.getItem('catchOptions')) || [],
|
|
|
- catchOptionsAll: [],
|
|
|
+ catchOptionsAll: [JSON.parse(localStorage.getItem('catchOptions'))] || [],
|
|
|
flightDate: new Array(2).fill(parseTime(new Date(), '{y}-{m}-{d}')),
|
|
|
paramsForm: {
|
|
|
params: [],
|
|
|
@@ -210,7 +210,6 @@ export default {
|
|
|
methods: {
|
|
|
queryHandler () {
|
|
|
const colDatas = this.authMsg
|
|
|
- console.log(colDatas)
|
|
|
if (colDatas?.length) {
|
|
|
const columns = colDatas.filter(item => item.isdisplay != 0)
|
|
|
const datas = _.orderBy(columns, ['displaynumber'], ['asc', 'desc'])
|
|
|
@@ -376,18 +375,65 @@ export default {
|
|
|
}).then(({ value }) => {
|
|
|
this.catchOptionsAll.push(this.queryContent)
|
|
|
const catchItem = {
|
|
|
+ itemId: this.catchOptionsAll.length,
|
|
|
itemKey: value,
|
|
|
itemVal: this.catchOptionsAll?.at(-1)
|
|
|
}
|
|
|
this.catchOptions.push(catchItem)
|
|
|
localStorage.setItem('catchOptions', JSON.stringify(this.catchOptions))
|
|
|
- }).catch((err) => {
|
|
|
- console.log(err)
|
|
|
+ }).catch(() => {
|
|
|
this.$message({
|
|
|
type: 'info',
|
|
|
message: '取消输入'
|
|
|
});
|
|
|
});
|
|
|
+ },
|
|
|
+ //删除收藏
|
|
|
+ queryConfirm (item, index) {
|
|
|
+ const catchCopy = this.catchOptions
|
|
|
+ catchCopy.splice(index, 1)
|
|
|
+ this.catchOptionsAll = []
|
|
|
+ this.catchOptionsAll = [catchCopy]
|
|
|
+ localStorage.setItem('catchOptions', JSON.stringify(catchCopy))
|
|
|
+ },
|
|
|
+ //收藏查询
|
|
|
+ queryRecover (item) {
|
|
|
+ const { itemVal } = item
|
|
|
+ this.queryRecoverFunc(itemVal)
|
|
|
+ },
|
|
|
+ //查询恢复
|
|
|
+ queryRecoverFunc (itemArray) {
|
|
|
+ if (!itemArray.length) return
|
|
|
+ const [datas, types] = [[], []]
|
|
|
+ itemArray.forEach(item => {
|
|
|
+ if (isNaN(item.value) && !isNaN(Date.parse(item.value))) {
|
|
|
+ types.push('date')
|
|
|
+ } else {
|
|
|
+ types.push('text')
|
|
|
+ }
|
|
|
+ const paramValue = ['is Null', 'is not Null'].includes(
|
|
|
+ item.comparisonOperator
|
|
|
+ )
|
|
|
+ ? ' '
|
|
|
+ : item.value
|
|
|
+ const obj = {
|
|
|
+ // leftBrackets: item.left,
|
|
|
+ paramKey: item.column,
|
|
|
+ comparisonOperator: item.comparator,
|
|
|
+ // rightBrackets: item.right,
|
|
|
+ paramValue,
|
|
|
+ connector: item.connector,
|
|
|
+ }
|
|
|
+ datas.push(obj)
|
|
|
+ })
|
|
|
+ this.queryHandler()
|
|
|
+ setTimeout(() => {
|
|
|
+ this.paramsTableCols[1].options = new Array(itemArray.length).fill(
|
|
|
+ comparisonOperatorOptions.slice(0, 5).reverse()
|
|
|
+ )
|
|
|
+ this.paramsTableCols[2].inputType = types
|
|
|
+ this.paramsForm.params = datas
|
|
|
+ }, 200)
|
|
|
}
|
|
|
}
|
|
|
}
|
