monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 3d250c44dff48424256158a6a17d4b24511eaa50 2 parents 924c9614 11731d6e

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
... ... @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('inspectionTaskIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['accessToken'];
var accessToken = common.getMjToken();
var inspectionTaskTable;
form.render();
initTable();
... ... @@ -463,13 +463,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
// 上传模板事件
upload.render({
elem: '#upload_tasktemp' //绑定元素
, url: common.domainName + '/api-web/inspectiontask/upload' //上传接口
, url: common.domainName + '/api-web/inspectiontask/upload?accessToken=' + accessToken //上传接口
, accept: 'file' //允许上传的文件类型
, exts: 'docx|doc'
, multiple: false
, before: function () {
layer.load(2);
this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId;
this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&accessToken=' + accessToken;
}
, done: function (res) {
layer.closeAll("loading");
... ...
... ... @@ -143,10 +143,10 @@ layui.define(['form', 'admin', 'layer', 'laytpl', 'common', 'view', 'sessions',
} else {
layer.msg('删除失败!', {icon: 2, time: 3000})
}
}.error(function (error) {
}).error(function (error) {
layer.close(loading);
layer.msg('删除失败!', {icon: 2, time: 3000})
}))
})
})
}
... ...
... ... @@ -29,18 +29,18 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 110px;top:10px;">时间范围：</label>
<div class="layui-inline">
<!-- <div class="layui-inline">-->
<div class="layui-input-inline layui-input-inline--long">
<input class="layui-input" id="shutdownplanStartTime" placeholder="开始时间"
type="text">
</div>
</div>
<div class="layui-inline layui-inline--sm">-</div>
<div class="layui-inline">
<!-- </div>-->
<div style="float: left">-</div><!--class="layui-inline layui-inline--sm" -->
<!-- <div class="layui-inline">-->
<div class="layui-input-inline layui-input-inline--long">
<input class="layui-input" id="shutdownplanEndTime" placeholder="结束时间"
type="text">
</div>
<!-- </div>-->
</div>
</div>
<button class="layui-btn layui-btn-normal" id="searchShutdownplan" type="button">
... ... @@ -50,19 +50,19 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 110px">创建时间范围：</label>
<div class="layui-inline">
<!-- <div class="layui-inline">-->
<div class="layui-input-inline layui-input-inline--long">
<input class="layui-input" id="shutdownplanCreateStart" placeholder="开始时间"
type="text">
</div>
</div>
<div class="layui-inline layui-inline--sm">-</div>
<div class="layui-inline">
<!-- </div>-->
<div style="float: left">-</div><!-- class="layui-inline layui-inline--sm"-->
<!-- <div class="layui-inline">-->
<div class="layui-input-inline layui-input-inline--long">
<input class="layui-input" id="shutdownplanCreateEnd" placeholder="结束时间"
type="text">
</div>
</div>
<!-- </div>-->
</div>
</div>
</form>
... ...