From 246b24e3a713b2d58678a02f86393bf56f55ffa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 12 Dec 2024 17:29:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8E=9F=E6=A0=B7=E5=AF=BC=E5=85=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  3 +-
 src/api/realTimeMonitor.js               | 10 ++++++-
 src/components/RealTimeMonitor/index.vue | 35 ++++++++++++++++++++----
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 5a12f43..e918f35 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
     "vue-pdf": "^4.3.0",
     "vue-router": "^3.5.1",
     "vue-seamless-scroll": "^1.1.23",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "xe-utils": "^3.5.14"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
diff --git a/src/api/realTimeMonitor.js b/src/api/realTimeMonitor.js
index 5d519f4..41fc31d 100644
--- a/src/api/realTimeMonitor.js
+++ b/src/api/realTimeMonitor.js
@@ -24,7 +24,7 @@ export function msg(params) {
 // 4.月度计划
 export function ydjh(params) {
   return request({
-    url: "/kban/ydjh",
+    url: "/dmSygdMx/list",
     method: "get",
     params,
   });
@@ -66,3 +66,11 @@ export function zxqwcqk(params) {
     params,
   });
 }
+
+export function getPerson(data={}) {
+  return request({
+    url: "/dmBzry/getList",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/components/RealTimeMonitor/index.vue b/src/components/RealTimeMonitor/index.vue
index ed04867..51f68dd 100644
--- a/src/components/RealTimeMonitor/index.vue
+++ b/src/components/RealTimeMonitor/index.vue
@@ -157,10 +157,10 @@
                 <el-table-column prop="dcCh" label="船号" width="80" />
                 <el-table-column prop="dcPl" label="批量" width="70" />
                 <el-table-column prop="dcFd" label="分段号" width="80" />
-                <el-table-column prop="bs" label="板数" width="50" />
+                <el-table-column prop="bs1" label="板数" width="50" />
                 <el-table-column prop="sl" label="上料" width="95" />
                 <el-table-column prop="xcpw" label="型材抛丸" width="80" />
-                <el-table-column prop="date" label="抛丸" width="70" />
+                <el-table-column prop="pw" label="抛丸" width="70" />
                 <el-table-column prop="yklm" label="一垮龙门板数" width="95" />
                 <el-table-column prop="yksk" label="一垮数控板数" width="95" />
                 <el-table-column
@@ -357,9 +357,10 @@ import {
   zyjh,
   getEveryKw,
   zxqZxDetail,
-  zxqwcqk,
+  zxqwcqk, getPerson,
 } from "@/api/realTimeMonitor";
 import VueSeamlessScroll from "vue-seamless-scroll";
+import XEUtils from 'xe-utils'
 export default {
   name: "RealTimeMonitor",
   components: {
@@ -367,6 +368,7 @@ export default {
   },
   data() {
     return {
+      personList:[],
       //1.出勤
       AttendanceObj: {},
       //2.安全公告
@@ -458,16 +460,32 @@ export default {
   },
   created() {},
   mounted() {
+    this.initPerson();
     this.kq(); //1.考勤接口
     this.msg(); //3.实时消息
     this.ydjh(); //4.月度计划接口
     this.zyjh(); //5.作业计划
     this.getEveryKw(); //6.本月计划汇总量
-    this.zxqZxDetail(); //7.作业区执行情况
     this.zxqwcqk(); //8.作业区未完成与完成量对比饼图
     this.leftBottomBoxHeight = this.$refs.leftBottomBoxHeight.offsetHeight;
   },
   methods: {
+    formatName(code){
+      console.log(code)
+      console.log(this.personList)
+      for (const item of this.personList) {
+        if (item.userCode===code){
+          return item.userName
+        }
+      }
+    },
+    initPerson(){
+      getPerson().then(res=>{
+        this.personList=res.data
+        console.log(res.data)
+        this.zxqZxDetail(); //7.作业区执行情况
+      })
+    },
     headerRowClass() {
       return "background:#072e7d;color:#fff;fontSize:12px; fontWeight: 400; textAlign: center;";
     },
@@ -495,7 +513,12 @@ export default {
     },
     // 4.月度计划
     ydjh() {
-      ydjh().then((res) => {
+      const date=new Date()
+      const data={
+        begin:'2024/12/01',
+        end:'2024/12/31'
+      }
+      ydjh(data).then((res) => {
         this.monthlyTableData = res.data;
       });
     },
@@ -548,7 +571,7 @@ export default {
             tzbh: item.tzbh,
             gx: item.gx,
             compAt: item.compAt,
-            name: item.name,
+            name: this.formatName(item.name),
           });
         });
         let valueArray = data.map((obj) => Object.values(obj));