From f7359e4c48b19293798798f8226463519bcdd659 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 19 十二月 2024 11:08:56 +0800
Subject: [PATCH] 优化AGV工作处理及上报逻辑
---
src/main/webapp/static/js/appVersion/appVersion.js | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/appVersion/appVersion.js b/src/main/webapp/static/js/appVersion/appVersion.js
index d036a0e..db58cec 100644
--- a/src/main/webapp/static/js/appVersion/appVersion.js
+++ b/src/main/webapp/static/js/appVersion/appVersion.js
@@ -1,4 +1,5 @@
var pageCurr;
+var odtotr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin','upload'], function(){
@@ -135,6 +136,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(appVersion)', function(obj){
var data = obj.data;
+ odtotr = data
switch (obj.event) {
case 'edit':
showEditModel(data);
@@ -177,7 +179,37 @@
parent.location.reload()
})
}else{
- window.open(baseUrl + "/appVersion/downloadApp/" + data.path);
+ var ipAddress = '';
+ $.ajax({
+ url: baseUrl+"/appVersion/downloadApp/getIp",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: function (res) {
+ ipAddress = res.data
+ admin.open({
+ type: 1,
+ area: '400px',
+ title: 'APP涓嬭浇',
+ content:
+ `<div>
+ <img class="template-code"
+ src="${baseUrl}/mac/code/auth?type=2¶m=${ipAddress}/${baseUrl}/appVersion/downloadApp/${data.path}"
+ width="100%">
+ </div>
+ <div style="height: 50px;display: flex;align-items: center;justify-content: center">
+ <button class="layui-btn layui-btn-sm" lay-event="down" onclick="download()">涓嬭浇鍒版湰鍦�</button>
+ </div>`,
+ success: function (layero, dIndex) {
+
+ }
+ })
+ }
+ })
+
+ // window.open(baseUrl + "/appVersion/downloadApp/" + data.path);
}
break;
}
@@ -292,3 +324,10 @@
page: {curr: pageCurr}
});
}
+
+function download() {
+ console.log(1)
+ layer.closeAll();
+ window.open(baseUrl + "/appVersion/downloadApp/" + odtotr.path);
+}
+
--
Gitblit v1.9.1