修改提交
This commit is contained in:
parent
1e60c7e3e3
commit
02d20b4552
|
|
@ -111,8 +111,8 @@
|
|||
<button class="layui-btn layui-export" permission="sys:dev:exp" ><i class="layui-icon layui-icon-download-circle"></i>导出</button>
|
||||
<button id="downloadExcel" class="layui-btn " permission="sys:dev:add" ><i class="layui-icon layui-icon-template-1"></i>模板下载</button>
|
||||
<button class="layui-btn layui-import" permission="sys:dev:add" ><i class="layui-icon layui-icon-export"></i>导入</button>
|
||||
<button class="layui-btn layui-refresh" permission="sys:dev:refresh" ><i class="layui-icon layui-icon-refresh"></i>刷新状态</button>
|
||||
<button class="layui-btn layui-cz" permission="sys:dev:refresh" ><i class="layui-icon layui-icon-refresh"></i>重置状态</button>
|
||||
<button style="display: none;" class="layui-btn layui-refresh" permission="sys:dev:refresh" ><i class="layui-icon layui-icon-refresh" ></i>刷新状态</button>
|
||||
<button style="display: none;" class="layui-btn layui-cz" permission="sys:dev:refresh" ><i class="layui-icon layui-icon-refresh"></i>重置状态</button>
|
||||
<input type="file" id="import-excel" name="image" style="display: none;"/>
|
||||
<table class="layui-hide" id="device-table" lay-filter="device-table"></table>
|
||||
<div id="voi-page" class="layout"></div>
|
||||
|
|
|
|||
|
|
@ -64,8 +64,38 @@ layui.use(['layer', 'form', 'element','laypage'], function(){
|
|||
exportData();
|
||||
})
|
||||
$("#downloadExcel").click(function(){
|
||||
window.open(dataUrl + 'proteam/pot/device/downloadExcel' + '?token=' + token);
|
||||
downLoadExcelModel();
|
||||
})
|
||||
|
||||
/*模板下载*/
|
||||
function downLoadExcelModel() {
|
||||
let loadingMsg = layer.msg('模板下载中,请稍候...', {icon: 16, scrollbar: false, time: 0});
|
||||
let url = dataUrl + 'proteam/pot/device/downloadExcel' + '?token=' + token
|
||||
let xhr = new XMLHttpRequest();
|
||||
xhr.open("get", url, true);
|
||||
xhr.responseType = "blob"; // 转换流
|
||||
xhr.setRequestHeader("encrypt",
|
||||
sm3(JSON.stringify({})));
|
||||
xhr.setRequestHeader('encryption','encryption');
|
||||
xhr.setRequestHeader('token',token);
|
||||
xhr.onload = function () {
|
||||
layer.close(loadingMsg); // 关闭提示层
|
||||
if (this.status === 200) {
|
||||
let blob = this.response;
|
||||
var a = document.createElement("a");
|
||||
var url = window.URL.createObjectURL(blob);
|
||||
a.href = url;
|
||||
a.download = "设备导入模板.xlsx"; // 文件名
|
||||
} else {
|
||||
layer.msg('服务异常，请稍后重试', {icon: 16, scrollbar: false, time: 2000});
|
||||
}
|
||||
a.click()
|
||||
window.URL.revokeObjectURL(url)
|
||||
};
|
||||
xhr.send();
|
||||
}
|
||||
|
||||
|
||||
$(".layui-import").click(function(){
|
||||
$("#import-excel").trigger('click');
|
||||
})
|
||||
|
|
@ -94,6 +124,8 @@ layui.use(['layer', 'form', 'element','laypage'], function(){
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
$("#query").off().click(function(){
|
||||
if(/^[a-zA-Z0-9\u4e80-\u9fa5\\s-]+$/.test($("#deviceName").val()) || ""==$("#deviceName").val()){
|
||||
|
|
|
|||
|
|
@ -142,7 +142,6 @@ function pages(pageNum, pageSize) {
|
|||
url: dataUrl + 'proteam/pot/newPro/getProList?token=' + token,
|
||||
data: params,
|
||||
type: 'POST',
|
||||
async: false,
|
||||
success: function (result) {
|
||||
if (result.code === 200) {
|
||||
console.log(result);
|
||||
|
|
@ -399,9 +398,7 @@ function viewData(data) {
|
|||
function getOrgSelect() {
|
||||
let keys = [];
|
||||
$.ajax({
|
||||
headers: {
|
||||
"encrypt": sm3(JSON.stringify({}))
|
||||
},
|
||||
|
||||
url: dataUrl + 'proteam/pot/team/getOrgSelected' + '?token=' + token,
|
||||
type: 'post',
|
||||
success: function (data) {
|
||||
|
|
@ -425,14 +422,11 @@ function getOrgSelect() {
|
|||
function getProject() {
|
||||
let keys = [];
|
||||
$("#bidName").empty();
|
||||
Ajax().post({
|
||||
headers: {
|
||||
"encrypt": sm3(JSON.stringify({
|
||||
currentUserId: user.userId,
|
||||
isSup: user.isSup,
|
||||
currentUserOrgId: user.orgId
|
||||
}))
|
||||
},
|
||||
$.ajax({
|
||||
type: 'post',
|
||||
headers:{
|
||||
"encryption":"encryption"
|
||||
},
|
||||
url: dataUrl + 'proteam/pot/newPro/getProjectSelect',
|
||||
data: {
|
||||
currentUserId: user.userId,
|
||||
|
|
@ -440,6 +434,8 @@ function getProject() {
|
|||
currentUserOrgId: user.orgId
|
||||
},
|
||||
success: function (data) {
|
||||
console.log("----44------>")
|
||||
console.log(data)
|
||||
let obj = data.data;
|
||||
$.each(obj, function (index, item) {
|
||||
keys.push({
|
||||
|
|
@ -448,13 +444,14 @@ function getProject() {
|
|||
});
|
||||
|
||||
});
|
||||
|
||||
formSelects.data('bidName', 'local', {
|
||||
arr: keys
|
||||
});
|
||||
formSelects.btns('bidName',['remove'])
|
||||
form.render();
|
||||
}
|
||||
},error:function(e){
|
||||
console.log("222")
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@ function getLocalpath(){
|
|||
url[1]='/base/log/logManage.html';
|
||||
}
|
||||
let yq=getHtmlPermission(usJosn.menus,url[1]);
|
||||
console.log(yq)
|
||||
if(!yq){
|
||||
|
||||
addLogs(url,url[1],usJosn.nickName);
|
||||
top.window.location.href = login_url;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue