mes-ocea-before.git

			@@ -245,6 +245,7 @@
			:show-overflow-tooltip="!item.noShowTip"
			:width="inMemoryColWidth[item.prop] \|\| item.width"
			:prop="item.prop"
			align="center"
			>
			<template slot="header" slot-scope="scope">
			<template v-if="item.isSearch">
			@@ -324,7 +325,7 @@
			<template v-if="!item.render">
			<template v-if="item.formatter">
			<span v-if="item.isTag" style="text-align: center;">
			<el-tag style="width:50px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
			<el-tag style="width:60px;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>
			@@ -397,6 +398,7 @@
			@size-change="sizeChangeHandle"
			:page-sizes="[10, 20, 50, 100]"
			:page-size="pagination.pageSize"
			:page-count="pagination.size"
			:layout="
			size
			? 'total, prev, pager, next'
			@@ -718,6 +720,7 @@
			currentPage:
			this.table.currentPage == null ? 1 : this.table.currentPage,
			pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
			size: this.table.size == null ? 7 : this.table.size,
			total: this.table.total == null ? 0 : this.table.total
			}, // 分页信息
			inMemoryColWidth: {}, // 记忆中列宽，默认列宽
			@@ -939,8 +942,7 @@
			}
			},
			getDataList(selectedId) {
			// this.dataListLoading = true
			this.dataListLoading = false
			this.dataListLoading = true
			var criteria = {}
			criteria.dateTimeFilters = this.dateTimeFilters
			criteria.multiSearchFilter = this.multiSearchFilter
			@@ -966,6 +968,7 @@
			return this.doCallback(this.ajaxFun, arr, selectedId)
			},
			doCallback(fn, args, selectedId) {
			this.tableData=[]
			return fn
			.apply(this, args)
			.then((response) => {
			@@ -1576,7 +1579,7 @@
			if (response.code != '0') {
			this.$message.warning(response.msg)
			} else {
			if(response.data!=""&&response.data!=[]){
			if(response.data!=""&&response.data!=[]&&response.data!=null){
			this.$message({
			message: response.data,
			type: 'success'