Browse Source

Merge pull request '样式统一' (#3) from lingxiao into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_ETL_WEBFRONT/pulls/3
pull/4/head
wangxy 3 years ago
parent
commit
ab279f3953
11 changed files with 24 additions and 39 deletions
  1. +9
    -24
      src/assets/css/base.css
  2. +1
    -1
      src/components/ContentContainer.vue
  3. +1
    -1
      src/components/SearchTemplate.vue
  4. +1
    -1
      src/views/etl/components/edit.vue
  5. +2
    -2
      src/views/etl/index.vue
  6. +2
    -2
      src/views/etlDB/index.vue
  7. +2
    -2
      src/views/field/index.vue
  8. +1
    -1
      src/views/oneimport/components/edit.vue
  9. +2
    -2
      src/views/oneimport/index.vue
  10. +1
    -1
      src/views/record/index.vue
  11. +2
    -2
      src/views/standard/index.vue

+ 9
- 24
src/assets/css/base.css View File

@ -17,33 +17,18 @@ body {
height: 100%;
}
/* table样式 */
.el-table th {
background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%);
}
.el-table--border td {
border-bottom: 2px solid #D5D5D5;
}
.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 {
.el-table--mini td, .el-table--mini th {
padding: 3px 0;
color: #3D3D42;
}
.el-table th>.cell {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
color: #3D3D42;
.el-table__row:nth-child(even) {
background: #F7F7F7;
}
.el-table .el-table__body .cell {
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
color: #5C5A5A;
.el-table .el-table__body tr.current-row>td {
background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
}
.el-table .el-table__body tr.current-row>td div {
color: #fff;
}
/* button样式 */
.el-button {


+ 1
- 1
src/components/ContentContainer.vue View File

@ -7,6 +7,6 @@
<style lang="less" scoped>
.content-container {
box-sizing: border-box;
padding: 20px;
padding: 8px;
}
</style>

+ 1
- 1
src/components/SearchTemplate.vue View File

@ -9,7 +9,7 @@
width: 100%;
min-height: 48px;
box-sizing: border-box;
padding: 20px;
padding: 8px;
background: linear-gradient(180deg, #fafcfc 0%, #eeeeee 47%, #e7e7e7 100%);
box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25);
}


+ 1
- 1
src/views/etl/components/edit.vue View File

@ -102,7 +102,7 @@
</el-form-item>
</el-col>
<el-col v-if="form['TaskHead-ExtractType']" :span="24">
<el-table :data="form['TaskHead-TaskLstLi']" :height="tableHeight" border>
<el-table size="mini" :data="form['TaskHead-TaskLstLi']" :height="tableHeight" border>
<el-table-column prop="TaskLst-SourceField" :label="getColumnName('TaskLst-SourceField')">
<template #default="scope">
<el-input v-model="scope.row['TaskLst-SourceField']" clearable placeholder="请输入" />


+ 2
- 2
src/views/etl/index.vue View File

@ -22,7 +22,7 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<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>
@ -31,7 +31,7 @@
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="380" fixed="right">
<el-table-column label="操作" width="340" 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="handlePerform(scope.row)" icon="el-icon-s-open" size="small">执行</el-button>


+ 2
- 2
src/views/etlDB/index.vue View File

@ -18,14 +18,14 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" width="170">
<template #default="scope">
<span v-if="item === 'DB-LastModify' || item === 'DB-CreateTime'">{{ parseTime(scope.row[item]) }}</span>
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="200" fixed="right">
<el-table-column label="操作" width="180" fixed="right">
<template #default="scope">
<el-button class="edit-button-style" @click="handleUpdate(scope.row)" icon="el-icon-edit" size="small">修改</el-button>
<el-button class="edit-button-style" @click="handleDelete(scope.row)" icon="el-icon-delete" size="small">删除</el-button>


+ 2
- 2
src/views/field/index.vue View File

@ -22,14 +22,14 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<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>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<el-table-column label="操作" width="180">
<template #default="scope">
<el-button class="edit-button-style" @click="handleUpdate(scope.row)" icon="el-icon-edit" size="small">修改</el-button>
<el-button class="edit-button-style" @click="handleDelete(scope.row)" icon="el-icon-delete" size="small">删除</el-button>


+ 1
- 1
src/views/oneimport/components/edit.vue View File

@ -52,7 +52,7 @@
</el-col>
<el-col :span="24">
<el-table :data="form['DataTableHead-DataTableLstLi']" :height="tableHeight" border>
<el-table size="mini" :data="form['DataTableHead-DataTableLstLi']" :height="tableHeight" border>
<!-- <el-table-column :label="getColumnName('DataTableLst-Pos')">
<template #default="scope">
<el-input v-model="scope.row['DataTableLst-Pos']" clearable placeholder="请输入" />


+ 2
- 2
src/views/oneimport/index.vue View File

@ -18,14 +18,14 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<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 === 'TaskHead-LastModify' || item === 'TaskHead-CreateTime'">{{ parseTime(scope.row[item]) }}</span>
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="380">
<el-table-column label="操作" width="340">
<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>


+ 1
- 1
src/views/record/index.vue View File

@ -63,7 +63,7 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" width="170">
<template #default="scope">
<span v-if="item === 'DB-LastModify' || item === 'DB-CreateTime'">{{ parseTime(scope.row[item]) }}</span>


+ 2
- 2
src/views/standard/index.vue View File

@ -18,14 +18,14 @@
</SearchTemplate>
<!-- 页面主题容器 -->
<ContentContainer>
<el-table :data="dataList" v-loading="loading" size="small" style="width: 100%" border>
<el-table :data="dataList" v-loading="loading" size="mini" style="width: 100%" border>
<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 === 'Stdef-LastModify' || item === 'Stdef-CreateTime'">{{ parseTime(scope.row[item]) }}</span>
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<el-table-column label="操作" width="180">
<template #default="scope">
<el-button class="edit-button-style" @click="handleUpdate(scope.row)" icon="el-icon-edit" size="small">修改</el-button>
<el-button class="edit-button-style" @click="handleDelete(scope.row)" icon="el-icon-delete" size="small">删除</el-button>


Loading…
Cancel
Save