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

zhangtianqi
Commit 481b9b2d9a87526ea4c8b14be392a20a6dd935ae 1 parent a136d902
Showing 4 changed files with 67 additions and 18 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigIndex.js
hg-monitor-web-base/src/main/resources/static/src/views/workreport/config.html
hg-monitor-web-base/src/main/resources/static/src/views/workreport/configAdd.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
View file @481b9b2
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
View file @481b9b2
@@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
     //对外暴露的接口
     exports('reportConfigAdd', function (data) {
-        var accessToken = session.getToken()['access_token']
+        // var accessToken = session.getToken()['access_token']
+        var accessToken = common.getMjToken();
         var adminSelect = {}
         var userSelect = {}
@@ -43,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             data.userName = userSelect.getValue('nameStr')
             data.theirType = $('#config_theirType').val();
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/save?access_token=' + accessToken,
+                url: domainName + '/api-web/bWorkreportGroup/save?accessToken=' + accessToken,
                 data: JSON.stringify(data),
                 type: 'post',
                 contentType: "application/json; charset=utf-8",
@@ -108,15 +109,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     }
                 })
             }*/
-            var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?access_token=${accessToken}`;
+            // var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+            let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
             $.ajax({
                 url: url,
                 success: function (res) {
-                    var selects = res.data;
+                    var selects = res.data.options;
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     $sel.append('<option value="">请选择</option>')
                     $.each(selects, function (i, e) {
-                        $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
+                        // $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
+                        $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
                     })
                     if (data && data.id) {
                         admin.req({
@@ -140,10 +143,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             })
         }
+        // 所属类型表单赋值
+        function fromTheirType() {
+            let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
+            $.ajax({
+                url: url,
+                success: function (res) {
+                    var selects = res.data.options;
+                    var $sel = $("form[name='add-config-form']").find("select[name='theirType']");
+                    $sel.append('<option value="">请选择</option>')
+                    $.each(selects, function (i, e) {
+                        $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
+                    })
+                    form.render();
+                }
+            })
+        }
+
         //初始化组负责人下拉列表框
         function initSelect() {
             $.ajax({
-                url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                // url: domainName + '/api-user/users/getAll?accessToken=' + accessToken,
+                url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + accessToken,
                 success: function (res) {
                     adminSelect = xmSelect.render({
                         el: '.admin',
@@ -157,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         },
                         layVerify: 'required',
                         layVerType: 'msg',
-                        data: res,
+                        data: res.data.rows,
                     })
                     userSelect = xmSelect.render({
                         el: '.user',
@@ -169,9 +190,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         },
                         layVerify: 'required',
                         layVerType: 'msg',
-                        data: res,
+                        data: res.data.rows,
                     })
                     fromAssignment()
+                    fromTheirType()
                 }
             })
         }
@@ -179,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         //初始化所属组列表
         function initGroupSelect() {
             $.ajax({
-                url: domainName + '/api-web/bWorkreportGroup/list?access_token=' + accessToken,
+                url: domainName + '/api-web/bWorkreportGroup/list?accessToken=' + accessToken,
                 success: function (res) {
                     $("#groupName")[0].options.length = 1
                     $.each(res.data, function (i, v) {
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigIndex.js
View file @481b9b2
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigIndex.js
View file @481b9b2
@@ -11,9 +11,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
     //对外暴露的接口
     exports("reportConfigIndex", function () {
-        var accessToken = session.getToken()['access_token']
+        // var accessToken = session.getToken()['access_token']
+        var accessToken = common.getMjToken();
+        let theirTypeOptions = [];
-        initGroupSelect()
+        // initGroupSelect()
         //回车搜索
         $('#adminName').keydown(function (e) {
@@ -82,11 +84,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                 {
                     field: 'theirType', title: '所属类型', align: 'center', width: 150,
                     templet: function (d) {
-                        if (d.theirType == '1') {
+                        /*if (d.theirType == '1') {
                             return '日志类型';
                         } else {
                             return '文档类型';
+                        }*/
+                        let label='';
+                        theirTypeOptions.forEach((item,index)=>{
+                            if (item.value == d.theirType){
+                                label = item.label;
                             }
+                        })
+                        return label;
                     }
                 },
                 {
@@ -183,7 +192,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                         , time: 1000
                     }, function () {
                         reloadConfigTable();
-                        initGroupSelect()
+                        // initGroupSelect()
                     });
                 }).error(function (error) {
                     console.log(error);
@@ -219,6 +228,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
             })
         }
+        // 所属类型表单赋值
+        function fromTheirType() {
+            let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
+            $.ajax({
+                url: url,
+                success: function (res) {
+                    var selects = res.data.options;
+                    theirTypeOptions = res.data.options;
+                    var $sel = $("form.layuiadmin-card-header-auto").find("select[name='theirType']");
+                    $.each(selects, function (i, e) {
+                        $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
+                    })
+                    form.render();
+                }
+            })
+        }
+        fromTheirType();
+
         //获取页面选中数据
         function getCheckStatusData() {
             return table.checkStatus('workReportConfigTable').data
--- a/hg-monitor-web-base/src/main/resources/static/src/views/workreport/config.html
View file @481b9b2
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/workreport/config.html
View file @481b9b2
@@ -20,7 +20,7 @@
                                                type="text">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline hide">
                                     <div class="layui-input-inline">
                                         <select id="groupName" lay-filter="groupName" name="groupName">
                                             <option value="">=配置名称=</option>
@@ -31,8 +31,8 @@
                                     <div class="layui-input-inline">
                                         <select id="theirType" lay-filter="theirType" name="theirType">
                                             <option value="">全部</option>
-                                            <option value="1">日志类型</option>
-                                            <option value="2">文档类型</option>
+<!--                                            <option value="1">日志类型</option>-->
+<!--                                            <option value="2">文档类型</option>-->
                                         </select>
                                     </div>
                                 </div>
--- a/hg-monitor-web-base/src/main/resources/static/src/views/workreport/configAdd.html
View file @481b9b2
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/workreport/configAdd.html
View file @481b9b2
@@ -18,8 +18,8 @@
         <label class="layui-form-label">所属类型</label>
         <div class="layui-input-block">
             <select id="config_theirType" lay-filter="config_theirType" lay-verify="required" name="theirType">
-                <option value="1">日志类型</option>
-                <option value="2">文档类型</option>
+<!--                <option value="1">日志类型</option>-->
+<!--                <option value="2">文档类型</option>-->
             </select>
         </div>
     </div>