Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
b56add58
提交
b56add58
authored
5月 12, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/main' into main
上级
5a772101
622169a3
显示空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
0 行增加
和
38 行删除
+0
-38
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+0
-1
index.js
frontend/src/utils/index.js
+0
-1
request.js
frontend/src/utils/request.js
+0
-2
util.js
frontend/src/views/chart/chart/util.js
+0
-1
Group.vue
frontend/src/views/chart/group/Group.vue
+0
-1
ChartEdit.vue
frontend/src/views/chart/view/ChartEdit.vue
+0
-1
index.vue
frontend/src/views/login/index.vue
+0
-1
index2.vue
frontend/src/views/login/index2.vue
+0
-1
index.vue
frontend/src/views/panel/GrantAuth/dept/index.vue
+0
-3
Slider.vue
...tend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
+0
-2
SubjectTemplateItem.vue
...s/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+0
-1
index.vue
frontend/src/views/panel/index.vue
+0
-1
TemplateAllList.vue
frontend/src/views/panel/list/EditPanel/TemplateAllList.vue
+0
-1
index.vue
frontend/src/views/panel/list/EditPanel/index.vue
+0
-2
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+0
-1
TemplateList.vue
frontend/src/views/panel/template/component/TemplateList.vue
+0
-1
index.vue
frontend/src/views/system/plugin/index.vue
+0
-17
没有找到文件。
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
b56add58
...
@@ -124,7 +124,6 @@ export default {
...
@@ -124,7 +124,6 @@ export default {
},
},
getData
(
id
)
{
getData
(
id
)
{
if
(
id
)
{
if
(
id
)
{
debugger
this
.
requestStatus
=
'waiting'
this
.
requestStatus
=
'waiting'
this
.
message
=
null
this
.
message
=
null
viewData
(
id
,
this
.
filter
).
then
(
response
=>
{
viewData
(
id
,
this
.
filter
).
then
(
response
=>
{
...
...
frontend/src/utils/index.js
浏览文件 @
b56add58
...
@@ -157,7 +157,6 @@ export function formatCondition(param) {
...
@@ -157,7 +157,6 @@ export function formatCondition(param) {
}
}
const
result
=
{
conditions
:
[]
}
const
result
=
{
conditions
:
[]
}
for
(
const
[
key
,
value
]
of
Object
.
entries
(
param
))
{
for
(
const
[
key
,
value
]
of
Object
.
entries
(
param
))
{
console
.
log
(
`
${
key
}
`
)
result
.
conditions
.
push
(
value
)
result
.
conditions
.
push
(
value
)
}
}
return
result
return
result
...
...
frontend/src/utils/request.js
浏览文件 @
b56add58
...
@@ -43,7 +43,6 @@ service.interceptors.request.use(
...
@@ -43,7 +43,6 @@ service.interceptors.request.use(
error
=>
{
error
=>
{
error
.
config
.
loading
&&
tryHideLoading
(
store
.
getters
.
currentPath
)
error
.
config
.
loading
&&
tryHideLoading
(
store
.
getters
.
currentPath
)
// do something with request error
// do something with request error
console
.
log
(
error
)
// for debug
return
Promise
.
reject
(
error
)
return
Promise
.
reject
(
error
)
}
}
)
)
...
@@ -147,7 +146,6 @@ service.interceptors.response.use(response => {
...
@@ -147,7 +146,6 @@ service.interceptors.response.use(response => {
checkPermission
(
error
.
response
)
checkPermission
(
error
.
response
)
msg
=
error
.
response
.
data
.
message
||
error
.
response
.
data
msg
=
error
.
response
.
data
.
message
||
error
.
response
.
data
}
else
{
}
else
{
console
.
log
(
'error: '
+
error
)
// for debug
msg
=
error
.
message
msg
=
error
.
message
}
}
!
error
.
config
.
hideMsg
&&
$error
(
msg
)
!
error
.
config
.
hideMsg
&&
$error
(
msg
)
...
...
frontend/src/views/chart/chart/util.js
浏览文件 @
b56add58
...
@@ -13,7 +13,6 @@ export function hexColorToRGBA(hex, alpha) {
...
@@ -13,7 +13,6 @@ export function hexColorToRGBA(hex, alpha) {
})
})
return
`rgba(
${
rgb
.
join
(
','
)}
,
${
alpha
/
100
}
)`
// 输出RGB格式颜色
return
`rgba(
${
rgb
.
join
(
','
)}
,
${
alpha
/
100
}
)`
// 输出RGB格式颜色
}
else
{
}
else
{
console
.
log
(
`Input
${
hex
}
is wrong!`
)
return
'rgb(0,0,0)'
return
'rgb(0,0,0)'
}
}
}
}
frontend/src/views/chart/group/Group.vue
浏览文件 @
b56add58
...
@@ -545,7 +545,6 @@ export default {
...
@@ -545,7 +545,6 @@ export default {
},
},
createChart
()
{
createChart
()
{
console
.
log
(
this
.
table
)
if
(
!
this
.
table
.
name
)
{
if
(
!
this
.
table
.
name
)
{
this
.
$message
({
this
.
$message
({
message
:
this
.
$t
(
'chart.name_can_not_empty'
),
message
:
this
.
$t
(
'chart.name_can_not_empty'
),
...
...
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @
b56add58
...
@@ -356,7 +356,6 @@ export default {
...
@@ -356,7 +356,6 @@ export default {
},
},
watch
:
{
watch
:
{
'param'
:
function
()
{
'param'
:
function
()
{
console
.
log
(
this
.
param
)
this
.
getData
(
this
.
param
.
id
)
this
.
getData
(
this
.
param
.
id
)
}
}
},
},
...
...
frontend/src/views/login/index.vue
浏览文件 @
b56add58
...
@@ -123,7 +123,6 @@ export default {
...
@@ -123,7 +123,6 @@ export default {
this
.
loading
=
false
this
.
loading
=
false
})
})
}
else
{
}
else
{
console
.
log
(
'error submit!!'
)
return
false
return
false
}
}
})
})
...
...
frontend/src/views/login/index2.vue
浏览文件 @
b56add58
...
@@ -116,7 +116,6 @@ export default {
...
@@ -116,7 +116,6 @@ export default {
this
.
loading
=
false
this
.
loading
=
false
})
})
}
else
{
}
else
{
console
.
log
(
'error submit!!'
)
return
false
return
false
}
}
})
})
...
...
frontend/src/views/panel/GrantAuth/dept/index.vue
浏览文件 @
b56add58
...
@@ -73,7 +73,6 @@ export default {
...
@@ -73,7 +73,6 @@ export default {
value
:
this
.
keyWord
value
:
this
.
keyWord
}
}
this
.
search
(
condition
)
this
.
search
(
condition
)
console
.
log
(
'start execute search'
)
}
}
this
.
destryTimeMachine
()
this
.
destryTimeMachine
()
},
1500
)
},
1500
)
...
@@ -169,10 +168,8 @@ export default {
...
@@ -169,10 +168,8 @@ export default {
this
.
$error
(
err
.
message
)
this
.
$error
(
err
.
message
)
return
false
return
false
})
})
console
.
log
(
'dept save'
)
},
},
cancel
()
{
cancel
()
{
console
.
log
(
'dept cancel'
)
},
},
buildRequest
(
rows
)
{
buildRequest
(
rows
)
{
...
...
frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
浏览文件 @
b56add58
...
@@ -127,7 +127,6 @@ export default {
...
@@ -127,7 +127,6 @@ export default {
},
},
methods
:
{
methods
:
{
subjectDelete
(
id
)
{
subjectDelete
(
id
)
{
debugger
deleteSubject
(
id
).
then
(
response
=>
{
deleteSubject
(
id
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'删除成功'
,
message
:
'删除成功'
,
...
@@ -141,7 +140,6 @@ export default {
...
@@ -141,7 +140,6 @@ export default {
const
request
=
{
const
request
=
{
details
:
JSON
.
stringify
(
this
.
canvasStyleData
)
details
:
JSON
.
stringify
(
this
.
canvasStyleData
)
}
}
debugger
saveSubject
(
request
).
then
(
response
=>
{
saveSubject
(
request
).
then
(
response
=>
{
this
.
$message
({
this
.
$message
({
message
:
'保存成功'
,
message
:
'保存成功'
,
...
...
frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
浏览文件 @
b56add58
...
@@ -163,7 +163,6 @@ export default {
...
@@ -163,7 +163,6 @@ export default {
watch
:
{
watch
:
{
subjectItem
:
{
subjectItem
:
{
handler
(
newVal
,
oldVla
)
{
handler
(
newVal
,
oldVla
)
{
debugger
this
.
subjectItemDetails
=
chartTransStr2Object
(
JSON
.
parse
(
newVal
.
details
),
'Y'
)
this
.
subjectItemDetails
=
chartTransStr2Object
(
JSON
.
parse
(
newVal
.
details
),
'Y'
)
},
},
deep
:
true
deep
:
true
...
...
frontend/src/views/panel/index.vue
浏览文件 @
b56add58
...
@@ -25,7 +25,6 @@ export default {
...
@@ -25,7 +25,6 @@ export default {
},
},
mounted
()
{
mounted
()
{
bus
.
$on
(
'PanelSwitchComponent'
,
(
c
)
=>
{
bus
.
$on
(
'PanelSwitchComponent'
,
(
c
)
=>
{
console
.
log
(
c
)
this
.
param
=
c
.
param
this
.
param
=
c
.
param
switch
(
c
.
name
)
{
switch
(
c
.
name
)
{
case
'PanelEdit'
:
case
'PanelEdit'
:
...
...
frontend/src/views/panel/list/EditPanel/TemplateAllList.vue
浏览文件 @
b56add58
...
@@ -72,7 +72,6 @@ export default {
...
@@ -72,7 +72,6 @@ export default {
},
},
methods
:
{
methods
:
{
clickMore
(
param
)
{
clickMore
(
param
)
{
console
.
log
(
param
)
switch
(
param
.
type
)
{
switch
(
param
.
type
)
{
case
'edit'
:
case
'edit'
:
this
.
templateEdit
(
param
.
data
)
this
.
templateEdit
(
param
.
data
)
...
...
frontend/src/views/panel/list/EditPanel/index.vue
浏览文件 @
b56add58
...
@@ -95,7 +95,6 @@ export default {
...
@@ -95,7 +95,6 @@ export default {
})
})
},
},
handleExceed
(
file
)
{
handleExceed
(
file
)
{
console
.
log
(
file
.
name
)
},
},
cancel
()
{
cancel
()
{
this
.
$emit
(
'closeEditPanelDialog'
)
this
.
$emit
(
'closeEditPanelDialog'
)
...
@@ -123,7 +122,6 @@ export default {
...
@@ -123,7 +122,6 @@ export default {
this
.
editPanel
.
panelInfo
.
name
=
this
.
importTemplateInfo
.
name
this
.
editPanel
.
panelInfo
.
name
=
this
.
importTemplateInfo
.
name
this
.
editPanel
.
panelInfo
.
panelStyle
=
this
.
importTemplateInfo
.
panelStyle
this
.
editPanel
.
panelInfo
.
panelStyle
=
this
.
importTemplateInfo
.
panelStyle
this
.
editPanel
.
panelInfo
.
panelData
=
this
.
importTemplateInfo
.
panelData
this
.
editPanel
.
panelInfo
.
panelData
=
this
.
importTemplateInfo
.
panelData
console
.
log
(
this
.
importTemplateInfo
)
}
}
reader
.
readAsText
(
file
)
reader
.
readAsText
(
file
)
},
},
...
...
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
b56add58
...
@@ -394,7 +394,6 @@ export default {
...
@@ -394,7 +394,6 @@ export default {
},
},
saveGroup
(
group
)
{
saveGroup
(
group
)
{
// console.log(group);
this
.
$refs
[
'groupForm'
].
validate
((
valid
)
=>
{
this
.
$refs
[
'groupForm'
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
addGroup
(
group
).
then
(
res
=>
{
addGroup
(
group
).
then
(
res
=>
{
...
...
frontend/src/views/panel/template/component/TemplateList.vue
浏览文件 @
b56add58
...
@@ -101,7 +101,6 @@ export default {
...
@@ -101,7 +101,6 @@ export default {
},
},
clickMore
(
param
)
{
clickMore
(
param
)
{
console
.
log
(
param
)
switch
(
param
.
type
)
{
switch
(
param
.
type
)
{
case
'edit'
:
case
'edit'
:
this
.
templateEdit
(
param
.
data
)
this
.
templateEdit
(
param
.
data
)
...
...
frontend/src/views/system/plugin/index.vue
浏览文件 @
b56add58
...
@@ -122,19 +122,6 @@ export default {
...
@@ -122,19 +122,6 @@ export default {
this
.
uploading
=
false
this
.
uploading
=
false
},
},
uploadSuccess
(
response
,
file
,
fileList
)
{
uploadSuccess
(
response
,
file
,
fileList
)
{
console
.
log
(
response
)
console
.
log
(
file
)
console
.
log
(
fileList
)
// this.path = response.data.path
// this.fields = response.data.fields
// this.data = response.data.data
// const datas = this.data
// this.$refs.plxTable.reloadData(datas)
// if (file.name.lastIndexOf('.') > 0) {
// this.name = file.name.substring(0, file.name.lastIndexOf('.'))
// }
// this.fileList = fileList
this
.
uploading
=
false
this
.
uploading
=
false
},
},
...
@@ -144,10 +131,6 @@ export default {
...
@@ -144,10 +131,6 @@ export default {
cancelButtonText
:
this
.
$t
(
'commons.cancel'
),
cancelButtonText
:
this
.
$t
(
'commons.cancel'
),
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
// delUser(encodeURIComponent(row.userId)).then(res => {
// this.$success(this.$t('commons.delete_success'))
// this.search()
// })
}).
catch
(()
=>
{
}).
catch
(()
=>
{
this
.
$info
(
this
.
$t
(
'commons.delete_cancel'
))
this
.
$info
(
this
.
$t
(
'commons.delete_cancel'
))
})
})
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论