设备管理看板

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

@@ -15,11 +15,12 @@
           <dv-border-box-8>返回</dv-border-box-8>
         </div>
       </div>
-      <dv-border-box-1 v-if="MiddleLeftPieViewList.data.length" style="width: 100%;height:89%;margin: 0 auto;box-sizing: border-box;overflow: hidden;">
+      <dv-border-box-1 v-if="MiddleLeftPieViewList.data.length" style="width: 100%;height:88%;margin: 0 auto;box-sizing: border-box;overflow: hidden;">
         <!-- 顶部数据 -->
         <div class="topCard">
           <top-bar v-if="topBarData.length" :info="topBarData" />
         </div>
+        <dv-decoration-10 style="height:1%;width: 96%;display:flex;margin: 0 auto;" />
         <div class="middleCard">
           <div style="width:100%;height: 100%;overflow: hidden;box-sizing: border-box;">
             <div class="middleCardLeft">
@@ -41,6 +42,7 @@
           </div>
           <dv-decoration-10 v-if="MiddleLeftPieViewList.data.length" style="height: 5%;" />
         </div>
+        <dv-decoration-10 style="height:1%;width: 96%;display:flex;margin: 0 auto;        " />
         <div class="bottomCard">
           <div style="width:28%;display:flex;overflow: hidden;">
             <div class="bottomCardLeft0">
@@ -63,7 +65,7 @@
 
           </div>
           <dv-decoration-2 v-if="sheBeiweiHuData.data.length" :reverse="true" style="width:2%;height:100%;" />
-          <div style="width:2%;display:flex;overflow: hidden;">
+          <div style="width:25%;display:flex;overflow: hidden;">
             <!-- <div class="bottomCardLeft">
               <middleCard v-if="sheBeiHeChaData.data.length" :info="sheBeiHeChaData" ref="sheBeiHeChaRef" />
             </div> -->
