Merge branch 'feature_table' of http://101.201.121.115:3000/leo/LAPP_ETL_WEBFRONT into liwei

src/assets/css/base.css

@@ -17,48 +17,38 @@ body {
   height: 100%;
 }
 /* table样式 */
-/* .el-table--border {
-	border-left: 2px solid #D5D5D5;
-	border-right: 2px solid #D5D5D5;
-} */
 .el-table th {
 	background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%);
 }
-.el-table td, .el-table th.is-leaf {
+.el-table--border td {
   border-bottom: 2px solid #D5D5D5;
 }
-.el-table--border td, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+.el-table--border td {
 	border-right: 2px solid #D5D5D5;
 }
 .el-table th.is-leaf {
 	border-right: none !important;
 }
+.el-table tr td:first-child {
+	border-left: 2px solid #D5D5D5;
+}
 .el-table thead {
 	color: #3D3D42;
 }
 .el-table th>.cell {
 	font-size: 16px;
 	font-family: PingFangSC-Medium, PingFang SC;
-	/* font-weight: 500; */
 	color: #3D3D42;
 }
 .el-table .el-table__body .cell {
 	font-size: 14px;
 	font-family: PingFangSC-Medium, PingFang SC;
-	/* font-weight: 500; */
 	color: #5C5A5A;
 }
-.el-table__body {
-	border-left: 2px solid #D5D5D5;
-	border-right: 2px solid #D5D5D5;
-	width: calc(100% + 1px) !important;
-	table-layout: initial;
-}
 /* button样式 */
 .el-button {
 	color: #5C5A5A;
   border-radius: 2px;
-	/* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
 	border: 1px solid #C3C3C3;
 }
 .el-table:before {
@@ -181,12 +171,21 @@ body {
 	border: 1px solid #CCCCCC;
 }
 /* 默认滚动条样式 */
-::-webkit-scrollbar {
+/* ::-webkit-scrollbar {
   width: 10px;
 	height: 10px;
   background-color: #A8A8A8;
+} */
+::-webkit-scrollbar { 
+	width: 10px; 
+	height: 10px;
+}
+::-webkit-scrollbar-thumb {
+	background: #ccc;
+}
+::-webkit-scrollbar-track {
+	background: #EDEDED;
 }
-
 /* 浮动以及清除浮动 */
 .fr {
   float: right;

src/views/etl/index.vue

@@ -7,10 +7,10 @@
 					<el-input v-model.trim="pagination.tabname" placeholder="请输入查询内容" clearable
 						prefix-icon="el-icon-search" size="medium" style="width: 240px" />
 				</el-form-item>
-				<el-form-item :label="getColumnName('TabColName-ColName')" style="margin-left:32px;">
+				<!-- <el-form-item :label="getColumnName('TabColName-ColName')" style="margin-left:32px;">
 					<el-input v-model.trim="pagination.colname" placeholder="请输入查询内容" clearable
 						prefix-icon="el-icon-search" size="medium" style="width: 240px" />
-				</el-form-item>
+				</el-form-item> -->
 				<el-form-item>
 					<el-button icon="el-icon-search" size="mini" class="search-button-style" @click="handleQuery">搜索</el-button>
 					<el-button icon="el-icon-refresh" size="mini" class="reset-button-style" @click="resetQuery">重置</el-button>
@@ -23,13 +23,13 @@
 		<!-- 页面主题容器 -->
 		<ContentContainer>
 			<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
-				<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true">
+				<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" width="200">
 					<template #default="scope">
 						<span v-if="item === 'TaskHead-LastModify' || item === 'TaskHead-CreateTime'">{{ parseTime(scope.row[item]) }}</span>
-						<span v-else>{{ (scope.row[item]) }}</span>
+						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="300">
+				<el-table-column label="操作" width="300" fixed="right">
 					<template #default="scope">
 						<el-button class="edit-button-style" @click="configuration(scope.row)" icon="el-icon-setting" size="small">配置</el-button>
 						<el-button class="edit-button-style" @click="handleUpdate(scope.row)" icon="el-icon-edit" size="small">修改</el-button>
@@ -67,6 +67,15 @@
 				item:{}, // 当前要操作的
 				headers: [
 					'TaskHead-TaskId',
+					'TaskHead-SourceDB',
+					'TaskHead-SourceTable',
+					'TaskHead-TargetDB',
+					'TaskHead-TargetTable',
+					'TaskHead-Status',
+					'TaskHead-ExtractStatus',
+					'TaskHead-LoadStatus',
+					'TaskHead-ExtractType',
+					'TaskHead-SearchType',
 					'TaskHead-LastModify',
 					'TaskHead-CreateTime'
 				], // 遍历表头

src/views/field/index.vue

@@ -26,7 +26,7 @@
 				<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true">
 					<template #default="scope">
 						<span v-if="item === 'TabColName-LastModify' || item === 'TabColName-CreateTime'">{{ parseTime(scope.row[item]) }}</span>
-						<span v-else>{{ (scope.row[item]) }}</span>
+						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" width="200">