From b2e8e233d59d107615a8336dce9da36f1f8bcde0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:47 +0800
Subject: [PATCH] ll

---
 admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue
index 2d2b991..64040ec 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue
@@ -56,10 +56,10 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column prop="code" label="宸℃鐐圭紪鐮�" min-width="100px"></el-table-column>
         <el-table-column prop="name" label="宸℃鐐瑰悕绉�" min-width="100px"></el-table-column>
-        <el-table-column prop="deviceName" label="宸℃鐐瑰悕绉�" min-width="100px"></el-table-column>
-        <el-table-column prop="areaName" label="宸℃鐐瑰悕绉�" min-width="100px"></el-table-column>
+        <el-table-column prop="deviceName" label="鍏宠仈璁惧" min-width="100px"></el-table-column>
+        <el-table-column prop="areaName" label="宸℃鍖哄煙" min-width="100px"></el-table-column>
       </el-table>
-      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
+      <pagination class="mt10" @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination">
       </pagination>
 
       <span slot="footer" class="dialog-footer">
@@ -75,7 +75,7 @@
 import GlobalWindow from '@/components/common/GlobalWindow'
 import Pagination from '@/components/common/Pagination'
 import { fetchList as getFetchList } from '@/api/Inspection/ywPatrolPoint'
-import { create,updateById, detailById } from '@/api/Inspection/ywPatrolLine'
+import { create, updateById, detailById } from '@/api/Inspection/ywPatrolLine'
 import { Message } from 'element-ui'
 import { fetchList } from '@/api/business/category'
 export default {
@@ -127,7 +127,7 @@
           if (list.length == 0) return Message.warning('璇峰厛閫夋嫨宸℃鐐�')
           form.linePointList = list
           this.isWorking = true
-          let  fn = form.id ? updateById : create
+          let fn = form.id ? updateById : create
           fn({ ...form }).then(res => {
             Message.success('淇濆瓨鎴愬姛')
             this.isWorking = false
@@ -155,7 +155,6 @@
       })
     },
     initData() {
-      this.list = []
       const { searchForm, pagination } = this
       getFetchList({
         page: pagination.page,
@@ -193,8 +192,8 @@
 
     },
     openModal() {
-      this.selPoint = this.list.map(i => i.id)
       this.getProject()
+      this.reset()
       this.isShowModal = true
     },
     changeSel(e) {
@@ -206,12 +205,23 @@
       this.initData()
     },
     subModal() {
-      this.list = this.selList.map(item => {
-        return {
-          needScancode: 0,
-          pointName: item.name,
-          pointId: item.id,
-          code: item.code
+      // this.list = this.selList.map(item => {
+      //   return {
+      //     needScancode: 0,
+      //     pointName: item.name,
+      //     pointId: item.id,
+      //     code: item.code
+      //   }
+      // })
+      this.selList.forEach(item => {
+        const index = this.list.findIndex(i => i.code === item.code)
+        if (index === -1) {
+          this.list.push({
+            needScancode: 0,
+            pointName: item.name,
+            pointId: item.id,
+            code: item.code
+          })
         }
       })
       this.isShowModal = false

--
Gitblit v1.9.3