Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datax-cloud
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄营
datax-cloud
Commits
eebc6381
Commit
eebc6381
authored
Aug 28, 2020
by
yuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目初始化
parent
d3df4c3b
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
397 additions
and
200 deletions
+397
-200
TypeDto.java
.../java/cn/datax/service/data/standard/api/dto/TypeDto.java
+0
-6
LogList.vue
datax-ui/src/views/market/apilog/LogList.vue
+6
-3
ApiMaskAdd.vue
datax-ui/src/views/market/apimask/ApiMaskAdd.vue
+107
-114
ApiMaskList.vue
datax-ui/src/views/market/apimask/ApiMaskList.vue
+6
-3
DataApiList.vue
datax-ui/src/views/market/dataapi/DataApiList.vue
+6
-3
DataServiceList.vue
datax-ui/src/views/market/dataservice/DataServiceList.vue
+6
-3
LogList.vue
datax-ui/src/views/market/servicelog/LogList.vue
+6
-3
ChangeRecordList.vue
...x-ui/src/views/metadata/changerecord/ChangeRecordList.vue
+6
-3
DataSourceList.vue
datax-ui/src/views/metadata/datasource/DataSourceList.vue
+6
-3
LogList.vue
datax-ui/src/views/monitor/loginlog/LogList.vue
+6
-3
LogList.vue
datax-ui/src/views/monitor/operlog/LogList.vue
+6
-3
JobList.vue
datax-ui/src/views/scheduler/job/JobList.vue
+6
-3
JobLogList.vue
datax-ui/src/views/scheduler/log/JobLogList.vue
+6
-3
DataDictList.vue
datax-ui/src/views/standard/datadict/DataDictList.vue
+170
-20
ConfigList.vue
datax-ui/src/views/system/config/ConfigList.vue
+6
-3
DeptList.vue
datax-ui/src/views/system/dept/DeptList.vue
+6
-3
DictList.vue
datax-ui/src/views/system/dict/DictList.vue
+6
-3
DictItemList.vue
datax-ui/src/views/system/dict/item/DictItemList.vue
+6
-3
MenuList.vue
datax-ui/src/views/system/menu/MenuList.vue
+6
-3
PostList.vue
datax-ui/src/views/system/post/PostList.vue
+6
-3
RoleList.vue
datax-ui/src/views/system/role/RoleList.vue
+6
-3
UserList.vue
datax-ui/src/views/system/user/UserList.vue
+6
-3
DataSetList.vue
datax-ui/src/views/visual/dataset/DataSetList.vue
+6
-3
No files found.
datax-modules/data-standard-service-parent/data-standard-service-api/src/main/java/cn/datax/service/data/standard/api/dto/TypeDto.java
View file @
eebc6381
...
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.io.Serializable
;
/**
/**
* <p>
* <p>
...
@@ -31,9 +30,4 @@ public class TypeDto implements Serializable {
...
@@ -31,9 +30,4 @@ public class TypeDto implements Serializable {
@ApiModelProperty
(
value
=
"标准类别名称"
)
@ApiModelProperty
(
value
=
"标准类别名称"
)
@NotBlank
(
message
=
"标准类别名称不能为空"
,
groups
=
{
ValidationGroups
.
Insert
.
class
,
ValidationGroups
.
Update
.
class
})
@NotBlank
(
message
=
"标准类别名称不能为空"
,
groups
=
{
ValidationGroups
.
Insert
.
class
,
ValidationGroups
.
Update
.
class
})
private
String
gbTypeName
;
private
String
gbTypeName
;
@ApiModelProperty
(
value
=
"状态"
)
@NotNull
(
message
=
"状态不能为空"
,
groups
=
{
ValidationGroups
.
Insert
.
class
,
ValidationGroups
.
Update
.
class
})
private
String
status
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
}
}
datax-ui/src/views/market/apilog/LogList.vue
View file @
eebc6381
...
@@ -263,9 +263,12 @@ export default {
...
@@ -263,9 +263,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delApiLog
(
row
.
id
)
delApiLog
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/market/apimask/ApiMaskAdd.vue
View file @
eebc6381
<
template
>
<
template
>
<div>
<el-card
class=
"box-card"
shadow=
"always"
>
<el-card
class=
"box-card"
shadow=
"always"
>
<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-plus"
round
:loading=
"loadingOptions.loading"
:disabled=
"loadingOptions.isDisabled"
@
click=
"submitForm"
>
{{
loadingOptions
.
loadingText
}}
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-plus"
round
@
click=
"submitForm"
:loading=
"loadingOptions.loading"
:disabled=
"loadingOptions.isDisabled"
>
{{
loadingOptions
.
loadingText
}}
</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>
<div
class=
"body-wrapper"
>
<div
class=
"body-wrapper"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"数据API"
prop=
"apiId"
>
<el-form-item
label=
"数据API"
prop=
"apiId"
>
<el-select
v-model=
"form.apiId"
placeholder=
"请选择数据API"
@
change=
"apiSelectChanged"
>
<el-select
v-model=
"form.apiId"
placeholder=
"请选择数据API"
@
change=
"apiSelectChanged"
>
<el-option
v-for=
"api in apiOptions"
:key=
"api.id"
:label=
"api.apiName"
:value=
"api.id"
:disabled=
"api.status === '0'"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"脱敏名称"
prop=
"maskName"
>
<el-input
v-model=
"form.maskName"
placeholder=
"请输入脱敏名称"
/>
</el-form-item>
<el-form-item
label=
"脱敏字段规则配置"
prop=
"rules"
>
<el-table
:data=
"resParamList"
stripe
border
:max-height=
"300"
style=
"width: 100%; margin: 15px 0;"
>
<el-table-column
label=
"序号"
width=
"55"
align=
"center"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"fieldName"
label=
"字段名称"
align=
"center"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"fieldRule(scope.row.fieldName)"
>
{{
scope
.
row
.
fieldName
}}
</el-button>
</
template
>
</el-table-column>
<el-table-column
prop=
"remark"
label=
"描述"
align=
"center"
show-overflow-tooltip
/>
<el-table-column
prop=
"dataType"
label=
"数据类型"
align=
"center"
show-overflow-tooltip
/>
<el-table-column
prop=
"exampleValue"
label=
"示例值"
align=
"center"
show-overflow-tooltip
/>
<el-table-column
prop=
"cipherType"
label=
"脱敏类型"
align=
"center"
show-overflow-tooltip
/>
<el-table-column
prop=
"cryptType"
label=
"规则类型"
align=
"center"
show-overflow-tooltip
/>
</el-table>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-radio-group
v-model=
"form.status"
>
<el-radio
v-for=
"dict in statusOptions"
:key=
"dict.id"
:label=
"dict.itemText"
>
{{ dict.itemValue }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入内容"
/>
</el-form-item>
</el-form>
<!-- 脱敏规则对话框 -->
<el-dialog
:title=
"cipher.title"
:visible
.
sync=
"cipher.open"
width=
"400px"
append-to-body
>
<el-form
ref=
"form2"
:model=
"form2"
:rules=
"rules2"
label-width=
"80px"
>
<el-form-item
label=
"字段名称"
prop=
"fieldName"
>
<el-input
v-model=
"form2.fieldName"
placeholder=
"请输入字段名称"
:disabled=
"true"
/>
</el-form-item>
<el-form-item
label=
"脱敏类型"
prop=
"cipherType"
>
<el-select
v-model=
"form2.cipherType"
clearable
placeholder=
"请选择脱敏类型"
@
change=
"cipherTypeSelectChanged"
>
<el-option
<el-option
v-for=
"api in apiOptions"
v-for=
"dict in cipherTypeOptions"
:key=
"api.id"
:key=
"dict.id"
:label=
"api.apiName"
:label=
"dict.itemValue"
:value=
"api.id"
:value=
"dict.itemText"
:disabled=
"api.status === '0'"
/>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"脱敏名称"
prop=
"maskName"
>
<el-form-item
label=
"规则类型"
prop=
"cryptType"
>
<el-input
v-model=
"form.maskName"
placeholder=
"请输入脱敏名称"
/>
<el-select
v-model=
"form2.cryptType"
clearable
placeholder=
"请选择规则类型"
>
</el-form-item>
<el-option
<el-form-item
label=
"脱敏字段规则配置"
prop=
"rules"
>
v-for=
"dict in cryptTypeOptions"
<el-table
:data=
"resParamList"
stripe
border
:max-height=
"300"
style=
"width: 100%; margin: 15px 0;"
>
<el-table-column
label=
"序号"
width=
"55"
align=
"center"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"fieldName"
label=
"字段名称"
align=
"center"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"fieldRule(scope.row.fieldName)"
>
{{
scope
.
row
.
fieldName
}}
</el-button>
</
template
>
</el-table-column>
<el-table-column
prop=
"remark"
label=
"描述"
align=
"center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"dataType"
label=
"数据类型"
align=
"center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"exampleValue"
label=
"示例值"
align=
"center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"cipherType"
label=
"脱敏类型"
align=
"center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"cryptType"
label=
"规则类型"
align=
"center"
show-overflow-tooltip
>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-radio-group
v-model=
"form.status"
>
<el-radio
v-for=
"dict in statusOptions"
:key=
"dict.id"
:key=
"dict.id"
:label=
"dict.itemText"
:label=
"dict.itemValue"
>
{{dict.itemValue}}
</el-radio>
:value=
"dict.itemText"
</el-radio-group>
/>
</el-form-item>
</el-select>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入内容"
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<!-- 脱敏规则对话框 -->
<el-button
type=
"primary"
@
click=
"submitFieldCipherForm"
>
确 定
</el-button>
<el-dialog
:title=
"cipher.title"
:visible
.
sync=
"cipher.open"
width=
"400px"
append-to-body
>
<el-button
@
click=
"cipher.open = false"
>
取 消
</el-button>
<el-form
ref=
"form2"
:model=
"form2"
:rules=
"rules2"
label-width=
"80px"
>
</div>
<el-form-item
label=
"字段名称"
prop=
"fieldName"
>
</el-dialog>
<el-input
v-model=
"form2.fieldName"
placeholder=
"请输入字段名称"
:disabled=
"true"
/>
</div>
</el-form-item>
</el-card>
<el-form-item
label=
"脱敏类型"
prop=
"cipherType"
>
<el-select
v-model=
"form2.cipherType"
clearable
placeholder=
"请选择脱敏类型"
@
change=
"cipherTypeSelectChanged"
>
<el-option
v-for=
"dict in cipherTypeOptions"
:key=
"dict.id"
:label=
"dict.itemValue"
:value=
"dict.itemText"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"规则类型"
prop=
"cryptType"
>
<el-select
v-model=
"form2.cryptType"
clearable
placeholder=
"请选择规则类型"
>
<el-option
v-for=
"dict in cryptTypeOptions"
:key=
"dict.id"
:label=
"dict.itemValue"
:value=
"dict.itemText"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitFieldCipherForm"
>
确 定
</el-button>
<el-button
@
click=
"cipher.open = false"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</el-card>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -110,17 +107,13 @@ export default {
...
@@ -110,17 +107,13 @@ export default {
props
:
{
props
:
{
data
:
{
data
:
{
type
:
Object
,
type
:
Object
,
default
:
function
()
{
default
:
function
()
{
return
{}
return
{}
}
}
}
}
},
},
data
()
{
data
()
{
return
{
return
{
classCardbody
:
{
overflow
:
'auto'
,
height
:
document
.
body
.
offsetHeight
-
240
+
'px'
},
title
:
'数据API脱敏新增'
,
title
:
'数据API脱敏新增'
,
// 展示切换
// 展示切换
showOptions
:
{
showOptions
:
{
...
@@ -185,7 +178,7 @@ export default {
...
@@ -185,7 +178,7 @@ export default {
}
}
}
}
},
},
created
()
{
created
()
{
this
.
getDicts
(
'sys_common_status'
).
then
(
response
=>
{
this
.
getDicts
(
'sys_common_status'
).
then
(
response
=>
{
if
(
response
.
success
)
{
if
(
response
.
success
)
{
this
.
statusOptions
=
response
.
data
this
.
statusOptions
=
response
.
data
...
@@ -209,29 +202,29 @@ export default {
...
@@ -209,29 +202,29 @@ export default {
})
})
},
},
methods
:
{
methods
:
{
showCard
()
{
showCard
()
{
this
.
$emit
(
'showCard'
,
this
.
showOptions
)
this
.
$emit
(
'showCard'
,
this
.
showOptions
)
},
},
getDataApiList
()
{
getDataApiList
()
{
listDataApi
().
then
(
response
=>
{
listDataApi
().
then
(
response
=>
{
if
(
response
.
success
)
{
if
(
response
.
success
)
{
this
.
apiOptions
=
response
.
data
this
.
apiOptions
=
response
.
data
}
}
})
})
},
},
apiSelectChanged
(
val
)
{
apiSelectChanged
(
val
)
{
this
.
resParamList
=
this
.
apiOptions
.
find
(
function
(
item
)
{
this
.
resParamList
=
this
.
apiOptions
.
find
(
function
(
item
)
{
return
item
.
id
===
val
return
item
.
id
===
val
}).
resParams
}).
resParams
},
},
fieldRule
(
fieldName
)
{
fieldRule
(
fieldName
)
{
this
.
cipher
.
open
=
true
this
.
cipher
.
open
=
true
this
.
form2
.
fieldName
=
fieldName
this
.
form2
.
fieldName
=
fieldName
this
.
form2
.
cipherType
=
undefined
this
.
form2
.
cipherType
=
undefined
this
.
form2
.
cryptType
=
undefined
this
.
form2
.
cryptType
=
undefined
this
.
cryptTypeOptions
=
[]
this
.
cryptTypeOptions
=
[]
},
},
cipherTypeSelectChanged
(
val
)
{
cipherTypeSelectChanged
(
val
)
{
this
.
form2
.
cryptType
=
undefined
this
.
form2
.
cryptType
=
undefined
this
.
cryptTypeOptions
=
[]
this
.
cryptTypeOptions
=
[]
if
(
val
===
'1'
)
{
if
(
val
===
'1'
)
{
...
@@ -242,8 +235,8 @@ export default {
...
@@ -242,8 +235,8 @@ export default {
this
.
cryptTypeOptions
=
this
.
algorithmCryptoOptions
this
.
cryptTypeOptions
=
this
.
algorithmCryptoOptions
}
}
},
},
submitFieldCipherForm
()
{
submitFieldCipherForm
()
{
le
t
fieldRuleIndex
=
this
.
form
.
rules
.
findIndex
((
item
)
=>
{
cons
t
fieldRuleIndex
=
this
.
form
.
rules
.
findIndex
((
item
)
=>
{
return
item
.
fieldName
===
this
.
form2
.
fieldName
return
item
.
fieldName
===
this
.
form2
.
fieldName
})
})
if
(
fieldRuleIndex
!==
-
1
)
{
if
(
fieldRuleIndex
!==
-
1
)
{
...
@@ -253,21 +246,21 @@ export default {
...
@@ -253,21 +246,21 @@ export default {
if
(
this
.
form2
.
cipherType
&&
this
.
form2
.
cryptType
)
{
if
(
this
.
form2
.
cipherType
&&
this
.
form2
.
cryptType
)
{
this
.
form
.
rules
.
push
(
this
.
form2
)
this
.
form
.
rules
.
push
(
this
.
form2
)
}
}
le
t
cipher
=
this
.
cipherTypeOptions
.
find
((
item
)
=>
{
cons
t
cipher
=
this
.
cipherTypeOptions
.
find
((
item
)
=>
{
return
item
.
itemText
===
this
.
form2
.
cipherType
return
item
.
itemText
===
this
.
form2
.
cipherType
})
})
le
t
crypt
=
this
.
cryptTypeOptions
.
find
((
item
)
=>
{
cons
t
crypt
=
this
.
cryptTypeOptions
.
find
((
item
)
=>
{
return
item
.
itemText
===
this
.
form2
.
cryptType
return
item
.
itemText
===
this
.
form2
.
cryptType
})
})
le
t
fieldParamIndex
=
this
.
resParamList
.
findIndex
((
item
)
=>
{
cons
t
fieldParamIndex
=
this
.
resParamList
.
findIndex
((
item
)
=>
{
return
item
.
fieldName
===
this
.
form2
.
fieldName
return
item
.
fieldName
===
this
.
form2
.
fieldName
})
})
le
t
resParam
=
Object
.
assign
({},
this
.
resParamList
[
fieldParamIndex
],
{
cipherType
:
(
cipher
&&
cipher
.
itemValue
)
||
undefined
,
cryptType
:
(
crypt
&&
crypt
.
itemValue
)
||
undefined
})
cons
t
resParam
=
Object
.
assign
({},
this
.
resParamList
[
fieldParamIndex
],
{
cipherType
:
(
cipher
&&
cipher
.
itemValue
)
||
undefined
,
cryptType
:
(
crypt
&&
crypt
.
itemValue
)
||
undefined
})
this
.
$set
(
this
.
resParamList
,
fieldParamIndex
,
resParam
)
this
.
$set
(
this
.
resParamList
,
fieldParamIndex
,
resParam
)
this
.
cipher
.
open
=
false
this
.
cipher
.
open
=
false
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
:
function
()
{
submitForm
:
function
()
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
if
(
this
.
form
.
rules
.
length
<=
0
)
{
if
(
this
.
form
.
rules
.
length
<=
0
)
{
...
...
datax-ui/src/views/market/apimask/ApiMaskList.vue
View file @
eebc6381
...
@@ -301,9 +301,12 @@ export default {
...
@@ -301,9 +301,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delApiMask
(
row
.
id
)
delApiMask
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/market/dataapi/DataApiList.vue
View file @
eebc6381
...
@@ -329,9 +329,12 @@ export default {
...
@@ -329,9 +329,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataApi
(
row
.
id
)
delDataApi
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/market/dataservice/DataServiceList.vue
View file @
eebc6381
...
@@ -309,9 +309,12 @@ export default {
...
@@ -309,9 +309,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataService
(
row
.
id
)
delDataService
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/market/servicelog/LogList.vue
View file @
eebc6381
...
@@ -262,9 +262,12 @@ export default {
...
@@ -262,9 +262,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataServiceLog
(
row
.
id
)
delDataServiceLog
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/metadata/changerecord/ChangeRecordList.vue
View file @
eebc6381
...
@@ -300,9 +300,12 @@ export default {
...
@@ -300,9 +300,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delChangeRecord
(
row
.
id
)
delChangeRecord
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/metadata/datasource/DataSourceList.vue
View file @
eebc6381
...
@@ -317,9 +317,12 @@ export default {
...
@@ -317,9 +317,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataSource
(
row
.
id
)
delDataSource
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/monitor/loginlog/LogList.vue
View file @
eebc6381
...
@@ -254,9 +254,12 @@ export default {
...
@@ -254,9 +254,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delLog
(
row
.
id
)
delLog
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/monitor/operlog/LogList.vue
View file @
eebc6381
...
@@ -272,9 +272,12 @@ export default {
...
@@ -272,9 +272,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delLog
(
row
.
id
)
delLog
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/scheduler/job/JobList.vue
View file @
eebc6381
...
@@ -374,9 +374,12 @@ export default {
...
@@ -374,9 +374,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delJob
(
row
.
id
)
delJob
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/scheduler/log/JobLogList.vue
View file @
eebc6381
...
@@ -282,9 +282,12 @@ export default {
...
@@ -282,9 +282,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delLog
(
row
.
id
)
delLog
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/standard/datadict/DataDictList.vue
View file @
eebc6381
<
template
>
<
template
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"
4
"
>
<el-col
:span=
"
6
"
>
<el-card
class=
"box-card tree-wrapper"
shadow=
"always"
>
<el-card
class=
"box-card tree-wrapper"
shadow=
"always"
>
<el-tree
<div
class=
"body-wrapper"
>
ref=
"type"
<el-tree
:data=
"typeOptions"
ref=
"type"
node-key=
"id"
:data=
"typeOptions"
empty-text=
"加载中,请稍后"
node-key=
"id"
:props=
"defaultProps"
empty-text=
"加载中,请稍后"
default-expand-all
:props=
"defaultProps"
:expand-on-click-node=
"false"
default-expand-all
@
node-click=
"handleNodeClick"
highlight-current
/>
:expand-on-click-node=
"false"
@
node-click=
"handleNodeClick"
>
<template
slot-scope=
"
{ node, data }">
<span
v-if=
"node.level === 1"
class=
"custom-tree-node"
@
mouseenter=
"mouseenter(data)"
@
mouseleave=
"mouseleave(data)"
>
<span><i
class=
"el-icon-folder tree-folder"
/>
{{
node
.
label
}}
</span>
<span
class=
"tree-bts"
>
<i
v-show=
"data.show"
class=
"el-icon-circle-plus-outline"
@
click=
"() => handleAddType()"
/>
</span>
</span>
<span
v-else
class=
"custom-tree-node"
@
mouseenter=
"mouseenter(data)"
@
mouseleave=
"mouseleave(data)"
>
<span>
{{
node
.
label
}}
</span>
<span
class=
"tree-bts"
>
<i
v-show=
"data.show"
class=
"el-icon-edit-outline"
@
click=
"() => handleEditType(data)"
/>
<i
v-show=
"data.show"
class=
"el-icon-delete"
@
click=
"() => handleDelType(data)"
/>
</span>
</span>
</
template
>
</el-tree>
</div>
</el-card>
</el-card>
</el-col>
</el-col>
<el-col
:span=
"
20
"
>
<el-col
:span=
"
18
"
>
<el-card
class=
"box-card"
shadow=
"always"
>
<el-card
class=
"box-card"
shadow=
"always"
>
<el-form
ref=
"queryForm"
:model=
"queryParams"
:inline=
"true"
>
<el-form
ref=
"queryForm"
:model=
"queryParams"
:inline=
"true"
>
<el-form-item
label=
"标准编码"
prop=
"gbCode"
>
<el-form-item
label=
"标准编码"
prop=
"gbCode"
>
...
@@ -180,11 +199,27 @@
...
@@ -180,11 +199,27 @@
/>
/>
</el-card>
</el-card>
</el-col>
</el-col>
<!-- 数据标准类别对话框 -->
<el-dialog
:title=
"dialog.title"
:visible
.
sync=
"dialog.open"
width=
"400px"
append-to-body
>
<el-form
ref=
"dialogForm"
:model=
"dialogForm"
:rules=
"dialogRules"
label-width=
"80px"
>
<el-form-item
label=
"类别编码"
prop=
"gbTypeCode"
>
<el-input
v-model=
"dialogForm.gbTypeCode"
placeholder=
"请输入类别编码"
/>
</el-form-item>
<el-form-item
label=
"类别名称"
prop=
"gbTypeName"
>
<el-input
v-model=
"dialogForm.gbTypeName"
placeholder=
"请输入类别名称"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitDialogForm"
>
确 定
</el-button>
<el-button
@
click=
"dialog.open = false"
>
取 消
</el-button>
</div>
</el-dialog>
</el-row>
</el-row>
</template>
</template>
<
script
>
<
script
>
import
{
listDataDictType
,
addDataDictType
,
updateDataDictType
,
pageDataDict
,
delDataDict
}
from
'@/api/standard/datadict'
import
{
listDataDictType
,
addDataDictType
,
updateDataDictType
,
delDataDictType
,
pageDataDict
,
delDataDict
}
from
'@/api/standard/datadict'
export
default
{
export
default
{
name
:
'DataDictList'
,
name
:
'DataDictList'
,
...
@@ -243,6 +278,21 @@ export default {
...
@@ -243,6 +278,21 @@ export default {
defaultProps
:
{
defaultProps
:
{
children
:
'children'
,
children
:
'children'
,
label
:
'gbTypeName'
label
:
'gbTypeName'
},
dialog
:
{
// 是否显示弹出层
open
:
false
,
// 弹出层标题
title
:
'数据标准类别'
},
dialogForm
:
{},
dialogRules
:
{
gbTypeCode
:
[
{
required
:
true
,
message
:
'类别编码不能为空'
,
trigger
:
'blur'
}
],
gbTypeName
:
[
{
required
:
true
,
message
:
'类别名称不能为空'
,
trigger
:
'blur'
}
]
}
}
}
}
},
},
...
@@ -252,8 +302,8 @@ export default {
...
@@ -252,8 +302,8 @@ export default {
this
.
statusOptions
=
response
.
data
this
.
statusOptions
=
response
.
data
}
}
})
})
this
.
getList
()
this
.
getTree
()
this
.
getTree
()
this
.
getList
()
},
},
mounted
()
{
mounted
()
{
this
.
initCols
()
this
.
initCols
()
...
@@ -266,14 +316,85 @@ export default {
...
@@ -266,14 +316,85 @@ export default {
const
tree
=
{}
const
tree
=
{}
tree
.
gbTypeName
=
'数据标准类别'
tree
.
gbTypeName
=
'数据标准类别'
tree
.
children
=
data
tree
.
children
=
data
this
.
typeOptions
=
[]
this
.
typeOptions
.
push
(
tree
)
this
.
typeOptions
.
push
(
tree
)
}
}
})
})
},
},
/** 节点单击事件 */
/** 节点单击事件 */
handleNodeClick
(
data
)
{
handleNodeClick
(
data
)
{
this
.
queryParams
.
typeId
=
data
.
id
if
(
data
.
id
)
{
this
.
getList
()
this
.
queryParams
.
typeId
=
data
.
id
this
.
getList
()
}
},
handleAddType
()
{
this
.
dialog
.
open
=
true
this
.
dialogForm
=
{
gbTypeCode
:
''
,
gbTypeName
:
''
}
},
submitDialogForm
()
{
this
.
$refs
[
'dialogForm'
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
dialogForm
.
id
)
{
updateDataDictType
(
this
.
dialogForm
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
$message
.
success
(
'保存成功'
)
this
.
dialog
.
open
=
false
this
.
getTree
()
}
else
{
this
.
$message
.
error
(
'保存失败'
)
}
}).
catch
(
error
=>
{
this
.
$message
.
error
(
error
.
msg
||
'保存失败'
)
})
}
else
{
addDataDictType
(
this
.
dialogForm
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
$message
.
success
(
'保存成功'
)
this
.
dialog
.
open
=
false
this
.
getTree
()
}
else
{
this
.
$message
.
error
(
'保存失败'
)
}
}).
catch
(
error
=>
{
this
.
$message
.
error
(
error
.
msg
||
'保存失败'
)
})
}
}
})
},
/** 树节点鼠标移入移出 */
mouseenter
(
data
)
{
this
.
$set
(
data
,
'show'
,
true
)
},
mouseleave
(
data
)
{
this
.
$set
(
data
,
'show'
,
false
)
},
handleEditType
(
data
)
{
this
.
dialog
.
open
=
true
this
.
dialogForm
=
{
id
:
data
.
id
,
gbTypeCode
:
data
.
gbTypeCode
,
gbTypeName
:
data
.
gbTypeName
}
},
handleDelType
(
data
)
{
this
.
$confirm
(
'选中数据将被永久删除, 是否继续?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
delDataDictType
(
data
.
id
).
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
$message
.
success
(
'删除成功'
)
this
.
getTree
()
}
})
}).
catch
(()
=>
{
})
},
},
/** 查询数据源列表 */
/** 查询数据源列表 */
getList
()
{
getList
()
{
...
@@ -309,7 +430,13 @@ export default {
...
@@ -309,7 +430,13 @@ export default {
},
},
/** 重置按钮操作 */
/** 重置按钮操作 */
resetQuery
()
{
resetQuery
()
{
this
.
$refs
[
'queryForm'
].
resetFields
()
this
.
queryParams
=
{
pageNum
:
1
,
pageSize
:
20
,
typeId
:
''
,
gbCode
:
''
,
gbName
:
''
}
this
.
handleQuery
()
this
.
handleQuery
()
},
},
/** 刷新列表 */
/** 刷新列表 */
...
@@ -361,9 +488,12 @@ export default {
...
@@ -361,9 +488,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataDict
(
row
.
id
)
delDataDict
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
@@ -409,5 +539,25 @@ export default {
...
@@ -409,5 +539,25 @@ export default {
}
}
.tree-wrapper
{
.tree-wrapper
{
overflow-y
:
auto
;
overflow-y
:
auto
;
.body-wrapper
{
margin
:
-10px
;
::v-deep
.custom-tree-node
{
flex
:
1
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
font-size
:
14px
;
.tree-folder
{
margin-right
:
5px
;
color
:
rgb
(
246
207
7
);
}
.tree-bts
{
i
{
margin-right
:
10px
;
padding
:
0px
;
}
}
}
}
}
}
</
style
>
</
style
>
datax-ui/src/views/system/config/ConfigList.vue
View file @
eebc6381
...
@@ -310,9 +310,12 @@ export default {
...
@@ -310,9 +310,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delConfig
(
row
.
id
)
delConfig
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/dept/DeptList.vue
View file @
eebc6381
...
@@ -239,9 +239,12 @@ export default {
...
@@ -239,9 +239,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDept
(
row
.
id
)
delDept
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/dict/DictList.vue
View file @
eebc6381
...
@@ -363,9 +363,12 @@ export default {
...
@@ -363,9 +363,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDict
(
row
.
id
)
delDict
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/dict/item/DictItemList.vue
View file @
eebc6381
...
@@ -336,9 +336,12 @@ export default {
...
@@ -336,9 +336,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDictItem
(
row
.
id
)
delDictItem
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/menu/MenuList.vue
View file @
eebc6381
...
@@ -260,9 +260,12 @@ export default {
...
@@ -260,9 +260,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delMenu
(
row
.
id
)
delMenu
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/post/PostList.vue
View file @
eebc6381
...
@@ -301,9 +301,12 @@ export default {
...
@@ -301,9 +301,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delPost
(
row
.
id
)
delPost
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/role/RoleList.vue
View file @
eebc6381
...
@@ -308,9 +308,12 @@ export default {
...
@@ -308,9 +308,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delRole
(
row
.
id
)
delRole
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/system/user/UserList.vue
View file @
eebc6381
...
@@ -385,9 +385,12 @@ export default {
...
@@ -385,9 +385,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delUser
(
row
.
id
)
delUser
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
datax-ui/src/views/visual/dataset/DataSetList.vue
View file @
eebc6381
...
@@ -301,9 +301,12 @@ export default {
...
@@ -301,9 +301,12 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
delDataSet
(
row
.
id
)
delDataSet
(
row
.
id
).
then
(
response
=>
{
this
.
$message
.
success
(
'删除成功'
)
if
(
response
.
success
)
{
this
.
getList
()
this
.
$message
.
success
(
'删除成功'
)
this
.
getList
()
}
})
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment