Commit Graph

1122 Commits

Author SHA1 Message Date
c3a8bbdb44 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-21 14:40:25 +08:00
f0cff34940 fix: 处理接口未返回newEToC、newCToE、newLineSeries时存在的问题,处理未销毁betaRefresh事件的问题 2024-02-21 14:38:22 +08:00
orgin
be621352bc Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy 2024-02-20 19:01:47 +08:00
orgin
2748cb167b Merge branch 'feature-Beta-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-Beta-dev-renpy 2024-02-20 18:22:00 +08:00
05c64441a7 feat: 增加修改关注台站后刷新Focus Data功能 2024-02-20 17:21:33 +08:00
69ca835d93 beta 新谱页面 result display 添加数据 2024-02-20 16:28:37 +08:00
9ff3cbf619 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-20 15:17:30 +08:00
f55ca0eb3b Data Receive status Monitoring 弹窗右侧图标提示框时间与后端返回不对应 2024-02-20 14:33:11 +08:00
829e870ec9 feat: Gamma的Spectrum弹窗增加phd:raw页 2024-02-20 10:41:45 +08:00
orgin
fadc2b0b8e Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-19 18:10:32 +08:00
d9b192cea1 fix: 增加对Country Code的非空校验 2024-02-19 17:25:27 +08:00
183bc52071 fix: 修复点击地图上的台站时,获取该台站的状态不正确的问题 2024-02-19 15:46:48 +08:00
6dbf6f99aa Analysis Monitor --- Avg Nuclide 页面,增加station 和 source type 搜索条件 2024-02-19 14:32:14 +08:00
d6ef68963b fix: 1、focus data中如果有排班任务,则高亮显示;2、Data Receive status Monitoring增加清理缓存功能 2024-02-19 14:09:20 +08:00
80c1f47996 ALARM -- Analysis Monitor --- Avg Nuclide 页面列表增加STATION 2024-02-19 10:06:45 +08:00
8c6ee232f4 用户信心下拉框增加用户名菜单展示 2024-02-18 16:11:20 +08:00
a76ec933f2 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-18 16:03:44 +08:00
2b04b7d7ba fix: Load From DB 来源切换时执行一次查询,Beta 谱 -> Energy Calibration弹窗增加获取类型为man的谱时对某些数据的回显 2024-02-18 12:01:04 +08:00
7995f08ccb 不加载gamma 谱,nuclide不显示二级菜单 2024-02-18 11:54:23 +08:00
26cc96b12d 修改密码弹窗中文改成英文 2024-02-18 11:20:36 +08:00
b0dbf4cc25 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-05 18:50:23 +08:00
aad8721800 服务器模块表格字段及取值字段调整 2024-02-05 18:46:48 +08:00
afc0d317ca Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-05 18:39:48 +08:00
c87c4ba6f7 log 模块的弹窗样式调整 2024-02-05 18:35:28 +08:00
fa04054986 bug 修改
新增错误消息弹窗显示
2024-02-05 17:42:56 +08:00
6cf0883b0a 字段取值有问题 2024-02-05 16:22:36 +08:00
73f7a943de Server Monitor、Database Monitor、Email Monitor 三个模块从 Overview 列表页双击进去 Instances 后,下拉框数据不对应 2024-02-05 14:53:15 +08:00
864ad75ce3 处理 Database Monitor 页面跳转后,下拉框不对应问题 2024-02-05 14:41:21 +08:00
3bc23ba09c Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-05 09:31:56 +08:00
d59fd9a75e 服务器模块中 SERVICE AND PROCESS table 增加滚动条 2024-02-05 09:31:34 +08:00
29a0d49043 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-04 11:48:37 +08:00
3c07b1bf8e 字段修改 2024-02-04 11:48:06 +08:00
7c2d03d7da Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-04 10:18:58 +08:00
fab7b4570c Database Monitor 列表字段调整 2024-02-04 10:13:54 +08:00
ed052e34e0 Merge branch 'master-dev' into feature-Beta-dev-renpy
# Conflicts:
#	src/style.less
2024-02-03 11:24:27 +08:00
165a05baf9 dataBase 服务器模块,处理五hostID 情况下的问题
增加错误提示功能
2024-02-03 11:22:34 +08:00
ca4d49f745 处理系统中table 表格中,表头尾部留白问题
处理表格表头不对其的问题
2024-02-01 17:34:30 +08:00
f16acfa7dd 处理系统中table 表格表头留白的问题,及表头与表格不对其的问题 2024-02-01 17:32:16 +08:00
3b8c23bc96 Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-02-01 11:05:52 +08:00
106725ac68 处理 服务器模块页面样式问题 2024-02-01 10:56:43 +08:00
b2fbac2f52 从交互分析页面跳转至统计页面,统计页面之前渲染的数据会被摧毁 2024-02-01 09:55:32 +08:00
ffa0fefdba Merge branch 'master-dev' into feature-Beta-dev-renpy 2024-01-31 15:32:04 +08:00
76e6916d33 请求地址 url 调整
Data Receive status Monitoring 中图表提示框调整
定时任务调整
2024-01-31 11:07:00 +08:00
4c0e48dd43 system 模块,quartz job 页面中新增弹窗调整 2024-01-30 17:44:44 +08:00
f09ca1e38a input 全局样式调整 2024-01-30 17:43:42 +08:00
1cef20422b 修改input 输入框的全局样式 2024-01-30 17:41:11 +08:00
736ee50711 system 模块,quartz job 页面中新增弹窗调整 2024-01-30 16:53:40 +08:00
781a4be8a1 合并代码冲突处理 2024-01-30 16:15:39 +08:00
a1ba381170 Merge branch 'master-dev' into feature-Beta-dev-renpy
# Conflicts:
#	src/views/stationOperation/components/MapMarker.vue
#	src/views/stationOperation/components/MapPane.vue
#	src/views/stationOperation/index.vue
2024-01-30 16:07:05 +08:00
7e8e82c9e1 删除无功能的按钮 2024-01-30 16:02:57 +08:00