From be088d69462254aee0d725791a00a0eeed9ca344 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 26 May 2025 09:05:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 88b9ba0..c27b3bc 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.179'; //正式版本号
+  version = '0.0.180'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

From 25cefccfc6090f47475291f74ef5d7b7c58e1a90 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Mon, 26 May 2025 10:07:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json       |  2 +-
 src/App.vue                 |  2 +-
 src/components/base/page.ts |  2 +-
 src/main.ts                 |  2 +-
 src/sfc.d.ts                |  2 +-
 src/utils/mixin.ts          |  2 +-
 src/utils/subtraction.ts    | 78 ++++++++++++++++++-------------------
 types/vue-form.d.ts         |  2 +-
 types/vue-prototype.d.ts    |  2 +-
 9 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e09ac67..9c84ac2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,7 +51,7 @@
     "LastEditors": "zhou lei", // 设置后，保存文件更改默认更新最后编辑人
     "Description": "",
     "FilePath": "Do not edit", // 设置后，默认生成文件相对于项目的路径
-    "custom_string_obkoro1": "联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司"
+    "custom_string_obkoro1": "联系方式:910592680@qq.com 18669792120  "
   },
   "[css]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/src/App.vue b/src/App.vue
index f476862..9c5ca3d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description: 
  * @FilePath: /wms_haiwai_app/src/App.vue
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120
 -->
 <script lang="ts">
 import Vue from 'vue';
diff --git a/src/components/base/page.ts b/src/components/base/page.ts
index 3667f1b..a92f4be 100644
--- a/src/components/base/page.ts
+++ b/src/components/base/page.ts
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/src/components/base/page.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120  
  */
 import { Component, Vue } from 'vue-property-decorator';
 import { page } from '@/utils/page';
diff --git a/src/main.ts b/src/main.ts
index 029b01f..e165e65 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/src/main.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120
  */
 import Vue from 'vue';
 import uView from 'uview-ui';
diff --git a/src/sfc.d.ts b/src/sfc.d.ts
index 9b2d95c..82c3e87 100644
--- a/src/sfc.d.ts
+++ b/src/sfc.d.ts
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/src/sfc.d.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120  
  */
 // 1. 确保在声明补充的类型之前导入 'vue'
 declare module '*.vue' {
diff --git a/src/utils/mixin.ts b/src/utils/mixin.ts
index 958ad78..eda9502 100644
--- a/src/utils/mixin.ts
+++ b/src/utils/mixin.ts
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/src/utils/mixin.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120  
  */
 import Vue from 'vue';
 import { Component } from 'vue-property-decorator';
diff --git a/src/utils/subtraction.ts b/src/utils/subtraction.ts
index d7ee4d1..69e12cb 100644
--- a/src/utils/subtraction.ts
+++ b/src/utils/subtraction.ts
@@ -1,39 +1,39 @@
-/*
- * @Author: zhou lei
- * @Date: 2023-02-22 19:08:18
- * @LastEditTime: 2023-02-22 19:19:54
- * @LastEditors: zhou lei
- * @Description:自定义减法，解决浮点类型相减精度问题
- * @FilePath: \hgwms-factory-app\src\utils\subtraction.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
- */
-//自定义减法，解决浮点类型相减精度问题
-export function subtraction(arg1: number, arg2: number) {
-  let r1: number, r2: number;
-  try {
-    r1 = arg1.toString().split('.')[1].length;
-  } catch (e) {
-    r1 = 0;
-  }
-  try {
-    r2 = arg2.toString().split('.')[1].length;
-  } catch (e) {
-    r2 = 0;
-  }
-  const c = Math.abs(r1 - r2);
-  const m = Math.pow(10, Math.max(r1, r2));
-  if (c > 0) {
-    const cm = Math.pow(10, c);
-    if (r1 > r2) {
-      arg1 = Number(arg1.toString().replace('.', ''));
-      arg2 = Number(arg2.toString().replace('.', '')) * cm;
-    } else {
-      arg1 = Number(arg1.toString().replace('.', '')) * cm;
-      arg2 = Number(arg2.toString().replace('.', ''));
-    }
-  } else {
-    arg1 = Number(arg1.toString().replace('.', ''));
-    arg2 = Number(arg2.toString().replace('.', ''));
-  }
-  return (arg1 - arg2) / m;
-}
+/*
+ * @Author: zhou lei
+ * @Date: 2023-02-22 19:08:18
+ * @LastEditTime: 2023-02-22 19:19:54
+ * @LastEditors: zhou lei
+ * @Description:自定义减法，解决浮点类型相减精度问题
+ * @FilePath: \hgwms-factory-app\src\utils\subtraction.ts
+ * 联系方式:910592680@qq.com 18669792120  
+ */
+//自定义减法，解决浮点类型相减精度问题
+export function subtraction(arg1: number, arg2: number) {
+  let r1: number, r2: number;
+  try {
+    r1 = arg1.toString().split('.')[1].length;
+  } catch (e) {
+    r1 = 0;
+  }
+  try {
+    r2 = arg2.toString().split('.')[1].length;
+  } catch (e) {
+    r2 = 0;
+  }
+  const c = Math.abs(r1 - r2);
+  const m = Math.pow(10, Math.max(r1, r2));
+  if (c > 0) {
+    const cm = Math.pow(10, c);
+    if (r1 > r2) {
+      arg1 = Number(arg1.toString().replace('.', ''));
+      arg2 = Number(arg2.toString().replace('.', '')) * cm;
+    } else {
+      arg1 = Number(arg1.toString().replace('.', '')) * cm;
+      arg2 = Number(arg2.toString().replace('.', ''));
+    }
+  } else {
+    arg1 = Number(arg1.toString().replace('.', ''));
+    arg2 = Number(arg2.toString().replace('.', ''));
+  }
+  return (arg1 - arg2) / m;
+}
diff --git a/types/vue-form.d.ts b/types/vue-form.d.ts
index 2b3c428..4539787 100644
--- a/types/vue-form.d.ts
+++ b/types/vue-form.d.ts
@@ -5,7 +5,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/types/vue-form.d.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120  
  */
 declare module 'vue/types/form' {
   /**
diff --git a/types/vue-prototype.d.ts b/types/vue-prototype.d.ts
index bbb2ec4..d14f57b 100644
--- a/types/vue-prototype.d.ts
+++ b/types/vue-prototype.d.ts
@@ -6,7 +6,7 @@
  * @LastEditors: zhou lei
  * @Description:
  * @FilePath: /wms_haiwai_app/types/vue-prototype.d.ts
- * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
+ * 联系方式:910592680@qq.com 18669792120  
  */
 import Vue from 'vue';
 //    在 types/vue.d.ts 里 Vue 有构造函数类型

From d6d2796a6098d4a024afeb9f71cdc1905d12d9df Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 30 May 2025 17:32:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE?=
 =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/MaintenanceAudit/index.vue | 1 +
 src/pages/equipment/RepairAudit/index.vue      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pages/equipment/MaintenanceAudit/index.vue b/src/pages/equipment/MaintenanceAudit/index.vue
index 4a5ef07..e9eb0f4 100644
--- a/src/pages/equipment/MaintenanceAudit/index.vue
+++ b/src/pages/equipment/MaintenanceAudit/index.vue
@@ -29,6 +29,7 @@
       <div class="item1">报修来源: {{ item.workCode }}</div>
       <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
       <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
+      <div class="item1" style="color: red">产线:{{ item.bindEquipmentName }}</div>
       <div class="item1" style="color: red">处理措施:{{ item.repairMeasures }}</div>
       <div class="item1" style="color: red">维修班组:{{ item.teamName }}</div>
       <div class="item1">维修人: {{ item.workPersonName }}</div>
diff --git a/src/pages/equipment/RepairAudit/index.vue b/src/pages/equipment/RepairAudit/index.vue
index dedec02..9b19df5 100644
--- a/src/pages/equipment/RepairAudit/index.vue
+++ b/src/pages/equipment/RepairAudit/index.vue
@@ -28,6 +28,7 @@
       <div class="item1">报修来源: {{ item.orderSource }}</div>
       <div class="item1" style="color: red">设备编码:{{ item.equipmentCode }}</div>
       <div class="item1" style="color: red">设备名称:{{ item.equipmentName }}</div>
+      <div class="item1" style="color: red">产线:{{ item.bindEquipmentName }}</div>
       <div class="item1" style="color: red">故障时间:{{ item.orderBreakdownTime }}</div>
       <div class="item1" style="color: red">故障描述:{{ item.orderDesc }}</div>
       <div class="item1">报修人: {{ item.orderRepairmanName }}</div>