Activity forgon-ssts-v4.1.0/ssts-web

3:53 下午

jason

More
41041
changed 10 files
root:

解决jira问题：ZSRY-60 新增【设备巡检】功能(4.3 新增设备巡检提醒功能)

- -0
- +252
./src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManagerTest.java
- History
- Source
./src/.../EquipmentInspectionDefManagerTest.java
- -0
- +21
./src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/timer.xml
- History
- Source
- Diff
./src/main/webapp/.../spring/timer.xml
- -0
- +16
./src/test/java/test/forgon/disinfectsystem/equipmentinspection/AllTests.java
- History
- Source
./src/test/.../equipmentinspection/AllTests.java
./src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition
- History
- Source
./src/test/java/.../equipmentinspection/definition
- -17
- +113
./src/main/java/com/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManagerImpl.java
- History
- Source
- Diff
./src/.../EquipmentInspectionDefManagerImpl.java
./src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition/service
- History
- Source
./src/test/java/.../definition/service
- -1
- +2
./src/test/java/test/forgon/disinfectsystem/AllTests.java
- History
- Source
- Diff
./src/test/.../disinfectsystem/AllTests.java
./src/test/java/test/forgon/disinfectsystem/equipmentinspection
- History
- Source
./src/test/.../disinfectsystem/equipmentinspection
- -0
- +5
./src/main/java/com/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManager.java
- History
- Source
- Diff
./src/.../EquipmentInspectionDefManager.java
… 1 more file in changeset.

1:57 下午

zc.li

More
41040
changed 2 files
root:

代码回滚

- -5
- +4
./src/test/java/test/forgon/AllTests.java
- History
- Source
- Diff
./src/test/java/test/forgon/AllTests.java
- -3
- +1
./src/test/java/test/forgon/directory/AllTests.java
- History
- Source
- Diff
./src/test/java/.../directory/AllTests.java

10:53 上午

zc.li

More
41039
changed 2 files
root:

暂时注释大部分测试

- -1
- +3
./src/test/java/test/forgon/directory/AllTests.java
- History
- Source
- Diff
./src/test/java/.../directory/AllTests.java
- -4
- +5
./src/test/java/test/forgon/AllTests.java
- History
- Source
- Diff
./src/test/java/test/forgon/AllTests.java

7:24 下午

terry.kwan

More
41038
changed 1 file
root:

恢复到上一版本的demo项目的config.js配置

- -82
- +43
./src/main/webapp/disinfectsystem/config/demo/config.js
- History
- Source
- Diff
./src/main/webapp/.../config/demo/config.js

4:52 下午

frank.qiu

More
41035
changed 1 file
root:

解决了 GZSZYY-122 - 【设备维护信息】【不良事件表单】【质量监测记录】新增质量监测记录自定义修改权限模式和增加全局修改权限模式

- -2
- +2
./src/main/resources/systemset/operationDefine.xml
- History
- Source
- Diff
./src/main/.../systemset/operationDefine.xml

4:22 下午

frank.qiu

More
41033
changed 11 files
root:

解决了 GZSZYY-122 - 【设备维护信息】【不良事件表单】【质量监测记录】新增质量监测记录自定义修改权限模式和增加全局修改权限模式

- -0
- +8
./src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
- History
- Source
- Diff
./src/main/.../routineMonitoringView.jsp
- -0
- +8
./src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp
- History
- Source
- Diff
./src/.../deviceMaintenanceCostomInsView.jsp
- -2
- +2
./src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
- History
- Source
- Diff
./src/main/.../routineMonitoringForm.js
- too large
./src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
- History
- Source
- Diff
./src/.../qualitymonitoringInstanceForm.js
- -0
- +2
./src/main/webapp/disinfectsystem/config/gzszyy/config.js
- History
- Source
- Diff
./src/main/webapp/.../config/gzszyy/config.js
- -1
- +4
./src/main/resources/systemset/operationDefine.xml
- History
- Source
- Diff
./src/main/.../systemset/operationDefine.xml
- -0
- +8
./src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
- History
- Source
- Diff
./src/.../qualitymonitoringInstanceView.jsp
- too large
./src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
- History
- Source
- Diff
./src/main/.../supplyRoomTypeForm.js
- -1
- +1
./src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
- History
- Source
- Diff
./src/.../deviceMaintenanceCostomInsForm.js
- -1
- +1
./src/main/webapp/disinfectsystem/customform/forminstanceForm.js
- History
- Source
- Diff
./src/main/.../customform/forminstanceForm.js
- -0
- +8
./src/main/webapp/disinfectsystem/customform/forminstanceView.jsp
- History
- Source
- Diff
./src/main/.../customform/forminstanceView.jsp

