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

fix: 工作日志加载日志列表优化



See merge request !1253

@@ -256,14 +256,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             , {field: 'alarmTime', title: '首次告警时间', align: 'center', minWidth: 180}
             , {field: 'alarmTime', title: '首次告警时间', align: 'center', minWidth: 180}
         ]
         ]
 
 
-        where = {
-            access_token: accessToken,
-            dateTime: $('#add-workReport-form').find("input[name='createTime']").val()
-        }
-
-        url = domainName + '/api-web/home/alarm/getAlarm'
 
 
-        getAlarmInfo(where,cols, url)
 
 
 
 
         /**
         /**
@@ -344,9 +337,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     , {field: 'clearUserId', title: '消除人', align: 'center', minWidth: 100,}
                     , {field: 'clearUserId', title: '消除人', align: 'center', minWidth: 100,}
                     , {field: 'clearTime', title: '消除时间', align: 'center', minWidth: 180,}
                     , {field: 'clearTime', title: '消除时间', align: 'center', minWidth: 180,}
                     , {field: 'clearReason', title: '消除原因', align: 'center', minWidth: 250})
                     , {field: 'clearReason', title: '消除原因', align: 'center', minWidth: 250})
-                where = {access_token: accessToken, reportId: data.id, time: time}
+                where = {accessToken: accessToken, reportId: data.id, time: time}
                 url = domainName + '/api-web/workreport/getAlarmListByReportId'
                 url = domainName + '/api-web/workreport/getAlarmListByReportId'
                 getAlarmInfo(where, cols, url)
                 getAlarmInfo(where, cols, url)
+            }else {
+                where = {
+                    accessToken: accessToken,
+                    dateTime: $('#add-workReport-form').find("input[name='createTime']").val()
+                }
+
+                url = domainName + '/api-web/home/alarm/getAlarm'
+
+                getAlarmInfo(where,cols, url)
             }
             }
         }
         }