diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index 6bb91297..95635306 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -8,6 +8,7 @@ +
@@ -522,6 +523,25 @@ // this never happens break; } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var code = jsonObject[i]["code"] === null ? '' : jsonObject[i]["code"]; + var mname = jsonObject[i]["mname"]; + var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"]; + var quantity = jsonObject[i]["quantity"]; + var show = "

" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "

"; + re += show + } + $("#showImportData").append(re); + }); } @@ -548,10 +568,20 @@ success: function () { if (socket !== null) { socket.close(); + }else{ + layer.close(index); } - layer.msg("数据导入完成", { + layer.alert("数据导入完成", { icon: 0, time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/material/findInventory', + page: { + curr: 1 + } + }, 'data'); }) } @@ -593,25 +623,7 @@ } - socket.addEventListener('message', function (event) { - layer.close(newIndexShade); - let shadeItem = '
'; - if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { - $('body').append(shadeItem); - } - let jsonObject = JSON.parse(event.data); - let re = ""; - $("#showImportData").show(); - for (let i = 0; i < jsonObject.length; i++) { - var code = jsonObject[i]["code"] === null ? '' : jsonObject[i]["code"]; - var mname = jsonObject[i]["mname"]; - var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"]; - var quantity = jsonObject[i]["quantity"]; - var show = "

" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "

"; - re += show - } - $("#showImportData").append(re); - }); + closeShowDataMessage = function () { diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html index a493ca06..bb9d7498 100644 --- a/src/main/resources/templates/pages/material/material-out.html +++ b/src/main/resources/templates/pages/material/material-out.html @@ -304,6 +304,28 @@ // this never happens break; } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var mname = jsonObject[i]["mname"]; + var code = jsonObject[i]["code"] == null || jsonObject[i]["code"] === undefined ? "" : jsonObject[i]["code"]; + var version = jsonObject[i]["version"] == null || jsonObject[i]["version"] === undefined ? "" : jsonObject[i]["version"]; + var texture = jsonObject[i]["texture"] == null || jsonObject[i]["texture"] === undefined ? "" : jsonObject[i]["texture"]; + var unit = jsonObject[i]["unit"] == null || jsonObject[i]["unit"] === undefined ? "" : jsonObject[i]["unit"]; + var typeId = jsonObject[i]["typeId"] == null || jsonObject[i]["typeId"] === undefined ? "" : jsonObject[i]["typeId"]; + var show = "

" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "

"; + re += show; + + } + $("#showImportData").append(re); + }); } @@ -330,10 +352,20 @@ success: function () { if (socket !== null) { socket.close(); + }else{ + layer.close(index); } - layer.msg("数据导入完成", { + layer.alert("数据导入完成", { icon: 0, time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/material/material', + page: { + curr: 1 + }, + }, 'data'); }) } }); @@ -373,28 +405,7 @@ }); } - socket.addEventListener('message', function (event) { - layer.close(newIndexShade); - let shadeItem = '
'; - if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { - $('body').append(shadeItem); - } - let jsonObject = JSON.parse(event.data); - let re = ""; - $("#showImportData").show(); - for (let i = 0; i < jsonObject.length; i++) { - var mname = jsonObject[i]["mname"]; - var code = jsonObject[i]["code"] == null || jsonObject[i]["code"] === undefined ? "" : jsonObject[i]["code"]; - var version = jsonObject[i]["version"] == null || jsonObject[i]["version"] === undefined ? "" : jsonObject[i]["version"]; - var texture = jsonObject[i]["texture"] == null || jsonObject[i]["texture"] === undefined ? "" : jsonObject[i]["texture"]; - var unit = jsonObject[i]["unit"] == null || jsonObject[i]["unit"] === undefined ? "" : jsonObject[i]["unit"]; - var typeId = jsonObject[i]["typeId"] == null || jsonObject[i]["typeId"] === undefined ? "" : jsonObject[i]["typeId"]; - var show = "

" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "

"; - re += show; - } - $("#showImportData").append(re); - }); closeShowDataMessage = function () { diff --git a/src/main/resources/templates/pages/materialtype/materialType_view.html b/src/main/resources/templates/pages/materialtype/materialType_view.html index 940f46c1..0c36fd16 100644 --- a/src/main/resources/templates/pages/materialtype/materialType_view.html +++ b/src/main/resources/templates/pages/materialtype/materialType_view.html @@ -8,6 +8,7 @@ +
@@ -301,6 +302,26 @@ // this never happens break; } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var tname = jsonObject[i]["tname"]; + var id = jsonObject[i]["oldId"]; + var parentId = jsonObject[i]["parentId"] == null ? "" : jsonObject[i]["parentId"]; + var introduce = jsonObject[i]["introduce"] == null ? "" : jsonObject[i]["introduce"]; + var show = "

