zhangjingyuan 2 éve
szülő
commit
3eb6e4a2eb

+ 18 - 5
src/views/system/jbdHome/board/component/equipment/getPieView.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="pieView">
-    <div style="height: 20%;text-align: left;padding-left: 10px;">{{info.config.title||""}}</div>   
-    <div style="width:100%;height:80%;display: inline-block; overflow: hidden;">
+    <div style="height: 10%;text-align: left;padding-left: 10px;">{{info.config.title||""}}</div>   
+    <div style="width:100%;height:90%;display: inline-block; overflow: hidden;" v-show="showChart">
       <div :id="info.config.idSelector" style="width:100%;height:95%;overflow: hidden;"> </div>
     </div>
+    <div style="background: #061237; width: 100%;height: 70%;display: flex;justify-content: cne;justify-content: center;align-items: center;" v-if="!showChart">
+      <div style="color:#c7c7c7;">目前无数据</div>
+    </div>
   </div>
 </template>
 
@@ -12,6 +15,7 @@ import * as echarts from "echarts";
 export default {
   data(){
     return{
+      showChart:true,
     }
   },
   props:{
@@ -29,13 +33,22 @@ export default {
   },
   methods:{
     getMiddleLeft(){ 
+      const radius = window.innerWidth > 1600 ? '55%' : '45%';
+      let inData = this.info.data;
+      let num = 0;
+      for(let i in inData){
+        num += inData[i].value;
+      }
+      if(num == 0){
+        this.showChart = false;
+      }
       let chartDom = document.getElementById(this.info.config.idSelector);
       var myChart = echarts.init(chartDom);
       var option;
       option = {
         title: {
           show: true,
-          left: 'center',
+          left: 'top',
           textStyle: {
             color: '#fff',
             fontSize: 20,
@@ -53,7 +66,7 @@ export default {
         legend: {
           show: true,
           z: 3,
-          orient: 'vertical',
+          orient: 'left',
           left: 'right',
           textStyle:{
             color: '#fff'
@@ -61,7 +74,7 @@ export default {
         },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius,
           center: ['50%', '50%'],
           data:this.info.data,
           emphasis: {

+ 12 - 14
src/views/system/jbdHome/board/equipmentBoard.vue

@@ -31,7 +31,6 @@
               <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter" />
             </div>
             <dv-decoration-2 v-if="eBgRateData.data.length" :reverse="true" style="width:2%;height:100%;overflow: hidden;box-sizing: border-box;" />
-
             <div class="middleCardRight1">
               <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="设备使用记录" />
             </div>
@@ -48,7 +47,7 @@
             <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 style="width:24%;display:flex;overflow: hidden;">
             <div class="bottomCardLeft0">
               <middleCard v-if="weiHuSheBeiDataShow" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef" />
             </div>
@@ -59,7 +58,7 @@
           </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 style="width:24%;display:flex;overflow: hidden;">
             <!-- <div style="width:40%">
               <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData" ref="zhuantaiEDataref" />
             </div> -->
@@ -139,13 +138,13 @@ export default {
       config: {
         header: ["设备名称", "编号", "状态"],
         data: [],
-        columnWidth: ["100", "110", "85"],
+        columnWidth: ["160", "110", "85"],
         rowNum: 6,
       },
       shiyonglvConfig: {
         header: ["设备名称", "使用时间", "使人","存放位置","状态", "频率"],
         data: [],
-        columnWidth: ["120", "120", "100", "160","120", "50"],
+        columnWidth: ["175", "110", "80", "140","100", "60"],
         rowNum: 6,
       },
       zichan: 0,
@@ -384,7 +383,7 @@ export default {
           this_.sheBeiData.data.push(data[0].goodEquipments);
           this_.sheBeiData.data.push(data[0].limitedEquipments);
           this_.sheBeiData.data.push(data[0].scrapEquipments);
-          this_.sheBeiData.config.title = "设备数量情况一览";
+          this_.sheBeiData.config.title = "设备各工作状态数量统计";
           this_.sheBeiData.config.idSelector = "main8";
           this_.bottomData.data=[];
           this_.bottomData.xData = ["计划核查数", "本月已核查数"];
@@ -427,7 +426,7 @@ export default {
           objRate.name = "故障率";
           this_.eBgRateData.data.push(objRate);
           this_.eBgRateData.color = ["#339933", "#FF0033"];
-          this_.eBgRateData.config.title = "设备工作状态情况";
+          this_.eBgRateData.config.title = "设备完好情况";
           this_.eBgRateData.config.idSelector = "main1";
           //设备维护
           let objweihu = {};
@@ -440,13 +439,12 @@ export default {
           objweihu.name = "已维护数";
           this_.weiHuSheBeiData.data.push(objweihu);
           this_.weiHuSheBeiData.color = ["#5470c6", "#38a838"];
-          this_.weiHuSheBeiData.config.title = "设备维护完成";
+          this_.weiHuSheBeiData.config.title = "设备维护完成情况";
           this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
           this_.weiHuSheBeiDataShow = true;
           //设备核查
           let objHeCha = {}; //核查改维修
           this_.sheBeiHeChaData.data =[];
-          debugger
           objHeCha.name = "维修申请数";
           objHeCha.value = data[0].checkNoEquipments;
           this_.sheBeiHeChaData.data.push(objHeCha);
@@ -455,7 +453,7 @@ export default {
           objHeCha.name = "已完成数";
           this_.sheBeiHeChaData.data.push(objHeCha);
           this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];
-          this_.sheBeiHeChaData.config.title = "设备维修分布";
+          this_.sheBeiHeChaData.config.title = "设备维修情况";
           this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
           this_.sheBeiHeChaDataShow = true;
           //设备检定校准
@@ -470,7 +468,7 @@ export default {
           objJianding.name = "已完成数";
           this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
           this_.jianDingjiaoZhunSheBeiData.color = ["#5470c6", "#38a838"];
-          this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定校准分布率";
+          this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定/校准完成情况";
           this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
           this_.jianDingjiaoZhunSheBeiDataShow = true;
           // setTimeout(() => {
@@ -698,20 +696,20 @@ export default {
       box-sizing: border-box;
     }
     .middleCardCenter {
-      width: 28%;
+      width: 24%;
       height: 100%;
       overflow: hidden;
       box-sizing: border-box;
     }
     .middleCardRight {
-      width: 28%;
+      width: 24%;
       height: 100%;
       overflow: hidden;
       box-sizing: border-box;
     }
     .middleCardRight1 {
       height: 100%;
-      width: 40%;
+      width: 48%;
       overflow: hidden;
       box-sizing: border-box;
     }

+ 21 - 10
src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -418,10 +418,15 @@ export default {
     getLoadEchartsTwo() {
       var chartDom = document.getElementById("in-echarts");
       const setEchartWH = {
-        //设置控制图表大小变量
-        width: 400,
-        height: 300,
-      };
+        // 设置控制图表大小变量
+        width: 500,
+        height: this.source.length < 7 ? 350 : (this.source.length - 1) * 30 + 100
+      }
+      // const setEchartWH = {
+      //   //设置控制图表大小变量
+      //   width: 400,
+      //   height: 300,
+      // };
 
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -464,7 +469,7 @@ export default {
               // Map the "product" column to Y axis
               y: "product",
             },
-            barWidth: 30,
+            barWidth: 15,
           },
         ],
       };
@@ -475,10 +480,15 @@ export default {
     getLoadCmaEchartsX() {
       var chartDom = document.getElementById("in-CMAecharts");
       const setEchartWH = {
-        //设置控制图表大小变量
-        width: 400,
-        height: 300,
-      };
+        // 设置控制图表大小变量
+        width: 500,
+        height: this.source.length < 7 ? 350 : (this.source.length - 1) * 30 + 100
+      }
+      // const setEchartWH = {
+      //   //设置控制图表大小变量
+      //   width: 400,
+      //   height: 300,
+      // };
 
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -520,7 +530,7 @@ export default {
               // Map the "product" column to Y axis
               y: "product",
             },
-            barWidth: 30,
+            barWidth: 15,
           },
         ],
       };
@@ -949,6 +959,7 @@ export default {
     .department {
       width: 400px;
       height: 300px;
+      margin-left: 60px;
     }
     #department {
       width: 400px;