Authored by 张凯

1,指标组管理,增加指标组描述字段,放到标识列后,将备注列加宽,可以出现横向滚动条。

2,指标组管理,绑定资源类型时,将对应的code值也赋值
3,指标组管理,新增和修改页面增加指标组描述字段
@@ -195,13 +195,13 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -195,13 +195,13 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
195 theme: '#1E9FFF' 195 theme: '#1E9FFF'
196 } 196 }
197 , cols: [[{ 197 , cols: [[{
198 - field: 'resTypeName', title: '名称', align: 'center', sort: true, width: '280' 198 + field: 'resTypeName', title: '名称', align: 'center', sort: true
199 }, { 199 }, {
200 - field: 'resTypeCode', title: '编码', align: 'center', sort: true, width: '390' 200 + field: 'resTypeCode', title: '编码', align: 'center', sort: true
201 }, { 201 }, {
202 - field: 'resTypeDesc', title: '类别', align: 'center', sort: true, width: '280' 202 + field: 'resTypeDesc', title: '类别', align: 'center', sort: true
203 }, { 203 }, {
204 - field: 'createTime', title: '创建时间', align: 'center', sort: true, width: '275' 204 + field: 'createTime', title: '创建时间', align: 'center', sort: true
205 }, { 205 }, {
206 title: '操作', align: 'center', fixed: 'right', width: '170', 206 title: '操作', align: 'center', fixed: 'right', width: '170',
207 toolbar: 207 toolbar:
@@ -425,7 +425,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -425,7 +425,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
425 id: '', 425 id: '',
426 flagId: '', 426 flagId: '',
427 bindId: v.resTypeId, 427 bindId: v.resTypeId,
428 - bindType: '1' 428 + bindType: '1',
  429 + bindCode: v.resTypeCode
429 }); 430 });
430 }); 431 });
431 $.each(appTableData, function (i, v) { 432 $.each(appTableData, function (i, v) {
@@ -66,12 +66,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -66,12 +66,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
66 {type: 'checkbox'} 66 {type: 'checkbox'}
67 , {field: 'index', title: '序号', align: 'center', type: 'numbers'} 67 , {field: 'index', title: '序号', align: 'center', type: 'numbers'}
68 , { 68 , {
69 - field: 'name', title: '名称', align: 'center', sort: true, 69 + field: 'name', title: '名称', align: 'center', sort: true,width: 200,
70 templet: '<div>' + 70 templet: '<div>' +
71 '<span kpiflag-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' + 71 '<span kpiflag-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
72 '</div>' 72 '</div>'
73 } 73 }
74 - , {field: 'flag', title: '标识', align: 'center', sort: true} 74 + , {field: 'flag', title: '标识', align: 'center', sort: true,width: 200}
  75 + , {field: 'describes', title: '指标组描述', align: 'left',width: 300}
75 , { field: 'dimension', title: '维度', align: 'center', width: 80, templet: ` 76 , { field: 'dimension', title: '维度', align: 'center', width: 80, templet: `
76 <div> 77 <div>
77 {{# 78 {{#
@@ -84,11 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe @@ -84,11 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
84 </div> 85 </div>
85 ` 86 `
86 } 87 }
87 - , {field: 'kpis', title: '绑定指标', align: 'left'}  
88 - , {field: 'restypes', title: '绑定资源类型', align: 'left'} 88 + , {field: 'kpis', title: '绑定指标', align: 'left',width: 300}
  89 + , {field: 'restypes', title: '绑定资源类型', align: 'left',width: 300}
89 , {field: 'createUser', title: '创建人',width: 100, align: 'center'} 90 , {field: 'createUser', title: '创建人',width: 100, align: 'center'}
90 - , {field: 'createTime', title: '创建时间', align: 'center'}  
91 - , {field: 'remark', title: '备注', align: 'left'} 91 + , {field: 'createTime', title: '创建时间', align: 'center',width: 180}
  92 + , {field: 'remark', title: '备注', align: 'left',width: 300}
92 , { 93 , {
93 title: '操作', 94 title: '操作',
94 align: 'center', 95 align: 'center',
@@ -11,29 +11,38 @@ @@ -11,29 +11,38 @@
11 </div> 11 </div>
12 </div> 12 </div>
13 <div class="inline-half layui-inline"> 13 <div class="inline-half layui-inline">
14 - <label class="layui-form-label">名称<span style="color: red">*</span></label> 14 + <label class="layui-form-label">维度<span style="color: red">*</span></label>
15 <div class="layui-input-inline"> 15 <div class="layui-input-inline">
16 - <input type="text" name="name" required lay-verify="required" placeholder="请输入名称" class="layui-input"> 16 + <select name="dimension" lay-verify="required" class="layui-select">
  17 + <option value="">=选择维度=</option>
  18 + <option value="1D">一维</option>
  19 + <option value="2D">二维</option>
  20 + </select>
17 </div> 21 </div>
18 </div> 22 </div>
19 </div> 23 </div>
20 <div class="layui-form-item"> 24 <div class="layui-form-item">
21 <div class="inline-half layui-inline"> 25 <div class="inline-half layui-inline">
22 - <label class="layui-form-label">创建人<span style="color: red">*</span></label> 26 + <label class="layui-form-label">名称<span style="color: red">*</span></label>
23 <div class="layui-input-inline"> 27 <div class="layui-input-inline">
24 - <input type="text" name="createUser" required lay-verify="required" placeholder="请输入创建人" class="layui-input"> 28 + <input type="text" name="name" required lay-verify="required" placeholder="请输入名称" class="layui-input">
25 </div> 29 </div>
26 </div> 30 </div>
27 <div class="inline-half layui-inline"> 31 <div class="inline-half layui-inline">
28 - <label class="layui-form-label">维度<span style="color: red">*</span></label> 32 + <label class="layui-form-label">描述<span style="color: red">*</span></label>
29 <div class="layui-input-inline"> 33 <div class="layui-input-inline">
30 - <select name="dimension" lay-verify="required" class="layui-select">  
31 - <option value="">=选择维度=</option>  
32 - <option value="1D">一维</option>  
33 - <option value="2D">二维</option>  
34 - </select> 34 + <input type="text" name="describes" required lay-verify="required" placeholder="请输入名称" class="layui-input">
  35 + </div>
  36 + </div>
  37 + </div>
  38 + <div class="layui-form-item">
  39 + <div class="inline-half layui-inline">
  40 + <label class="layui-form-label">创建人<span style="color: red">*</span></label>
  41 + <div class="layui-input-inline">
  42 + <input type="text" name="createUser" required lay-verify="required" placeholder="请输入创建人" class="layui-input">
35 </div> 43 </div>
36 </div> 44 </div>
  45 +
37 </div> 46 </div>
38 <div class="layui-form-item"> 47 <div class="layui-form-item">
39 <label class="layui-form-label textarea-label">说明</label> 48 <label class="layui-form-label textarea-label">说明</label>