Commit 5003eac7 by yuwei

项目初始化

parent 85975397
...@@ -67,6 +67,7 @@ public class ModelController extends BaseController { ...@@ -67,6 +67,7 @@ public class ModelController extends BaseController {
public R getModelList() { public R getModelList() {
QueryWrapper<ModelEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<ModelEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", DataConstant.EnableState.ENABLE.getKey()); queryWrapper.eq("status", DataConstant.EnableState.ENABLE.getKey());
queryWrapper.eq("flow_status", DataConstant.AuditState.AGREE.getKey());
List<ModelEntity> list = modelService.list(queryWrapper); List<ModelEntity> list = modelService.list(queryWrapper);
List<ModelVo> collect = list.stream().map(modelMapstruct::toVO).collect(Collectors.toList()); List<ModelVo> collect = list.stream().map(modelMapstruct::toVO).collect(Collectors.toList());
return R.ok().setData(collect); return R.ok().setData(collect);
......
...@@ -36,9 +36,9 @@ public class MetadataSourceEntity extends DataScopeBaseEntity { ...@@ -36,9 +36,9 @@ public class MetadataSourceEntity extends DataScopeBaseEntity {
private String sourceName; private String sourceName;
/** /**
* 元数据同步1是0否 * 元数据同步(0否,1是)
*/ */
private Integer sourceSync; private String isSync;
/** /**
* 数据源连接信息 * 数据源连接信息
......
...@@ -28,5 +28,5 @@ public class MetadataSourceVo implements Serializable { ...@@ -28,5 +28,5 @@ public class MetadataSourceVo implements Serializable {
private String dbType; private String dbType;
private String sourceName; private String sourceName;
private DbSchema dbSchema; private DbSchema dbSchema;
private Integer sourceSync; private String isSync;
} }
...@@ -84,7 +84,7 @@ public class MetadataSourceServiceImpl extends BaseServiceImpl<MetadataSourceDao ...@@ -84,7 +84,7 @@ public class MetadataSourceServiceImpl extends BaseServiceImpl<MetadataSourceDao
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveMetadataSource(MetadataSourceDto metadataSourceDto) { public void saveMetadataSource(MetadataSourceDto metadataSourceDto) {
MetadataSourceEntity dataSource = metadataSourceMapper.toEntity(metadataSourceDto); MetadataSourceEntity dataSource = metadataSourceMapper.toEntity(metadataSourceDto);
dataSource.setSourceSync(Integer.valueOf(DataConstant.TrueOrFalse.FALSE.getKey())); dataSource.setIsSync(DataConstant.TrueOrFalse.FALSE.getKey());
metadataSourceDao.insert(dataSource); metadataSourceDao.insert(dataSource);
} }
...@@ -158,7 +158,7 @@ public class MetadataSourceServiceImpl extends BaseServiceImpl<MetadataSourceDao ...@@ -158,7 +158,7 @@ public class MetadataSourceServiceImpl extends BaseServiceImpl<MetadataSourceDao
@Override @Override
public void syncMetadata(String id) { public void syncMetadata(String id) {
MetadataSourceEntity metadataSourceEntity = super.getById(id); MetadataSourceEntity metadataSourceEntity = super.getById(id);
if (Integer.valueOf(DataConstant.TrueOrFalse.TRUE.getKey()).equals(metadataSourceEntity.getSourceSync())) { if (DataConstant.TrueOrFalse.TRUE.getKey().equals(metadataSourceEntity.getIsSync())) {
throw new DataException("元数据已同步"); throw new DataException("元数据已同步");
} }
// 异步执行同步任务 // 异步执行同步任务
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<result column="remark" property="remark" /> <result column="remark" property="remark" />
<result column="db_type" property="dbType" /> <result column="db_type" property="dbType" />
<result column="source_name" property="sourceName" /> <result column="source_name" property="sourceName" />
<result column="source_sync" property="sourceSync" /> <result column="is_sync" property="isSync" />
</resultMap> </resultMap>
<resultMap id="ExtendResultMap" type="cn.datax.service.data.metadata.api.entity.MetadataSourceEntity" extends="BaseResultMap"> <resultMap id="ExtendResultMap" type="cn.datax.service.data.metadata.api.entity.MetadataSourceEntity" extends="BaseResultMap">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
update_by, update_by,
update_time, update_time,
remark, remark,
db_type, source_name, source_sync db_type, source_name, is_sync
</sql> </sql>
<sql id="Extend_Column_List"> <sql id="Extend_Column_List">
......
<template> <template>
<div class="top-nav"> <div class="top-nav">
<div class="log">管理系统</div> <div class="log">数据治理</div>
<el-menu <el-menu
:active-text-color="variables.menuActiveText" :active-text-color="variables.menuActiveText"
:default-active="activeMenu" :default-active="activeMenu"
......
...@@ -19,20 +19,6 @@ ...@@ -19,20 +19,6 @@
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="12"> <el-col :span="12">
<el-button-group> <el-button-group>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -82,7 +68,6 @@ ...@@ -82,7 +68,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -138,7 +123,7 @@ ...@@ -138,7 +123,7 @@
</template> </template>
<script> <script>
import { pageApiLog, delApiLog, delApiLogs } from '@/api/market/apilog' import { pageApiLog, delApiLog } from '@/api/market/apilog'
export default { export default {
name: 'ApiLogList', name: 'ApiLogList',
...@@ -153,12 +138,6 @@ export default { ...@@ -153,12 +138,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'apiName', label: '接口名称', show: true }, { prop: 'apiName', label: '接口名称', show: true },
...@@ -247,15 +226,9 @@ export default { ...@@ -247,15 +226,9 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showDetail = true this.showOptions.showDetail = true
this.$emit('showCard', this.showOptions) this.$emit('showCard', this.showOptions)
...@@ -276,16 +249,6 @@ export default { ...@@ -276,16 +249,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -25,27 +25,6 @@ ...@@ -25,27 +25,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -95,7 +74,6 @@ ...@@ -95,7 +74,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -157,7 +135,7 @@ ...@@ -157,7 +135,7 @@
</template> </template>
<script> <script>
import { pageApiMask, delApiMask, delApiMasks } from '@/api/market/apimask' import { pageApiMask, delApiMask } from '@/api/market/apimask'
export default { export default {
name: 'ApiMaskList', name: 'ApiMaskList',
...@@ -174,12 +152,6 @@ export default { ...@@ -174,12 +152,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'maskName', label: '脱敏名称', show: true }, { prop: 'maskName', label: '脱敏名称', show: true },
...@@ -265,12 +237,6 @@ export default { ...@@ -265,12 +237,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -282,7 +248,7 @@ export default { ...@@ -282,7 +248,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -291,7 +257,7 @@ export default { ...@@ -291,7 +257,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -314,16 +280,6 @@ export default { ...@@ -314,16 +280,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -25,27 +25,6 @@ ...@@ -25,27 +25,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -95,7 +74,6 @@ ...@@ -95,7 +74,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -177,7 +155,7 @@ ...@@ -177,7 +155,7 @@
</template> </template>
<script> <script>
import { pageDataApi, delDataApi, delDataApis, copyDataApi, releaseDataApi, cancelDataApi } from '@/api/market/dataapi' import { pageDataApi, delDataApi, copyDataApi, releaseDataApi, cancelDataApi } from '@/api/market/dataapi'
export default { export default {
name: 'DataApiList', name: 'DataApiList',
...@@ -195,12 +173,6 @@ export default { ...@@ -195,12 +173,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'apiName', label: 'API名称', show: true }, { prop: 'apiName', label: 'API名称', show: true },
...@@ -290,12 +262,6 @@ export default { ...@@ -290,12 +262,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -308,7 +274,7 @@ export default { ...@@ -308,7 +274,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -318,7 +284,7 @@ export default { ...@@ -318,7 +284,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -369,16 +335,6 @@ export default { ...@@ -369,16 +335,6 @@ export default {
} }
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -25,27 +25,6 @@ ...@@ -25,27 +25,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -95,7 +74,6 @@ ...@@ -95,7 +74,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -157,7 +135,7 @@ ...@@ -157,7 +135,7 @@
</template> </template>
<script> <script>
import { pageDataService, delDataService, delDataServices } from '@/api/market/dataservice' import { pageDataService, delDataService } from '@/api/market/dataservice'
export default { export default {
name: 'DataServiceList', name: 'DataServiceList',
...@@ -174,12 +152,6 @@ export default { ...@@ -174,12 +152,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'serviceNo', label: '服务编号', show: true }, { prop: 'serviceNo', label: '服务编号', show: true },
...@@ -273,12 +245,6 @@ export default { ...@@ -273,12 +245,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -290,7 +256,7 @@ export default { ...@@ -290,7 +256,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -299,7 +265,7 @@ export default { ...@@ -299,7 +265,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -322,16 +288,6 @@ export default { ...@@ -322,16 +288,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -19,20 +19,6 @@ ...@@ -19,20 +19,6 @@
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="12"> <el-col :span="12">
<el-button-group> <el-button-group>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -82,7 +68,6 @@ ...@@ -82,7 +68,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -138,7 +123,7 @@ ...@@ -138,7 +123,7 @@
</template> </template>
<script> <script>
import { pageDataServiceLog, delDataServiceLog, delDataServiceLogs } from '@/api/market/dataservicelog' import { pageDataServiceLog, delDataServiceLog } from '@/api/market/dataservicelog'
export default { export default {
name: 'ServiceLogList', name: 'ServiceLogList',
...@@ -153,12 +138,6 @@ export default { ...@@ -153,12 +138,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'serviceName', label: '服务名称', show: true }, { prop: 'serviceName', label: '服务名称', show: true },
...@@ -246,15 +225,9 @@ export default { ...@@ -246,15 +225,9 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showDetail = true this.showOptions.showDetail = true
this.$emit('showCard', this.showOptions) this.$emit('showCard', this.showOptions)
...@@ -275,16 +248,6 @@ export default { ...@@ -275,16 +248,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -213,27 +213,6 @@ ...@@ -213,27 +213,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
</el-row> </el-row>
...@@ -245,7 +224,6 @@ ...@@ -245,7 +224,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -325,12 +303,6 @@ export default { ...@@ -325,12 +303,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总数据条数 // 总数据条数
total: 0, total: 0,
// 查询参数 // 查询参数
...@@ -391,12 +363,6 @@ export default { ...@@ -391,12 +363,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -410,7 +376,7 @@ export default { ...@@ -410,7 +376,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.modelId = this.modelId this.showOptions.data.modelId = this.modelId
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -420,7 +386,7 @@ export default { ...@@ -420,7 +386,7 @@ export default {
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.modelId = this.modelId this.showOptions.data.modelId = this.modelId
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -443,16 +409,6 @@ export default { ...@@ -443,16 +409,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{ title }}</span> <span>{{ title }}</span>
<el-button-group style="float: right;"> <el-button-group style="float: right;">
<el-button size="mini" icon="el-icon-s-data" round @click="submit">提交</el-button> <el-button v-if="form.flowStatus === '1' || form.flowStatus === '6'" size="mini" icon="el-icon-s-data" round @click="submit">提交</el-button>
<el-button size="mini" icon="el-icon-s-data" round @click="createTable">建模</el-button> <el-button v-if="form.flowStatus === '4'" :disabled="form.isSync === '1'" size="mini" icon="el-icon-s-data" round @click="createTable">建模</el-button>
<el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button> <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
</el-button-group> </el-button-group>
</div> </div>
...@@ -308,7 +308,6 @@ export default { ...@@ -308,7 +308,6 @@ export default {
getDataModel: function(id) { getDataModel: function(id) {
getDataModel(id).then(response => { getDataModel(id).then(response => {
if (response.success) { if (response.success) {
console.log(response.data)
this.form = response.data this.form = response.data
} }
}) })
......
...@@ -25,27 +25,6 @@ ...@@ -25,27 +25,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -95,7 +74,6 @@ ...@@ -95,7 +74,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -125,6 +103,7 @@ ...@@ -125,6 +103,7 @@
type="text" type="text"
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
:disabled="scope.row.flowStatus === '3' || scope.row.flowStatus === '4' || scope.row.flowStatus === '5'"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
...@@ -137,6 +116,7 @@ ...@@ -137,6 +116,7 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
:disabled="scope.row.flowStatus === '2' || scope.row.flowStatus === '3' || scope.row.flowStatus === '4' || scope.row.flowStatus === '5'"
>删除</el-button> >删除</el-button>
<el-button slot="reference">操作</el-button> <el-button slot="reference">操作</el-button>
</el-popover> </el-popover>
...@@ -157,7 +137,7 @@ ...@@ -157,7 +137,7 @@
</template> </template>
<script> <script>
import { pageDataModel, delDataModel, delDataModels } from '@/api/masterdata/datamodel' import { pageDataModel, delDataModel } from '@/api/masterdata/datamodel'
export default { export default {
name: 'DataModelList', name: 'DataModelList',
...@@ -174,22 +154,22 @@ export default { ...@@ -174,22 +154,22 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'modelName', label: '模型名称', show: true }, { prop: 'modelName', label: '模型名称', show: true },
{ prop: 'modelLogicTable', label: '模型逻辑表', show: true }, { prop: 'modelLogicTable', label: '模型逻辑表', show: true },
{ {
prop: 'status', prop: 'status',
label: '状态', label: '业务状态',
show: true, show: true,
formatter: this.statusFormatter formatter: this.statusFormatter
}, },
{
prop: 'flowStatus',
label: '流程状态',
show: true,
formatter: this.flowStatusFormatter
},
{ prop: 'createTime', label: '创建时间', show: true } { prop: 'createTime', label: '创建时间', show: true }
], ],
// 默认选择中表格头 // 默认选择中表格头
...@@ -206,7 +186,9 @@ export default { ...@@ -206,7 +186,9 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
modelName: '' modelName: ''
} },
// 流程状态数据字典
flowStatusOptions: []
} }
}, },
created() { created() {
...@@ -215,6 +197,11 @@ export default { ...@@ -215,6 +197,11 @@ export default {
this.statusOptions = response.data this.statusOptions = response.data
} }
}) })
this.getDicts('sys_flow_status').then(response => {
if (response.success) {
this.flowStatusOptions = response.data
}
})
this.getList() this.getList()
}, },
mounted() { mounted() {
...@@ -266,12 +253,6 @@ export default { ...@@ -266,12 +253,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -283,7 +264,7 @@ export default { ...@@ -283,7 +264,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -292,7 +273,7 @@ export default { ...@@ -292,7 +273,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -315,16 +296,6 @@ export default { ...@@ -315,16 +296,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
...@@ -343,6 +314,22 @@ export default { ...@@ -343,6 +314,22 @@ export default {
} else { } else {
return <el-tag type='warning'>{dictLabel}</el-tag> return <el-tag type='warning'>{dictLabel}</el-tag>
} }
},
flowStatusFormatter(row, column, cellValue, index) {
const dictLabel = this.selectDictLabel(this.flowStatusOptions, cellValue)
if (cellValue === '1') {
return <el-tag type='primary'>{dictLabel}</el-tag>
} else if (cellValue === '2') {
return <el-tag type='info'>{dictLabel}</el-tag>
} else if (cellValue === '3') {
return <el-tag>{dictLabel}</el-tag>
} else if (cellValue === '4') {
return <el-tag type='success'>{dictLabel}</el-tag>
} else if (cellValue === '5') {
return <el-tag type='warning'>{dictLabel}</el-tag>
} else if (cellValue === '6') {
return <el-tag type='danger'>{dictLabel}</el-tag>
}
} }
} }
} }
......
...@@ -19,27 +19,6 @@ ...@@ -19,27 +19,6 @@
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="12"> <el-col :span="12">
<el-button-group> <el-button-group>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -89,7 +68,6 @@ ...@@ -89,7 +68,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -151,7 +129,7 @@ ...@@ -151,7 +129,7 @@
</template> </template>
<script> <script>
import { pageChangeRecord, delChangeRecord, delChangeRecords } from '@/api/metadata/changerecord' import { pageChangeRecord, delChangeRecord } from '@/api/metadata/changerecord'
export default { export default {
name: 'ChangeRecordList', name: 'ChangeRecordList',
...@@ -168,12 +146,6 @@ export default { ...@@ -168,12 +146,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'sourceName', label: '数据源', show: true }, { prop: 'sourceName', label: '数据源', show: true },
...@@ -275,15 +247,9 @@ export default { ...@@ -275,15 +247,9 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -292,7 +258,7 @@ export default { ...@@ -292,7 +258,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -315,16 +281,6 @@ export default { ...@@ -315,16 +281,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -42,13 +42,6 @@ ...@@ -42,13 +42,6 @@
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
<el-col :span="12"> <el-col :span="12">
<el-button-group> <el-button-group>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -101,7 +94,6 @@ ...@@ -101,7 +94,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -168,12 +160,6 @@ export default { ...@@ -168,12 +160,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'columnName', label: '字段名称', show: true }, { prop: 'columnName', label: '字段名称', show: true },
...@@ -273,15 +259,9 @@ export default { ...@@ -273,15 +259,9 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showDetail = true this.showOptions.showDetail = true
this.$emit('showCard', this.showOptions) this.$emit('showCard', this.showOptions)
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{ title }}</span> <span>{{ title }}</span>
<el-button-group style="float: right;"> <el-button-group style="float: right;">
<el-button size="mini" icon="el-icon-coin" type="primary" round @click="handleSync">元数据同步</el-button> <el-button :disabled="form.sourceSync === 1" size="mini" icon="el-icon-coin" type="primary" round @click="handleSync">元数据同步</el-button>
<el-button size="mini" icon="el-icon-coin" type="primary" round @click="handleWord">数据库文档</el-button> <el-button :disabled="form.sourceSync === 0" size="mini" icon="el-icon-coin" type="primary" round @click="handleWord">数据库文档</el-button>
<el-button v-if="active == 2" size="mini" icon="el-icon-coin" type="primary" round @click="handleCheckConnection">连通性检测</el-button> <el-button size="mini" icon="el-icon-coin" type="primary" round @click="handleCheckConnection">连通性检测</el-button>
<el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button> <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
</el-button-group> </el-button-group>
</div> </div>
......
...@@ -26,27 +26,6 @@ ...@@ -26,27 +26,6 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button <el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
<el-button
type="warning" type="warning"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
...@@ -101,7 +80,6 @@ ...@@ -101,7 +80,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -163,7 +141,7 @@ ...@@ -163,7 +141,7 @@
</template> </template>
<script> <script>
import { pageDataSource, delDataSource, delDataSources, refreshMetadata } from '@/api/metadata/datasource' import { pageDataSource, delDataSource, refreshMetadata } from '@/api/metadata/datasource'
export default { export default {
name: 'DataSourceList', name: 'DataSourceList',
...@@ -180,12 +158,6 @@ export default { ...@@ -180,12 +158,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'sourceName', label: '数据源名称', show: true }, { prop: 'sourceName', label: '数据源名称', show: true },
...@@ -271,12 +243,6 @@ export default { ...@@ -271,12 +243,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -288,7 +254,7 @@ export default { ...@@ -288,7 +254,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -297,7 +263,7 @@ export default { ...@@ -297,7 +263,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -330,16 +296,6 @@ export default { ...@@ -330,16 +296,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -65,27 +65,6 @@ ...@@ -65,27 +65,6 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button <el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
<el-button
type="warning" type="warning"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
...@@ -140,7 +119,6 @@ ...@@ -140,7 +119,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -237,12 +215,6 @@ export default { ...@@ -237,12 +215,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'gbTypeCode', label: '标准类别编码', show: true }, { prop: 'gbTypeCode', label: '标准类别编码', show: true },
...@@ -444,12 +416,6 @@ export default { ...@@ -444,12 +416,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -466,7 +432,7 @@ export default { ...@@ -466,7 +432,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -475,7 +441,7 @@ export default { ...@@ -475,7 +441,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -508,16 +474,6 @@ export default { ...@@ -508,16 +474,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -25,27 +25,6 @@ ...@@ -25,27 +25,6 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
</el-button-group> </el-button-group>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -95,7 +74,6 @@ ...@@ -95,7 +74,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -157,7 +135,7 @@ ...@@ -157,7 +135,7 @@
</template> </template>
<script> <script>
import { pageDataSet, delDataSet, delDataSets } from '@/api/visual/dataset' import { pageDataSet, delDataSet } from '@/api/visual/dataset'
export default { export default {
name: 'DataSetList', name: 'DataSetList',
...@@ -174,12 +152,6 @@ export default { ...@@ -174,12 +152,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'setName', label: '数据集名称', show: true }, { prop: 'setName', label: '数据集名称', show: true },
...@@ -265,12 +237,6 @@ export default { ...@@ -265,12 +237,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -282,7 +248,7 @@ export default { ...@@ -282,7 +248,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -291,7 +257,7 @@ export default { ...@@ -291,7 +257,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -314,16 +280,6 @@ export default { ...@@ -314,16 +280,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -26,27 +26,6 @@ ...@@ -26,27 +26,6 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
<el-button <el-button
type="success"
icon="el-icon-edit-outline"
size="mini"
:disabled="single"
@click="handleEdit"
>修改</el-button>
<el-button
type="info"
icon="el-icon-view"
size="mini"
:disabled="single"
@click="handleDetail"
>详情</el-button>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleBatchDelete"
>删除</el-button>
<el-button
type="warning" type="warning"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
...@@ -101,7 +80,6 @@ ...@@ -101,7 +80,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -180,12 +158,6 @@ export default { ...@@ -180,12 +158,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'businessCode', label: '业务编码', show: true }, { prop: 'businessCode', label: '业务编码', show: true },
...@@ -273,12 +245,6 @@ export default { ...@@ -273,12 +245,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.showOptions.data = {} this.showOptions.data = {}
...@@ -290,7 +256,7 @@ export default { ...@@ -290,7 +256,7 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleEdit(row) { handleEdit(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = true this.showOptions.showEdit = true
...@@ -299,7 +265,7 @@ export default { ...@@ -299,7 +265,7 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleDetail(row) { handleDetail(row) {
this.showOptions.data.id = row.id || this.ids[0] this.showOptions.data.id = row.id
this.showOptions.showList = false this.showOptions.showList = false
this.showOptions.showAdd = false this.showOptions.showAdd = false
this.showOptions.showEdit = false this.showOptions.showEdit = false
...@@ -322,16 +288,6 @@ export default { ...@@ -322,16 +288,6 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
/** 批量删除按钮操作 */
handleBatchDelete() {
if (!this.ids.length) {
this.$message({
message: '请先选择需要操作的数据',
type: 'warning'
})
}
this.$message.warning('不支持批量删除')
},
/** 刷新缓存 */ /** 刷新缓存 */
handleCacheRefresh() { handleCacheRefresh() {
refreshBusiness().then(response => { refreshBusiness().then(response => {
......
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
:size="tableSize" :size="tableSize"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -210,12 +209,6 @@ export default { ...@@ -210,12 +209,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'id', label: '流程定义ID', show: true }, { prop: 'id', label: '流程定义ID', show: true },
...@@ -370,12 +363,6 @@ export default { ...@@ -370,12 +363,6 @@ export default {
handleRefresh() { handleRefresh() {
this.getList() this.getList()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleResource(row) { handleResource(row) {
this.currentProcessDefinitionId = row.id this.currentProcessDefinitionId = row.id
this.dialogFlowResourceVisible = true this.dialogFlowResourceVisible = true
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -91,12 +90,6 @@ export default { ...@@ -91,12 +90,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'processDefinitionId', label: '流程定义ID', show: true }, { prop: 'processDefinitionId', label: '流程定义ID', show: true },
...@@ -151,12 +144,6 @@ export default { ...@@ -151,12 +144,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleTrack(row) { handleTrack(row) {
this.currentProcessInstanceId = row.id this.currentProcessInstanceId = row.id
this.dialogFlowImageVisible = true this.dialogFlowImageVisible = true
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -92,12 +91,6 @@ export default { ...@@ -92,12 +91,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'processDefinitionId', label: '流程定义ID', show: true }, { prop: 'processDefinitionId', label: '流程定义ID', show: true },
...@@ -152,12 +145,6 @@ export default { ...@@ -152,12 +145,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleTrack(row) { handleTrack(row) {
this.currentProcessInstanceId = row.id this.currentProcessInstanceId = row.id
this.dialogFlowImageVisible = true this.dialogFlowImageVisible = true
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -112,12 +111,6 @@ export default { ...@@ -112,12 +111,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'processDefinitionId', label: '流程定义ID', show: true }, { prop: 'processDefinitionId', label: '流程定义ID', show: true },
...@@ -176,12 +169,6 @@ export default { ...@@ -176,12 +169,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleTrack(row) { handleTrack(row) {
this.currentProcessInstanceId = row.id this.currentProcessInstanceId = row.id
this.dialogFlowImageVisible = true this.dialogFlowImageVisible = true
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -80,12 +79,6 @@ export default { ...@@ -80,12 +79,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'name', label: '节点名称', show: true }, { prop: 'name', label: '节点名称', show: true },
...@@ -138,12 +131,6 @@ export default { ...@@ -138,12 +131,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`) console.log(`每页 ${val} 条`)
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
tooltip-effect="dark" tooltip-effect="dark"
:height="tableHeight" :height="tableHeight"
style="width: 100%;margin: 15px 0;" style="width: 100%;margin: 15px 0;"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="55" align="center"> <el-table-column label="序号" width="55" align="center">
...@@ -131,12 +130,6 @@ export default { ...@@ -131,12 +130,6 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 表格头 // 表格头
tableColumns: [ tableColumns: [
{ prop: 'name', label: '节点名称', show: true }, { prop: 'name', label: '节点名称', show: true },
...@@ -194,12 +187,6 @@ export default { ...@@ -194,12 +187,6 @@ export default {
} }
this.handleQuery() this.handleQuery()
}, },
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleClaim(row) { handleClaim(row) {
this.$confirm('签收任务?', '提示', { this.$confirm('签收任务?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment