From 60a3d1b13b599984904fbbea7cba32084b64580a Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Tue, 19 Apr 2022 17:16:03 +0800
Subject: [PATCH] 1

---
 web/src/x.min.js              | 6 +++---
 web/srczip/common.js          | 2 +-
 web/srczip/logic/dashboard.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index 31dfb53..67466eb 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -263,7 +263,7 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
-                        callback && callback("查无数据");
+                        callback && callback(d.msg);
                     }else {
                         layer.msg(d.msg);
                     }
@@ -6905,8 +6905,8 @@ var X = window.X || {
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                if(val == '查无数据'){
-                    $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
+                if(typeof val  == 'string'){
+                    $('#model-two-'+d['report_id']).html('<span class="woshujv">'+ val +'</span>');
                 }else {
                     var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
                     var data;
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 8e3e2b2..7da8d68 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -262,7 +262,7 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
-                        callback && callback("查无数据");
+                        callback && callback(d.msg);
                     }else {
                         layer.msg(d.msg);
                     }
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 3036234..ca2e6eb 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -895,8 +895,8 @@
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                if(val == '查无数据'){
-                    $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
+                if(typeof val  == 'string'){
+                    $('#model-two-'+d['report_id']).html('<span class="woshujv">'+ val +'</span>');
                 }else {
                     var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
                     var data;