xiaost 2 жил өмнө
parent
commit
6a72d5d229

+ 10 - 7
src/components/smtechart/bottom/bottom1Chart/chart.vue

@@ -3,7 +3,7 @@
         <Echart
                 :options="options"
                 id="bottom1Chart"
-                height="220px"
+                height="195px"
                 width="1100px"
         ></Echart>
     </div>
@@ -101,7 +101,7 @@
             cdata: {
                 handler(newData) {
                     this.options = {
-                        title: {
+                   /*     title: {
                             text: '',
                             textStyle: {
                                 color: '#D3D6DD',
@@ -184,12 +184,15 @@
                                 fontSize: 5
                             },
                             nameGap: 8
-                        },
+                        },*/
                         grid: {
-                            left: 50,
+                           /* left: 50,
                             right: 80,
                             bottom: 30,
-                            top: '60%'
+                            top: '60%'*/
+                            left: '5%',
+                            right: '4%',
+                            bottom: '3%',
                         },
                         xAxis: {
                             type: 'category',
@@ -232,7 +235,7 @@
                             }
                         },
                         series: [
-                            {
+                           /* {
                                 name: '',
                                 type: 'radar',
                                 symbolSize: 0,
@@ -310,7 +313,7 @@
                                         }
                                     }
                                 ]
-                            },
+                            },*/
                             {
                                 name: '',
                                 type: 'line',

+ 4 - 4
src/components/smtechart/bottom/bottom1Chart/index.vue

@@ -64,7 +64,7 @@
                     +"/"
                     +(dateBase.getDate()  < 10 ? "0" + (dateBase.getDate()) : dateBase.getDate() );
                 //获取统计数据,上周,历史
-                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!BadDutyInfo&_noc=1&page=1&pageSize=100&condition=1=1")
+               /* await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!BadDutyInfo&_noc=1&page=1&pageSize=100&condition=1=1")
                     .then((result)=>{
                             let dataList = JSON.parse(result.data.data);
                             let lastw ;
@@ -82,7 +82,7 @@
                         },(result)=>{
                             console.error(result)
                         }
-                    );
+                    );*/
                 //良率直通图
                 await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!DAYTURNOUT&_noc=1&page=1&pageSize=100&condition=1=1")
                     .then((result)=>{
@@ -111,7 +111,7 @@
                         }
                     );
                 //雷达图:
-                await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!RadiusBadDuty&_noc=1&page=1&pageSize=100&condition=1=1")
+               /* await this.$http.get("kanban/datalist.action?caller=KB!SMT!BUTTOM1!RadiusBadDuty&_noc=1&page=1&pageSize=100&condition=1=1")
                     .then((result)=>{
                             let dataList = JSON.parse(result.data.data);
                             let radarData = new Array();
@@ -149,7 +149,7 @@
                         },(result)=>{
                             console.error(result)
                         }
-                    );
+                    );*/
             }
         }
     };

+ 2 - 2
src/components/smtechart/up/up1Chart/chart.vue

@@ -27,8 +27,8 @@ export default {
          // data: ["标准产量", "实际产量达标","实际产量未达标" ,"抛料PPM"],
         },
         grid: {
-          left: '3%',
-          right: '4%',
+          left: '2%',
+          right: '3%',
           bottom: '3%',
           containLabel: true
         },

+ 2 - 2
src/components/smtechart/up/up3Chart/chart.vue

@@ -3,8 +3,8 @@
     <Echart
       :options="options"
       id="up3Chart"
-      height="350px"
-      width="300px"
+      height="380px"
+      width="340px"
     ></Echart>
   </div>
 </template>

+ 1 - 1
src/views/assembly/index.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
-              <span class="text ">设备运行分析</span>
+             <!-- <span class="text ">设备运行分析</span>-->
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>

+ 1 - 1
src/views/package/index.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
-              <span class="text ">设备运行分析</span>
+             <!-- <span class="text ">设备运行分析</span>-->
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>

+ 6 - 4
src/views/smt/bottom1.vue

@@ -116,7 +116,7 @@
         .up {
             .bg-color-black {
                 border-radius: 10px;
-                height: 250px;
+                height: 225px;
             }
 
             .text {
@@ -141,12 +141,14 @@
         }
 
         .down{
-            height: 200px;
+            height: 225px;
+            padding-top: 5px;
             .bg-color-black {
                 border-radius: 10px;
-                height: 200px;
+                height: 225px;
+                padding-top: 5px;
                 .dv-scr-board {
-                    height: 180px;
+                    height: 205px;
                 }
             }
         }

+ 1 - 1
src/views/smt/index.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
-              <span class="text ">设备运行分析</span>
+             <!-- <span class="text ">设备运行分析</span>-->
             </div>
             <div class="react-right mr-4 react-l-s">
               <span class="react-after"></span>