Authored by 王涛

Merge branch 'master-mj-ztq' into 'master-mj'

Master mj ztq



See merge request !1199
@@ -31,7 +31,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -31,7 +31,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
31 var conditions = form.val('form-prediction-condition'); 31 var conditions = form.val('form-prediction-condition');
32 Object.assign(conditions, { 32 Object.assign(conditions, {
33 access_token: accessToken, 33 access_token: accessToken,
34 - keyword: $("#keyword").val(),  
35 viewMode: 'true' 34 viewMode: 'true'
36 }); 35 });
37 table.render({ 36 table.render({