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 @@ -112,13 +112,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'laydate', 'common'], function
112 common.bizTypeSelect("add-information-host", function () { 112 common.bizTypeSelect("add-information-host", function () {
113 form.render("select"); 113 form.render("select");
114 }); 114 });
115 - var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 115 + var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
116 $.ajax({ 116 $.ajax({
117 url: url, 117 url: url,
118 success: function (res) { 118 success: function (res) {
119 var options = "<option value=''>运维公司</option>"; 119 var options = "<option value=''>运维公司</option>";
120 $.each(res.data, function (i, v) { 120 $.each(res.data, function (i, v) {
121 - options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 121 + options += "<option value='" + v.id + "'>" + v.name + "</option>"
122 }); 122 });
123 options += "<option value='0'>其他</option>"; 123 options += "<option value='0'>其他</option>";
124 $('#factoryId').html(options); 124 $('#factoryId').html(options);
@@ -110,13 +110,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports) { @@ -110,13 +110,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports) {
110 110
111 form.render("select"); 111 form.render("select");
112 }); 112 });
113 - var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 113 + var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
114 $.ajax({ 114 $.ajax({
115 url: url, 115 url: url,
116 success: function (res) { 116 success: function (res) {
117 var options = "<option value=''>申请单位</option>"; 117 var options = "<option value=''>申请单位</option>";
118 $.each(res.data, function (i, v) { 118 $.each(res.data, function (i, v) {
119 - options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 119 + options += "<option value='" + v.id + "'>" + v.name + "</option>"
120 }); 120 });
121 options += "<option value='0'>其他</option>"; 121 options += "<option value='0'>其他</option>";
122 $('#factoryId').html(options); 122 $('#factoryId').html(options);
@@ -98,7 +98,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laydate', 'common'], function @@ -98,7 +98,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laydate', 'common'], function
98 success: function (res) { 98 success: function (res) {
99 var options = "<option value=''>合同乙方单位</option>"; 99 var options = "<option value=''>合同乙方单位</option>";
100 $.each(res.data, function (i, v) { 100 $.each(res.data, function (i, v) {
101 - options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 101 + options += "<option value='" + v.id + "'>" + v.name + "</option>"
102 }); 102 });
103 options += "<option value='0'>其他</option>"; 103 options += "<option value='0'>其他</option>";
104 $('#factoryId').html(options); 104 $('#factoryId').html(options);
@@ -114,13 +114,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports) @@ -114,13 +114,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common'], function (exports)
114 common.bizTypeSelect("add-information-virtual", function () { 114 common.bizTypeSelect("add-information-virtual", function () {
115 form.render("select"); 115 form.render("select");
116 }); 116 });
117 - var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 117 + var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
118 $.ajax({ 118 $.ajax({
119 url: url, 119 url: url,
120 success: function (res) { 120 success: function (res) {
121 var options = "<option value=''>运维公司</option>"; 121 var options = "<option value=''>运维公司</option>";
122 $.each(res.data, function (i, v) { 122 $.each(res.data, function (i, v) {
123 - options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 123 + options += "<option value='" + v.id + "'>" + v.name + "</option>"
124 }); 124 });
125 options += "<option value='0'>其他</option>"; 125 options += "<option value='0'>其他</option>";
126 $('#factoryId').html(options); 126 $('#factoryId').html(options);
1 <article class="page-container"> 1 <article class="page-container">
2 - <div class="page-panel"> 2 + <div class="page-panel" style="width: calc(100% - 50px)">
3 <div class="main"> 3 <div class="main">
4 <div class="layui-card"> 4 <div class="layui-card">
5 <div class="layui-card-header"> 5 <div class="layui-card-header">