3:39 下午

frank.qiu

More
41032
changed 1 file
root:

解决了 GZSZYY-122 - 【质量监测记录】新增质量监测记录自定义修改权限模式和增加全局修改权限模式

- -2
- +11
./src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
- History
- Source
- Diff
./src/main/.../routineMonitoringForm.js

3:06 下午

frank.qiu

More
41031
changed 4 files
root:

解决了 GZSZYY-122 - 【质量监测记录】新增质量监测记录自定义修改权限模式和增加全局修改权限模式

- too large
./src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
- History
- Source
- Diff
./src/.../qualitymonitoringInstanceForm.js
- -0
- +4
./src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
- History
- Source
- Diff
./src/.../qualitymonitoringInstanceView.jsp
- -0
- +6
./src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
- History
- Source
- Diff
./src/main/.../routineMonitoringForm.js
- -0
- +7
./src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
- History
- Source
- Diff
./src/main/.../routineMonitoringView.jsp

2:36 下午

frank.qiu

More
41029
changed 1 file
root:

解决了 GZSZYY-122 - 【质量监测记录】新增质量监测记录自定义修改权限模式和增加全局修改权限模式

- too large
./src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
- History
- Source
- Diff
./src/main/.../supplyRoomTypeForm.js

11:17 上午

frank.qiu

More
41028
changed 1 file
root:

解决了 ZSWY-272 - 【科室申请】和【发货管理】的打印模版允许设置打印行数

- too large
./src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
- History
- Source
- Diff
./src/main/webapp/.../print/printConfig.js

11:10 上午

zc.li

More
41027
changed 1 file
root:

测试用例完善

- -3
- +6
./src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerForCheckCleanTypeTest.java
- History
- Source
- Diff
./src/.../RecyclingRecordManagerForCheckCleanTypeTest.java

5:30 下午

frank.qiu

More
41025
changed 4 files
root:

解决了 ZSYKEQ-8 - 【接口管理】增加适配机器视觉识别器械SN序列号

- -1
- +1
./src/main/webapp/disinfectsystem/websocket/websocketClient.js
- History
- Source
- Diff
./src/main/.../websocket/websocketClient.js
- too large
./src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./src/main/webapp/.../packing/packingView.js
- -1
- +1
./src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
- History
- Source
- Diff
./src/main/.../recycle/awaitForRecycleList.js
- too large
./src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./src/main/.../recycleForTouchScreen.js

5:08 下午

frank.qiu

More
41024
updated 2 files
root:

解决了 ZSYKEQ-8 - 【接口管理】增加适配机器视觉识别器械SN序列号

- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/enableSNCode_1.png
- History
- Source
- Diff
./src/main/.../images/enableSNCode_1.png
- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/disabledSNCode_1.png
- History
- Source
- Diff
./src/main/.../images/disabledSNCode_1.png

4:43 下午

frank.qiu

More
41023
changed 3 files
root:

解决了 ZSYKEQ-8 - 【接口管理】增加适配机器视觉识别器械SN序列号

- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/disabledSNCode_1.png
- History
- Source
./src/main/webapp/.../images/disabledSNCode_1.png
- -2
- +2
./src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
- History
- Source
- Diff
./src/main/.../recycleForTouchScreen.jsp
- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/enableSNCode_1.png
- History
- Source
./src/main/webapp/.../images/enableSNCode_1.png

