xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng

Browse Source
This commit is contained in:
Rue Ji
2026-02-02 23:52:52 +08:00
parent 5133e4f983 8d3cca18d9
commit 79a8fc11cf
18 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/jsp/maintenance/libraryFaultBiz4Tree.jsp
View File

@ -101,7 +101,7 @@
$.post(ext.contextPath + '/maintenance/libraryFaultBloc/doInit.do', {unitId: unitId}, function (data) {
if (data.code == '1') {
showAlert('s', data.msg, 'mainAlertdiv');
// refreshPage('/SIPAIIS_WMS/maintenance/libraryFaultBloc/showList4TreeBiz.do')
// refreshPage('/TGLW/maintenance/libraryFaultBloc/showList4TreeBiz.do')
location.reload();
} else {
showAlert('d', data.msg, 'mainAlertdiv');

2
src/main/webapp/jsp/register.jsp
View File

@ -39,7 +39,7 @@
//微信授权注册
var companyid=$('#pid').val();
//console.info(companyid);
$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=SIPAIIS_WMS'+'&companyid='+companyid);
$("#btn_wechat").attr('href','http://wx.sipaiis.com/wxAuth/wxLogin?systemFlag=TGLW'+'&companyid='+companyid);
//输入框验证
$("#subForm").bootstrapValidator({

26
src/main/webapp/jsp/robot.jsp
View File

@ -106,8 +106,8 @@
// function getJobList(){
// $.ajax({
// type: 'get',
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// dataType: JSON,
// async: true,
// success: function(data) {
@ -191,8 +191,8 @@
$.ajax({
type: 'get',
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskStart.do?type=1&taskId=" + taskId,
// url: "http://10.197.50.126:8081/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
url: "http://10.194.10.125:8088/TGLW/robot/taskStart.do?type=1&taskId=" + taskId,
dataType: JSON,
async: true,
success: function (data) {
@ -253,14 +253,14 @@
function getJobList2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table9').bootstrapTable('destroy');
$("#table9").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/getJobList.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -389,14 +389,14 @@
function getJobListTYPE_2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table11').bootstrapTable('destroy');
$("#table11").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobListTYPE_2.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/getJobListTYPE_2.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -484,7 +484,7 @@
// function getJobList() {
// $("#table").bootstrapTable({ // 对应table标签的id
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
// contentType: null,
// cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
// striped: true, //表格显示条纹，默认为false
@ -648,8 +648,8 @@
openModal("robotsubModal")
$('#table10').bootstrapTable('destroy');
$("#table10").bootstrapTable({ // 对应table标签的id
// url: "http://10.197.50.126:8081/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
// url: "http://10.197.50.126:8081/TGLW/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false

14
src/main/webapp/jsp/robot2.jsp
View File

@ -105,8 +105,8 @@
// function getJobList(){
// $.ajax({
// type: 'get',
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do",
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// // url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do",
// dataType: JSON,
// async: true,
// success: function(data) {
@ -251,13 +251,13 @@
function getJobList2() {
// $.post("http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $.post("http://10.194.10.125:8088/TGLW/robot/getJobList.do", {id: hiddenUnitId}, function (data) {
// $('#mptableTop').css('display', 'block');
// $('#singleBizDivTop').css('display', 'none');
$('#table9').bootstrapTable('destroy');
$("#table9").bootstrapTable({ // 对应table标签的id
url: "http://10.194.10.125:8088/SIPAIIS_WMS/ro2/getList", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/ro2/getList", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@ -368,7 +368,7 @@
// function getJobList() {
// $("#table").bootstrapTable({ // 对应table标签的id
// url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/getJobList.do", // 获取表格数据的url
// url: "http://10.194.10.125:8088/TGLW/robot/getJobList.do", // 获取表格数据的url
// contentType: null,
// cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
// striped: true, //表格显示条纹，默认为false
@ -533,7 +533,7 @@
/* $.ajax({
type: 'get',
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do?jobId=" + jobId,
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do?jobId=" + jobId,
dataType: JSON,
async: true,
success: function (data) {
@ -651,7 +651,7 @@
$('#table10').bootstrapTable('destroy');
$("#table10").bootstrapTable({ // 对应table标签的id
url: "http://10.194.10.125:8088/SIPAIIS_WMS/robot/taskResult.do", // 获取表格数据的url
url: "http://10.194.10.125:8088/TGLW/robot/taskResult.do", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false

2
src/main/webapp/jsp/top.jsp
View File

@ -779,7 +779,7 @@
width: 150,
height: 150,
//text: "http://www.baidu.com"
text: "http://127.0.0.1:8080/SIPAIIS_WMS/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
text: "http://127.0.0.1:8080/TGLW/app/downLoadAPP.do?&path=D:\\Tomcat 7.0\\webapps\\SIPAIIS_WMS_APK&ng=''"
}); */
}

2
src/main/webapp/jsp/visual/material.jsp
View File

@ -1522,7 +1522,7 @@
<div style="margin-left: 36%;">
<%--<div class="div8_out">
<div id="chart_div_16" style="width:100%; height: 100%;"></div>
</div>D:\workspace\SIPAIIS_WMS\WebRoot\IMG\model\battery.png
</div>D:\workspace\TGLW\WebRoot\IMG\model\battery.png
<div class="div8_out">
<div id="chart_div_17" style="width:100%; height: 100%;"></div>
</div>--%>

2
src/main/webapp/jsp/work/materialDeployOverview.jsp
View File

@ -265,7 +265,7 @@
window.onresize = function(){
var biz_id = '?biz_id='+unitId;
console.log("+biz_id"+biz_id);
refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
}
//物资

2
src/main/webapp/jsp/work/materverview.jsp
View File

@ -23,7 +23,7 @@
$(function(){
var biz_id = '?biz_id='+unitId;
console.log("+biz_id"+biz_id);
refreshPage('/SIPAIIS_WMS/work/mpoint/showlistOverview.do'+biz_id);
refreshPage('/TGLW/work/mpoint/showlistOverview.do'+biz_id);
});
</script>