Bladeren bron

新增html流程图渲染

zdd 3 jaren geleden
bovenliggende
commit
f5d91fd9c3
2 gewijzigde bestanden met toevoegingen van 16 en 14 verwijderingen
  1. 2 2
      src/main/resources/application-dev.yml
  2. 14 12
      src/main/resources/static/diagram-viewer/index.html

+ 2 - 2
src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
 spring:
   #数据源配置
   datasource:
-    url: jdbc:mysql://47.108.115.128:3306/airposrt_activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.16.90.64:3306/airposrt_activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
     username: root
-    password: zdd755
+    password: 123456
     type: com.alibaba.druid.pool.DruidDataSource
     #freemarker模板配置
     freemarker:

+ 14 - 12
src/main/resources/static/diagram-viewer/index.html

@@ -107,21 +107,23 @@
 
     var baseUrl = window.document.location.protocol + "//" + window.document.location.host + "/";
     var shortenedUrl = window.document.location.href.replace(baseUrl, "");
-    baseUrl = baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/"));
-
-    // ActivitiRest.options = {
-    //   processInstanceHighLightsUrl: baseUrl + "/trace/process-instance/{processInstanceId}/highlights?callback=?",
-    //   processDefini
-    //      tionUrl: baseUrl + "/trace/process-definition/{processDefinitionId}/diagram-layout?callback=?",
-    //   processDefin7itionByKeyUrl: baseUrl + "/trace/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
-    // };
-
+    baseUrl= baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/"));
+    var apiurl =window.document.location.protocol + "//" + window.document.location.host;
+    console.log(apiurl);
     ActivitiRest.options = {
-      processInstanceHighLightsUrl:  "http://172.16.90.11:8081/activiti/process-instance/{processInstanceId}/highlights?callback=?",
-      processDefinitionUrl: "http://172.16.90.11:8081/activiti/process-definition/{processDefinitionId}/diagram-layout?callback=?",
-      processDefinitionByKeyUrl: "http://172.16.90.11:8081/activiti/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
+      processInstanceHighLightsUrl: apiurl + "/activiti/process-instance/{processInstanceId}/highlights?callback=?",
+      processDefinitionUrl: apiurl + "/activiti/process-definition/{processDefinitionId}/diagram-layout?callback=?",
+      processDefinitionByKeyUrl: apiurl + "/activiti/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
     };
 
+
+    // ActivitiRest.options = {
+    //   processInstanceHighLightsUrl:  "http://172.16.90.136:11375/activiti/process-instance/{processInstanceId}/highlights?callback=?",
+    //   processDefinitionUrl: "http://172.16.90.136:11375/activiti/process-definition/{processDefinitionId}/diagram-layout?callback=?",
+    //   processDefinitionByKeyUrl: "http://172.16.90.136:11375/activiti/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
+    // };
+    var json = JSON.stringify(ActivitiRest.options);
+    console.log(json);
     if (processDefinitionId) {
       ProcessDiagramGenerator.drawDiagram(processDefinitionId);