4:40 下午

frank.qiu

More
41022
changed 10 files
root:

解决了 ZSYKEQ-8 - 【接口管理】增加适配机器视觉识别器械SN序列号

- -0
- +19
./src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
- History
- Source
- Diff
./src/main/.../recycleForTouchScreen.jsp
- -0
- +2
./src/main/webapp/disinfectsystem/config/zsykzx/config.js
- History
- Source
- Diff
./src/main/webapp/.../config/zsykzx/config.js
- too large
./src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./src/main/webapp/.../packing/packingView.js
- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/disabledSNCode.png
- History
- Source
./src/main/webapp/.../images/disabledSNCode.png
- -0
- +1
./src/main/webapp/disinfectsystem/packing/packingView.jsp
- History
- Source
- Diff
./src/main/webapp/.../packing/packingView.jsp
- -0
- +9
./src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
- History
- Source
- Diff
./src/main/.../recycle/awaitForRecycleList.jsp
- -0
- +36
./src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
- History
- Source
- Diff
./src/main/.../recycle/awaitForRecycleList.js
- -8
- +10
./src/main/webapp/disinfectsystem/websocket/websocketClient.js
- History
- Source
- Diff
./src/main/.../websocket/websocketClient.js
- binary
./src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/enableSNCode.png
- History
- Source
./src/main/webapp/.../1980/images/enableSNCode.png
- too large
./src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./src/main/.../recycleForTouchScreen.js

4:37 下午

frank.qiu

More
41021
changed 1 file
root:

解决了 DGSFYBJY-100 - 【物品绑定】设置主次物品绑定后，通过新建回收单回收主物品，次物品的申请比例不正确。

- too large
./src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./src/main/.../recycleForTouchScreen.js

11:33 上午

frank.qiu

More
41018
changed 1 file
root:

解决了 ZSYKEQ-8 - 【接口管理】增加适配机器视觉识别器械SN序列号

- -2
- +8
./src/main/webapp/disinfectsystem/websocket/websocketClient.js
- History
- Source
- Diff
./src/main/.../websocket/websocketClient.js

4:36 下午

frank.qiu

More
41017
changed 1 file
root:

解决了 BJDXZLYY-74 - 【设备接口】清洗记录和灭菌记录增加参数图确认功能

- -0
- +1
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js
- History
- Source
- Diff
./src/main/.../sterilizerLineChartOfCommon.js

3:48 下午

frank.qiu

More
41016
changed 2 files
root:

解决了 BJDXZLYY-74 - 【设备接口】清洗记录和灭菌记录增加参数图确认功能

- -330
- +320
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
- History
- Source
- Diff
./src/main/.../sterilizationRecordView.js
- -0
- +13
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
- History
- Source
- Diff
./src/main/.../washAndDisinfectView.js

2:09 下午

frank.qiu

More
41015
changed 1 file
root:

解决了 BJDXZLYY-74 - 【设备接口】清洗记录和灭菌记录增加参数图确认功能

- -1
- +1
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
- History
- Source
- Diff
./src/main/.../washDataLineChart.jsp

10:39 上午

frank.qiu

More
41013
changed 1 file
root:

解决了 GDSFYBJY-38 - 【外部代理灭菌】界面排版问题导致器械包添加按钮不能正常显示

- -133
- +237
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
- History
- Source
- Diff
./src/main/.../foreignProxyDisinfectionView.js

5:57 下午

frank.qiu

More
41012
changed 10 files
root:

解决了 BJDXZLYY-74 - 【设备接口】清洗记录和灭菌记录增加参数图确认功能

