monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 077e404c9750922b771cc836e2f32986f76c0e32 2 parents bd95334b 614c73c3

Merge branch 'master-v32-lushangqing' into 'master' 

用户管理 扩展信息根据字典配置展示输入框，单选框，文本框



See merge request !299
Inline Side-by-side
Showing 2 changed files with 131 additions and 7 deletions
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
195 //获取属性值 195 //获取属性值
196 function addUserProperty() { 196 function addUserProperty() {
197 var arr = []; 197 var arr = [];
198 - var $inputs = $("#user_property_html_id").find("input"); 198 + var $inputs = $("#user_property_html_id").find(".input");
199 $.each($inputs, function (i, e) { 199 $.each($inputs, function (i, e) {
200 var obj = { 200 var obj = {
201 id: $(e).attr("data-id"), 201 id: $(e).attr("data-id"),
@@ -207,6 +207,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -207,6 +207,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
207 }; 207 };
208 arr.push(obj) 208 arr.push(obj)
209 }) 209 })
  210 + console.log("arr-$inputs",arr)
  211 + // Start 获取select的值 LSQ 2021/12/28 14:29 TODO
  212 + var $selects = $("#user_property_html_id").find(".select");
  213 + $.each($selects, function (i, e) {
  214 + var obj = {
  215 + id: $(e).attr("data-id"),
  216 + username: $(e).attr("data-username"),
  217 + property: $(e).attr("data-property"),
  218 + value: $(e).val(),
  219 + sort: $(e).attr("data-sort"),
  220 + remark: $(e).attr("data-remark")
  221 + };
  222 + arr.push(obj)
  223 + })
  224 + var $textareas = $("#user_property_html_id").find(".textarea");
  225 + $.each($textareas, function (i, e) {
  226 + var obj = {
  227 + id: $(e).attr("data-id"),
  228 + username: $(e).attr("data-username"),
  229 + property: $(e).attr("data-property"),
  230 + value: $(e).val(),
  231 + sort: $(e).attr("data-sort"),
  232 + remark: $(e).attr("data-remark")
  233 + };
  234 + arr.push(obj)
  235 + })
  236 + //End LSQ 2021/12/28 14:50 TODO
210 return arr; 237 return arr;
211 } 238 }
212 239
@@ -234,27 +261,80 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -234,27 +261,80 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
234 var rowTail = '</div>'; 261 var rowTail = '</div>';
235 var content = ''; 262 var content = '';
236 $.each(propertyList, function (i, v) { 263 $.each(propertyList, function (i, v) {
  264 + // Start 根据字典配置后缀展示输入框，单选框，文本框 LSQ 2021/12/28 16:34 TODO
  265 + var str='';
  266 + var dropStrIndex=v.ddicCode.indexOf('_drop_');
  267 + var textareaStrIndex=v.ddicCode.indexOf('_textarea_');
  268 + if(textareaStrIndex!=-1){
  269 + str='<textarea data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-textarea textarea" name="' + v.ddicCode + '"></textarea>'
  270 +
  271 + }else if(dropStrIndex!=-1){
  272 + var strArr=v.ddicCode.split('_drop_');
  273 + var selectOption='';
  274 + if(strArr && strArr.length>0){
  275 + var strArrEle=strArr[1].split('_');
  276 + if(strArrEle[0]=='yes'){
  277 + selectOption=' <option value="0">否</option>'+
  278 + ' <option value="1">是</option>';
  279 + }else if(strArrEle[0]=='long'){
  280 + selectOption=' <option value="0">长期</option>'+
  281 + ' <option value="1">短期</option>';
  282 + }
  283 + }
  284 +
  285 + str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
  286 + ' <option value="" style="display:none;"></option>'+ selectOption +
  287 + '</select>';
  288 + }else{
  289 + str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">'
  290 + }
237 var property = ' <div class="layui-inline ">' + 291 var property = ' <div class="layui-inline ">' +
238 ' <label class="layui-form-label">' + v.ddicName + '</label>' + 292 ' <label class="layui-form-label">' + v.ddicName + '</label>' +
239 - ' <div class="layui-input-inline">' +  
240 - ' <input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">' + 293 + ' <div class="layui-input-inline">' +str+
  294 + // ' <input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input" name="' + v.ddicCode + '" autocomplete="off">' +
241 ' </div>' + 295 ' </div>' +
242 ' </div>'; 296 ' </div>';
243 - if (i % 2 == 0 && i != 0) { 297 +
  298 + if(textareaStrIndex!=-1){
  299 + if (i % 1 == 0 ) {
  300 + content += rowTail;
  301 + }
  302 + if (i % 1 == 0) {//需要添加表头
  303 + content += rowHead + property;
  304 + } else {//
  305 + content += property;
  306 + }
  307 + }else{
  308 + if (i % 2 == 0 && i != 0) {
  309 + content += rowTail;
  310 + }
  311 +
  312 + if (i % 2 == 0) {//需要添加表头
  313 + content += rowHead + property;
  314 + } else {//
  315 + content += property;
  316 + }
  317 + }
  318 + //End LSQ 2021/12/28 16:35 TODO
  319 +
  320 + /* if (i % 2 == 0 && i != 0) {
244 content += rowTail; 321 content += rowTail;
245 } 322 }
  323 +
246 if (i % 2 == 0) {//需要添加表头 324 if (i % 2 == 0) {//需要添加表头
247 content += rowHead + property; 325 content += rowHead + property;
248 } else {// 326 } else {//
249 content += property; 327 content += property;
250 - } 328 + }*/
  329 +
  330 +
251 }); 331 });
252 $('#user_property_html_id').append(content); 332 $('#user_property_html_id').append(content);
253 } 333 }
254 334
255 //回显属性信息 335 //回显属性信息
256 function evaluation(list){ 336 function evaluation(list){
257 - var $inputs = $("#user_property_html_id").find("input"); 337 + var $inputs = $("#user_property_html_id").find(".input");
258 $.each($inputs, function (i, e) { 338 $.each($inputs, function (i, e) {
259 var $that=$(this); 339 var $that=$(this);
260 $.each(list, function (index,v) { 340 $.each(list, function (index,v) {
@@ -267,6 +347,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -267,6 +347,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
267 } 347 }
268 }); 348 });
269 }); 349 });
  350 + // Start 回显select的值 LSQ 2021/12/28 14:55 TODO
  351 + var $selects = $("#user_property_html_id").find(".select");
  352 + $.each($selects, function (i, e) {
  353 + var $that=$(this);
  354 + $.each(list, function (index,v) {
  355 + if($that.attr('data-property')== v.property){
  356 + $that.attr("data-id",v.id);
  357 + $that.attr("data-username",v.username);
  358 + $that.val(v.value);
  359 + $that.attr("data-sort",v.sort);
  360 + $that.attr("data-remark",v.remark);
  361 + }
  362 + });
  363 + });
  364 + var $textarea = $("#user_property_html_id").find(".textarea");
  365 + $.each($textarea, function (i, e) {
  366 + var $that=$(this);
  367 + $.each(list, function (index,v) {
  368 + if($that.attr('data-property')== v.property){
  369 + $that.attr("data-id",v.id);
  370 + $that.attr("data-username",v.username);
  371 + $that.val(v.value);
  372 + $that.attr("data-sort",v.sort);
  373 + $that.attr("data-remark",v.remark);
  374 + }
  375 + });
  376 + });
  377 + //End LSQ 2021/12/28 14:55 TODO
270 } 378 }
271 }) 379 })
272 }) 380 })
@@ -7892,4 +7892,20 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -7892,4 +7892,20 @@ form[lay-filter="activewarning-form"] .layui-inline {
7892 } 7892 }
7893 .padding-left-10{ 7893 .padding-left-10{
7894 padding-left:10px; 7894 padding-left:10px;
7895 -}  
  7895 +}
  7896 +/* Start 自定义select的样式*/
  7897 +.select-input-my+.layui-form-select .layui-select-title .layui-input::-webkit-input-placeholder {
  7898 + color:#999;
  7899 +}
  7900 +.select-input-my+.layui-form-select .layui-select-title .layui-input::-moz-placeholder {
  7901 + color:#999;
  7902 +}
  7903 +.select-input-my+.layui-form-select .layui-select-title .layui-input::-ms-input-placeholder {
  7904 + color:#999;
  7905 +}
  7906 +
  7907 +.select-input-my+.layui-form-select dl dd.layui-this{
  7908 + color:#666666;
  7909 + background-color:rgb(242, 242, 242);
  7910 +}
  7911 +/* End 自定义select的样式*/