Browse Source

奥维修改SMT线体看板

xiaost 2 months ago
parent
commit
a603ecf164

+ 1 - 1
src/assets/scss/indexsmt.scss

@@ -126,7 +126,7 @@
     .body-box {
       margin-top: 10px;
       display: grid;
-      grid-template-columns: 1fr 8fr ;
+      grid-template-columns: 1fr 8.2fr ;
 
       .left-box{
          .lup{

+ 2 - 2
src/components/smtechart/rbottom/aoiRateChart/index.vue

@@ -11,7 +11,7 @@ export default {
   data() {
     return {
       timing: null,
-      cdata: 0,
+      cdata: 100,
     }
   },
   components: {
@@ -43,7 +43,7 @@ export default {
         }).then((result) => {
           let dataList = JSON.parse(result.data.data);
           if(dataList.length>0){
-             this.cdata = dataList[0].v_aoidata;
+             this.cdata = dataList[0].v_rate;
           }
         }, (result) => {
           console.error(result)

+ 2 - 2
src/components/smtechart/rbottom/badChart/chart.vue

@@ -3,8 +3,8 @@
     <Echart
       :options="options"
       id="smtbadChart"
-      height="280px"
-      width="200px"
+      height="300px"
+      width="400px"
     ></Echart>
   </div>
 </template>

+ 2 - 2
src/components/smtechart/rbottom/spiRateChart/index.vue

@@ -11,7 +11,7 @@ export default {
   data() {
     return {
       timing: null,
-      cdata: 20,
+      cdata: 100,
     }
   },
   components: {
@@ -43,7 +43,7 @@ export default {
           }).then((result) => {
             let dataList = JSON.parse(result.data.data);
             if (dataList.length > 0) {
-              this.cdata = dataList[0].v_aoidata;
+              this.cdata = dataList[0].v_rate;
             }
           }, (result) => {
             console.error(result)

+ 18 - 21
src/views/smt/index.vue

@@ -206,36 +206,33 @@ export default {
       this.getTemp();
       this.timing = setInterval(() => {
         this.getTemp(); //获取--数据
-      }, 30000);
+      }, 120000);
     },
     //获取温度湿度
     async getTemp(){
-      var caller = 'KB!SMT!BUTTOM1!ZWDATA';
+      var caller = 'KB!SMT!TEMPDATA';
+      let paramsData = ''
+      if (sessionStorage.getItem('li_code') === 'SMTA' ||
+          sessionStorage.getItem('li_code') === 'SMTB'
+      ) {
+        paramsData = " equitype = '二楼南'"
+      } else {
+        paramsData = " equitype = '二楼北'"
+      }
       await this.$http.get("kanban/datalist.action?caller=" + caller + "&_noc=1&page=1&pageSize=100", {
         params: {
-          condition: "1=1 ",
+          condition: paramsData,
         }
       }).then((result) => {
         let dataList = JSON.parse(result.data.data);
-        let resultList = new Array();
-        for (let index = 0; index < dataList.length; index++) {
-          const element = dataList[index];
-          let item = new Array();
-          //"线别", "机台", "料号", "抛料率", "抛料数"
-          item.push(element.v_licode);
-          item.push(element.prlocation);
-          item.push(element.prodcode);
-          if (element.plrate > 1) {  //抛料率大于1%显示红色
-            item.push("<span  class='colorRed'>" + element.plrate + "</span>");
-          } else {
-            item.push(element.plrate);
-          }
-          item.push(element.plqty);
-          resultList.push(item);
+        if(dataList.length>0){
+          const element = dataList[0];
+          this.v_temp  = element.v_temp;
+          this.v_rh = element.v_rh;
+
         }
-        const scrollBoard = this.$refs['scroll-board'];
-        //刷新数据
-        scrollBoard.updateRows(resultList);
+
+
       }, (result) => {
         console.error(result)
           }

+ 4 - 4
src/views/smt/rdown2.vue

@@ -123,7 +123,7 @@ export default {
             headers.push(element.text);
             columnWidths.push(element.width);
             fieldnames.push(element.dataIndex);
-            aligns.push('center');
+            aligns.push('left');
           }
         }
         this.config1.header = headers;
@@ -165,7 +165,7 @@ export default {
                 headers.push(element.text);
                 columnWidths.push(element.width);
                 fieldnames.push(element.dataIndex);
-                aligns.push('center');
+                aligns.push('left');
               }
             }
             this.config2.header = headers;
@@ -207,7 +207,7 @@ export default {
                 headers.push(element.text);
                 columnWidths.push(element.width);
                 fieldnames.push(element.dataIndex);
-                aligns.push('center');
+                aligns.push('left');
               }
             }
             this.config3.header = headers;
@@ -332,7 +332,7 @@ $box-width: 100%;
     border-radius: 10px;
   }
   .dv-scr-board {
-    height: 115px;
+    height: 112px;
   }
 
   .dv-scr-board2 {

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

@@ -149,7 +149,7 @@ export default {
 
         // 构建三行数据(原始完整数据)
         const actualOutputs = dataList.map(item => item.v_outqty ?? 0)
-        const planOutputs = dataList.map(item => item.v_planqty ?? 0)
+        const planOutputs = dataList.map(item => item.v_planoutqty ?? 0)
         const rates = dataList.map(item => (item.v_rate ?? 0) + '%')
 
         this.tableData = [

+ 3 - 3
src/views/smt/rup2.vue

@@ -26,7 +26,7 @@ export default {
       config: {
         header: [],
         data: [],
-        rowNum: 10, //表格行数
+        rowNum: 8, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
@@ -116,10 +116,10 @@ $box-width: 100%;
   .body-box {
     border-radius: 10px;
     overflow: hidden;
-    height: 385px;
+    height: 375px;
 
     .dv-scr-board {
-      height: 380px;
+      height: 370px;
     }
   }
 }

File diff suppressed because it is too large
+ 330 - 330
yarn.lock


Some files were not shown because too many files changed in this diff