monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhangtianqi
Commit 481b9b2d9a87526ea4c8b14be392a20a6dd935ae 1 parent a136d902

feat:工作日志配置（汇报人、接收人）获取数据

Inline Side-by-side
Showing 4 changed files with 68 additions and 19 deletions
@@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
12 12
13 //对外暴露的接口 13 //对外暴露的接口
14 exports('reportConfigAdd', function (data) { 14 exports('reportConfigAdd', function (data) {
15 - var accessToken = session.getToken()['access_token'] 15 + // var accessToken = session.getToken()['access_token']
  16 + var accessToken = common.getMjToken();
16 var adminSelect = {} 17 var adminSelect = {}
17 var userSelect = {} 18 var userSelect = {}
18 19
@@ -43,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -43,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
43 data.userName = userSelect.getValue('nameStr') 44 data.userName = userSelect.getValue('nameStr')
44 data.theirType = $('#config_theirType').val(); 45 data.theirType = $('#config_theirType').val();
45 admin.req({ 46 admin.req({
46 - url: domainName + '/api-web/bWorkreportGroup/save?access_token=' + accessToken, 47 + url: domainName + '/api-web/bWorkreportGroup/save?accessToken=' + accessToken,
47 data: JSON.stringify(data), 48 data: JSON.stringify(data),
48 type: 'post', 49 type: 'post',
49 contentType: "application/json; charset=utf-8", 50 contentType: "application/json; charset=utf-8",
@@ -108,15 +109,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -108,15 +109,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
108 } 109 }
109 }) 110 })
110 }*/ 111 }*/
111 - var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?access_token=${accessToken}`; 112 + // var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
  113 + let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
112 $.ajax({ 114 $.ajax({
113 url: url, 115 url: url,
114 success: function (res) { 116 success: function (res) {
115 - var selects = res.data; 117 + var selects = res.data.options;
116 var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']"); 118 var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
117 $sel.append('<option value="">请选择</option>') 119 $sel.append('<option value="">请选择</option>')
118 $.each(selects, function (i, e) { 120 $.each(selects, function (i, e) {
119 - $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>') 121 + // $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
  122 + $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
120 }) 123 })
121 if (data && data.id) { 124 if (data && data.id) {
122 admin.req({ 125 admin.req({
@@ -140,10 +143,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -140,10 +143,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
140 }) 143 })
141 } 144 }
142 145
  146 + // 所属类型表单赋值
  147 + function fromTheirType() {
  148 + let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
  149 + $.ajax({
  150 + url: url,
  151 + success: function (res) {
  152 + var selects = res.data.options;
  153 + var $sel = $("form[name='add-config-form']").find("select[name='theirType']");
  154 + $sel.append('<option value="">请选择</option>')
  155 + $.each(selects, function (i, e) {
  156 + $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
  157 + })
  158 + form.render();
  159 + }
  160 + })
  161 + }
  162 +
143 //初始化组负责人下拉列表框 163 //初始化组负责人下拉列表框
144 function initSelect() { 164 function initSelect() {
145 $.ajax({ 165 $.ajax({
146 - url: domainName + '/api-user/users/getAll?access_token=' + accessToken, 166 + // url: domainName + '/api-user/users/getAll?accessToken=' + accessToken,
  167 + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + accessToken,
147 success: function (res) { 168 success: function (res) {
148 adminSelect = xmSelect.render({ 169 adminSelect = xmSelect.render({
149 el: '.admin', 170 el: '.admin',
@@ -157,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -157,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
157 }, 178 },
158 layVerify: 'required', 179 layVerify: 'required',
159 layVerType: 'msg', 180 layVerType: 'msg',
160 - data: res, 181 + data: res.data.rows,
161 }) 182 })
162 userSelect = xmSelect.render({ 183 userSelect = xmSelect.render({
163 el: '.user', 184 el: '.user',
@@ -169,9 +190,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -169,9 +190,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
169 }, 190 },
170 layVerify: 'required', 191 layVerify: 'required',
171 layVerType: 'msg', 192 layVerType: 'msg',
172 - data: res, 193 + data: res.data.rows,
173 }) 194 })
174 fromAssignment() 195 fromAssignment()
  196 + fromTheirType()
175 } 197 }
176 }) 198 })
177 } 199 }
@@ -179,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -179,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
179 //初始化所属组列表 201 //初始化所属组列表
180 function initGroupSelect() { 202 function initGroupSelect() {
181 $.ajax({ 203 $.ajax({
182 - url: domainName + '/api-web/bWorkreportGroup/list?access_token=' + accessToken, 204 + url: domainName + '/api-web/bWorkreportGroup/list?accessToken=' + accessToken,
183 success: function (res) { 205 success: function (res) {
184 $("#groupName")[0].options.length = 1 206 $("#groupName")[0].options.length = 1
185 $.each(res.data, function (i, v) { 207 $.each(res.data, function (i, v) {
@@ -11,9 +11,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -11,9 +11,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
11 11
12 //对外暴露的接口 12 //对外暴露的接口
13 exports("reportConfigIndex", function () { 13 exports("reportConfigIndex", function () {
14 - var accessToken = session.getToken()['access_token'] 14 + // var accessToken = session.getToken()['access_token']
  15 + var accessToken = common.getMjToken();
  16 + let theirTypeOptions = [];
15 17
16 - initGroupSelect() 18 + // initGroupSelect()
17 19
18 //回车搜索 20 //回车搜索
19 $('#adminName').keydown(function (e) { 21 $('#adminName').keydown(function (e) {
@@ -82,11 +84,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -82,11 +84,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
82 { 84 {
83 field: 'theirType', title: '所属类型', align: 'center', width: 150, 85 field: 'theirType', title: '所属类型', align: 'center', width: 150,
84 templet: function (d) { 86 templet: function (d) {
85 - if (d.theirType == '1') { 87 + /*if (d.theirType == '1') {
86 return '日志类型'; 88 return '日志类型';
87 } else { 89 } else {
88 return '文档类型'; 90 return '文档类型';
89 - } 91 + }*/
  92 + let label='';
  93 + theirTypeOptions.forEach((item,index)=>{
  94 + if (item.value == d.theirType){
  95 + label = item.label;
  96 + }
  97 + })
  98 + return label;
90 } 99 }
91 }, 100 },
92 { 101 {
@@ -183,7 +192,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -183,7 +192,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
183 , time: 1000 192 , time: 1000
184 }, function () { 193 }, function () {
185 reloadConfigTable(); 194 reloadConfigTable();
186 - initGroupSelect() 195 + // initGroupSelect()
187 }); 196 });
188 }).error(function (error) { 197 }).error(function (error) {
189 console.log(error); 198 console.log(error);
@@ -219,6 +228,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -219,6 +228,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
219 }) 228 })
220 } 229 }
221 230
  231 + // 所属类型表单赋值
  232 + function fromTheirType() {
  233 + let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
  234 + $.ajax({
  235 + url: url,
  236 + success: function (res) {
  237 + var selects = res.data.options;
  238 + theirTypeOptions = res.data.options;
  239 + var $sel = $("form.layuiadmin-card-header-auto").find("select[name='theirType']");
  240 + $.each(selects, function (i, e) {
  241 + $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
  242 + })
  243 + form.render();
  244 + }
  245 + })
  246 + }
  247 + fromTheirType();
  248 +
222 //获取页面选中数据 249 //获取页面选中数据
223 function getCheckStatusData() { 250 function getCheckStatusData() {
224 return table.checkStatus('workReportConfigTable').data 251 return table.checkStatus('workReportConfigTable').data
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 type="text"> 20 type="text">
21 </div> 21 </div>
22 </div> 22 </div>
23 - <div class="layui-inline"> 23 + <div class="layui-inline hide">
24 <div class="layui-input-inline"> 24 <div class="layui-input-inline">
25 <select id="groupName" lay-filter="groupName" name="groupName"> 25 <select id="groupName" lay-filter="groupName" name="groupName">
26 <option value="">=配置名称=</option> 26 <option value="">=配置名称=</option>
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
31 <div class="layui-input-inline"> 31 <div class="layui-input-inline">
32 <select id="theirType" lay-filter="theirType" name="theirType"> 32 <select id="theirType" lay-filter="theirType" name="theirType">
33 <option value="">全部</option> 33 <option value="">全部</option>
34 - <option value="1">日志类型</option>  
35 - <option value="2">文档类型</option> 34 +<!-- <option value="1">日志类型</option>-->
  35 +<!-- <option value="2">文档类型</option>-->
36 </select> 36 </select>
37 </div> 37 </div>
38 </div> 38 </div>
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 <label class="layui-form-label">所属类型</label> 18 <label class="layui-form-label">所属类型</label>
19 <div class="layui-input-block"> 19 <div class="layui-input-block">
20 <select id="config_theirType" lay-filter="config_theirType" lay-verify="required" name="theirType"> 20 <select id="config_theirType" lay-filter="config_theirType" lay-verify="required" name="theirType">
21 - <option value="1">日志类型</option>  
22 - <option value="2">文档类型</option> 21 +<!-- <option value="1">日志类型</option>-->
  22 +<!-- <option value="2">文档类型</option>-->
23 </select> 23 </select>
24 </div> 24 </div>
25 </div> 25 </div>