操作日志修改

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -865,7 +865,7 @@ public class SubInfoController extends BaseController {
     }
 
     @GetMapping("editSubInfo2")
-    @Log("用户点击项目信息编辑按钮，编辑项目信息")
+    // @Log("页面：【项目编辑页】,执行操作：查询")
     public ModelAndView editSubInfo2(String subId, ModelMap model, String queryType) {
         model.put("id", subId);
 
@@ -1158,7 +1158,7 @@ public class SubInfoController extends BaseController {
         return begin + "~" + end;
     }
 
-    @Log("用户查看项目详细信息")
+    @Log("页面：【项目详情页】,执行操作：查询")
     @GetMapping("detailView2")
     public ModelAndView viewDetail(Model model, String subId, String lastUrl, Boolean layer, String queryYear, Boolean isCt) {
         // Map<String, Object> subInfo = subInfoService.getSubInfoById(subId, queryYear);

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -879,7 +879,7 @@ public class SubInfoExportController extends BaseController {
      */
     @PostMapping("/exportDetailExcel")
     public void exportDetailExcel(@RequestBody SubInfoQueryTzVO queryVO) {
-        WebLogAspect.content.set(String.format("用户点击项目四库管理%s导出明细", StringUtils.isBlank(queryVO.getStatus()) ? "项目总库" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
+        WebLogAspect.content.set(String.format("页面：【项目四库管理-%s库】,执行操作：导出明细", StringUtils.isBlank(queryVO.getStatus()) ? "项目总" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
         queryVO.setSubjectAuthIds(getSubjectIds());
         List<SubInfoGxj> list = subInfoQueryService.queryAll(getCurUser().getLoginUser(), queryVO);
         // 行业字典
@@ -1120,8 +1120,8 @@ public class SubInfoExportController extends BaseController {
     @PostMapping("/exportTotalExcelByStatus")
     @Log("4库导出总表")
     public void exportTotalExcelByStatus(@RequestBody SubInfoQueryTzVO vo) {
-        WebLogAspect.content.set(String.format("用户点击项目四库管理%s导出总表",
-                StringUtils.isBlank(vo.getStatus()) ? "项目总库" : SubInfoStatusEnum.getDesc(vo.getStatus())));
+        WebLogAspect.content.set(String.format("页面：【项目四库管理-%s库】,执行操作：导出汇总",
+                StringUtils.isBlank(vo.getStatus()) ? "项目总" : SubInfoStatusEnum.getDesc(vo.getStatus())));
         vo.setSubjectAuthIds(getSubjectIds());
         // 查询数据以及字典
         List<SubInfoTotalExcel> list = subInfoService.exportTotalExcelByStatus(vo);

projects/src/main/java/com/rtrh/projects/web/controller/subject/WorkBenchTwoController.java

@@ -78,7 +78,7 @@ public class WorkBenchTwoController extends BaseController {
 	 * @param model
 	 * @return
 	 */
-	@Log("用户查看工作台")
+	@Log("页面：【工作台】,执行操作：查询")
 	@GetMapping(value = "/zrWorkBench")
 	public ModelAndView zrWorkBench(ModelMap model) {
 		Map<String, Object> map = workBenchService.statisticData();

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -386,6 +386,7 @@ public class SubInfoApiController extends BaseController {
      * @return
      */
     @PostMapping(value = "/getById")
+    @Log("页面：【项目编辑页】,执行操作：查询")
     public Message getById(@RequestBody SubInfoJsonGetVO getVO) {
         Message message = new Message();
         try {
@@ -770,7 +771,7 @@ public class SubInfoApiController extends BaseController {
      * @return
      */
     @PostMapping("saveEditSubInfo")
-    @Log("保存项目信息")
+    @Log("页面：【项目编辑页】,执行操作：保存项目信息")
     public Message saveEditSubInfo(@RequestBody EditSubInfoGxjDataVO vo) {
         Message message = new Message();
         try {
@@ -1316,7 +1317,7 @@ public class SubInfoApiController extends BaseController {
     @PostMapping(value = "/moveDb")
     @Log("移入")
     public Message moveDb(@RequestBody MoveDbParamVo vo) {
-        WebLogAspect.content.set(String.format("用户点击项目四库管理移入%s库",
+        WebLogAspect.content.set(String.format("页面：【项目四库管理-%s库】,执行操作：移入",
                 StringUtils.isBlank(vo.getStatus()) ? "项目总" : SubInfoStatusEnum.getDesc(vo.getStatus())));
         Message message = new Message();
         try {

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -272,7 +272,7 @@ public class SubInfoQueryApiController extends BaseController {
     @PostMapping("queryPage")
     @Log("分页查询")
     public ListMessage queryPage(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
-        WebLogAspect.content.set(String.format("用户点击项目四库管理%s分页查询", StringUtils.isBlank(queryVO.getStatus()) ? "项目总库" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
+        WebLogAspect.content.set(String.format("页面：【项目四库管理-%s库】,执行操作：查询", StringUtils.isBlank(queryVO.getStatus()) ? "项目总" : SubInfoStatusEnum.getDesc(queryVO.getStatus())));
         queryVO.setSubjectAuthIds(getSubjectIds());
         ListMessage message = new ListMessage();
         try {

projects/src/main/webapp/vmodules/graphic/list.jsp

@@ -182,6 +182,9 @@ new Vue({
 				data:xmlx
 			});
 			this.getData();
+
+			window.addEventListener('message', this.receiveMessage, false);
+			window.parent.postMessage('init loaded')
 			window.toDetail = this.toDetail;
 			window.showImage = this.showImage;
 		},
@@ -299,6 +302,12 @@ new Vue({
 			var param = layui.form.getValue("searchForm");
 			this.pageNo = 1;
 			this.getData();
+		},
+		receiveMessage (e) {
+			console.log('cb receiveMessage: ', e.data)
+			if (e.data.topBreadcrumb) {
+				$(".top-breadcrumb").html(e.data.topBreadcrumb)
+			}
 		}
 	}
 });