From c9651794a8ccc9124d6f6ce73b4024ee096e201c Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 7 Nov 2025 09:11:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=96=B0=E5=A2=9E=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E7=BA=BF=E8=B7=AF=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加巡检线路明细页面路由配置
- 优化线路编号展示逻辑，支持显示routeCode或inspectRouteId
- 修复巡检线路明细页面参数获取错误问题
- 完善表单重置逻辑，确保inspectRouteId正确赋值
-优化表单提交校验，增加deviceId必填提示
- 使用Object.assign保持表单数据响应式引用完整性
---
 src/router/index.js                           | 14 ++++++++
 src/views/dms/dmsBaseInspectRoute/index.vue   |  4 +--
 src/views/dms/dmsInspectRouteDetail/index.vue | 34 +++++++++++--------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9db5d43..1065ee0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -422,6 +422,20 @@ export const dynamicRoutes = [
       },
     ],
   },
+  {
+    path: "/dms/dmsInspectRouteDetail",
+    component: Layout,
+    hidden: true,
+    permissions: ["dms:dmsInspectRouteDetail:query"],
+    children: [
+      {
+        path: "index/:inspectRouteId",
+        component: () => import("@/views/dms/dmsInspectRouteDetail/index"),
+        name: "DmsInspectRouteDetail",
+        meta: {title: "巡检线路明细", activeMenu: "/dms/dmsBaseInspectRoute"},
+      },
+    ],
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/dms/dmsBaseInspectRoute/index.vue b/src/views/dms/dmsBaseInspectRoute/index.vue
index 5163b21..130f9a2 100644
--- a/src/views/dms/dmsBaseInspectRoute/index.vue
+++ b/src/views/dms/dmsBaseInspectRoute/index.vue
@@ -113,8 +113,8 @@
 <!--      <el-table-column label="线路编号" align="center" prop="routeCode" />-->
       <el-table-column label="线路编号" align="center" prop="routeCode" >
         <template slot-scope="scope">
-          <router-link :to="'/dms/dmsInspectRouteDetail/index/' + scope.row.inspectRouteId" class="link-type">
-            <span>{{ scope.row.inspectRouteId }}</span>
+          <router-link :to="`/dms/dmsInspectRouteDetail/index/${scope.row.inspectRouteId}`" class="link-type">
+            <span>{{ scope.row.routeCode || scope.row.inspectRouteId }}</span>
           </router-link>
         </template>
       </el-table-column>
diff --git a/src/views/dms/dmsInspectRouteDetail/index.vue b/src/views/dms/dmsInspectRouteDetail/index.vue
index f658344..fc2f05d 100644
--- a/src/views/dms/dmsInspectRouteDetail/index.vue
+++ b/src/views/dms/dmsInspectRouteDetail/index.vue
@@ -292,24 +292,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        inspectRouteId: [
+/*        inspectRouteId: [
           { required: true, message: "线路ID,关联dms_base_inspect_route的inspect_route_id不能为空", trigger: "blur" }
-        ],
-        deviceId: [
+        ],*/
+/*        deviceId: [
           { required: true, message: "巡检设备ID，关联dms_base_device_ledger的device_id不能为空", trigger: "blur" }
-        ],
-        isFlag: [
+        ],*/
+/*        isFlag: [
           { required: true, message: "是否标识：1-是；0-否不能为空", trigger: "blur" }
-        ],
+        ],*/
       }
     };
   },
   created() {
-    const inspectRouteid = this.$route.params && this.$route.params.routeCode;
-    console.log(inspectRouteid)
-    this.inspectRouteIdCheck = inspectRouteid;
-    this.queryParams.inspectRouteId = inspectRouteid;
-    this.form.inspectRouteId = inspectRouteid;
+    const inspectRouteId = this.$route.params && this.$route.params.inspectRouteId;
+    console.log(inspectRouteId)
+    this.inspectRouteIdCheck = inspectRouteId;
+    this.queryParams.inspectRouteId = inspectRouteId;
+    this.reset();
     this.getList();
     this.getRoute();
     this.getDevice();
@@ -364,9 +364,10 @@ export default {
     reset() {
       this.form = {
         routeDetailId: null,
-        inspectRouteId: null,
+        inspectRouteId: this.inspectRouteIdCheck,
         lineStep: null,
         deviceId: null,
+        machineId: null,
         inspectStandard: null,
         isFlag: null,
         remark: null
@@ -393,7 +394,6 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.form.inspectRouteId = this.inspectRouteIdCheck;
       this.title = "添加巡检线路明细";
     },
     /** 修改按钮操作 */
@@ -401,7 +401,8 @@ export default {
       this.reset();
       const routeDetailId = row.routeDetailId || this.ids
       getDmsInspectRouteDetail(routeDetailId).then(response => {
-        this.form = response.data;
+        // 使用 Object.assign 保持响应式引用，并确保所有字段完整
+        Object.assign(this.form, response.data);
         this.open = true;
         this.title = "修改巡检线路明细";
       });
@@ -410,6 +411,11 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 前置校验：deviceId 不能为空
+          if (!this.form.deviceId) {
+            this.$modal.msgWarning("请选择巡检设备");
+            return;
+          }
           if (this.form.routeDetailId != null) {
             updateDmsInspectRouteDetail(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");