" + tname + " " + id + " " + parentId + "成功" + "

"; + re += show + + } + $("#showImportData").append(re); + }); } @@ -327,10 +348,22 @@ success:function () { if (socket !== null) { socket.close(); + }else{ + layer.close(index); } - layer.msg("数据导入完成", { + layer.alert("数据导入完成", { icon: 0, time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/materialType/materialTypeRecord', + page: { + curr: 1 + }, + where: {"parentId": parentId} + }); + }) } }); @@ -370,26 +403,7 @@ }); } - socket.addEventListener('message', function (event) { - layer.close(newIndexShade); - let shadeItem = '
'; - if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { - $('body').append(shadeItem); - } - let jsonObject = JSON.parse(event.data); - let re = ""; - $("#showImportData").show(); - for (let i = 0; i < jsonObject.length; i++) { - var tname = jsonObject[i]["tname"]; - var id = jsonObject[i]["oldId"]; - var parentId = jsonObject[i]["parentId"] == null ? "" : jsonObject[i]["parentId"]; - var introduce = jsonObject[i]["introduce"] == null ? "" : jsonObject[i]["introduce"]; - var show = "

" + tname + " " + id + " " + parentId + "成功" + "

"; - re += show - } - $("#showImportData").append(re); - }); closeShowDataMessage = function () { diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html index 4e311652..95635306 100644 --- a/target/classes/templates/pages/depository/table-stock.html +++ b/target/classes/templates/pages/depository/table-stock.html @@ -8,6 +8,7 @@ +
@@ -83,6 +84,13 @@ + +
@@ -99,6 +107,16 @@ } + function closeShowDataMessage() { + + } + + let socket; + + let newIndexShade; + + + layui.use(['form', 'table', 'upload'], function () { var $ = layui.jquery, form = layui.form, @@ -483,7 +501,51 @@ re += show } - layer.open({ + if ("WebSocket" in window) { + socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450'); + switch (socket.readyState) { + case WebSocket.CONNECTING: + // 连接中 + socket.onopen = function () { + console.log("连接成功") + }; + break; + case WebSocket.OPEN: + // 连接成功 + break; + case WebSocket.CLOSING: + // 连接正在关闭。 + break; + case WebSocket.CLOSED: + // 连接关闭。 + break; + default: + // this never happens + break; + } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var code = jsonObject[i]["code"] === null ? '' : jsonObject[i]["code"]; + var mname = jsonObject[i]["mname"]; + var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"]; + var quantity = jsonObject[i]["quantity"]; + var show = "

" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "

"; + re += show + } + $("#showImportData").append(re); + }); + + } + + newIndexShade = layer.open({ type: 1 , title: false //不显示标题栏 , closeBtn: false @@ -502,9 +564,28 @@ type: "post", data: JSON.stringify({"result":"yes"}), dataType: "json", - contentType: "application/json;charset=utf-8" + contentType: "application/json;charset=utf-8", + success: function () { + if (socket !== null) { + socket.close(); + }else{ + layer.close(index); + } + layer.alert("数据导入完成", { + icon: 0, + time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/material/findInventory', + page: { + curr: 1 + } + }, 'data'); + }) + } + }); - layer.close(index);//关闭当前页 } , btn2: function (index, layero) { @@ -514,10 +595,17 @@ type: "post", data: JSON.stringify({"result":"no"}), dataType: "json", - contentType: "application/json;charset=utf-8" + contentType: "application/json;charset=utf-8", + success: function () { + if (socket !== null) { + socket.close(); + } + } }) } }); + + } else { layer.msg(res.msg) } @@ -534,6 +622,19 @@ }) } + + + + + closeShowDataMessage = function () { + $("#layui-layer-shade-x"+newIndexShade).remove(); + $("#showImportData").hide(); + $("#showImportData").empty(); + if (socket !== null) { + socket.close(); + } + }; + }); diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html index a493ca06..bb9d7498 100644 --- a/target/classes/templates/pages/material/material-out.html +++ b/target/classes/templates/pages/material/material-out.html @@ -304,6 +304,28 @@ // this never happens break; } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var mname = jsonObject[i]["mname"]; + var code = jsonObject[i]["code"] == null || jsonObject[i]["code"] === undefined ? "" : jsonObject[i]["code"]; + var version = jsonObject[i]["version"] == null || jsonObject[i]["version"] === undefined ? "" : jsonObject[i]["version"]; + var texture = jsonObject[i]["texture"] == null || jsonObject[i]["texture"] === undefined ? "" : jsonObject[i]["texture"]; + var unit = jsonObject[i]["unit"] == null || jsonObject[i]["unit"] === undefined ? "" : jsonObject[i]["unit"]; + var typeId = jsonObject[i]["typeId"] == null || jsonObject[i]["typeId"] === undefined ? "" : jsonObject[i]["typeId"]; + var show = "

" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "

"; + re += show; + + } + $("#showImportData").append(re); + }); } @@ -330,10 +352,20 @@ success: function () { if (socket !== null) { socket.close(); + }else{ + layer.close(index); } - layer.msg("数据导入完成", { + layer.alert("数据导入完成", { icon: 0, time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/material/material', + page: { + curr: 1 + }, + }, 'data'); }) } }); @@ -373,28 +405,7 @@ }); } - socket.addEventListener('message', function (event) { - layer.close(newIndexShade); - let shadeItem = '
'; - if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { - $('body').append(shadeItem); - } - let jsonObject = JSON.parse(event.data); - let re = ""; - $("#showImportData").show(); - for (let i = 0; i < jsonObject.length; i++) { - var mname = jsonObject[i]["mname"]; - var code = jsonObject[i]["code"] == null || jsonObject[i]["code"] === undefined ? "" : jsonObject[i]["code"]; - var version = jsonObject[i]["version"] == null || jsonObject[i]["version"] === undefined ? "" : jsonObject[i]["version"]; - var texture = jsonObject[i]["texture"] == null || jsonObject[i]["texture"] === undefined ? "" : jsonObject[i]["texture"]; - var unit = jsonObject[i]["unit"] == null || jsonObject[i]["unit"] === undefined ? "" : jsonObject[i]["unit"]; - var typeId = jsonObject[i]["typeId"] == null || jsonObject[i]["typeId"] === undefined ? "" : jsonObject[i]["typeId"]; - var show = "

" + mname + " " + version + " " + code + " " + texture + " " + unit + " " + typeId + " ：成功" + "

"; - re += show; - } - $("#showImportData").append(re); - }); closeShowDataMessage = function () { diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html index 940f46c1..0c36fd16 100644 --- a/target/classes/templates/pages/materialtype/materialType_view.html +++ b/target/classes/templates/pages/materialtype/materialType_view.html @@ -8,6 +8,7 @@ +
@@ -301,6 +302,26 @@ // this never happens break; } + socket.addEventListener('message', function (event) { + layer.close(newIndexShade); + let shadeItem = '
'; + if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { + $('body').append(shadeItem); + } + let jsonObject = JSON.parse(event.data); + let re = ""; + $("#showImportData").show(); + for (let i = 0; i < jsonObject.length; i++) { + var tname = jsonObject[i]["tname"]; + var id = jsonObject[i]["oldId"]; + var parentId = jsonObject[i]["parentId"] == null ? "" : jsonObject[i]["parentId"]; + var introduce = jsonObject[i]["introduce"] == null ? "" : jsonObject[i]["introduce"]; + var show = "

" + tname + " " + id + " " + parentId + "成功" + "

"; + re += show + + } + $("#showImportData").append(re); + }); } @@ -327,10 +348,22 @@ success:function () { if (socket !== null) { socket.close(); + }else{ + layer.close(index); } - layer.msg("数据导入完成", { + layer.alert("数据导入完成", { icon: 0, time: 1000 + },function () { + closeShowDataMessage(); + table.reload('currentTableId', { + url: '/materialType/materialTypeRecord', + page: { + curr: 1 + }, + where: {"parentId": parentId} + }); + }) } }); @@ -370,26 +403,7 @@ }); } - socket.addEventListener('message', function (event) { - layer.close(newIndexShade); - let shadeItem = '
'; - if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { - $('body').append(shadeItem); - } - let jsonObject = JSON.parse(event.data); - let re = ""; - $("#showImportData").show(); - for (let i = 0; i < jsonObject.length; i++) { - var tname = jsonObject[i]["tname"]; - var id = jsonObject[i]["oldId"]; - var parentId = jsonObject[i]["parentId"] == null ? "" : jsonObject[i]["parentId"]; - var introduce = jsonObject[i]["introduce"] == null ? "" : jsonObject[i]["introduce"]; - var show = "

" + tname + " " + id + " " + parentId + "成功" + "

"; - re += show - } - $("#showImportData").append(re); - }); closeShowDataMessage = function () {