Skip to content

H
hiip
Commit b4d3ee7d authored by helwen's avatar helwen
Browse files
Options

修改枝江项目

parent 7fac35e0
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 100 deletions
hiip-admin/src/main/resources/config/deda/dev/jeesite.properties
View file @ b4d3ee7d
......@@ -8,8 +8,9 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//192.168.1.133:1521//HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......@@ -143,4 +144,4 @@ activiti.form.server.url=
#rhapsodyƽ̨ߵز
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://127.0.0.1:8444/
\ No newline at end of file
bus.rhapsody.url=https://172.22.156.118:8444/
\ No newline at end of file
hiip-admin/src/main/resources/config/deda/pro/jeesite.properties
View file @ b4d3ee7d
......@@ -20,7 +20,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=hiip
......@@ -145,4 +146,4 @@ activiti.form.server.url=
#rhapsodyƽ̨ߵز
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://192.188.90.137:8444/
bus.rhapsody.url=https://172.22.156.118:8444/
hiip-admin/src/main/resources/jeesite.properties
View file @ b4d3ee7d
......@@ -11,8 +11,8 @@
jdbc.type=oracle
jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
#jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
......@@ -143,4 +143,4 @@ activiti.form.server.url=
#rhapsodyƽ̨ߵز
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://192.188.90.137:8444/
\ No newline at end of file
bus.rhapsody.url=https://172.22.156.118:8444/
\ No newline at end of file
hiip-cdalib/resources/config/deda/dev/jeesite.properties
View file @ b4d3ee7d
......@@ -8,9 +8,10 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//47.100.64.197:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
#jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=1qaz@WSX
jdbc.password=hiip
# Local
#jdbc.url=jdbc:oracle:thin:@localhost:1521:xe
......
hiip-cdalib/resources/config/deda/pro/jeesite.properties
View file @ b4d3ee7d
......@@ -11,9 +11,10 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
#jdbc.username=HIIP
#jdbc.password=1qaz@WSX
jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=Zaq12wsx
jdbc.password=hiip
# Local
#jdbc.url=jdbc:oracle:thin:@localhost:1521:xe
......
hiip-cdalib/src/main/resources/jeesite.properties
View file @ b4d3ee7d
......@@ -11,7 +11,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
#jdbc.username=HIIP
#jdbc.password=1qaz@WSX
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......
hiip-cdalib/src/main/resources/log4j.properties
View file @ b4d3ee7d
......@@ -8,7 +8,7 @@ log4j.appender.Console.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#RollingFile
log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.RollingFile.File=../logs/jeesite/jeesite.log
log4j.appender.RollingFile.File=/opt/logs/hiip-cdalib/jeesite.log
log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout
log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
......
hiip-empi/src/main/resouces/jeesite.properties → hiip-empi/src/main/resources/jeesite.properties
View file @ b4d3ee7d
......@@ -14,7 +14,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......
hiip-empi/src/main/resouces/log4j.properties → hiip-empi/src/main/resources/log4j.properties
View file @ b4d3ee7d
......@@ -8,7 +8,7 @@ log4j.appender.Console.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#RollingFile
log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.RollingFile.File=../logs/jeesite/jeesite.log
log4j.appender.RollingFile.File=/opt/logs/hiip-empi/jeesite.log
log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout
log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
......
hiip-monitor/src/main/resources/config/dev/jeesite.properties
View file @ b4d3ee7d
......@@ -9,7 +9,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......@@ -161,7 +162,7 @@ queue_manager_port=2414
#rhapsody平台总线的相关参数
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://192.188.90.137:8444/
bus.rhapsody.url=https://172.22.156.118:8444/
#查询主索引数量接口地址
#empi.core.main.index=http://10.10.10.111:8083/
......
hiip-monitor/src/main/resources/config/pro/jeesite.properties
View file @ b4d3ee7d
......@@ -14,7 +14,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=hiip
......@@ -166,7 +167,7 @@ queue_manager_port=2414
#rhapsody平台总线的相关参数
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://192.188.90.137:8444/
bus.rhapsody.url=https://172.22.156.118:8444/
#查询主索引数量接口地址
empi.core.main.index=http://192.188.90.100:8080/
\ No newline at end of file
hiip-monitor/src/main/resources/jeesite.properties
View file @ b4d3ee7d
......@@ -12,7 +12,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.username=HIIP
#jdbc.password=1qaz@WSX
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......@@ -163,7 +164,7 @@ queue_manager_port=2414
#rhapsody平台总线的相关参数
bus.rhapsody.username=api_user
bus.rhapsody.password=1
bus.rhapsody.url=https://192.188.90.137:8444/
bus.rhapsody.url=https://172.22.156.118:8444/
#查询主索引数量接口地址
#empi.core.main.index=http://10.10.10.111:8083/
empi.core.main.index=http://192.188.90.100:8080/
\ No newline at end of file
hiip-portal/resources/config/deda/dev/jeesite.properties
View file @ b4d3ee7d
jdbc.type=oracle
jdbc.driver=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
#jdbc.url=jdbc:oracle:thin:@//192.168.1.133:1521/HIIP
......
hiip-portal/resources/config/deda/pro/jeesite.properties
View file @ b4d3ee7d
......@@ -10,7 +10,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=hiip
#local
......
hiip-portal/src/main/java/com/thinkgem/jeesite/modules/home/ws/WorkflowServiceClient.java
View file @ b4d3ee7d
......@@ -74,9 +74,10 @@ public class WorkflowServiceClient {
result.put("toDoWorkflowList", toDoWorkflowList);
result.put("totalCount", totalCount);
result.put("oaWorkflowTodoUrl", this.oaWorkflowTodoUrl);
logger.info("查询OA待办事项列表成功====");
} catch (Exception var21) {
result = null;
this.logger.error(var21.getMessage());
this.logger.error("查询OA待办事项列表出现问题："+var21.getMessage());
}
return result;
......
hiip-portal/src/main/webapp/home/js/home.js
View file @ b4d3ee7d
......@@ -217,76 +217,77 @@ function getOaWorkFlowList(pageNum, pageSize) {
if (res.success) {
var data = res.datas;
// 总件数
var totalNum = data.totalCount;
// 总页数
var totalPage = 0;
if (totalNum/pageSize > parseInt(totalNum/pageSize)) {
totalPage = parseInt(totalNum/pageSize) + 1;
} else {
totalPage = parseInt(totalNum/pageSize);
}
if(data) {
// 总件数
var totalNum = data.totalCount;
// 总页数
var totalPage = 0;
if (totalNum / pageSize > parseInt(totalNum / pageSize)) {
totalPage = parseInt(totalNum / pageSize) + 1;
} else {
totalPage = parseInt(totalNum / pageSize);
}
// 分页栏
var newoptions = {
currentPage: pageNum,
totalPages : totalPage, //总页数
size : "normal",
alignment : "center",
bootstrapMajorVersion: 3,
itemTexts : function(type, page ,current) {
switch (type) {
case "first":
return "<<";
case "prev":
return "<";
case "next":
return ">";
case "last":
return ">>";
case "page":
return page;
// 分页栏
var newoptions = {
currentPage: pageNum,
totalPages: totalPage, //总页数
size: "normal",
alignment: "center",
bootstrapMajorVersion: 3,
itemTexts: function (type, page, current) {
switch (type) {
case "first":
return "<<";
case "prev":
return "<";
case "next":
return ">";
case "last":
return ">>";
case "page":
return page;
}
},
onPageClicked: function (e, originalEvent, type, page) {
getOaWorkFlowList(page, pageSize);
}
},
onPageClicked : function(e,originalEvent, type, page) {
getOaWorkFlowList(page, pageSize);
};
if (totalNum > 0) {
// 重新设置OA待办事项分页栏
$('#toDoWorkflowPage').bootstrapPaginator("setOptions", newoptions);
}
};
if (totalNum > 0) {
// 重新设置OA待办事项分页栏
$('#toDoWorkflowPage').bootstrapPaginator("setOptions", newoptions);
}
// 待办事项详情跳转地址
// http://toa.yczxyy.com:20080/login/ssologin.jsp?uid=[UID]&token=[TOKEN]&gopage=/workflow/request/ViewRequest.jsp?requestid=[REQUESTID]
var oaWorkflowTodoUrl = data.oaWorkflowTodoUrl;
// 待办事项列表
var dataList = data.toDoWorkflowList;
// 清空OA待办事项列表
$('#toDoWorkflowList').empty();
var html = "";
if (dataList.length > 0) {
$.each(dataList, function(index, value) {
var requestId = value.requestId;
var requestUrl = oaWorkflowTodoUrl;
requestUrl = requestUrl.replace("[UID]", global_userUniqueId);
requestUrl = requestUrl.replace("[TOKEN]", global_token);
requestUrl = requestUrl.replace("[REQUESTID]", requestId);
html += "<li ><a href='" + requestUrl + "' target='_blank'>";
html += "<div class='oa_workflow_content'>";
html += "<p style='text-align:left'><span style='margin-left:5px;'>" + value.requestName + "</span></p>";
html += "</div></a></li>";
});
// OA待办事项列表
$('#toDoWorkflowList').append(html);
} else {
// OA待办事项列表
$('#toDoWorkflowList').append("<li><a><p style='text-align:center'><span>查询无数据</span></p></a></li>");
// 待办事项详情跳转地址
// http://toa.yczxyy.com:20080/login/ssologin.jsp?uid=[UID]&token=[TOKEN]&gopage=/workflow/request/ViewRequest.jsp?requestid=[REQUESTID]
var oaWorkflowTodoUrl = data.oaWorkflowTodoUrl;
// 待办事项列表
var dataList = data.toDoWorkflowList;
// 清空OA待办事项列表
$('#toDoWorkflowList').empty();
var html = "";
if (dataList.length > 0) {
$.each(dataList, function (index, value) {
var requestId = value.requestId;
var requestUrl = oaWorkflowTodoUrl;
requestUrl = requestUrl.replace("[UID]", global_userUniqueId);
requestUrl = requestUrl.replace("[TOKEN]", global_token);
requestUrl = requestUrl.replace("[REQUESTID]", requestId);
html += "<li ><a href='" + requestUrl + "' target='_blank'>";
html += "<div class='oa_workflow_content'>";
html += "<p style='text-align:left'><span style='margin-left:5px;'>" + value.requestName + "</span></p>";
html += "</div></a></li>";
});
// OA待办事项列表
$('#toDoWorkflowList').append(html);
} else {
// OA待办事项列表
$('#toDoWorkflowList').append("<li><a><p style='text-align:center'><span>查询无数据</span></p></a></li>");
}
}
} else {
toastr.error(res.description + '！');
}
......
hiip-portal/src/main/webapp/js/config/deda/dev/constant.js
View file @ b4d3ee7d
......@@ -25,12 +25,12 @@ var UPV_INTRANET_URL = "http://47.100.64.197:8080";
// 自定义资源路径
var BI_ADDRESS = "http://47.104.168.199:8080";
//var EMPI_ADDRESS = "http://47.104.168.199:8080";
var EMPI_ADDRESS = "http://127.0.0.1:8080";
var EMPI_ADDRESS = "http://172.22.156.2:8080";
//var ADMIN_ADDRESS = "http://47.104.168.199:8080";
var ADMIN_ADDRESS = "http://127.0.0.1:8080";
var ADMIN_ADDRESS = "http://172.22.156.2:8080";
var PORTAL_ADDRESS = "http://47.104.168.199:8080";
//var UPV_ADDRESS = "http://47.104.168.199:8080";
var UPV_ADDRESS = "http://127.0.0.1:8080";
var UPV_ADDRESS = "http://172.22.156.2:8080";
// nginx
//var BI_ADDRESS = "http://192.168.9.187";
......
hiip-portal/src/main/webapp/js/config/deda/pro/constant.js
View file @ b4d3ee7d
......@@ -32,9 +32,9 @@ var UPV_INTRANET_URL = "http://47.100.64.197:8080";
// nginx
var BI_ADDRESS = "http://192.168.9.187";
//var EMPI_ADDRESS = "http://192.168.9.187";
var EMPI_ADDRESS = "http://127.0.0.1:8080";
var EMPI_ADDRESS = "http://172.22.156.2:8080";
//var ADMIN_ADDRESS = "http://192.168.9.187";
var ADMIN_ADDRESS = "http://127.0.0.1:8080";
var ADMIN_ADDRESS = "http://172.22.156.2:8080";
var PORTAL_ADDRESS = "http://192.168.9.187";
//var UPV_ADDRESS = "http://192.168.9.178:8080";
var UPV_ADDRESS = "http://127.0.0.1:8080";
var UPV_ADDRESS = "http://172.22.156.2:8080";
hiip-upv/src/main/resources/config/deda/dev/jeesite.properties
View file @ b4d3ee7d
......@@ -15,7 +15,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//47.95.218.98:1521/Hetai
#jdbc.username=HIIP
#jdbc.password=1qaz@WSX
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......
hiip-upv/src/main/resources/config/deda/pro/jeesite.properties
View file @ b4d3ee7d
......@@ -15,7 +15,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
#jdbc.url=jdbc:oracle:thin:@//192.188.90.139:1521/orcl
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=HIIP
jdbc.password=hiip
......
hiip-upv/src/main/resources/jeesite.properties
View file @ b4d3ee7d
......@@ -15,7 +15,8 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@//hiip.yczxyy.com:1521/HIIP
#jdbc.username=HIIP
#jdbc.password=Zaq12wsx
jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
#jdbc.url=jdbc:oracle:thin:@//10.10.10.112:1521/orcl11g
jdbc.url=jdbc:oracle:thin:@//172.22.156.20:1521/orcl11g
jdbc.username=hiip
jdbc.password=hiip
......
hiip-upv/src/main/resources/log4j.properties
View file @ b4d3ee7d
......@@ -8,7 +8,7 @@ log4j.appender.Console.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#RollingFile
log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
log4j.appender.RollingFile.File=../logs/jeesite/jeesite.log
log4j.appender.RollingFile.File=/opt/logs/hiip-upv/jeesite.log
log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout
log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
......
hiip-upv/src/main/webapp/ehr/js/index_overview.js
View file @ b4d3ee7d
var baseUrl = "http://localhost:8070/hiip-upv/";//"http://10.10.18.167:8080/hiip-upv";//"http://192.168.9.178:8080/hiip-upv";//"http://10.10.19.71:8080/hiip-upv";
var baseUrl = "http://172.22.156.2:8080/hiip-upv/";//"http://10.10.18.167:8080/hiip-upv";//"http://192.168.9.178:8080/hiip-upv";//"http://10.10.19.71:8080/hiip-upv";
var baseDate;
var seletedDate, showDates, showTimes;
var dpId, patientId, patientIdNum, uid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment