车间看板样式调整

src/components/shopechart/up4Chart/chart.vue

@@ -67,12 +67,19 @@ export default {
               type: "pie",
               radius: [15, 60],
               roseType: "area",
-              center: ["23%", "48%"],
+              center: ["28%", "48%"],
               data: newData.seriesData,
               label: {
-                /*width: 5,
-                overflow: "truncate",*/
-              }
+                fontSize: 13,
+                formatter:function(param){
+                  let text = param.data.name;
+                  if (text.length < 8) {
+                    return text ;
+                  } else {
+                    return text.substring(0, 8) + '...' ;
+                  }
+                },
+              },
             }
           ]
         }

src/views/prodline/bottom1.vue

@@ -109,14 +109,15 @@
     $box-height: 520px;
     $box-width: 100%;
     #bottom1 {
-        padding: 8px 10px;
+        padding: 13px;
         height: $box-height;
         width: $box-width;
         border-radius: 5px;
         .up {
             .bg-color-black {
                 border-radius: 10px;
-                height: 225px;
+                height: 215px;
+                padding: 5px;
             }
 
             .text {

src/views/prodline/bottom2.vue

@@ -49,7 +49,7 @@ import Bottom2Chart from "@/components/prodlinechart/bottom2Chart";
   $box-height: 520px;
   $box-width: 100%;
   #bottom2 {
-    padding: 12px;
+    padding: 13px;
    // padding-top: 20px;
     height: $box-height;
     width: $box-width;
@@ -57,6 +57,7 @@ import Bottom2Chart from "@/components/prodlinechart/bottom2Chart";
     .bg-color-black {
       height: $box-height - 25px;
       border-radius: 10px;
+      padding: 5px;
     }
     .text {
       color: #c3cbde;

src/views/prodline/index.vue

@@ -60,7 +60,7 @@
                   产线看板<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item class="dropdownitem"><router-link to="workshop">车间看板</router-link></el-dropdown-item>
+                    <el-dropdown-item class="dropdownitem"><router-link to="shop">车间看板</router-link></el-dropdown-item>
                     <el-dropdown-item class="dropdownitem"><router-link to="quality">品质看板</router-link></el-dropdown-item>
                     <el-dropdown-item class="dropdownitem"><router-link to="device">设备看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>

src/views/prodline/up2.vue

@@ -187,7 +187,8 @@
             margin-bottom: 60px;
           }
           .water {
-            width: 230px;
+            margin-left:25px;
+            width: 200px;
             .dv-wa-le-po {
               height: 120px;
             }

src/views/shop/index.vue

@@ -47,7 +47,7 @@
                   车间看板<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item class="dropdownitem"><router-link to="lineshop">产线看板</router-link></el-dropdown-item>
+                    <el-dropdown-item class="dropdownitem"><router-link to="prodline">产线看板</router-link></el-dropdown-item>
                     <el-dropdown-item class="dropdownitem"><router-link to="quality">品质看板</router-link></el-dropdown-item>
                     <el-dropdown-item class="dropdownitem"><router-link to="device">设备看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>

src/views/shop/up3.vue

@@ -52,8 +52,8 @@ export default {
             for (let index = 0; index < dataList.length; index++) {
               const element = dataList[index];
               datas.push({
-                name:element.v_stepname ,
-                value:element.v_ztrate,
+                name:"<span  class='fs-md'>" + element.v_stepname+"<span/>" ,
+                value:"<span  class='fs-md'>" + element.v_ztrate +"<span/>",
               });
             }
             this.ranking.data = datas;
@@ -91,7 +91,8 @@ $box-width: 100%;
       }
     }
   }
-
-
+  ::v-deep .dv-scroll-ranking-board .ranking-info .rank{width:40px;color: #18a158;font-size: 15px;}
+  ::v-deep .dv-scroll-ranking-board .ranking-column{border-bottom:2px solid rgb(25, 161, 95,.5);margin-top:5px}
+  ::v-deep .dv-scroll-ranking-board .ranking-column .inside-column{position:relative;height:7px;background-color: #19a15f;margin-bottom:2px;border-radius:1px;overflow:hidden}
 }
 </style>

src/views/shop/up4.vue

@@ -37,12 +37,12 @@ export default {
       config: {
         header: ['线别', '产出', '不良','良率%','计划数','达成率%'],
         data: [],
-        // rowNum: 5, //表格行数
+         rowNum: 5, //表格行数
         headerHeight: 35,
         headerBGC: '#0f1325', //表头
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
-        columnWidth: [110,100,100,90,90,90],
+        columnWidth: [120,110,110,110,110,120],
         align: ['center']
       },
       timing:null,
@@ -78,16 +78,16 @@ export default {
                 for (let index = 0; index < dataList.length; index++) {
                   const element = dataList[index];
                   let item = new Array();
-                  item.push(element.linecode);
-                  item.push("<span  class='colorGrass'>"+element.value+"</span>");
-                  item.push("<span  class='colorGrass'>"+element.ngqty+"</span>");
+                  item.push("<span  class='fs-md'>"+ element.linecode +"</span>");
+                  item.push("<span  class='colorGrass fs-md'>"+element.value+"</span>");
+                  item.push("<span  class='colorGrass fs-md'>"+element.ngqty+"</span>");
                   if(element.okrate<98) {  //98%
-                    item.push("<span  class='colorRed'>" + element.okrate + "</span>");
+                    item.push("<span  class='colorRed fs-md'>" + element.okrate + "</span>");
                   }else {
-                    item.push("<span  class='colorGrass'>" + element.okrate + "</span>");
+                    item.push("<span  class='colorGrass fs-md'>" + element.okrate + "</span>");
                   }
-                  item.push("<span  class='colorGrass'>"+element.planqty+"</span>");
-                  item.push("<span  class='colorGrass'>"+element.getrate+"</span>");
+                  item.push("<span  class='colorGrass fs-md'>"+element.planqty+"</span>");
+                  item.push("<span  class='colorGrass fs-md'>"+element.getrate+"</span>");
                   resultList.push(item);
                 }
                 const scrollBoard = this.$refs['scroll-board'];
@@ -130,8 +130,8 @@ $box-width: 100%;
   }
   .down{
     height: 200px;
-    .dv-scroll-board .header {
-      font-size: 20px;
+    ::v-deep .dv-scroll-board .header{
+      font-size: 19px;
     }
     .dv-scroll-board {
       height: 200px;

vue.config.js

@@ -11,7 +11,7 @@ module.exports = {
   devServer: {
     proxy: {
       "/mes":{           // /proxy_url 这个用来和根路径 baseURL 进行匹配
-        target:'http://localhost:8080/ERP/',   // target: http://218.64.89.153:8099/mes/， 'http://localhost:8099/uas/' ,这个是填写跨域的请求域名+端口号，也就是要请求的URL(不包含URL路径)
+        target:'http://113.98.196.181:8099/mes',   // target: http://218.64.89.153:8099/mes/， 'http://localhost:8099/uas/' ,这个是填写跨域的请求域名+端口号，也就是要请求的URL(不包含URL路径)
         changeOrigin: true,  // 是否允许跨域请求，在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: {   // 路径重写
           '^/mes': '' // 替换target中的请求地址，原请求为 http://127.0.0.1:8000/kuayu 实际请求为 http://127.0.0.1:8000/proxy_url/kuayu