-
-
-
-
@@ -92,6 +99,17 @@
function bindTableToolbarFunction(){
}
+
+
+ function closeShowDataMessage() {
+
+ }
+
+ let socket;
+
+ let newIndexShade;
+
+
layui.use(['form', 'table', 'upload'], function () {
var $ = layui.jquery,
form = layui.form,
@@ -245,27 +263,98 @@
exts: 'xls|xlsx|csv',
done: function (res) {
//如果上传成功
- if (res.code == 200) {
+ if (res.code === 200) {
var re = "";
for (let i = 0; i < res.data.errMsg.length; i++) {
var show = "
" + res.data.errMsg[i] + "：错误" + "
";
re += show
}
+ console.log(res.data.dataList.length);
for (let i = 0; i < res.data.dataList.length; i++) {
var tname = res.data.dataList[i]["tname"];
var id = res.data.dataList[i]["oldId"];
var parentId = res.data.dataList[i]["parentId"] == null ? "" : res.data.dataList[i]["parentId"];
var introduce = res.data.dataList[i]["introduce"] == null ? "" : res.data.dataList[i]["introduce"];
- var show = "
" + tname + " " + id + " " + parentId + "成功" + "
";
+ var show = "
" + tname + " " + id + " " + parentId + "通过" + "
";
re += show
}
- layer.open({
- type: 1,
- skin: 'layui-layer-rim', //加上边框
- area: ['500px', '500px'], //宽高
- content: re
- })
+ 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;
+ }
+
+ }
+
+ newIndexShade = layer.open({
+ type: 1
+ , title: false //不显示标题栏
+ , closeBtn: false
+ , area: ['500px', '500px']
+ , shade: 0.8
+ , id: 'LAY_layuipro' //设定一个id，防止重复弹出
+ , resize: false
+ , btn: ['导入', '取消']
+ , btnAlign: 'c'
+ , moveType: 1 //拖拽模式，0或者1
+ , content: re
+ , yes: function (index, layero) {
+ //按钮【按钮一】的回调
+ $.ajax({
+ url:"/excel/realImportMaterialType",
+ type: "post",
+ data: JSON.stringify({"result":"yes"}),
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success:function () {
+ if (socket !== null) {
+ socket.close();
+ }
+ layer.msg("数据导入完成", {
+ icon: 0,
+ time: 1000
+ })
+ }
+ });
+
+ }
+ , btn2: function (index, layero) {
+ //按钮【按钮二】的回调
+ $.ajax({
+ url:"/excel/realImportMaterialType",
+ type: "post",
+ data: JSON.stringify({"result":"no"}),
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function () {
+ if (socket !== null) {
+ socket.close();
+ }
+ }
+ })
+ }
+ });
+
+
+
} else {
layer.msg(res.msg)
}
@@ -281,6 +370,36 @@
});
}
+ 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 () {
+ $("#layui-layer-shade-x"+newIndexShade).remove();
+ $("#showImportData").hide();
+ $("#showImportData").empty();
+ if (socket !== null) {
+ socket.close();
+ }
+ };
//监听表格复选框选择
table.on('checkbox(currentTableFilter)', function (obj) {
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
index d91b220e..98d10177 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
@@ -65,9 +65,15 @@ public class TestForOther {
// approvalInfo.setApprover(approver);
// depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"599076aa8e931b27af7935eb69db4243","2","202303290034", false,2);
// depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009");
-// UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null);
+ UserByPort userByPort = LinkInterfaceUtil.FindUserById(76, null);
// List
s = excelService.writeExcelForPrint(2, 4,userByPort);
// GetMonthStartAndEnd();
+
+// List departmentHeadByUser = LinkInterfaceUtil.findDepartmentHeadByUser(userByPort);
+// System.out.println(departmentHeadByUser);
+ System.out.println(userByPort);
+ List a = new ArrayList<>();
+ List list = Collections.synchronizedList(a);
}
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index 147cb08c..a646d1ec 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -652,6 +652,13 @@
FROM material m WHERE m.id =#{id}
+
+
+
' + (e && 2 != r.type ? "" : u) + '
' + (0 == r.type && r.icon !== -1 ? '' : "") + (1 == r.type && e ? "" : r.content || "") + '
' + function () {
+ var e = c ? '' : "";
+ return r.closeBtn && (e += ''), e
+ }() + "" + (r.btn ? function () {
+ var e = "";
+ "string" == typeof r.btn && (r.btn = [r.btn]);
+ for (var t = 0, i = r.btn.length; t < i; t++) e += '
' + r.btn[t] + "";
+ return '
' + e + "
"
+ }() : "") + (r.resize ? '
' : "") + "