fix:设备管理看板

src/views/system/jbdHome/board/component/equipment/zhuzhuangtu.vue

@@ -106,7 +106,7 @@ export default {
               color: "#fff"
             }
           },
-          interval:this.yAxisNum
+          interval:10
         },
         ],
         series: [

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

@@ -44,6 +44,10 @@
         </div>
         <dv-decoration-10 style="height:1%;width: 96%;display:flex;margin: 0 auto;        " />
         <div class="bottomCard">
+          <div style="width:25%">
+            <zhuzhuangtu v-if="sheBeiData.data.length" :info="sheBeiData" ref="sheBeiDataDataref" />
+          </div>
+          <dv-decoration-2 v-if="bottomData.data.length" :reverse="true" style="width:2%;height:100%;" />
           <div style="width:25%;display:flex;overflow: hidden;">
             <div class="bottomCardLeft0">
               <middleCard v-if="weiHuSheBeiDataShow" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef" />
@@ -74,10 +78,7 @@
               <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData" ref="bottomCardLeft" />
             </div> -->
           </div>
-          <dv-decoration-2 v-if="bottomData.data.length" :reverse="true" style="width:2%;height:100%;" />
-          <div style="width:25%">
-            <zhuzhuangtu v-if="sheBeiData.data.length" :info="sheBeiData" ref="sheBeiDataDataref" />
-          </div>
+
         </div>
       </dv-border-box-1>
     </dv-full-screen-container>
@@ -136,15 +137,15 @@ export default {
       sheBeiData: { xData: [], data: [], config: { idSelector: "" } },
       sheBeiweiHuData: { xData: [], data: [], config: { idSelector: "" } },
       config: {
-        header: ["设备名称", "编号", "规格型号", "状态"],
+        header: ["设备名称", "编号", "状态"],
         data: [],
-        columnWidth: ["100", "110", "85", "85"],
+        columnWidth: ["100", "110", "85"],
         rowNum: 6,
       },
       shiyonglvConfig: {
-        header: ["设备名称", "使用时间", "状态", "频率"],
+        header: ["设备名称", "使用时间", "使人","存放位置","状态", "频率"],
         data: [],
-        columnWidth: ["120", "120", "120", "50"],
+        columnWidth: ["120", "120", "100", "160","120", "50"],
         rowNum: 6,
       },
       zichan: 0,
@@ -236,11 +237,7 @@ export default {
           //   return
           // }
           // let zichan = '待确认';
-          let eIntactnessRate = Number(
-            (
-              (data[0].goodEquipments / data[0].Equipments).toFixed(3) + ""
-            ).slice(2, 4)
-          );
+          let eIntactnessRate = Number(((data[0].goodEquipments / data[0].Equipments).toFixed(3) + "").slice(2, 4));
           this_.MiddleLeftPieViewList.data = [];
           let eBadRate = 100 - eIntactnessRate;
           let obj = {};
@@ -511,7 +508,7 @@ export default {
             data1 = [];
             data1.push(item.she_bei_ming_cheng_);
             data1.push(item.she_bei_shi_bie_h);
-            data1.push(item.gui_ge_xing_hao_);
+            // data1.push(item.gui_ge_xing_hao_);
             data1.push(item.she_bei_zhuang_ta);
             this_.config.data.push(data1);
           });
@@ -523,7 +520,7 @@ export default {
 
     async getCarouselShiYonglvTable() {
       let this_ = this;
-      const sql = `select she_bei_ming_chen,she_bei_bian_hao_ ,create_time_,she_bei_zhuang_ku,COUNT(*) AS pinlv FROM t_mjsbsy GROUP BY she_bei_bian_hao_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
+      const sql = `select b.name_,c.cun_fang_di_dian_, a.she_bei_ming_chen,a.she_bei_bian_hao_ ,a.create_time_,a.she_bei_zhuang_ku,a.shi_yong_ren_,COUNT(*) AS pinlv FROM t_mjsbsy  AS a JOIN ibps_party_employee AS b ON a.shi_yong_ren_ = b.id_ JOIN t_sbdj AS c ON a.she_bei_bian_hao_ = c.id_  GROUP BY create_time_  HAVING create_time_ LIKE  '${this.month}%' ORDER BY pinlv DESC`;
       let data1 = [];
       let res1 = [];
       this.shiyonglvConfig.data = [];
@@ -535,6 +532,8 @@ export default {
               data1 = [];
               data1.push(item.she_bei_ming_chen);
               data1.push(this_.timestampToTime(item.create_time_ / 1000));
+              data1.push(item.name_);
+              data1.push(item.cun_fang_di_dian_);
               data1.push(item.she_bei_zhuang_ku);
               data1.push(item.pinlv);
               this_.shiyonglvConfig.data.push(data1);
@@ -705,14 +704,14 @@ export default {
       box-sizing: border-box;
     }
     .middleCardRight {
-      width: 34%;
+      width: 28%;
       height: 100%;
       overflow: hidden;
       box-sizing: border-box;
     }
     .middleCardRight1 {
       height: 100%;
-      width: 34%;
+      width: 40%;
       overflow: hidden;
       box-sizing: border-box;
     }