Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -162,14 +162,15 @@ export default {
       (select count(*) as Equipments from t_sbdj) as a,
       (select zi_chan_yuan_zhi_ as mony FROM t_sbdj) as a1,
       (select count(*) as addEquipments  from t_sbdj where gou_jin_ri_qi_ LIKE '%${this_.month}%') as b,
-      (select count(*) as testEquipments FROM t_sbjdxzzx WHERE parent_id_ IN (select  id_ FROM t_sbjdxzqr WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month}%')) as c,
-      (select count(*) as testNoEquipments FROM t_mjsbjdxzjhzb WHERE parent_id_ IN (select  id_ FROM t_mjsbjdxzjh WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian	LIKE '%${this_.month}%')) as c1,
+
+      (select count(*) as testEquipments FROM t_sbjdxzzx WHERE parent_id_ IN (select  id_ FROM t_sbjdxzqr WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month.slice(0,4)}%')) as c,
+      (select count(*) as testNoEquipments FROM t_mjsbjdxzjhzb WHERE parent_id_ IN (select  id_ FROM t_mjsbjdxzjh WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian	LIKE '%${this_.month.slice(0,4)}%')) as c1,
       (select count(*) as checkEquipments from t_sbqjhcjlb WHERE shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month}%') as d,
-      (select count(*) as checkNoEquipments from t_yqsbhcjh WHERE parent_id_ IN (select  id_ FROM t_sbhcjh WHERE  shi_fou_guo_shen_ ='1' AND bian_zhi_shi_jian LIKE '%${this_.month}%')) as d1,
+      (select count(*) as checkNoEquipments from t_sbqjhcjlb WHERE  create_time_ LIKE '%${this_.month}%' or bian_zhi_shi_jian LIKE '%${this_.month}%' ) as d1,
       (select count(*) as goodEquipments  from t_sbdj where she_bei_zhuang_ta ='正常') as e,
       (select count(*) as scrapEquipments  from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用') as f,
       (select count(*) as limitedEquipments  from t_sbdj where she_bei_zhuang_ta ='限制使用' or she_bei_zhuang_ta ='备用') as g,
-      (select count(*) as weiHuNoEquipments  from t_mjsbwhjhzb where create_time_ LIKE '%${this_.month}%') as h,
+      (select count(*) as weiHuNoEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '%${this_.month }%') as h,
       (select count(*) as weiHuEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '%${this_.month}%' and shi_fou_guo_shen_ ='1') as h1`;
       await curdPost("sql", sql)
         .then((res) => {
@@ -396,11 +397,15 @@ export default {
           this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
           //设备数核查
           let objHeCha = {};
+          let zero = 0;
+          if(data[0].checkNoEquipments== 0 &&data[0].checkEquipments== 0 ){
+            zero = 1;
+          }
           objHeCha.name = "本月计划核查数";
-          objHeCha.value = data[0].checkNoEquipments;
+          objHeCha.value = zero==1? zero: data[0].checkNoEquipments;
           this_.sheBeiHeChaData.data.push(objHeCha);
           objHeCha = {};
-          objHeCha.value = data[0].checkEquipments;
+          objHeCha.value =zero==1? zero:data[0].checkEquipments;
           objHeCha.name = "本月已核查数";
           this_.sheBeiHeChaData.data.push(objHeCha);
           this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];