diff --git a/.env.dev b/.env.dev
index aa921e4..7299510 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,4 +1,4 @@
NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://10.127.47.152:8098/
+VUE_APP_BASE_URL = http://101.201.121.115:9010/
VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司
VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
diff --git a/.env.test b/.env.test
index d12adb4..ea699f8 100644
--- a/.env.test
+++ b/.env.test
@@ -1,4 +1,4 @@
NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://10.127.47.152:8098/
+VUE_APP_BASE_URL = http://10.127.47.152:9010/
VUE_APP_LOGIN_TITLE = 沈阳领新智科智能信息系统有限公司
VUE_APP_LOGIN_LOGO = ../assets/img/logo.png
\ No newline at end of file
diff --git a/src/assets/css/base.css b/src/assets/css/base.css
index 66a28df..bb783fd 100644
--- a/src/assets/css/base.css
+++ b/src/assets/css/base.css
@@ -12,6 +12,12 @@ body {
width: 100%;
height: 100%;
}
+a {
+ text-decoration: none;
+}
+li {
+ list-style: none;
+}
#app {
width: 100%;
height: 100%;
@@ -45,6 +51,15 @@ body {
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;
+}
+.el-table--mini td, .el-table--mini th{
+ padding: 3px 0;
+}
/* button样式 */
.el-button {
color: #5C5A5A;
@@ -55,6 +70,11 @@ body {
color: #5C5A5A;
border: 1px solid #C3C3C3;
}
+.el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover {
+ background: #C3C3C3;
+ border-color: #C3C3C3;
+ color: #fff;
+}
.el-table:before {
height: 0;
}
@@ -67,9 +87,7 @@ body {
.pagination-container {
position: relative;
height: 25px;
- margin-bottom: 10px;
- margin-top: 15px;
- padding: 10px 20px !important;
+ padding: 8px 20px !important;
}
.pagination-container .el-pagination {
@@ -129,8 +147,10 @@ body {
}
/* 新增按钮样式 */
.add-button-style {
- width: 144px;
- height: 40px;
+ width: 72px;
+ height: 32px !important;
+ min-height: 32px;
+ padding: 0;
background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%);
box-shadow: 0px 1px 1px 0px #FFFFFF;
border-radius: 2px;
@@ -147,7 +167,7 @@ body {
}
/* 搜索按钮样式 */
.search-button-style {
- height: 40px;
+ height: 32px;
background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%);
border-radius: 2px;
border: 1px solid #1E5353;
@@ -164,7 +184,7 @@ body {
}
/* 重置按钮样式 */
.reset-button-style {
- height: 40px;
+ height: 32px;
background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%);
border-radius: 2px;
border: 1px solid #CCCCCC;
@@ -218,6 +238,8 @@ body {
border-radius: 2px;
border: 2px solid #CCCCCC;
color: #5F6266;
+ height: 32px;
+ line-height: 32px;
}
.el-input__inner::placeholder {
font-family: PingFang-SC-Medium, PingFang-SC;
@@ -231,8 +253,8 @@ body {
line-height: 42px;
}
.el-input--medium .el-input__inner {
- height: 40px;
- line-height: 40px;
+ height: 32px;
+ line-height: 32px;
}
.el-input__inner:focus {
border: 2px solid #CCCCCC;
@@ -251,6 +273,11 @@ body {
padding: 0;
border: none;
}
+.el-input-number__decrease, .el-input-number__increase {
+ height: 29px;
+ line-height: 29px;
+ top: 5px;
+}
/* select筛选框样式 */
.el-select {
width: 100%;
@@ -258,6 +285,9 @@ body {
.el-select .el-input.is-focus .el-input__inner, .el-select .el-input__inner:focus {
border-color: #CCCCCC;
}
+.el-select-dropdown__item.is-disabled:hover {
+ background: #2D9B8E;
+}
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background: #2D9B8E;
color: #fff;
@@ -265,11 +295,14 @@ body {
.el-form .el-select .el-input__suffix {
right: 0;
width: 48px;
- height: 36px;
- line-height: 36px;
+ height: 28px;
+ line-height: 28px;
border: 2px solid #CCCCCC;
background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%);
}
+.el-select .el-input__icon {
+ line-height: normal;
+}
/* textarea框 */
.el-textarea__inner, .el-textarea__inner:focus {
border: 2px solid #CCCCCC;
@@ -318,6 +351,14 @@ body {
border-top: 1px solid #C6C6C6;
padding: 24px 40px 40px;
}
+.dialog-delete-button, .el-message-box__btns button:nth-child(2) {
+ width: 144px;
+ height: 40px;
+ background: linear-gradient(180deg, #ec8a8a 0%, #FF3B31 100%);
+ border-radius: 2px;
+ border: 1px solid #FF3B31 !important;
+ color: #fff !important;
+}
.dialog-submit-button, .el-message-box__btns button:nth-child(2) {
width: 144px;
height: 40px;
@@ -335,16 +376,16 @@ body {
margin-left: 40px !important;
}
.el-dialog .el-button--primary{
- width: 144px;
- height: 40px;
+ width: 72px;
+ height: 30px;
background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%);
border-radius: 2px;
border: 1px solid #1E5353;
color: #fff;
}
.el-dialog .el-button--default{
- width: 144px;
- height: 40px;
+ width: 72px;
+ height: 30px;
border-radius: 2px;
border: 1px solid #5C5A5A;
color: #3D3D42;
@@ -352,8 +393,8 @@ body {
}
.el-dialog .el-button--danger{
- width: 144px;
- height: 40px;
+ width: 72px;
+ height: 30px;
border-radius: 2px;
color: #fff;
}
@@ -415,9 +456,9 @@ body {
}
/* 列表修改 删除按钮样式 */
.edit-button-style {
- width: 70px;
- height: 24px;
- padding: 0;
+ min-width: 50px !important;
+ height: 24px !important;
+ padding: 0 10px;
min-height: 24px;
}
/* 查询条件 */
@@ -427,12 +468,15 @@ body {
/* form表单样式 */
.el-input-group__append .el-button {
width: 102px;
- height: 40px;
+ height: 32px;
background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%);
border-radius: 2px;
border: 2px solid #CCCCCC;
margin: 0;
}
+.el-form-item .el-input,.el-input-number{
+ width: 100%;
+}
/* checkbox */
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #3D3D42;
@@ -445,4 +489,59 @@ body {
}
.el-checkbox__inner:hover, .el-checkbox__input.is-focus .el-checkbox__inner {
border-color: #979797;
+}
+/* 穿梭框 */
+.el-transfer {
+ width: 100%;
+}
+.el-checkbox-group {
+ display: flex;
+ flex-direction: column;
+}
+.el-transfer__buttons {
+ width: 130px !important;
+}
+.el-transfer-panel {
+ width: calc((100% - 190px) / 2);
+}
+.el-transfer__buttons {
+ display: inline-flex;
+}
+.el-transfer__button:first-child {
+ margin-bottom: 0;
+}
+.el-transfer__button {
+ width: 60px !important;
+ border-radius: 4px;
+}
+.el-transfer__button.is-disabled:hover {
+ color: #FFF;
+ border: 1px solid #1E5353;
+ background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%);
+}
+/* tabs样式 */
+.el-tabs--card>.el-tabs__header {
+ background: #DFDFDF;
+ border: 2px solid #979797;
+}
+.el-tabs--card>.el-tabs__header .el-tabs__item {
+ background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%);
+ /* box-shadow: 0px 4px 3px 0px #FFFFFF; */
+ border-radius: 2px;
+ border: 2px solid #B9B9B9;
+ color: #2D3940;
+ height: 36px;
+ line-height: 31px;
+}
+.el-tabs__nav-wrap {
+ margin-bottom: -2px;
+}
+.el-tabs--top .el-tabs__item.is-top:nth-child(n+2) {
+ border-left: none;
+}
+.el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
+ border-bottom-color: transparent;
+}
+.el-tabs__header {
+ margin: 0 0 13px;
}
\ No newline at end of file
diff --git a/src/components/ContentContainer.vue b/src/components/ContentContainer.vue
index 1b33435..2a3f48c 100644
--- a/src/components/ContentContainer.vue
+++ b/src/components/ContentContainer.vue
@@ -7,6 +7,6 @@
diff --git a/src/components/SearchTemplate.vue b/src/components/SearchTemplate.vue
index 278287d..d98a4d5 100644
--- a/src/components/SearchTemplate.vue
+++ b/src/components/SearchTemplate.vue
@@ -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);
}
diff --git a/src/server/request.js b/src/server/request.js
index db175ab..4511ca9 100644
--- a/src/server/request.js
+++ b/src/server/request.js
@@ -2,7 +2,7 @@ import axios from "axios";
// create an axios instance
const service = axios.create({
- baseURL: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:8098/',
+ baseURL: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:9010/',
timeout: 20000, // request timeout
});
// request interceptor
diff --git a/src/views/etl/components/configuration.vue b/src/views/etl/components/configuration.vue
index 3482f3e..4f51ccf 100644
--- a/src/views/etl/components/configuration.vue
+++ b/src/views/etl/components/configuration.vue
@@ -28,7 +28,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{
+ if (code === 200) {
+ this.shellNameArray = data
+ }
+ })
+ },
},
created() {
// 获取标准定义
@@ -376,6 +385,8 @@ export default {
this.allSelect[key] = res.data || [];
});
}
+ // 获取脚本名称
+ this.getShellNameData()
},
mounted() {
// 获取已有配置
@@ -406,9 +417,9 @@ export default {
font-weight: 600;
}
}
-.el-input-number {
- width: 140px;
-}
+// .el-input-number {
+// width: 140px;
+// }
.el-button--primary {
float: right;
}
diff --git a/src/views/etl/components/configuringParameters.vue b/src/views/etl/components/configuringParameters.vue
new file mode 100644
index 0000000..70beeb2
--- /dev/null
+++ b/src/views/etl/components/configuringParameters.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
diff --git a/src/views/etl/components/edit.vue b/src/views/etl/components/edit.vue
index a5ceb39..239a6d1 100644
--- a/src/views/etl/components/edit.vue
+++ b/src/views/etl/components/edit.vue
@@ -3,6 +3,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -95,14 +117,9 @@
测试
-
-
-
-
-
-
+
@@ -157,7 +174,7 @@
-
+
{
this.funcArray = res.data || []
})
+ // 抽取阶段开关
+ this.getStanderOne({ 'StatId': 'TaskHead-CtlParam3' }).then(res => {
+ this.ctlParamArray = res.data || []
+ })
},
methods: {
/** 新增字段 */
diff --git a/src/views/etl/index.vue b/src/views/etl/index.vue
index 36a1c34..107f283 100644
--- a/src/views/etl/index.vue
+++ b/src/views/etl/index.vue
@@ -22,7 +22,7 @@
-
+
{{ parseTime(scope.row[item]) }}
@@ -31,12 +31,13 @@
{{ scope.row[item] }}
-
+
配置
执行
修改
删除
+ 配置脚本参数
@@ -46,6 +47,8 @@
+
+
@@ -55,6 +58,7 @@
import ContentContainer from "../../components/ContentContainer.vue"
import EditTemplate from "./components/edit.vue"
import Configuration from "./components/configuration.vue"
+ import ConfiguringParameters from "./components/configuringParameters.vue"
import { ListMixin } from '@/mixins/ListMixin'
import { post } from "../../server/api.js";
export default {
@@ -63,7 +67,8 @@
SearchTemplate,
ContentContainer,
EditTemplate,
- Configuration
+ Configuration,
+ ConfiguringParameters
},
mixins: [ListMixin], // mixins 里面封装了操作列表的共用方法，直接引入mixins即可
data() {
@@ -72,6 +77,7 @@
statusHeadArray: [], // 状态数组集合
headers: [
'TaskHead-TaskId',
+ "TaskHead-Descr",
'TaskHead-SourceDB',
'TaskHead-SourceTable',
'TaskHead-TargetDB',
@@ -132,6 +138,11 @@
this.item=item;
this.changeDialogStatus('configuration');
},
+ // 配置脚本参数
+ configuringParameters(item) {
+ this.item=item;
+ this.changeDialogStatus('configuringParameters');
+ },
// 搜索按钮操作
handleQuery() {
if (this.pagination.sourcetable === '') this.pagination.sourcetable = undefined
diff --git a/src/views/etlDB/index.vue b/src/views/etlDB/index.vue
index c3b82c1..6b11b19 100644
--- a/src/views/etlDB/index.vue
+++ b/src/views/etlDB/index.vue
@@ -18,14 +18,14 @@
-
+
{{ parseTime(scope.row[item]) }}
{{ scope.row[item] }}
-
+
修改
删除
diff --git a/src/views/field/index.vue b/src/views/field/index.vue
index 1601700..ed6be71 100644
--- a/src/views/field/index.vue
+++ b/src/views/field/index.vue
@@ -22,14 +22,14 @@
-
+
{{ parseTime(scope.row[item]) }}
{{ scope.row[item] }}
-
+
修改
删除
diff --git a/src/views/oneimport/components/edit.vue b/src/views/oneimport/components/edit.vue
index 1186634..835e685 100644
--- a/src/views/oneimport/components/edit.vue
+++ b/src/views/oneimport/components/edit.vue
@@ -50,14 +50,8 @@
-
-
-
+
@@ -68,16 +62,6 @@
-
-
@@ -112,12 +96,7 @@
-
-
+
-
+
{{ parseTime(scope.row[item]) }}
{{ scope.row[item] }}
-
+
配置
修改
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index e5fd0a6..bc8655d 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -63,7 +63,7 @@
-
+
{{ parseTime(scope.row[item]) }}
diff --git a/src/views/standard/index.vue b/src/views/standard/index.vue
index a0a0923..e50dafb 100644
--- a/src/views/standard/index.vue
+++ b/src/views/standard/index.vue
@@ -18,14 +18,14 @@
-
+
{{ parseTime(scope.row[item]) }}
{{ scope.row[item] }}
-
+
修改
删除
diff --git a/vue.config.js b/vue.config.js
index d9f5adf..830a938 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
open: true,
proxy: {
"/user": {
- target: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:8098/', //要跨域的域名 目标地址
+ target: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:9010/', //要跨域的域名 目标地址
changeOrigin: true, //是否开启跨域 是否更改源路径
ws: true,
pathRewrite: {