Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
23938f3a
提交
23938f3a
编写于
4月 24, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhujiamin 发布系统代码 [TrainSys,网页端]
上级
ea9eda78
变更
12
展开全部
显示空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
756 行增加
和
37 行删除
+756
-37
index.html
app_Web/index.html
+4
-0
package.json
app_Web/package.json
+1
-0
am-pie-threed-echarts.scss
...s/common/am-pie-threed-echarts/am-pie-threed-echarts.scss
+10
-0
am-pie-threed-echarts.tsx
...ts/common/am-pie-threed-echarts/am-pie-threed-echarts.tsx
+114
-0
pie-threed-echarts.scss
...ponents/common/pie-threed-echarts/pie-threed-echarts.scss
+10
-0
pie-threed-echarts.tsx
...mponents/common/pie-threed-echarts/pie-threed-echarts.tsx
+563
-0
tab-exp-view.scss
app_Web/src/components/views/tab-exp-view/tab-exp-view.scss
+2
-0
app-menu.tsx
app_Web/src/components/widgets/app-menu/app-menu.tsx
+17
-7
index-view.ts
app_Web/src/views/index-view/index-view.ts
+19
-19
index-view.vue
app_Web/src/views/index-view/index-view.vue
+8
-3
PSSYSAPP.json
.../ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+4
-4
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+4
-4
未找到文件。
app_Web/index.html
浏览文件 @
23938f3a
...
@@ -4,6 +4,10 @@
...
@@ -4,6 +4,10 @@
<meta
charset=
"UTF-8"
/>
<meta
charset=
"UTF-8"
/>
<link
id=
"favicon"
rel=
"icon"
type=
"image/svg+xml"
href=
"/assets/img/favicon.ico"
/>
<link
id=
"favicon"
rel=
"icon"
type=
"image/svg+xml"
href=
"/assets/img/favicon.ico"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
/>
<meta
http-equiv=
"Expires"
content=
"0"
>
<meta
http-equiv=
"Pragma"
content=
"no-cache"
>
<meta
http-equiv=
"Cache-control"
content=
"no-cache"
>
<meta
http-equiv=
"Cache"
content=
"no-cache"
>
<link
type=
"text/css"
href=
"/assets/css/app-loading.css"
rel=
"stylesheet"
/>
<link
type=
"text/css"
href=
"/assets/css/app-loading.css"
rel=
"stylesheet"
/>
<link
<link
type=
"text/css"
type=
"text/css"
...
...
app_Web/package.json
浏览文件 @
23938f3a
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"@floating-ui/dom"
:
"^1.0.11"
,
"@floating-ui/dom"
:
"^1.0.11"
,
"@ibiz-template-plugin/jsjcy-kq-web"
:
"^0.0.1-beta.1"
,
"@ibiz-template/command"
:
"^0.0.1-beta.50"
,
"@ibiz-template/command"
:
"^0.0.1-beta.50"
,
"@ibiz-template/controller"
:
"^0.0.1-beta.69"
,
"@ibiz-template/controller"
:
"^0.0.1-beta.69"
,
"@ibiz-template/core"
:
"^0.0.1-beta.69"
,
"@ibiz-template/core"
:
"^0.0.1-beta.69"
,
...
...
app_Web/src/components/common/am-pie-threed-echarts/am-pie-threed-echarts.scss
0 → 100644
浏览文件 @
23938f3a
.am-pie-threed-echarts
{
width
:
100%
;
height
:
600px
;
/* stylelint-disable-next-line selector-id-pattern */
#myChart
{
width
:
100%
;
height
:
100%
;
}
}
app_Web/src/components/common/am-pie-threed-echarts/am-pie-threed-echarts.tsx
0 → 100644
浏览文件 @
23938f3a
import
{
defineComponent
,
ref
,
onMounted
}
from
'vue'
;
import
*
as
am4core
from
'@amcharts/amcharts4/core'
;
import
*
as
am4charts
from
'@amcharts/amcharts4/charts'
;
// eslint-disable-next-line camelcase
import
am4themes_animated
from
'@amcharts/amcharts4/themes/animated'
;
import
'./am-pie-threed-echarts.scss'
;
export
const
AmPie3D
=
defineComponent
({
name
:
'Pie3D'
,
props
:
{
pieData
:
{
type
:
Array
<
IData
>
,
default
:
()
=>
[],
},
},
setup
(
_props
)
{
const
pieChart
=
ref
(
null
);
onMounted
(()
=>
{
// Set theme
am4core
.
useTheme
(
am4themes_animated
);
// Create chart instance
const
chart
=
am4core
.
create
(
'myChart'
,
am4charts
.
PieChart3D
);
// 角度
chart
.
angle
=
50
;
// 厚度
chart
.
depth
=
20
;
// Add data
chart
.
data
=
[
{
category
:
'Lithuania'
,
value
:
501.9
,
sliced
:
true
,
color
:
am4core
.
color
(
'#F44336'
),
},
{
category
:
'Czechia'
,
value
:
301.9
,
sliced
:
true
,
color
:
am4core
.
color
(
'#4CAF50'
),
},
{
category
:
'Ireland'
,
value
:
201.1
,
sliced
:
true
,
color
:
am4core
.
color
(
'#2196F3'
),
},
{
category
:
'Germany'
,
value
:
165.8
,
sliced
:
true
,
color
:
am4core
.
color
(
'#FFC107'
),
},
{
category
:
'Australia'
,
value
:
139.9
,
sliced
:
true
,
color
:
am4core
.
color
(
'#9C27B0'
),
},
{
category
:
'Austria'
,
value
:
128.3
,
sliced
:
true
,
},
{
category
:
'UK'
,
value
:
99
,
sliced
:
true
,
},
{
category
:
'Belgium'
,
value
:
60
,
sliced
:
true
,
},
{
category
:
'The Netherlands'
,
value
:
50
,
sliced
:
true
,
},
];
// Add and configure Series
const
pieSeries
=
chart
.
series
.
push
(
new
am4charts
.
PieSeries3D
());
pieSeries
.
dataFields
.
value
=
'value'
;
pieSeries
.
dataFields
.
category
=
'category'
;
pieSeries
.
slices
.
template
.
stroke
=
am4core
.
color
(
'#fff'
);
pieSeries
.
slices
.
template
.
strokeWidth
=
2
;
pieSeries
.
slices
.
template
.
strokeOpacity
=
1
;
// 设置图例
chart
.
legend
=
new
am4charts
.
Legend
();
chart
.
legend
.
position
=
'right'
;
// 设置 isActive 属性为数据项的 sliced 属性
pieSeries
.
slices
.
template
.
propertyFields
.
isActive
=
'sliced'
;
// 设置颜色字段为 "color"
pieSeries
.
slices
.
template
.
propertyFields
.
fill
=
'color'
;
});
return
{
pieChart
,
};
},
render
()
{
return
(
<
div
class=
'am-pie-threed-echarts'
>
<
div
id=
'myChart'
ref=
'pieChart'
/>
</
div
>
);
},
});
app_Web/src/components/common/pie-threed-echarts/pie-threed-echarts.scss
0 → 100644
浏览文件 @
23938f3a
.chart-wrapper
{
width
:
100%
;
height
:
600px
;
/* stylelint-disable-next-line selector-id-pattern */
#myChart
{
width
:
100%
;
height
:
100%
;
}
}
app_Web/src/components/common/pie-threed-echarts/pie-threed-echarts.tsx
0 → 100644
浏览文件 @
23938f3a
此差异已折叠。
点击以展开。
app_Web/src/components/views/tab-exp-view/tab-exp-view.scss
浏览文件 @
23938f3a
...
@@ -53,6 +53,8 @@
...
@@ -53,6 +53,8 @@
top
:
-50px
;
top
:
-50px
;
right
:
0
;
right
:
0
;
z-index
:
500
;
z-index
:
500
;
width
:
auto
;
background-color
:
transparent
;
border
:
0
;
border
:
0
;
.
#{
bem
(
'view-layout-header-content'
,
'caption'
)
}
{
.
#{
bem
(
'view-layout-header-content'
,
'caption'
)
}
{
display
:
none
;
display
:
none
;
...
...
app_Web/src/components/widgets/app-menu/app-menu.tsx
浏览文件 @
23938f3a
...
@@ -4,7 +4,11 @@ import {
...
@@ -4,7 +4,11 @@ import {
AppMenuItemModel
,
AppMenuItemModel
,
IPSAppMenuItem
,
IPSAppMenuItem
,
}
from
'@ibiz-template/model'
;
}
from
'@ibiz-template/model'
;
import
{
useAppMenuController
,
useNamespace
}
from
'@ibiz-template/vue-util'
;
import
{
useAppMenuController
,
useNamespace
,
useRouter
,
}
from
'@ibiz-template/vue-util'
;
import
{
import
{
defineComponent
,
defineComponent
,
getCurrentInstance
,
getCurrentInstance
,
...
@@ -176,12 +180,12 @@ export const AppMenu = defineComponent({
...
@@ -176,12 +180,12 @@ export const AppMenu = defineComponent({
menus
.
value
=
getMenus
(
c
.
model
.
items
);
menus
.
value
=
getMenus
(
c
.
model
.
items
);
});
});
let
menuClickDoing
=
false
;
let
cacheFullPath
=
''
;
const
onClick
=
async
(
key
:
string
)
=>
{
const
onClick
=
async
(
key
:
string
)
=>
{
menuClickDoing
=
true
;
cacheFullPath
=
proxy
.
$route
.
fullPath
;
await
c
.
onClickMenuItem
(
key
);
await
c
.
onClickMenuItem
(
key
);
menuClickDoing
=
false
;
cacheFullPath
=
''
;
};
};
const
ns
=
useNamespace
(
'app-menu'
);
const
ns
=
useNamespace
(
'app-menu'
);
...
@@ -197,15 +201,21 @@ export const AppMenu = defineComponent({
...
@@ -197,15 +201,21 @@ export const AppMenu = defineComponent({
},
500
);
},
500
);
};
};
const
router
=
useRouter
(
proxy
);
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
if
(
from
.
fullPath
===
cacheFullPath
)
{
emit
(
'menuRouteChange'
);
console
.
log
(
'菜单点击'
,
from
);
}
next
();
});
// 菜单选中回显,监听视图传进来的currentPath
// 菜单选中回显,监听视图传进来的currentPath
watch
(
watch
(
()
=>
props
.
currentPath
,
()
=>
props
.
currentPath
,
(
newVal
,
oldVal
)
=>
{
(
newVal
,
oldVal
)
=>
{
// 新旧值不一样,且新值不为空时变更
// 新旧值不一样,且新值不为空时变更
if
(
newVal
!==
oldVal
&&
newVal
)
{
if
(
newVal
!==
oldVal
&&
newVal
)
{
if
(
menuClickDoing
===
true
)
{
emit
(
'menuRouteChange'
);
}
const
findItem
=
c
.
model
.
allItems
.
find
(
item
=>
{
const
findItem
=
c
.
model
.
allItems
.
find
(
item
=>
{
return
item
.
viewModelPath
===
newVal
;
return
item
.
viewModelPath
===
newVal
;
});
});
...
...
app_Web/src/views/index-view/index-view.ts
浏览文件 @
23938f3a
...
@@ -66,6 +66,25 @@ export function useIndexRouteManage(
...
@@ -66,6 +66,25 @@ export function useIndexRouteManage(
});
});
};
};
// 监听当前的key,维护数据
watch
(
currentKey
,
(
newVal
,
oldVal
)
=>
{
if
(
newVal
!==
oldVal
&&
newVal
)
{
const
index
=
keyHistory
.
value
.
indexOf
(
newVal
);
// 历史记录里没有的新建信息,放入开头
if
(
index
===
-
1
)
{
keyHistory
.
value
.
unshift
(
newVal
);
}
else
{
// 已存在的调整顺序至开头
keyHistory
.
value
.
splice
(
index
,
1
);
keyHistory
.
value
.
unshift
(
newVal
);
}
}
},
{
immediate
:
true
},
);
// 监听路由
// 监听路由
watch
(
watch
(
()
=>
proxy
.
$route
.
path
,
()
=>
proxy
.
$route
.
path
,
...
@@ -98,25 +117,6 @@ export function useIndexRouteManage(
...
@@ -98,25 +117,6 @@ export function useIndexRouteManage(
{
deep
:
true
,
immediate
:
true
},
{
deep
:
true
,
immediate
:
true
},
);
);
// 监听当前的key,维护数据
watch
(
currentKey
,
(
newVal
,
oldVal
)
=>
{
if
(
newVal
!==
oldVal
&&
newVal
)
{
const
index
=
keyHistory
.
value
.
indexOf
(
newVal
);
// 历史记录里没有的新建信息,放入开头
if
(
index
===
-
1
)
{
keyHistory
.
value
.
unshift
(
newVal
);
}
else
{
// 已存在的调整顺序至开头
keyHistory
.
value
.
splice
(
index
,
1
);
keyHistory
.
value
.
unshift
(
newVal
);
}
}
},
{
immediate
:
true
},
);
/**
/**
* 更新路由信息
* 更新路由信息
*
*
...
...
app_Web/src/views/index-view/index-view.vue
浏览文件 @
23938f3a
<
script
setup
lang=
"ts"
>
<
script
setup
lang=
"ts"
>
import
{
ViewNeuron
}
from
'@ibiz-template/controller'
;
import
{
ViewNeuron
}
from
'@ibiz-template/controller'
;
import
{
useIndexViewController
}
from
'@ibiz-template/vue-util'
;
import
{
useIndexViewController
}
from
'@ibiz-template/vue-util'
;
import
{
computed
,
getCurrentInstance
,
onMounted
}
from
'vue'
;
import
{
computed
,
getCurrentInstance
,
onMounted
,
ref
}
from
'vue'
;
import
{
createUUID
}
from
'qx-util'
;
import
{
useIndexRouteManage
}
from
'./index-view'
;
import
{
useIndexRouteManage
}
from
'./index-view'
;
interface
IndexViewProps
{
interface
IndexViewProps
{
...
@@ -27,6 +28,8 @@ const {
...
@@ -27,6 +28,8 @@ const {
deleteRouteCache
,
deleteRouteCache
,
}
=
useIndexRouteManage
(
proxy
,
c
);
}
=
useIndexRouteManage
(
proxy
,
c
);
const
appKeepAliveKey
=
ref
(
createUUID
());
// 视图初始化,监听事件
// 视图初始化,监听事件
const
onCreated
=
(
neuron
:
ViewNeuron
)
=>
{
const
onCreated
=
(
neuron
:
ViewNeuron
)
=>
{
const
key
=
currentKey
.
value
;
const
key
=
currentKey
.
value
;
...
@@ -37,6 +40,7 @@ const onCreated = (neuron: ViewNeuron) => {
...
@@ -37,6 +40,7 @@ const onCreated = (neuron: ViewNeuron) => {
updateRouteMsg
(
key
,
{
caption
:
title
});
updateRouteMsg
(
key
,
{
caption
:
title
});
});
});
};
};
// dfsdfds
onMounted
(()
=>
{
onMounted
(()
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
@@ -57,7 +61,8 @@ const collapseChange = (collapse: boolean) => {
...
@@ -57,7 +61,8 @@ const collapseChange = (collapse: boolean) => {
};
};
const
onMenuRouteChange
=
()
=>
{
const
onMenuRouteChange
=
()
=>
{
deleteRouteCache
(
keyHistory
.
value
.
slice
(
1
));
deleteRouteCache
(
keyHistory
.
value
.
slice
(
0
));
appKeepAliveKey
.
value
=
createUUID
();
};
};
// 后退按钮触发事件,删除上一个路由的缓存
// 后退按钮触发事件,删除上一个路由的缓存
...
@@ -87,7 +92,7 @@ const currentPath = computed(() => {
...
@@ -87,7 +92,7 @@ const currentPath = computed(() => {
:collapse-change=
"c.collapseChange"
:collapse-change=
"c.collapseChange"
@
menuRouteChange=
"onMenuRouteChange"
@
menuRouteChange=
"onMenuRouteChange"
></AppMenu>
></AppMenu>
<AppKeepAlive
:key-list=
"keyHistory"
>
<AppKeepAlive
:key
=
"appKeepAliveKey"
:key
-list=
"keyHistory"
>
<router-view
<router-view
:key=
"currentKey"
:key=
"currentKey"
@
neuronInit=
"onCreated"
@
neuronInit=
"onCreated"
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @
23938f3a
...
@@ -1224,16 +1224,16 @@
...
@@ -1224,16 +1224,16 @@
"mOSFilePath"
:
"pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
,
"mOSFilePath"
:
"pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
,
"name"
:
"视图消息组2"
,
"name"
:
"视图消息组2"
,
"getPSAppViewMsgGroupDetails"
:
[
{
"getPSAppViewMsgGroupDetails"
:
[
{
"name"
:
"视图消息
2
"
,
"name"
:
"视图消息"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
3
"
"id"
:
"ViewMsg
2
"
}
}
},
{
},
{
"name"
:
"视图消息"
,
"name"
:
"视图消息
2
"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
2
"
"id"
:
"ViewMsg
3
"
}
}
}
],
}
],
"rTMOSFilePath"
:
"pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
"rTMOSFilePath"
:
"pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
23938f3a
...
@@ -2451,16 +2451,16 @@
...
@@ -2451,16 +2451,16 @@
"mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
"mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
"name" : "视图消息组2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息
2
",
"name" : "视图消息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
3
"
"id" : "ViewMsg
2
"
}
}
}, {
}, {
"name" : "视图消息",
"name" : "视图消息
2
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
2
"
"id" : "ViewMsg
3
"
}
}
} ],
} ],
"rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
"rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录