From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level2AddOrUpdate.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level2AddOrUpdate.java b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
index 4c154c0..6bedfa1 100644
--- a/src/main/java/com/example/client/service/Level2AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
@@ -9,6 +9,8 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.service.*;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
@@ -115,10 +117,10 @@
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("del", "鍒犻櫎"));
- columnDto.add(new ColumnDto("搴忓彿", "", 50, "autoCreate", false, null,null));
+ columnDto.add(new ColumnDto("搴忓彿", "", 50, "autoCreate", true, null,null));
//columnDto.add(new ColumnDto("宸ョ▼涓撲笟", "majorName", 180, null, false, null,null));
- columnDto.add(new ColumnDto("鑺傜偣鍚嶇О", "ProcessName", 160, null, false, null,null));
- columnDto.add(new ColumnDto("瑕佹眰瀹屾垚鏃堕棿", "requiredCompletionTime", 120, null, false, null,null));
+ columnDto.add(new ColumnDto("鑺傜偣鍚嶇О", "ProcessName", 160, null, true, null,null));
+ columnDto.add(new ColumnDto("瑕佹眰瀹屾垚鏃堕棿", "requiredCompletionTime", 120, "selectDate", true, null,null));
columnDto.add(new ColumnDto("鎿嶄綔", "", 85, "", true, buttonList,null));
JTable subTable = CommonTable.createCommonTable(list, columnDto);
@@ -168,11 +170,11 @@
mxGraph graph = new mxGraph();
DjJdgzNetworkLevel2 djJdgzNetworkLevel2 = level2Service.get(data.getId());
- graph = netWorkDiagramService.getCsDiagram(graph,djJdgzNetworkLevel2.getContent(),null,diagram.getWidth(),diagram.getHeight());
+ graph = netWorkDiagramService.getCsDiagram(graph,djJdgzNetworkLevel2.getContent(),null,diagram.getWidth(),diagram.getHeight(),null);
mxGraphComponent graphComponent = new mxGraphComponent(graph);
graphComponent.setConnectable(false);
graphComponent.setDragEnabled(false);
- graphComponent.zoomTo(2, true);
+ graphComponent.zoomTo(1, true);
diagram.add(graphComponent);
mxGraph finalGraph = graph;
@@ -202,8 +204,18 @@
btnSave.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
+ if (user==null){
+ JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ if (subTable.isEditing()) {
+ subTable.getCellEditor().stopCellEditing();
+ }
CommonTable.saveTableList(list,subTable,columnDto);
level2ListService.save(list,data.getId(),diagram, finalGraph);
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+
}
});
--
Gitblit v1.9.1