Merge branch 'master-mj-yuanjinpeng' into 'master-mj'

fix:数据库恢复验证概况超链接跳转问题处理



See merge request !1252

 /** 应急演练 */
-layui.define(['table', 'form','laytpl', 'sessions', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) {
+layui.define(['table', 'form','laytpl', 'sessions','view', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) {
     var $ = layui.$;
     var form = layui.form;
     var common = layui.common;
     var laytpl = layui.laytpl;
+    var view = layui.view;
     exports('recoverycount', function () {
         var sessions = layui.sessions;
         var accessToken = localStorage.getItem("accessToken");

@@ -7,15 +7,37 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
     var common = layui.common;
     var laydate = layui.laydate;
     var element = layui.element;
-    exports('recoveryverify', function () {
+    exports('recoveryverify', function (data) {
         var accessToken = common.getMjToken();
         var domainName = common.domainName;
         var timeChart = echarts.init(document.getElementById('recoveryverify-chart-time-record'));
 
         var dateLimit = ""
-        var createTime = "year"
         var manufactureArr = [];
+        var createTime = "year"
+        var resId = "";
+        var paramData = data;
+
+        if (paramData.period) {
+            createTime = paramData.period;
+            $.each($("button.date"), function (i, e) {
+                var $dom = $(e);
+                if ($dom.hasClass("active")) {
+                    $dom.removeClass("active")
+                }
 
+            })
+            $.each($("button.date"), function (i, e) {
+                var $dom = $(e);
+                if ($dom.data("period") == createTime) {
+                    $dom.addClass("active")
+                }
+
+            })
+            $("#dateLimit").val('');
+            dateLimit = ''
+            resId = paramData.resId;
+        }
         //日期范围选择
         laydate.render({
             elem: '#recoveryverifydateLimit'
@@ -90,7 +112,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 accessToken: accessToken,
                 createtime: createTime,
                 viewMode: 'true',
-                dateLimit: dateLimit
+                dateLimit: dateLimit,
+                resId:resId
             });
             table.render({
                 elem: '#recoveryverify-table',
@@ -128,7 +151,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                         field: 'omanufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                             var manufacturerName = '';
-                            if(d.omanufacturerId == '0'){
+                            if(d.omanufacturerId == '0' || d.omanufacturerId == ''){
                                 manufacturerName = '其他';
                             }else {
                                 if(manufactureArr && manufactureArr.length>0){

@@ -102,8 +102,12 @@
         </div>
     </div>
 </article>
+<script  template lay-done="layui.data.sendParams(d.params)">
+</script>
 <script>
-    layui.use('recoveryverify', function (fn) {
-        fn();
-    });
+    layui.data.sendParams = function (params) {
+        layui.use('recoveryverify', function (fn) {
+            fn(params);
+        });
+    };
 </script>