- -10
- +17
./src/main/webapp/js/commonUtils.js
- History
- Source
- Diff
./src/main/webapp/js/commonUtils.js
- -2
- +3
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
- History
- Source
- Diff
./src/main/.../washAndDisinfectView.js
- -0
- +2
./src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
- History
- Source
- Diff
./src/main/webapp/.../bjdxzlyy/config.js
- -5
- +304
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js
- History
- Source
- Diff
./src/main/.../sterilizerLineChartOfCommon.js
- -6
- +19
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp
- History
- Source
- Diff
./src/main/.../sterilizerLineChartOfCommon.jsp
- -117
- +0
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGETING_WD500.jsp
- History
- Source
- Diff
./src/main/.../washDataChartOfGETING_WD500.jsp
- -15
- +3
./src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
- History
- Source
- Diff
./src/main/.../sterilizationRecordView.js
- -3
- +91
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js
- History
- Source
- Diff
./src/main/.../washDataChartOfCommon.js
- -180
- +298
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
- History
- Source
- Diff
./src/main/.../washDataLineChart.jsp
- -8
- +19
./src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp
- History
- Source
- Diff
./src/main/.../washDataChartOfCommon.jsp

5:55 下午

frank.qiu

More
41011
changed 1 file
root:

解决了 FSEYEQ-22 - 新增报表消毒供应中心护理质量质控指标

- -1
- +1
./src/main/webapp/ext/js/multiSelectCombo.js
- History
- Source
- Diff
./src/main/webapp/.../js/multiSelectCombo.js

5:53 下午

frank.qiu

More
41010
changed 1 file
root:

解决了 GDSFYBJY-39 - 【科室快速回收】新增多项改进(汇总行的申请回收数量显示为总数并支持联动调整，可以通过单击调整篮筐，进入快速回收页面默认弹窗)

- -0
- +1
./src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js
- History
- Source
- Diff
./src/main/.../expressRecycleForTouchScreen.js

11:54 上午

jason

More
41002
changed 3 files
root:

解决jira问题：QHRSGZZYY-21【接口管理】“使用记录登记服务接口”服务地址合并到"器械包信息查询服务接口"服务中

- -0
- +11
./src/main/webapp/disinfectsystem/config/qhrsgzzyy/spring/webservice-cxf.xml
- History
- Source
- Diff
./src/main/.../spring/webservice-cxf.xml
… 2 more files in changeset.

11:39 上午

linnansheng

More
41001
changed 2 files
root:

selenium3提交：优化质量监测的自动化测试用例，增加等待时间

- -2
- +5
./src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java
- History
- Source
- Diff
./src/test/.../QualityMonitoringProxy.java
- -5
- +10
./src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java
- History
- Source
- Diff
./src/test/.../TestQualityMonitoring.java

11:38 上午

terry.kwan

More
41000
changed 1 file
root:

提交产品演示的配置文件

- -43
- +82
./src/main/webapp/disinfectsystem/config/demo/config.js
- History
- Source
- Diff
./src/main/webapp/.../config/demo/config.js

10:03 上午

linnansheng

More
40999
changed 1 file
root:

selenium3提交：优化自动化测试灭菌模块的用例

- -1
- +3
./src/test/java/test/forgon/disinfectsystem/selenium3/page/sterilize/SterilizeProxy.java
- History
- Source
- Diff
./src/test/.../sterilize/SterilizeProxy.java

7:05 下午

linnansheng

More
40998
changed 1 file
root:

selenium3提交：优化灭菌的自动化测试用例，增加等待时间

- -0
- +2
./src/test/java/test/forgon/disinfectsystem/selenium3/page/sterilize/SterilizeProxy.java
- History
- Source
- Diff
./src/test/.../sterilize/SterilizeProxy.java

6:12 下午

frank.qiu

More
40997
changed 1 file
root:

解决了 GDSFYBJY-39 - 【科室快速回收】新增多项改进(汇总行的申请回收数量显示为总数并支持联动调整，可以通过单击调整篮筐，进入快速回收页面默认弹窗)

- -5
- +6
./src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js
- History
- Source
- Diff
./src/main/.../expressRecycleForTouchScreen.js

ssts-web

Line History

Stats

Commits this week: 37

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

zc.li

zc.li

terry.kwan

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

zc.li

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

jason

linnansheng

terry.kwan

linnansheng

linnansheng

frank.qiu