Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

@@ -109,8 +109,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     }
                     }
                 })
                 })
             }*/
             }*/
-            // var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+             var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+/*
             let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
             let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
+*/
             $.ajax({
             $.ajax({
                 url: url,
                 url: url,
                 success: function (res) {
                 success: function (res) {
@@ -118,8 +120,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     $sel.append('<option value="">请选择</option>')
                     $sel.append('<option value="">请选择</option>')
                     $.each(selects, function (i, e) {
                     $.each(selects, function (i, e) {
-                        // $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
-                        $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
+                         $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
+/*
+                        $sel.append(`<option value="${e.code}"> ${e.label}</option>`)
+*/
                     })
                     })
                     if (data && data.id) {
                     if (data && data.id) {
                         admin.req({
                         admin.req({

@@ -521,6 +521,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                 $.each(data, function (k, v) {
                 $.each(data, function (k, v) {
                     var $dom = $($("#resManageAddProtocol").html());
                     var $dom = $($("#resManageAddProtocol").html());
                     $dom.find(".protocol-title span").text(k);
                     $dom.find(".protocol-title span").text(k);
+                    $dom.find(".protocol-title a.protocol-pwd").attr('data-protocol',k);
                     showPwdBtn(k, $dom, v);
                     showPwdBtn(k, $dom, v);
                     $.each(v, function (index, param) {
                     $.each(v, function (index, param) {
                         //是否必填 0必填，1非必填
                         //是否必填 0必填，1非必填
@@ -575,7 +576,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                 }, function (layerIndex) {
                 }, function (layerIndex) {
                     loading = layer.load(2);
                     loading = layer.load(2);
                     admin.req({
                     admin.req({
-                        url: `${common.domainName}/api-web/res/pwd/log/change?resId=${resId}&collProtocol=${protocol}`,
+                        url: `${common.domainName}/api-web/res/pwd/log/change?resId=${id}&collProtocol=${protocol}`,
                         data: {},
                         data: {},
                         type: 'GET',
                         type: 'GET',
                         contentType: 'application/json;charset=UTF-8',
                         contentType: 'application/json;charset=UTF-8',

@@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
 
 
     //对外暴露的接口
     //对外暴露的接口
     exports("workReportIndex", function () {
     exports("workReportIndex", function () {
-        var accessToken = session.getToken()['access_token']
+        var accessToken = common.getMjToken();
         var createTime = 'today'
         var createTime = 'today'
         var isRead = ''
         var isRead = ''
         var repType = ''
         var repType = ''
@@ -178,7 +178,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                 })
                 })
             }
             }
         })
         })
-
+        //下载
+        $('#workReport_download').on('click', function (){
+            var data = table.checkStatus('workReportTable').data;
+            var ids = '';
+            if(data.length<=0){
+                layer.msg("请至少选择一条下载", { offset: '15px' , icon: 7 , time: 1500 });
+            }else if(data.length>=1){
+                var arr = [];
+                $.each(data,function (i,e) {
+                    arr.push(e.id)
+                })
+                ids = arr.toString();
+                var url = domainName + `/api-web/workreport/exportWord?accessToken=` + accessToken+"&ids="+ids;
+                window.open(url);
+            }
+        })
         //刷新表格
         //刷新表格
         function reloadWorkReportTable() {
         function reloadWorkReportTable() {
             workReportTable.reload({
             workReportTable.reload({

@@ -240,7 +240,7 @@
     <div class="detail_menubox" id="mainindex_menubox" style="display: none;">
     <div class="detail_menubox" id="mainindex_menubox" style="display: none;">
         <ul>
         <ul>
             <li type="a"><i class="layui-icon">&#xe667;</i>活动告警</li>
             <li type="a"><i class="layui-icon">&#xe667;</i>活动告警</li>
-            <li type="r"><i class="layui-icon">&#xe653;</i>资源信息</li>
+<!--            <li type="r"><i class="layui-icon">&#xe653;</i>资源信息</li>-->
             <li type="t"><i class="layui-icon">&#xe641;</i>拓扑视图</li>
             <li type="t"><i class="layui-icon">&#xe641;</i>拓扑视图</li>
             <li type="top"><i class="layui-icon iconfont">&#xe61c;</i>置顶</li>
             <li type="top"><i class="layui-icon iconfont">&#xe61c;</i>置顶</li>
             <!--<li type="d"><i class="layui-icon">&#xe610;</i>拨测信息</li>-->
             <!--<li type="d"><i class="layui-icon">&#xe610;</i>拨测信息</li>-->

@@ -86,6 +86,9 @@
                         <button class="layui-btn layui-btn-sm layui-btn-normal" id="workReport_create_month">
                         <button class="layui-btn layui-btn-sm layui-btn-normal" id="workReport_create_month">
                             新增月报
                             新增月报
                         </button>
                         </button>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="workReport_download" >
+                            <i class="layui-icon">&#xe601;</i>下载
+                        </button>
                     </div>
                     </div>
                     <table id="workReportTable" lay-filter="workReportTable"></table>
                     <table id="workReportTable" lay-filter="workReportTable"></table>
                 </div>
                 </div>