monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 高磊
Commit 5b9ea709146c78f9c27c7f3e7f47d54c990c82f0 2 parents d6008bce b52e8d51

Merge branch 'master-mj-yjpnew' into 'master-mj' 

fix:山西信息化资产单位加载全称优化



See merge request !1231
Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
... ... @@ -112,13 +112,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'laydate', 'common'], function
common.bizTypeSelect("add-information-host", function () {
form.render("select");
});
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>运维公司</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
options += "<option value='" + v.id + "'>" + v.name + "</option>"
});
options += "<option value='0'>其他</option>";
$('#factoryId').html(options);
... ...
... ... @@ -110,13 +110,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports) {
form.render("select");
});
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>申请单位</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
options += "<option value='" + v.id + "'>" + v.name + "</option>"
});
options += "<option value='0'>其他</option>";
$('#factoryId').html(options);
... ...
... ... @@ -98,7 +98,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laydate', 'common'], function
success: function (res) {
var options = "<option value=''>合同乙方单位</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
options += "<option value='" + v.id + "'>" + v.name + "</option>"
});
options += "<option value='0'>其他</option>";
$('#factoryId').html(options);
... ...
... ... @@ -114,13 +114,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports)
common.bizTypeSelect("add-information-virtual", function () {
form.render("select");
});
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>运维公司</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
options += "<option value='" + v.id + "'>" + v.name + "</option>"
});
options += "<option value='0'>其他</option>";
$('#factoryId').html(options);
... ...
<article class="page-container">
<div class="page-panel">
<div class="page-panel" style="width: calc(100% - 50px)">
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
... ...