From bfec64932ca7ab9f3970e23ac7ca769a333f3add Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 11 Dec 2025 14:30:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?flx:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/weldingManage/equipmentMonitor.vue | 2 +-
 src/views/projectFront/weldingManage/weldingRecord.vue    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/projectFront/weldingManage/equipmentMonitor.vue b/src/views/projectFront/weldingManage/equipmentMonitor.vue
index 0c775bcf..da9db1c6 100644
--- a/src/views/projectFront/weldingManage/equipmentMonitor.vue
+++ b/src/views/projectFront/weldingManage/equipmentMonitor.vue
@@ -265,7 +265,7 @@ export default {
         devSn: row.devSn,
       }).then((res) => {
         if (res.code == 200) {
-          const resultList = res.result instanceof Array ? res.result : [];
+          const resultList = res.result instanceof Array ? res.result.reverse() : [];
           const result = {
             series: [
               {
diff --git a/src/views/projectFront/weldingManage/weldingRecord.vue b/src/views/projectFront/weldingManage/weldingRecord.vue
index 819b3d4c..ff3dd285 100644
--- a/src/views/projectFront/weldingManage/weldingRecord.vue
+++ b/src/views/projectFront/weldingManage/weldingRecord.vue
@@ -6,9 +6,9 @@
           <el-select v-model="searchForm.equipmentName" placeholder="请选择">
             <el-option
               v-for="item in weldingDevList"
-              :key="item.devName"
+              :key="item.devSn"
               :label="item.devName"
-              :value="item.devName"
+              :value="item.devSn"
             >
             </el-option>
           </el-select>
@@ -1158,11 +1158,11 @@ export default {
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
         devSn: this.searchForm.devSn,
-        equipmentName: this.searchForm.equipmentName,
+        eqDevSn: this.searchForm.equipmentName,
         operatorName: this.searchForm.operatorName,
         weldBead: this.searchForm.weldBead,
         dataSource: this.searchForm.dataSource,
-        duration: this.searchForm.duration ? this.searchForm.duration : "",
+        duration_begin: this.searchForm.duration ? this.searchForm.duration : "",
         endWeldingTime_begin:
           this.searchForm.dateRangeArr instanceof Array && this.searchForm.dateRangeArr[0]
             ? this.searchForm.dateRangeArr[0]

From 236ca9561945900147e327ab5c1301cff3d46088 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 11 Dec 2025 16:27:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?flx:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/weldingManage/weldingRecord.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/projectFront/weldingManage/weldingRecord.vue b/src/views/projectFront/weldingManage/weldingRecord.vue
index ff3dd285..aecb686f 100644
--- a/src/views/projectFront/weldingManage/weldingRecord.vue
+++ b/src/views/projectFront/weldingManage/weldingRecord.vue
@@ -198,7 +198,7 @@
         @size-change="SizeChange"
         @current-change="CurrentChange"
         :current-page="pagInfo.pageNo"
-        :page-sizes="$store.state.PAGESIZRS"
+        :page-sizes="[...$store.state.PAGESIZRS, 200, 500]"
         :page-size="pagInfo.pageSize"
         layout="total, sizes, prev, pager, next"
         :total="Number(pagInfo.total)"
@@ -731,27 +731,28 @@ export default {
       }).then((res) => {
         if (res.code == 200) {
           this.operatingRiskDialog = true;
+          const resultList = res.result instanceof Array ? res.result.reverse() : [];
           this.$nextTick(() => {
             const params = {
               series: [
                 {
                   name: "焊接电流",
-                  data: res.result.map((item) => item.weldingCurrent),
+                  data: resultList.map((item) => item.weldingCurrent),
                 },
                 {
                   name: "焊接电压",
-                  data: res.result.map((item) => item.weldingVoltage),
+                  data: resultList.map((item) => item.weldingVoltage),
                 },
                 {
                   name: "预置电压",
-                  data: res.result.map((item) => item.presetVoltage),
+                  data: resultList.map((item) => item.presetVoltage),
                 },
                 {
                   name: "预置电流",
-                  data: res.result.map((item) => item.presetCurrent),
+                  data: resultList.map((item) => item.presetCurrent),
                 },
               ],
-              x: res.result.map((item) => item.uploadTime),
+              x: resultList.map((item) => item.uploadTime),
             };
             this.riskTrendLineChartsFn(this.$refs.riskTrendLineCharts, params);
           });
@@ -1222,6 +1223,7 @@ export default {
       });
     },
     isAdd(type, obj) {
+      this.tableData = [];
       if (type == 1) {
         this.title = "新增";
         this.close();

From 249d577934dc7a735c24f1990e4e08f2ba3e8641 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 11 Dec 2025 18:35:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?flx:=E5=8E=BB=E9=99=A4=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A0=B8=E9=AA=8C=E4=BA=BA=E5=92=8C=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=9A=84=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                                           | 2 +-
 src/views/projectFront/quality/rectificationRecord.vue          | 2 +-
 .../v2/hiddenTroubleComponents/hazardousWorkDistribution.vue    | 2 +-
 .../v2/hiddenTroubleComponents/hazardousWorkDistribution.vue    | 2 +-
 src/views/projectFront/safeSame/rectificationRecord.vue         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index f38e5866..12f99d6c 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -209,7 +209,7 @@ if (process.env.NODE_ENV == "development") {
         // axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
         // axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000/"; // 潮州
         // axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌
-        // axios.defaults.baseURL = "http://112.93.255.85:9840/"; // 广深高速
+    axios.defaults.baseURL = "http://112.93.255.85:9840/"; // 广深高速
 } else if (process.env.NODE_ENV == "debug") {
     axios.defaults.baseURL = "https://www.ceshi.com";
 } else if (process.env.NODE_ENV == "production") {
diff --git a/src/views/projectFront/quality/rectificationRecord.vue b/src/views/projectFront/quality/rectificationRecord.vue
index 79a188cb..e6d95d82 100644
--- a/src/views/projectFront/quality/rectificationRecord.vue
+++ b/src/views/projectFront/quality/rectificationRecord.vue
@@ -4358,7 +4358,7 @@ export default {
       };
       if (this.dangerReviewInfo.enableVerify == 1) {
         data.roleName = this.dangerReviewInfo.verifyRoleName;
-        data.enterpriseId = this.unitEnterpriseId.join(",");
+        // data.enterpriseId = this.unitEnterpriseId.join(",");
       }
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {
diff --git a/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue b/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
index dc9271b1..cf908881 100644
--- a/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
+++ b/src/views/projectFront/quality/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
@@ -2121,7 +2121,7 @@ export default {
       };
       if (this.dangerReviewInfo.enableVerify == 1) {
         data.roleName = this.dangerReviewInfo.verifyRoleName;
-        data.enterpriseId = this.unitEnterpriseId.join(",");
+        // data.enterpriseId = this.unitEnterpriseId.join(",");
       }
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {
diff --git a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
index 407867d8..5832cb94 100644
--- a/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
+++ b/src/views/projectFront/safeManage/v2/hiddenTroubleComponents/hazardousWorkDistribution.vue
@@ -2121,7 +2121,7 @@ export default {
       };
       if (this.dangerReviewInfo.enableVerify == 1) {
         data.roleName = this.dangerReviewInfo.verifyRoleName;
-        data.enterpriseId = this.unitEnterpriseId.join(",");
+        // data.enterpriseId = this.unitEnterpriseId.join(",");
       }
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {
diff --git a/src/views/projectFront/safeSame/rectificationRecord.vue b/src/views/projectFront/safeSame/rectificationRecord.vue
index 0fc5cea6..8b7a5c71 100644
--- a/src/views/projectFront/safeSame/rectificationRecord.vue
+++ b/src/views/projectFront/safeSame/rectificationRecord.vue
@@ -4358,7 +4358,7 @@ export default {
       };
       if (this.dangerReviewInfo.enableVerify == 1) {
         data.roleName = this.dangerReviewInfo.verifyRoleName;
-        data.enterpriseId = this.unitEnterpriseId.join(",");
+        // data.enterpriseId = this.unitEnterpriseId.join(",");
       }
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {

From 2552a2179803dde386e7060a5da6260cde8dff84 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Mon, 15 Dec 2025 09:27:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debug.log                                     | 56 +++++++++++++------
 .../laborManage/personDetails.vue             | 21 +++++--
 .../laborManage/personModule/courseWriter.vue | 12 ++--
 3 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/debug.log b/debug.log
index 81b7e864..0f640669 100644
--- a/debug.log
+++ b/debug.log
@@ -1,16 +1,40 @@
-[0530/113505.640:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/113508.674:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/141801.489:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/141801.943:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090447.805:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090447.874:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090448.024:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090501.978:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163244.965:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163245.034:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163246.926:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163247.976:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.070:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.252:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.886:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144830.214:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0524/103228.221:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0530/171244.522:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0929/142712.385:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0929/142712.471:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0929/142712.525:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0929/142714.949:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[0929/142715.640:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142430.859:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142430.928:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142431.787:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142432.128:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142443.092:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142443.106:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142443.432:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1011/142450.819:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1013/155917.873:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1013/155917.907:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1013/155918.542:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1013/155919.231:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1016/115027.840:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1016/115027.926:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1016/115028.810:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1016/115028.968:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1020/142935.493:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1020/142935.527:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1020/142935.848:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1020/142936.229:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1022/140627.479:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1022/140627.514:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1022/140628.205:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1022/140628.872:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1201/183600.144:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1201/183600.190:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1201/183601.414:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1201/183602.811:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1202/180852.976:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1202/180853.033:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1202/180853.222:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1202/180854.691:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
+[1205/092752.010:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 0389a682..a7feaa15 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -13,7 +13,7 @@
       <div class="title">{{ $t("message.laborMange.crewInfoDetail") }}</div>
     </div>
     <div class="flex2 data_wrap">
-      <vue-scroll @handle-scroll="handleScroll">
+      <vue-scroll class="data_wrap_scroll" @handle-scroll="handleScroll">
         <div id="basic" class="table">
           <div class="pageTitle">
             {{ $t("message.laborMange.essential") }}
@@ -4527,9 +4527,22 @@ export default {
   height: calc(100% - 55px);
   box-sizing: border-box;
   padding: 15px 0 0;
-  .__vuescroll {
-    width: 80% !important;
-    flex: 1;
+  .data_wrap_scroll {
+    width: calc(100% - 12%) !important;
+    // overflow-x: hidden;
+    /deep/ .__panel {
+      width: 100% !important;
+      .__view {
+        width: 100% !important;
+      }
+    }
+  }
+    // .__vuescroll {
+  //   width: 80% !important;
+  //   flex: 1;
+  // }
+  .tables {
+    width: 100%;
   }
 }
 
diff --git a/src/views/projectFront/laborManage/personModule/courseWriter.vue b/src/views/projectFront/laborManage/personModule/courseWriter.vue
index e75de262..e357c519 100644
--- a/src/views/projectFront/laborManage/personModule/courseWriter.vue
+++ b/src/views/projectFront/laborManage/personModule/courseWriter.vue
@@ -338,19 +338,23 @@ export default {
 }
 .tables {
   min-height: initial;
+  width: 100%;
+}
+/deep/ .el-table__body {
+  width: 100% !important;
 }
 .bigScreen-wrap {
   width: calc(100% - 32px);
   height: 610px;
   position: relative;
-  overflow: hidden;
+  // overflow: hidden;
   display: flex;
   #map {
-    width: 814px;
+    width: 714px;
     height: 100%;
   }
   .map-box {
-    width: 814px;
+    width: 714px;
     height: 100%;
     background-color: #eff3f7 !important;
     position: relative;
@@ -367,7 +371,7 @@ export default {
     }
   }
   .content-right {
-    flex: 1;
+    width: calc(100% - 714px);
     .content-right_main {
       padding: 0 20px;
       .content-right_time {