From a38b13a96620a33421a21cfecc73a115e181f8ed Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 11:27:28 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E9=85=8D=E7=BD=AE-=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E5=91=A8=E6=9C=9F(h)-=E5=8F=AA=E8=83=BD=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentInspectionPoint/addInspectDailog.vue               | 2 +-
 src/views/safetyManagement/equipmentInspectionPoint/index.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue b/src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue
index 5058f99..2353943 100644
--- a/src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue
+++ b/src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue
@@ -61,7 +61,7 @@
                     </template>
                     <template #default="scope">
                         <el-form-item :prop="`tableData[${scope.$index}].insCycle`" :rules="formRules.insCycle">
-                            <el-input v-model="scope.row.insCycle" placeholder="请输入" style="width: 100%"></el-input>
+                            <el-input-number controls-position="right" v-model="scope.row.insCycle" placeholder="请输入" style="width: 100%"></el-input-number>
                         </el-form-item>
                     </template>
                 </el-table-column>
diff --git a/src/views/safetyManagement/equipmentInspectionPoint/index.vue b/src/views/safetyManagement/equipmentInspectionPoint/index.vue
index 74924d2..95db479 100644
--- a/src/views/safetyManagement/equipmentInspectionPoint/index.vue
+++ b/src/views/safetyManagement/equipmentInspectionPoint/index.vue
@@ -166,7 +166,7 @@ export default {
             span: 24,
             search: false,
             searchLabelWidth: 90,
-            // type: 'number',
+            type: 'number',
             rules: [
               {
                 required: true,

From 556196c36559a295ef58818e5bc64a661e7b821c Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 11:38:22 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-=E5=88=97=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyInspectionTask/index.vue            | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue
index 50e52dd..85cea00 100644
--- a/src/views/safetyManagement/safetyInspectionTask/index.vue
+++ b/src/views/safetyManagement/safetyInspectionTask/index.vue
@@ -22,7 +22,7 @@
     </avue-crud>
   </basic-container>
 </template>
-
+ 
 <script>
 import { getList, add, remove, update } from '@/api/safetyManagement/safetyInspectionTask';
 
@@ -65,7 +65,6 @@ export default {
         dialogWidth: 600,
         dialogClickModal: false,
         searchEnter: true,
-        excelBtn: false,
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
@@ -83,31 +82,6 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         column: [
-          {
-            label: "任务状态",
-            prop: "taskStatus",
-            sortable: true,
-            filter: true,
-            search: true,
-            type: "select",
-            // value: "2",
-            searchLabelWidth: 80,
-            dicData: [
-              {
-                label: "已检",
-                value: "1",
-              },
-              {
-                label: "待检",
-                value: "2",
-              },
-              {
-                label: "未准时完成",
-                value: "3",
-              }
-
-            ],
-          },
           {
             label: "巡检点编号",
             prop: "insNum",
@@ -191,7 +165,31 @@ export default {
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             // searchRange: true,
           },
-       
+        {
+            label: "任务状态",
+            prop: "taskStatus",
+            sortable: true,
+            filter: true,
+            search: true,
+            type: "select",
+            // value: "2",
+            searchLabelWidth: 80,
+            dicData: [
+              {
+                label: "已检",
+                value: "1",
+              },
+              {
+                label: "待检",
+                value: "2",
+              },
+              {
+                label: "未准时完成",
+                value: "3",
+              }
+
+            ],
+          },
           {
             label: "备注",
             prop: "memo",

From 22a7a07132579bd6d69a4bb15ba7d3a04814bb94 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 11:40:28 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86-=E6=8C=89=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/teamManagement.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index b52f5af..e5632dc 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -773,6 +773,7 @@ export default {
     onLoad() {
       this.loading = true;
       getList({
+        descs:'TS_CODE',
         current:this.page.currentPage,
         size:this.page.pageSize,
         ...this.query

From d3e62afaa537c371edaf1cf4fb0a8836279d6895 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 11:43:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E9=95=80=E7=A7=8D=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8C=89=E7=BC=96=E7=A0=81=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/processManagement/platingAssort.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/processManagement/platingAssort.vue b/src/views/processManagement/platingAssort.vue
index 76d2177..593a79c 100644
--- a/src/views/processManagement/platingAssort.vue
+++ b/src/views/processManagement/platingAssort.vue
@@ -400,6 +400,7 @@ export default {
       this.loading = true;
 
       getList({
+        descs:'CODE',
         current:this.page.currentPage,
         size:this.page.pageSize,
         ...this.query

From e50de353dd3d37c218f23595f072d40b2f04fdc3 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 11:45:06 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=83=BD=E5=8A=9B-=E6=8C=89=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/processManagement/processCapability.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/processManagement/processCapability.vue b/src/views/processManagement/processCapability.vue
index 44b7397..eb3a09f 100644
--- a/src/views/processManagement/processCapability.vue
+++ b/src/views/processManagement/processCapability.vue
@@ -538,6 +538,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       let param = {
+        descs:'CA_CODE',
         ...this.query,
         startTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[0],
         endTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[1],

From 9b83be310f8b8b93ab4d9318cdcac9c9a1092cd7 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 13:19:51 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E9=85=B8=E9=9B=BE?=
 =?UTF-8?q?=E5=A1=94=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86-=E5=88=97?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wasteGasSet/components/alarmRecord.vue    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
index 91702db..b62da20 100644
--- a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
@@ -86,26 +86,6 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         column: [
-          {
-            label: "状态",
-            prop: "dealStatus",
-            search: true,
-            searchLabelWidth: 50,
-            sortable: true,
-            filter: true,
-            type: "select",
-            value:1,
-            dicData: [  
-              {
-                label: "已处理",
-                value: 0,
-              },
-              {
-                label: "未处理",
-                value: 1,
-              }
-            ],
-          },
           {
             label: "编码",
             prop: "btCode",
@@ -115,7 +95,7 @@ export default {
             searchLabelWidth: 50,
           },
           {
-            label: "日期",
+            label: "时间",
             prop: "queryBtDate",
             search: true,
             searchLabelWidth: 50,
@@ -130,7 +110,7 @@ export default {
             endPlaceholder: "结束时间"
           },
           {
-            label: "日期",
+            label: "时间",
             prop: "btDate",
             sortable: true,
             filter: true,
@@ -155,6 +135,26 @@ export default {
             sortable: true,
             filter: true,
           },
+          {
+            label: "状态",
+            prop: "dealStatus",
+            search: true,
+            searchLabelWidth: 50,
+            sortable: true,
+            filter: true,
+            type: "select",
+            value:1,
+            dicData: [  
+              {
+                label: "已处理",
+                value: 0,
+              },
+              {
+                label: "未处理",
+                value: 1,
+              }
+            ],
+          },
           {
             label: "持续时间",
             prop: "consLong",