Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -276,6 +276,27 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 }
             });
         },
+        //文件预览
+        fileviewer: function(filepath){
+            var accessToken = '';
+            layui.use(['sessions', 'common'], function () {
+                var sessions = layui.sessions;
+                accessToken = sessions.getToken()['access_token'];
+            });
+            var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}`+'&access_token=' + accessToken;
+            var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
+            $.ajax({
+                type: "get",
+                url: url,
+                async: true,
+                success: function (data) {
+                    if (data.code == 0) {
+                        layer.close(loadIndex);
+                        window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
+                    }
+                }
+            });
+        },
         //业务下拉选择数据绑定
         bizTypeSelect: function (targtetId, callback) {
             var options = "<option value=''>=所属业务=</option>";

@@ -57,7 +57,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -65,6 +65,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                        var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -75,7 +76,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath)
                         }
                     })
 

@@ -57,7 +57,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -65,6 +65,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                        var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -75,7 +76,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath)
                         }
                     })
 

@@ -111,7 +111,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     },
                     {
                         title: '操作', align: "center", width: 120,
-                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link preview-attachment-btn">预览</span>' +
+                        templet: '<div><span data-id="{{d.id}}" data-suffix="{{d.suffix}}" data-path="{{d.path}}" class="layui-table-link preview-attachment-btn">预览</span>' +
                             '<span data-id="{{d.id}}" data-suffix="{{d.suffix}}" class="layui-table-link attachment-download-btn" style="margin-left: 10px">下载</span></div>'
                     }
                 ]],
@@ -119,6 +119,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                     $('.preview-attachment-btn').on('click', function () {
                         var id = $(this).data('id')
                         var suffix = $(this).data('suffix')
+                       var filepath = $(this).data('path')
                         if (suffix == 'jpg' || suffix == 'png' || suffix == 'JPG' || suffix == 'PNG') { //图片类型
                             var srcUrl = domainName + `/api-web/openoffice/readImage/${id}?access_token=` + accessToken
                             layer.open({
@@ -129,7 +130,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             })
                         } else {
                             //附件为文档类型
-                            common.openReport(id)
+                            common.fileviewer(filepath);
                         }
                     })
 

@@ -276,6 +276,27 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 }
             });
         },
+        //文件预览
+        fileviewer: function(filepath){
+            var accessToken = '';
+            layui.use(['sessions', 'common'], function () {
+                var sessions = layui.sessions;
+                accessToken = sessions.getToken()['access_token'];
+            });
+            var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}`+'&access_token=' + accessToken;
+            var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
+            $.ajax({
+                type: "get",
+                url: url,
+                async: true,
+                success: function (data) {
+                    if (data.code == 0){
+                        layer.close(loadIndex);
+                        window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(data.str));
+                    }
+                }
+            });
+        },
         //业务下拉选择数据绑定
         bizTypeSelect: function (targtetId, callback) {
             var options = "<option value=''>=所属业务=</option>";