Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
资
资产管理
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
资产管理
提交
1fba92ac
提交
1fba92ac
编写于
7月 30, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_gzf 部署微服务应用
上级
9ae9068e
变更
13
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
811 行增加
和
11 行删除
+811
-11
view-config.json
app_AssetManagement/public/assets/json/view-config.json
+50
-0
app-picker.vue
app_AssetManagement/src/components/app-picker/app-picker.vue
+1
-1
eamasset_en_US.ts
...ent/src/locale/lanres/entities/eamasset/eamasset_en_US.ts
+274
-0
eamasset_zh_CN.ts
...ent/src/locale/lanres/entities/eamasset/eamasset_zh_CN.ts
+274
-0
eamlocation_en_US.ts
...c/locale/lanres/entities/eamlocation/eamlocation_en_US.ts
+8
-0
eamlocation_zh_CN.ts
...c/locale/lanres/entities/eamlocation/eamlocation_zh_CN.ts
+8
-0
viewconfig.ts
app_AssetManagement/src/mock/viewconfig/viewconfig.ts
+40
-0
eamasset-service-base.ts
...tManagement/src/service/eamasset/eamasset-service-base.ts
+116
-0
default.less
app_AssetManagement/src/styles/default.less
+13
-0
eamasset-ui-service-base.ts
...gement/src/uiservice/eamasset/eamasset-ui-service-base.ts
+5
-0
tree-exp-viewtreeexpbar-treeexpbar.html
...expbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.html
+7
-1
h2_table.xml
...management-core/src/main/resources/liquibase/h2_table.xml
+9
-9
EAMAssetMapper.xml
...c/main/resources/mapper/asset/eamasset/EAMAssetMapper.xml
+6
-0
未找到文件。
app_AssetManagement/public/assets/json/view-config.json
浏览文件 @
1fba92ac
...
...
@@ -9,6 +9,16 @@
"viewtag"
:
"00fcbd6336b5d40a31a2c3d5c346d16c"
,
"memo"
:
""
},
"eamassettreeexpview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DETREEEXPVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetTreeExpView"
,
"viewfilename"
:
"eamasset-tree-exp-view"
,
"viewtag"
:
"075e8b706da4cd2328cf2239fd6f4d06"
,
"memo"
:
""
},
"eamlocationstateeditview"
:
{
"title"
:
"功能位置状态信息"
,
"caption"
:
"功能位置状态"
,
...
...
@@ -89,6 +99,16 @@
"viewtag"
:
"30027967566375f388f110149cf48b49"
,
"memo"
:
""
},
"eamasseteditview"
:
{
"title"
:
"资产编辑视图"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetEditView"
,
"viewfilename"
:
"eamasset-edit-view"
,
"viewtag"
:
"3bac4846ece1082b8c3799d9a1fc7dde"
,
"memo"
:
"系统自动添加"
},
"eamlocationstatemodelpickupview"
:
{
"title"
:
"功能位置状态模型数据选择视图"
,
"caption"
:
"功能位置状态模型"
,
...
...
@@ -159,6 +179,16 @@
"viewtag"
:
"6c2c69027dbbe13ab8d2732923487f59"
,
"memo"
:
"系统自动添加"
},
"eamassetinfoview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DETABEXPVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetInfoView"
,
"viewfilename"
:
"eamasset-info-view"
,
"viewtag"
:
"6c816d46a07d56b2a9afca077d9bbfc3"
,
"memo"
:
""
},
"eamlocationstatemodeleditview"
:
{
"title"
:
"功能位置状态模型信息"
,
"caption"
:
"功能位置状态模型"
,
...
...
@@ -299,6 +329,16 @@
"viewtag"
:
"bb8b4b03a77ed63b8eb4ef3d62b669a6"
,
"memo"
:
"系统自动添加"
},
"eamassetlocationassetgridview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEGRIDVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetLocationAssetGridView"
,
"viewfilename"
:
"eamasset-location-asset-grid-view"
,
"viewtag"
:
"c6a93309b2a9d12617cdbaf29731d2a4"
,
"memo"
:
""
},
"eamlocationsummaryview"
:
{
"title"
:
"功能位置数据看板视图"
,
"caption"
:
"功能位置"
,
...
...
@@ -418,5 +458,15 @@
"viewfilename"
:
"eamlocation-state-grid-view"
,
"viewtag"
:
"f7c04762f2a3e3026c909e6191a0998f"
,
"memo"
:
""
},
"eamassetgridview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEGRIDVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetGridView"
,
"viewfilename"
:
"eamasset-grid-view"
,
"viewtag"
:
"fc4b884f4116e498cafad375e0b6cb7d"
,
"memo"
:
"系统自动添加"
}
}
\ No newline at end of file
app_AssetManagement/src/components/app-picker/app-picker.vue
浏览文件 @
1fba92ac
...
...
@@ -338,7 +338,7 @@ export default class AppPicker extends Vue {
query
=
''
;
}
this
.
inputState
=
false
;
Object
.
assign
(
_param
,
{
query
:
query
});
Object
.
assign
(
_param
,
{
query
:
query
,
size
:
1000
});
// 错误信息国际化
let
error
:
string
=
(
this
.
$t
(
'components.appPicker.error'
)
as
any
);
let
miss
:
string
=
(
this
.
$t
(
'components.appPicker.miss'
)
as
any
);
...
...
app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_en_US.ts
浏览文件 @
1fba92ac
...
...
@@ -18,14 +18,53 @@ export default {
assetnumber
:
"资产编号"
,
},
views
:
{
treeexpview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
editview
:
{
caption
:
"资产"
,
title
:
"资产编辑视图"
,
},
summaryview
:
{
caption
:
"资产"
,
title
:
"资产数据看板视图"
,
},
infoview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
info_mainview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
locationassetgridview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
gridview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
},
main_form
:
{
details
:
{
group1
:
"资产基本信息"
,
formpage1
:
"基本信息"
,
group2
:
"操作信息"
,
formpage2
:
"其它"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"资产标识"
,
srfmajortext
:
"资产名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
assetid
:
"资产标识"
,
},
uiactions
:
{
},
},
info_main_form
:
{
details
:
{
...
...
@@ -49,4 +88,239 @@ export default {
uiactions
:
{
},
},
main_grid
:
{
columns
:
{
assetnumber
:
"资产编号"
,
assetname
:
"资产名称"
,
eamassettypename
:
"资产类型"
,
eamlocationname
:
"功能位置"
,
passetname
:
"上级资产"
,
eamassetstatename
:
"资产状态"
,
},
uiactions
:
{
},
},
childgrid_grid
:
{
columns
:
{
passetname
:
"上级资产"
,
assetnumber
:
"资产编号"
,
assetname
:
"资产名称"
,
eamassettypename
:
"资产类型"
,
eamlocationname
:
"功能位置"
,
eamassetstatename
:
"资产状态"
,
},
uiactions
:
{
},
},
default_searchform
:
{
details
:
{
formpage1
:
"常规条件"
,
},
uiactions
:
{
},
},
gridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"New"
,
tip
:
"New"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"Edit"
,
tip
:
"Edit {0}"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"Remove"
,
tip
:
"Remove {0}"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"Export"
,
tip
:
"Export {0} Data To Excel"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"Filter"
,
tip
:
"Filter"
,
},
},
editviewtoolbar_toolbar
:
{
tbitem10
:
{
caption
:
"Save"
,
tip
:
"Save"
,
},
tbitem12
:
{
caption
:
"Save And New"
,
tip
:
"Save And New"
,
},
tbitem11
:
{
caption
:
"Save And Close"
,
tip
:
"Save And Close Window"
,
},
tbitem18
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem9
:
{
caption
:
"Remove And Close"
,
tip
:
"Remove And Close Window"
,
},
tbitem19
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem5
:
{
caption
:
"New"
,
tip
:
"New"
,
},
tbitem21
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
tbitem22
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"第一个记录"
,
tip
:
"第一个记录"
,
},
tbitem7
:
{
caption
:
"上一个记录"
,
tip
:
"上一个记录"
,
},
tbitem6
:
{
caption
:
"下一个记录"
,
tip
:
"下一个记录"
,
},
tbitem4
:
{
caption
:
"最后一个记录"
,
tip
:
"最后一个记录"
,
},
tbitem25
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"Help"
,
tip
:
"Help"
,
},
},
childgridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"New"
,
tip
:
"New"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"Edit"
,
tip
:
"Edit {0}"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"Remove"
,
tip
:
"Remove {0}"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"Export"
,
tip
:
"Export {0} Data To Excel"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"Filter"
,
tip
:
"Filter"
,
},
},
locationassetgridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"New"
,
tip
:
"New"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"Edit"
,
tip
:
"Edit {0}"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"Remove"
,
tip
:
"Remove {0}"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"Export"
,
tip
:
"Export {0} Data To Excel"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"Filter"
,
tip
:
"Filter"
,
},
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_zh_CN.ts
浏览文件 @
1fba92ac
...
...
@@ -17,14 +17,53 @@ export default {
assetnumber
:
"资产编号"
,
},
views
:
{
treeexpview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
editview
:
{
caption
:
"资产"
,
title
:
"资产编辑视图"
,
},
summaryview
:
{
caption
:
"资产"
,
title
:
"资产数据看板视图"
,
},
infoview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
info_mainview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
locationassetgridview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
gridview
:
{
caption
:
"资产"
,
title
:
"资产信息"
,
},
},
main_form
:
{
details
:
{
group1
:
"资产基本信息"
,
formpage1
:
"基本信息"
,
group2
:
"操作信息"
,
formpage2
:
"其它"
,
srfupdatedate
:
"更新时间"
,
srforikey
:
""
,
srfkey
:
"资产标识"
,
srfmajortext
:
"资产名称"
,
srftempmode
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
assetid
:
"资产标识"
,
},
uiactions
:
{
},
},
info_main_form
:
{
details
:
{
...
...
@@ -48,4 +87,239 @@ export default {
uiactions
:
{
},
},
main_grid
:
{
columns
:
{
assetnumber
:
"资产编号"
,
assetname
:
"资产名称"
,
eamassettypename
:
"资产类型"
,
eamlocationname
:
"功能位置"
,
passetname
:
"上级资产"
,
eamassetstatename
:
"资产状态"
,
},
uiactions
:
{
},
},
childgrid_grid
:
{
columns
:
{
passetname
:
"上级资产"
,
assetnumber
:
"资产编号"
,
assetname
:
"资产名称"
,
eamassettypename
:
"资产类型"
,
eamlocationname
:
"功能位置"
,
eamassetstatename
:
"资产状态"
,
},
uiactions
:
{
},
},
default_searchform
:
{
details
:
{
formpage1
:
"常规条件"
,
},
uiactions
:
{
},
},
gridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"新建"
,
tip
:
"新建"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"编辑"
,
tip
:
"编辑"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"拷贝"
,
tip
:
"拷贝"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"删除"
,
tip
:
"删除"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"导出"
,
tip
:
"导出"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"过滤"
,
tip
:
"过滤"
,
},
},
editviewtoolbar_toolbar
:
{
tbitem10
:
{
caption
:
"保存"
,
tip
:
"保存"
,
},
tbitem12
:
{
caption
:
"保存并新建"
,
tip
:
"保存并新建"
,
},
tbitem11
:
{
caption
:
"保存并关闭"
,
tip
:
"保存并关闭"
,
},
tbitem18
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem9
:
{
caption
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
},
tbitem19
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem5
:
{
caption
:
"新建"
,
tip
:
"新建"
,
},
tbitem21
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"拷贝"
,
tip
:
"拷贝"
,
},
tbitem22
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"第一个记录"
,
tip
:
"第一个记录"
,
},
tbitem7
:
{
caption
:
"上一个记录"
,
tip
:
"上一个记录"
,
},
tbitem6
:
{
caption
:
"下一个记录"
,
tip
:
"下一个记录"
,
},
tbitem4
:
{
caption
:
"最后一个记录"
,
tip
:
"最后一个记录"
,
},
tbitem25
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"帮助"
,
tip
:
"帮助"
,
},
},
childgridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"新建"
,
tip
:
"新建"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"编辑"
,
tip
:
"编辑"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"拷贝"
,
tip
:
"拷贝"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"删除"
,
tip
:
"删除"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"导出"
,
tip
:
"导出"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"过滤"
,
tip
:
"过滤"
,
},
},
locationassetgridviewtoolbar_toolbar
:
{
tbitem5
:
{
caption
:
"新建"
,
tip
:
"新建"
,
},
seperator1
:
{
caption
:
""
,
tip
:
""
,
},
tbitem2
:
{
caption
:
"编辑"
,
tip
:
"编辑"
,
},
seperator2
:
{
caption
:
""
,
tip
:
""
,
},
tbitem1
:
{
caption
:
"拷贝"
,
tip
:
"拷贝"
,
},
tbitem15
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"删除"
,
tip
:
"删除"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem3
:
{
caption
:
"导出"
,
tip
:
"导出"
,
},
tbitem17
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem10
:
{
caption
:
"过滤"
,
tip
:
"过滤"
,
},
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_en_US.ts
浏览文件 @
1fba92ac
...
...
@@ -276,6 +276,14 @@ export default {
tip
:
"Filter"
,
},
},
locationassettree_treeview
:
{
nodes
:
{
all
:
"全部资产"
,
root
:
"默认根节点"
,
},
uiactions
:
{
},
},
locationtree_treeview
:
{
nodes
:
{
root
:
"默认根节点"
,
...
...
app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_zh_CN.ts
浏览文件 @
1fba92ac
...
...
@@ -275,6 +275,14 @@ export default {
tip
:
"过滤"
,
},
},
locationassettree_treeview
:
{
nodes
:
{
all
:
"全部资产"
,
root
:
"默认根节点"
,
},
uiactions
:
{
},
},
locationtree_treeview
:
{
nodes
:
{
root
:
"默认根节点"
,
...
...
app_AssetManagement/src/mock/viewconfig/viewconfig.ts
浏览文件 @
1fba92ac
...
...
@@ -15,6 +15,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"EAMAssetStateGridView"
,
"viewtag"
:
"00fcbd6336b5d40a31a2c3d5c346d16c"
},
"eamassettreeexpview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DETREEEXPVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetTreeExpView"
,
"viewtag"
:
"075e8b706da4cd2328cf2239fd6f4d06"
},
"eamlocationstateeditview"
:
{
"title"
:
"功能位置状态信息"
,
"caption"
:
"功能位置状态"
,
...
...
@@ -79,6 +87,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"EAMAssetStateModelGridView"
,
"viewtag"
:
"30027967566375f388f110149cf48b49"
},
"eamasseteditview"
:
{
"title"
:
"资产编辑视图"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEEDITVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetEditView"
,
"viewtag"
:
"3bac4846ece1082b8c3799d9a1fc7dde"
},
"eamlocationstatemodelpickupview"
:
{
"title"
:
"功能位置状态模型数据选择视图"
,
"caption"
:
"功能位置状态模型"
,
...
...
@@ -135,6 +151,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"EAMAssetStateModelEditView"
,
"viewtag"
:
"6c2c69027dbbe13ab8d2732923487f59"
},
"eamassetinfoview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DETABEXPVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetInfoView"
,
"viewtag"
:
"6c816d46a07d56b2a9afca077d9bbfc3"
},
"eamlocationstatemodeleditview"
:
{
"title"
:
"功能位置状态模型信息"
,
"caption"
:
"功能位置状态模型"
,
...
...
@@ -247,6 +271,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"EAMLocationStateModelPickupGridView"
,
"viewtag"
:
"bb8b4b03a77ed63b8eb4ef3d62b669a6"
},
"eamassetlocationassetgridview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEGRIDVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetLocationAssetGridView"
,
"viewtag"
:
"c6a93309b2a9d12617cdbaf29731d2a4"
},
"eamlocationsummaryview"
:
{
"title"
:
"功能位置数据看板视图"
,
"caption"
:
"功能位置"
,
...
...
@@ -342,6 +374,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewmodule"
:
"Location"
,
"viewname"
:
"EAMLocationStateGridView"
,
"viewtag"
:
"f7c04762f2a3e3026c909e6191a0998f"
},
"eamassetgridview"
:
{
"title"
:
"资产信息"
,
"caption"
:
"资产"
,
"viewtype"
:
"DEGRIDVIEW"
,
"viewmodule"
:
"Asset"
,
"viewname"
:
"EAMAssetGridView"
,
"viewtag"
:
"fc4b884f4116e498cafad375e0b6cb7d"
}
}];
});
\ No newline at end of file
app_AssetManagement/src/service/eamasset/eamasset-service-base.ts
浏览文件 @
1fba92ac
此差异已折叠。
点击以展开。
app_AssetManagement/src/styles/default.less
浏览文件 @
1fba92ac
...
...
@@ -1208,4 +1208,17 @@ div::-webkit-scrollbar-thumb {
}
}
}
// 列表导航栏样式
.app-list-exp-bar {
> .ivu-split-horizontal {
> .left-pane {
padding-right: 8px;
> .container-header {
margin-bottom: 6px;
}
}
}
}
@import './user.less';
\ No newline at end of file
app_AssetManagement/src/uiservice/eamasset/eamasset-ui-service-base.ts
浏览文件 @
1fba92ac
...
...
@@ -89,8 +89,13 @@ export default class EAMAssetUIServiceBase extends UIService {
* @memberof EAMAssetUIServiceBase
*/
public
initViewMap
(){
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'treeexpview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
'EDITVIEW:'
,{
viewname
:
'editview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'summaryview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'infoview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'info_mainview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'locationassetgridview'
,
srfappde
:
'eamassets'
});
this
.
allViewMap
.
set
(
'MDATAVIEW:'
,{
viewname
:
'gridview'
,
srfappde
:
'eamassets'
});
}
/**
...
...
app_AssetManagement/src/widgets/eamlocation/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.html
浏览文件 @
1fba92ac
<split
id=
"treeexpviewtreeexpbar"
class=
'app-tree-exp-bar'
v-model=
"split"
mode=
"horizontal"
@
on-move-end=
"onSplitChange.apply(_self, arguments)"
>
<div
class=
"app-tree-exp-bar-left"
slot=
'left'
>
<div
class=
"app-tree-exp-bar-left enable-search"
slot=
'left'
>
<div
class=
'search-content'
>
<i-input
:search=
"true"
@
on-change=
"($event) => { this.srfnodefilter = $event.target.value; }"
@
on-search=
"onSearch"
>
</i-input>
</div>
<div
class=
'tree-exp-content'
>
<view
_treeexpbar_tree
:viewState=
"viewState"
...
...
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
1fba92ac
...
...
@@ -116,7 +116,7 @@
<!--输出实体[EAMASSET]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-eamasset-
33
-6"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-eamasset-
51
-6"
>
<createTable
tableName=
"ASSET"
>
<column
name=
"ASSETID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_EAMASSET_ASSETID"
/>
...
...
@@ -236,7 +236,7 @@
<!--输出实体[EAMLOCATION]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-eamlocation-8
3
-11"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-eamlocation-8
8
-11"
>
<createTable
tableName=
"EAMLOCATION"
>
<column
name=
"EAMLOCATIONID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_EAMLOCATION_EAMLOCATIONID"
/>
...
...
@@ -581,16 +581,16 @@
<addForeignKeyConstraint
baseColumnNames=
"EAMAPPLYSTATEMODELID"
baseTableName=
"EAMAPPLYTYPE"
constraintName=
"DER1N_EAMAPPLYTYPE_EAMAPPLYSTA"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMAPPLYSTATEMODELID"
referencedTableName=
"EAMAPPLYSTATEMODEL"
validate=
"true"
/>
</changeSet>
<!--输出实体[EAMASSET]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
33
-31"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
51
-31"
>
<addForeignKeyConstraint
baseColumnNames=
"EAMASSETSTATEID"
baseTableName=
"ASSET"
constraintName=
"DER1N_EAMASSET_EAMASSETSTATE_E"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMASSETSTATEID"
referencedTableName=
"EAMASSETSTATE"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
33
-32"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
51
-32"
>
<addForeignKeyConstraint
baseColumnNames=
"EAMASSETTYPEID"
baseTableName=
"ASSET"
constraintName=
"DER1N_EAMASSET_EAMASSETTYPE_EA"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMASSETTYPEID"
referencedTableName=
"EAMASSETTYPE"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
33
-33"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
51
-33"
>
<addForeignKeyConstraint
baseColumnNames=
"PASSETID"
baseTableName=
"ASSET"
constraintName=
"DER1N_EAMASSET_EAMASSET_PASSET"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ASSETID"
referencedTableName=
"ASSET"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
33
-34"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamasset-
51
-34"
>
<addForeignKeyConstraint
baseColumnNames=
"EAMLOCATIONID"
baseTableName=
"ASSET"
constraintName=
"DER1N_EAMASSET_EAMLOCATION_EAM"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMLOCATIONID"
referencedTableName=
"EAMLOCATION"
validate=
"true"
/>
</changeSet>
<!--输出实体[EAMASSETSTATE]外键关系 -->
...
...
@@ -604,13 +604,13 @@
<addForeignKeyConstraint
baseColumnNames=
"EAMASSETSTATEMODELID"
baseTableName=
"EAMASSETTYPE"
constraintName=
"DER1N_EAMASSETTYPE_EAMASSETSTA"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMASSETSTATEMODELID"
referencedTableName=
"EAMASSETSTATEMODEL"
validate=
"true"
/>
</changeSet>
<!--输出实体[EAMLOCATION]外键关系 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
3
-38"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
8
-38"
>
<addForeignKeyConstraint
baseColumnNames=
"EAMLOCATIONSTATEID"
baseTableName=
"EAMLOCATION"
constraintName=
"DER1N_EAMLOCATION_EAMLOCATIONS"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMLOCATIONSTATEID"
referencedTableName=
"EAMLOCATIONSTATE"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
3
-39"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
8
-39"
>
<addForeignKeyConstraint
baseColumnNames=
"EAMLOCATIONTYPEID"
baseTableName=
"EAMLOCATION"
constraintName=
"DER1N_EAMLOCATION_EAMLOCATIONT"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMLOCATIONTYPEID"
referencedTableName=
"EAMLOCATIONTYPE"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
3
-40"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-eamlocation-8
8
-40"
>
<addForeignKeyConstraint
baseColumnNames=
"PEAMLOCATIONID"
baseTableName=
"EAMLOCATION"
constraintName=
"DER1N_EAMLOCATION_EAMLOCATION_"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"EAMLOCATIONID"
referencedTableName=
"EAMLOCATION"
validate=
"true"
/>
</changeSet>
<!--输出实体[EAMLOCATIONSTATE]外键关系 -->
...
...
assetmanagement-core/src/main/resources/mapper/asset/eamasset/EAMAssetMapper.xml
浏览文件 @
1fba92ac
...
...
@@ -70,6 +70,12 @@
<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1 LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID
]]>
</sql>
<!--数据查询[LocationAsset]-->
<sql
id=
"LocationAsset"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1 LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID
WHERE ( t1.`EAMLOCATIONID` = #{srf.datacontext.eamlocationid} )
]]>
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1 LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录