From 0dce33b14fa32380b6e325ba2cccc7ee6c7ee53d Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 9 Jan 2024 14:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E7=BA=BF=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finishproduct/BottomRightTable1.vue       |  10 +-
 .../kanban/finishproduct/TopMiddleCmp.vue     |  16 +-
 src/views/kanban/finishproduct/index.vue      | 205 +++++++++---------
 src/views/mes/unitprice/index.vue             |   8 +-
 4 files changed, 125 insertions(+), 114 deletions(-)

diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue
index d96ac3d..765e2e2 100644
--- a/src/views/kanban/finishproduct/BottomRightTable1.vue
+++ b/src/views/kanban/finishproduct/BottomRightTable1.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="bottom-right-table-1">
-    <dv-border-box-6>
+    <dv-border-box-13 :key="borderBoxKey">
       <div class="table-name">
-        <dv-scroll-board :config="getScrollBoardConfig()"  />
+        <dv-scroll-board :config="getScrollBoardConfig()" />
+<!--        <dv-scroll-board :config="getScrollBoardConfig()"  />-->
       </div>
-    </dv-border-box-6>
+    </dv-border-box-13>
   </div>
 </template>
 
@@ -19,6 +20,7 @@ export default {
   },
   data () {
     return {
+      borderBoxKey: 1, // 初始化一个key值
       config:{
         header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'],
         data: [
@@ -37,6 +39,7 @@ export default {
     tableData(newVal) {
       console.log("newVal-",newVal)
       this.config.data = this.formatTableData(newVal);
+      this.borderBoxKey += 1;
     }
   },
   methods: {
@@ -100,5 +103,6 @@ export default {
   .dv-scroll-board {
     height: calc(~"100% - 0px");
   }
+
 }
 </style>
diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue
index 3941989..de13d20 100644
--- a/src/views/kanban/finishproduct/TopMiddleCmp.vue
+++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue
@@ -87,15 +87,15 @@ export default {
 <style scoped>
 .top-middle-cmp {
   position: relative;
-  padding: 0 50px;
+  padding: 0 0px;
   box-sizing: border-box;
 
-.chart-name {
-  position: absolute;
-  right: 70px;
-  text-align: right;
-  font-size: 20px;
-  top: 10px;
-}
+/*.chart-name {*/
+/*  position: absolute;*/
+/*  right: 70px;*/
+/*  text-align: right;*/
+/*  font-size: 20px;*/
+/*  top: 10px;*/
+/*}*/
 }
 </style>
diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue
index 9ae42c8..8715499 100644
--- a/src/views/kanban/finishproduct/index.vue
+++ b/src/views/kanban/finishproduct/index.vue
@@ -1,32 +1,47 @@
 <template>
-  <div id="data-view">
-    <dv-full-screen-container>
-      <div class="main-header">
-        <div class="mh-left">
+  <v-scale-screen width="1920" height="1080" :fullScreen="true">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">成品包装线生产看板</div>
+        </div>
+        <div class="head-logo">
           <img src="../../../assets/images/logo.png" alt="" />
         </div>
-        <div class="mh-middle">成品包装线生产看板</div>
-        <div class="mh-right">{{currentDateTime}}
+        <div class="back">
+          <el-button
+            @click="back()"
+            type="primary"
+            icon="el-icon-s-home"
+          ></el-button>
         </div>
       </div>
-
-      <dv-border-box-1 class="main-container">
+      <div class="content-top">
+        <div class="timebox">
+          <div class="time">
+            {{ currentDateTime }}
+          </div>
+        </div>
+      </div>
+      <div class="content">
         <div class="mc-top">
-          <Top-Left-Cmp :data="valueForTopLeftCmp"/>
-          <Top-Middle-Cmp :data="valueForTopMiddleCmp" />
-          <Top-right-Cmp />
+          <div class="mc-left">
+            <Top-Left-Cmp :data="valueForTopLeftCmp"/>
+          </div>
+          <div class="mc-middle">
+
+          </div>
+          <div class="mc-right">
+            <Top-Middle-Cmp :data="valueForTopMiddleCmp"  style="height: 100%;"/>
+          </div>
         </div>
         <div class="mc-bottom">
-          <BottomRightTable1  :tableData="BottomRightTableValue"/>
+          <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px"/>
+          <!-- 设置 .mc-bottom 的高度，你可以根据实际情况调整 -->
         </div>
-
-<!--        <div class="mc-bottom">-->
-<!--          <BottomRightTable1 v-for="index in 4" :key="index+4" :tableIndex="index" :tableData="BottomRightTable2Value"/>-->
-<!--        </div>-->
-      </dv-border-box-1>
-
-    </dv-full-screen-container>
-  </div>
+      </div>
+    </div>
+  </v-scale-screen>
 </template>
 
 <script>
@@ -104,100 +119,92 @@ export default {
 }
 </script>
 
-<style lang="less">
-#data-view {
+<style lang="scss" scoped>
+
+.app-container {
+  padding: 0px 24px;
+  color: #fff;
+}
+.home {
   width: 100%;
   height: 100%;
-  background-color: #030409;
-  color: #fff;
-
-  #dv-full-screen-container {
-    background-image: url("../../../assets/images/bg-finishproduct.png");
-    background-size: 100% 100%;
-    box-shadow: 0 0 3px blue;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .main-header {
-    height: 80px;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-
-    .mh-left {
-      margin-top: 10px;
+  background: url("../../../assets/images/bg-finishproduct.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
     }
-
-    .mh-middle {
-      font-size: 30px;
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+      img {
+        height: 38px;
+        // width: ;
+      }
     }
-
-    .mh-left, .mh-right {
-      width: 200px;
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
     }
   }
-
-  .main-container {
-    height: calc(~"100% - 80px");
-    margin-left:0px;
-    .mc-top, .mc-bottom ,mc-bottom-1 {
-      box-sizing: border-box;
-      padding: 30px;
-      display: flex;
-
+  .content-top {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .timebox {
+      width: 480px;
+      height: 100px;
+
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      right: 0px;
+      .time {
+        font-size: 30px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 71px;
+      }
     }
-
+  }
+  .content {
+    margin-top: 63px;
+    display: block;
+    justify-content: space-between;
     .mc-top {
-      height: 40%;
-    }
-
-    .mc-bottom-1, .mc-bottom-2 {
       height: 100%;
-    }
-
-    .top-left-cmp, .bottom-left-container {
-      width: 32%;
-    }
-
-    .top-middle-cmp, .top-right-cmp {
-      width: 34%;
-    }
-
-    .bottom-left-container {
-      position: relative;
-
-      .border-box-content {
-        display: flex;
-      }
-
-      .mcb-decoration-1, .mcb-decoration-2 {
-        position: absolute;
-        left: 50%;
-        margin-left: -2px;
-      }
-
-      .mcb-decoration-1 {
-        top: 5%;
-        transform: rotate(180deg);
+      width: 100%;
+      display: flex;
+      .mc-left {
+        flex: 2;  // 占据剩余的空间
       }
 
-      .mcb-decoration-2 {
-        top: 50%;
+      .mc-middle {
+        flex: 1;  // 占据剩余的空间
       }
-
-      .bottom-left-chart-1, .bottom-left-chart-2 {
-        width: 50%;
-        height: 100%;
+      .mc-right {
+        flex: 2;  // 占据剩余的空间
       }
     }
 
-    .bottom-right-container {
-      width: 68%;
-      padding-left: 30px;
-      box-sizing: border-box;
-      display: flex;
-    }
   }
+
 }
+
 </style>
diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue
index dba26fb..00c7e02 100644
--- a/src/views/mes/unitprice/index.vue
+++ b/src/views/mes/unitprice/index.vue
@@ -106,9 +106,9 @@
 			<el-table-column label="物料描述" align="center" prop="productName" />
 			<el-table-column label="产线编码" align="center" prop="lineCode" />
 			<el-table-column label="产线名称" align="center" prop="lineName" />
-
 			<el-table-column label="子工序编码" align="center" prop="childprocessCode" />
 			<el-table-column label="子工序名称" align="center" prop="childprocessName" />
+      <el-table-column label="工序单价（元/pc）" align="center" prop="attr1" />
 
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
@@ -256,7 +256,7 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
@@ -340,7 +340,7 @@ export default {
         // 设置上传的请求头部
         headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mes/unitprice/importData"
+        url: process.env.VUE_APP_BASE_API + "/mes/unitPrice/importData"
       },
 			// 查询参数
 			queryParams: {
@@ -543,7 +543,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "子工序导入";
+      this.upload.title = "导入";
       this.upload.open = true;
     },