From 7de6df5efd271a7596545fc6d52c3acc71000591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 6 Dec 2024 11:40:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E5=B0=8F=E6=B1=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=A0=E5=B7=A5=E4=BF=A1=E6=81=AF,=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E7=9C=8B=E6=9D=BFpdf=E6=98=BE=E7=A4=BA,?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/integration.js               |   9 +-
 src/components/Integration/index.vue | 120 +++++++++++++--------------
 src/components/ViewPDF/index.vue     |   1 +
 3 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/src/api/integration.js b/src/api/integration.js
index f684201..bc1b90f 100644
--- a/src/api/integration.js
+++ b/src/api/integration.js
@@ -1,3 +1,10 @@
 import request from "@/utils/request";
 
-// 小池集成
\ No newline at end of file
+// 小池集成
+export function device(params) {
+  return request({
+    url: "/kban/getDeviceStatus",
+    method: "get",
+    params,
+  });
+}
diff --git a/src/components/Integration/index.vue b/src/components/Integration/index.vue
index d88f44f..8fcc9a6 100644
--- a/src/components/Integration/index.vue
+++ b/src/components/Integration/index.vue
@@ -5,7 +5,7 @@
     <div class="formData-box">
       <el-form ref="form" :model="formData" label-width="90px">
         <el-form-item label="请选择垮位" size="mini">
-          <el-select v-model="formData.kw" placeholder="">
+          <el-select v-model="formData.kw" placeholder="" @change="change">
             <el-option label="四垮" :value="4"></el-option>
             <el-option label="五垮" :value="5"></el-option>
             <el-option label="六垮" :value="6"></el-option>
@@ -27,12 +27,12 @@
               >
                 <div class="pop-left">
                   <dv-border-box-12 class="datav-border">
-                    <div class="status-text">设备状态： {{item.status==='00'?'停机':'开机'}}</div>
+                    <div class="status-text">设备状态： {{item.zt}}</div>
                     <div class="status-text">船号： {{item.dcCh}}</div>
                     <div class="status-text">批次： {{item.dcPl}}</div>
                     <div class="status-text">套料图号： {{item.tzbh}}</div>
-                    <div class="status-text">开始时间： {{item.beginAt}}</div>
-                    <div class="">结束时间： {{item.overAt}}</div>
+                    <div class="status-text">开始时间： {{item.beginDate}} {{item.beginTime}}</div>
+                    <div class="">结束时间： {{item.overDate}} {{item.overTime}}</div>
                   </dv-border-box-12>
                 </div>
                 <img :src="item.img" alt="" />
@@ -47,12 +47,12 @@
                 <div class="pop-left">
                   <!-- <dv-border-box-8 style="width: 200px;height: 100px;">dv-border-box-8</dv-border-box-8> -->
                   <dv-border-box-12 class="datav-border">
-                    <div class="status-text">设备状态： {{item.status==='00'?'停机':'开机'}}</div>
+                    <div class="status-text">设备状态： {{item.zt}}</div>
                     <div class="status-text">船号： {{item.dcCh}}</div>
                     <div class="status-text">批次： {{item.dcPl}}</div>
                     <div class="status-text">套料图号： {{item.tzbh}}</div>
-                    <div class="status-text">开始时间： {{item.beginAt}}</div>
-                    <div class="">结束时间： {{item.overAt}}</div>
+                    <div class="status-text">开始时间： {{item.beginDate}} {{item.beginTime}}</div>
+                    <div class="">结束时间： {{item.overDate}} {{item.overTime}}</div>
                   </dv-border-box-12>
                 </div>
                 <img :src="item.img" alt="" />
@@ -65,7 +65,7 @@
   </div>
 </template>
 <script>
-import {} from "@/api/integration";
+import {device} from "@/api/integration";
 export default {
   name: "Integration",
   data() {
@@ -74,62 +74,10 @@ export default {
         kw: 4,
       },
       deviceLeftList: [
-        {
-          status:'00',
-          dcCh:'G175K-12',
-          dcPl:'119',
-          tzbh:'B119N4PX011',
-          beginAt:'2024/11/27 13:01',
-          overAt:'2024/11/27 14:01',
-          img: require("@/assets/image/xc1.png"),
-        },
-        {
-          status:'01',
-          dcCh:'G175K-12',
-          dcPl:'119',
-          tzbh:'B119N4PX011',
-          beginAt:'2024/11/27 07:27',
-          overAt:'',
-          img: require("@/assets/image/xc1.png"),
-        },
+
       ],
       deviceRightList: [
-        {
-          status:'01',
-          dcCh:'G175K-12',
-          dcPl:'119',
-          tzbh:'B119N4PX007',
-          beginAt:'2024/11/27 07:27',
-          overAt:'',
-          img: require("@/assets/image/xc2.png"),
-        },
-        {
-          status:'01',
-          dcCh:"G175K-12",
-          dcPl:'119',
-          tzbh:'B119N4PX016',
-          beginAt:'2024/11/27 07:27',
-          overAt:'',
-          img: require("@/assets/image/xc2.png"),
-        },
-        {
-          status:'01',
-          dcCh:"G175K-12",
-          dcPl:'119',
-          tzbh:'B119N4PX021',
-          beginAt:'2024/11/27 07:27',
-          overAt:'',
-          img: require("@/assets/image/xc2.png"),
-        },
-        {
-          status:'00',
-          dcCh:"G175K-12",
-          dcPl:'119',
-          tzbh:'B119N4PX020',
-          beginAt:'2024/11/27 07:27',
-          overAt:'2024/11/27 08:15',
-          img: require("@/assets/image/xc2.png"),
-        },
+
       ],
     };
   },
@@ -138,12 +86,58 @@ export default {
   },
   methods: {
     // 根据垮位查询
-    queryBtn() {},
+    queryBtn() {
+      device().then(res => {
+        this.list = res.data
+        this.init()
+      })
+    },
+    change(){
+      this.$nextTick(()=>{
+        this.init()
+      })
+    },
+    init () {
+      const _name = `N${this.formData.kw}`
+      const left = []
+      const right = []
+      this.list.forEach(item => {
+        if (item.zt === 5) {
+          item.zt = '完成'
+        }
+        if (item.zt === 3) {
+          item.zt = '正在加工'
+        }
+        if (item.zt === 1) {
+          item.zt = '计划'
+        }
+        if (!item.zt){
+          item.zt='关机'
+        }
+        if (item.name.indexOf(_name) > -1) {
+          if (item.name.indexOf('印字') > -1) {
+            item.img=require('@/assets/image/xc1.png')
+            left.push(item)
+          }
+          if (item.name.indexOf('切割') > -1) {
+            item.img=require('@/assets/image/xc2.png')
+            right.push(item)
+          }
+        }
+      })
+      this.deviceLeftList = left
+      this.deviceRightList = right
+    }
   },
 };
 </script>
 
 <style scoped lang="scss">
+::v-deep {
+  .dv-border-box-12 {
+    width: 300px !important,
+  }
+}
 .integration-container {
   margin-top: 10px;
   padding-left: 5px;
diff --git a/src/components/ViewPDF/index.vue b/src/components/ViewPDF/index.vue
index 7c1f84c..c165f98 100644
--- a/src/components/ViewPDF/index.vue
+++ b/src/components/ViewPDF/index.vue
@@ -184,6 +184,7 @@ export default {
     border: 2px solid #016ae0;
     border-radius: 10px;
     padding: 0 1%;
+    overflow-y:auto;
   }
   .border-inner {
     background-color: rgba(2, 8, 23, 0.1);