Merge branch 'master-500-dev-joke' into 'master-500-dev'

指标组管理页面优化

1，指标组管理，增加指标组描述字段，放到标识列后，将备注列加宽，可以出现横向滚动条。
2，指标组管理，绑定资源类型时，将对应的code值也赋值
3，指标组管理，新增和修改页面增加指标组描述字段

See merge request !769

@@ -146,7 +146,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
           }
           }
           return inputDom.prop('outerHTML');
           return inputDom.prop('outerHTML');
         }
         }
-      }, {
+      },
+        {field: 'createUser', title: '创建人', align: 'center'},
+        {field: 'createTime', title: '创建人', align: 'center'},
+        {
         title: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-kpiflag-delete">' +
         title: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-kpiflag-delete">' +
             '<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i  class="layui-icon"></i></a></span>'
             '<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i  class="layui-icon"></i></a></span>'
       }]],
       }]],
@@ -195,13 +198,13 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
         theme: '#1E9FFF'
         theme: '#1E9FFF'
       }
       }
       , cols: [[{
       , cols: [[{
-        field: 'resTypeName', title: '名称', align: 'center', sort: true, width: '280'
+        field: 'resTypeName', title: '名称', align: 'center', sort: true
       }, {
       }, {
-        field: 'resTypeCode', title: '编码', align: 'center', sort: true, width: '390'
+        field: 'resTypeCode', title: '编码', align: 'center', sort: true
       }, {
       }, {
-        field: 'resTypeDesc', title: '类别', align: 'center', sort: true, width: '280'
+        field: 'resTypeDesc', title: '类别', align: 'center', sort: true
       }, {
       }, {
-        field: 'createTime', title: '创建时间', align: 'center', sort: true, width: '275'
+        field: 'createTime', title: '创建时间', align: 'center', sort: true
       }, {
       }, {
         title: '操作', align: 'center', fixed: 'right', width: '170',
         title: '操作', align: 'center', fixed: 'right', width: '170',
         toolbar:
         toolbar:
@@ -319,6 +322,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
             }
             }
           });
           });
           if (flag) {
           if (flag) {
+            // value.createUser = form.val('form-flag-edit').createUser;
+            // value.createTime = common.getToday('');
             resTypeTableData.push(value);
             resTypeTableData.push(value);
           }
           }
         });
         });
@@ -425,7 +430,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
           id: '',
           id: '',
           flagId: '',
           flagId: '',
           bindId: v.resTypeId,
           bindId: v.resTypeId,
-          bindType: '1'
+          bindType: '1',
+          bindCode: v.resTypeCode
         });
         });
       });
       });
       $.each(appTableData, function (i, v) {
       $.each(appTableData, function (i, v) {
@@ -511,7 +517,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
                     kpiIdent: e.kpiIdent
                     kpiIdent: e.kpiIdent
                   },
                   },
                   isUnique: '0',
                   isUnique: '0',
-                  sort: i
+                  sort: i,
+                  createUser: form.val('form-flag-edit').createUser,
+                  createTime: common.getToday('')
                 });
                 });
               }
               }
             });
             });

@@ -66,12 +66,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
                 {type: 'checkbox'}
                 {type: 'checkbox'}
                 , {field: 'index', title: '序号', align: 'center', type: 'numbers'}
                 , {field: 'index', title: '序号', align: 'center', type: 'numbers'}
                 , {
                 , {
-                    field: 'name', title: '名称', align: 'center', sort: true,
+                    field: 'name', title: '名称', align: 'center', sort: true,width: 200,
                     templet: '<div>' +
                     templet: '<div>' +
                         '<span kpiflag-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
                         '<span kpiflag-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
                         '</div>'
                         '</div>'
                 }
                 }
-                , {field: 'flag', title: '标识', align: 'center', sort: true}
+                , {field: 'flag', title: '标识', align: 'center', sort: true,width: 200}
+                , {field: 'describes', title: '指标组描述', align: 'left',width: 300}
                 , { field: 'dimension', title: '维度', align: 'center', width: 80, templet: `
                 , { field: 'dimension', title: '维度', align: 'center', width: 80, templet: `
                         <div>
                         <div>
                         {{#
                         {{#
@@ -84,11 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
                         </div>
                         </div>
                         `
                         `
                 }
                 }
-                , {field: 'kpis', title: '绑定指标', align: 'left'}
-                , {field: 'restypes', title: '绑定资源类型', align: 'left'}
+                , {field: 'kpis', title: '绑定指标', align: 'left',width: 500}
+                , {field: 'restypes', title: '绑定资源类型', align: 'left',width: 300}
                 , {field: 'createUser', title: '创建人',width: 100, align: 'center'}
                 , {field: 'createUser', title: '创建人',width: 100, align: 'center'}
-                , {field: 'createTime', title: '创建时间', align: 'center'}
-                , {field: 'remark', title: '备注', align: 'left'}
+                , {field: 'createTime', title: '创建时间', align: 'center',width: 180}
+                , {field: 'remark', title: '备注', align: 'left',width: 500}
                 , {
                 , {
                     title: '操作',
                     title: '操作',
                     align: 'center',
                     align: 'center',

@@ -11,11 +11,29 @@
         </div>
         </div>
       </div>
       </div>
       <div class="inline-half layui-inline">
       <div class="inline-half layui-inline">
+        <label class="layui-form-label">维度<span style="color: red">*</span></label>
+        <div class="layui-input-inline">
+          <select name="dimension" lay-verify="required" class="layui-select">
+            <option value="">=选择维度=</option>
+            <option value="1D">一维</option>
+            <option value="2D">二维</option>
+          </select>
+        </div>
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="inline-half layui-inline">
         <label class="layui-form-label">名称<span style="color: red">*</span></label>
         <label class="layui-form-label">名称<span style="color: red">*</span></label>
         <div class="layui-input-inline">
         <div class="layui-input-inline">
           <input type="text" name="name" required lay-verify="required" placeholder="请输入名称" class="layui-input">
           <input type="text" name="name" required lay-verify="required" placeholder="请输入名称" class="layui-input">
         </div>
         </div>
       </div>
       </div>
+      <div class="inline-half layui-inline">
+        <label class="layui-form-label">描述<span style="color: red">*</span></label>
+        <div class="layui-input-inline">
+          <input type="text" name="describes" required lay-verify="required" placeholder="请输入名称" class="layui-input">
+        </div>
+      </div>
     </div>
     </div>
     <div class="layui-form-item">
     <div class="layui-form-item">
       <div class="inline-half layui-inline">
       <div class="inline-half layui-inline">
@@ -25,13 +43,9 @@
         </div>
         </div>
       </div>
       </div>
       <div class="inline-half layui-inline">
       <div class="inline-half layui-inline">
-        <label class="layui-form-label">维度<span style="color: red">*</span></label>
+        <label class="layui-form-label">创建时间</label>
         <div class="layui-input-inline">
         <div class="layui-input-inline">
-          <select name="dimension" lay-verify="required" class="layui-select">
-            <option value="">=选择维度=</option>
-            <option value="1D">一维</option>
-            <option value="2D">二维</option>
-          </select>
+          <input type="text" name="createTime" required lay-verify="required" disabled placeholder="请输入创建人" class="layui-input">
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>