monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit c2cce5ff32d6ab0c8a71de52351d24842f1e5b1e 2 parents 0c023b76 9b9cac6e

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
@@ -5268,10 +5268,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -5268,10 +5268,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
5268 //判断类型是输入框还是下拉列表 5268 //判断类型是输入框还是下拉列表
5269 let titleName=''; 5269 let titleName='';
5270 let promptHtml=''; 5270 let promptHtml='';
5271 - if(fieldSourceType == '0'){ 5271 + if(fieldSourceType == 'input'){
5272 titleName='请输入'; 5272 titleName='请输入';
5273 promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">` 5273 promptHtml=`<input type="text" id="promptInput" name="promptInput" autocomplete="off" class="layui-input">`
5274 - }else if(fieldSourceType== '1'){ 5274 + }else if(fieldSourceType== 'select'){
5275 titleName='请选择'; 5275 titleName='请选择';
5276 promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">` 5276 promptHtml=`<select id="promptInput" style="width:80%;cursor:pointer;" class="layui-select" lay-filter="promptInput">`
5277 if(fieldList){ 5277 if(fieldList){
@@ -5282,7 +5282,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -5282,7 +5282,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
5282 } 5282 }
5283 promptHtml+=`</select>`; 5283 promptHtml+=`</select>`;
5284 }else{ 5284 }else{
5285 - promptHtml=`` 5285 + titleName='请查看';
  5286 + promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
5286 } 5287 }
5287 let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`; 5288 let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
5288 layer.open({ 5289 layer.open({