@@ -128,13 +130,13 @@ export default {
       zhuantaiEData: { xData: [], data: [], config: { idSelector: "" } },
       sheBeiweiHuData: { xData: [], data: [], config: { idSelector: "" } },
       config: {
-        header: ["设备名称", "设备编号", "规格型号", "设备状态"],
+        header: ["设备名称", "编号", "规格型号", "状态"],
         data: [],
         columnWidth: ["100", "110", "85", "85"],
         rowNum: 6,
       },
       shiyonglvConfig: {
-        header: ["设备名称", "使用时间", "设备状态", "频率"],
+        header: ["设备名称", "使用时间", "状态", "频率"],
         data: [],
         columnWidth: ["120", "120", "120", "50"],
         rowNum: 6,
@@ -217,25 +219,23 @@ export default {
         .then((res) => {
           const data = res.variables.data;
           // 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 - parseInt(eIntactnessRate);
+          let eBadRate = 100 - eIntactnessRate;
           let obj = {};
+          debugger
           obj.value = data[0].goodEquipments;
           obj.name = "正常设备数";
           this_.MiddleLeftPieViewList.data.push(obj);
           obj = {};
           obj.value = data[0].scrapEquipments;
-          obj.name = "停用/报废";
+          obj.name = "停用/报废设备数";
+          this_.MiddleLeftPieViewList.data.push(obj);
           obj = {};
           obj.value = data[0].limitedEquipments;
-          obj.name = "备用设备数";
-          this_.MiddleLeftPieViewList.data.push(obj);
+          obj.name = "受限设备数";
           this_.MiddleLeftPieViewList.data.push(obj);
+          // this_.MiddleLeftPieViewList.data.push(obj);
           this_.MiddleLeftPieViewList.color = ["#339933", "#FFFF66", "#FF0033"];
           this_.MiddleLeftPieViewList.config.title = "设备状态工作分布率";
           this_.MiddleLeftPieViewList.config.idSelector = "main2";
@@ -250,28 +250,28 @@ export default {
               title: "",
               children: [
                 {
-                  label: "设备数总数",
+                  label: "设备总数",
                   value: data[0].Equipments,
                   danwei: "",
                 },
                 {
-                  label: "新增设备数",
+                  label: "新增数",
                   value: data[0].addEquipments,
                   danwei: "",
                 },
                 {
-                  label: "正常设备数",
+                  label: "正常数",
                   value: data[0].goodEquipments,
                   danwei: "",
                 },
 
                 {
-                  label: "受限设备数",
+                  label: "受限数",
                   value: data[0].limitedEquipments,
                   danwei: "",
                 },
                 {
-                  label: "报废/停用设备数",
+                  label: "报废/停用数",
                   value: data[0].scrapEquipments,
                   danwei: "",
                 },
@@ -281,12 +281,12 @@ export default {
               title: "",
               children: [
                 {
-                  label: "计划维护设备数",
+                  label: "计划维护数",
                   value: data[0].weiHuNoEquipments,
                   danwei: "",
                 },
                 {
-                  label: "已维护设备数",
+                  label: "已维护数",
                   value: data[0].weiHuEquipments,
                   danwei: "",
                 },
@@ -296,12 +296,12 @@ export default {
               title: "",
               children: [
                 {
-                  label: "计划检定/校准设备数",
+                  label: "计划检定/校准数",
                   value: data[0].testNoEquipments,
                   danwei: "",
                 },
                 {
-                  label: "已检定/校准设备数",
+                  label: "已检定/校准数",
                   value: data[0].testEquipments,
                   danwei: "",
                 },
@@ -316,12 +316,12 @@ export default {
               title: "",
               children: [
                 {
-                  label: "申请维修设备数",
+                  label: "申请维修数",
                   value: data[0].checkNoEquipments,
                   danwei: "",
                 },
                 {
-                  label: "完成维修设备数",
+                  label: "完成维修数",
                   value: data[0].checkEquipments,
                   danwei: "",
                 },
@@ -354,21 +354,21 @@ export default {
             },
           ];
           //
-          this_.bottomData.xData = ["计划核查设备数", "已核查设备数"];
+          this_.bottomData.xData = ["计划核查数", "本月已核查数"];
           this_.bottomData.data.push(data[0].checkNoEquipments);
           this_.bottomData.data.push(data[0].checkEquipments);
           this_.bottomData.config.title = "期间核查设备完成图";
           this_.bottomData.config.idSelector = "main4";
           this_.zhuantaiEData.xData = [
-            "计划检定/校准设备数",
-            "已完成检定/校准设备数",
+            "计划检定/校准数",
+            "已完成检定/校准数",
           ];
           this_.zhuantaiEData.data.push(data[0].testNoEquipments);
           this_.zhuantaiEData.data.push(data[0].testEquipments);
           this_.zhuantaiEData.config.title = "设备检定/校准设备完成图";
           this_.zhuantaiEData.config.idSelector = "main3";
           //维护设备柱状图
-          this_.sheBeiweiHuData.xData = ["计划维护设备数", "已完成设备数"];
+          this_.sheBeiweiHuData.xData = ["计划维护数", "已完成数"];
           this_.sheBeiweiHuData.data.push(data[0].weiHuNoEquipments);
           this_.sheBeiweiHuData.data.push(data[0].weiHuEquipments);
           this_.sheBeiweiHuData.config.title = "设备维护柱状图";
@@ -388,48 +388,48 @@ export default {
           });
 
           let objRate = {};
-          objRate.name = "设备完好率";
+          objRate.name = "完好率";
           objRate.value = eIntactnessRate;
           this_.eBgRateData.data.push(objRate);
           objRate = {};
           objRate.value = eBadRate;
-          objRate.name = "设备故障率";
+          objRate.name = "故障率";
           this_.eBgRateData.data.push(objRate);
           this_.eBgRateData.color = ["#339933", "#FF0033"];
           // this_.eBgRateData.config.title = "设备完好率分布";
           // this_.eBgRateData.config.idSelector = "main1";
           //设备维护
           let objweihu = {};
-          objweihu.name = "计划维护设备数";
+          objweihu.name = "计划维护数";
           objweihu.value = data[0].weiHuNoEquipments;
           this_.weiHuSheBeiData.data.push(objweihu);
           objweihu = {};
           objweihu.value = data[0].weiHuEquipments;
-          objweihu.name = "已维护设备数";
+          objweihu.name = "已维护数";
           this_.weiHuSheBeiData.data.push(objweihu);
           this_.weiHuSheBeiData.color = ["#5470c6", "#38a838"];
           this_.weiHuSheBeiData.config.title = "设备维护完成图";
           this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
           //设备核查
           let objHeCha = {}; //核查改维修
-          objHeCha.name = "维修设备申请";
+          objHeCha.name = "维修申请";
           objHeCha.value = data[0].checkNoEquipments;
           this_.sheBeiHeChaData.data.push(objHeCha);
           objHeCha = {};
           objHeCha.value = data[0].checkEquipments;
-          objHeCha.name = "已完成维修设备数";
+          objHeCha.name = "已完成维修数";
           this_.sheBeiHeChaData.data.push(objHeCha);
           this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];
           this_.sheBeiHeChaData.config.title = "设备维修分布";
           this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
           //设备检定校准
           let objJianding = {};
-          objJianding.name = "计划检定/校准设备数";
+          objJianding.name = "计划检定/校准数";
           objJianding.value = data[0].testNoEquipments;
           this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
           objJianding = {};
           objJianding.value = data[0].testEquipments;
-          objJianding.name = "已完成设备数";
+          objJianding.name = "已完成数";
           this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
           this_.jianDingjiaoZhunSheBeiData.color = ["#5470c6", "#38a838"];
           this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定校准分布率";
@@ -623,12 +623,12 @@ export default {
   }
   .topCard {
     width: 100%;
-    height: 20%;
+    height: 16%;
     box-sizing: border-box;
     overflow: hidden;
   }
   .bottomCard {
-    height: 38%;
+    height: 39%;
     overflow: hidden;
     box-sizing: border-box;
   }