mes-ocea-before.git

			@@ -327,7 +327,12 @@
			<template v-else>
			<template v-if="!item.render">
			<template v-if="item.formatter">
			<span
			<span v-if="item.isTag" style="text-align: center;">
			<el-tag style="width:50px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
			<span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
			</el-tag>
			</span>
			<span v-else
			v-html="
			item.formatter(scope.row, item, scope.row[item.prop])
			"
			@@ -814,6 +819,7 @@
			this.isCleanInfo = true
			}
			}
			this.$emit("queryParam",this.queryParam)
			},
			deep: true
			},
			@@ -954,7 +960,6 @@
			arr.push(this.paramArr[i])
			}
			}

			return this.doCallback(this.ajaxFun, arr, selectedId)
			},
			doCallback(fn, args, selectedId) {
			@@ -962,7 +967,12 @@
			.apply(this, args)
			.then((response) => {
			var _this = this
			_this.tableData = response.data.data.records
			var resultData = response.data.data.records
			if(resultData == undefined){
			_this.tableData = response.data.data
			}else{
			_this.tableData = response.data.data.records
			}
			_this.pagination.total = response.data.data.total
			// 置空选中
			this.$refs.lmesTable.setCurrentRow()
			@@ -990,6 +1000,7 @@
			this.clickTable(selectObj)
			}
			}
			this.$emit('change',resultData);
			})
			.catch((error) => {
			this.dataListLoading = false
			@@ -1522,6 +1533,7 @@
			}
			}
			}
			console.log(this.columnList);
			this.tableKey = Math.random()
			// this.$forceUpdate();
			const currPathColumnOrder = this.currPath + '_column'