From b9a46864b5a3f1be6db155f1bdaf44a1665fa603 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 9 May 2024 15:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=BB=9F=E8=AE=A1=E6=96=B0=E5=A2=9E=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=A0=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fireInfoReport/components/firePoint.vue   | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/views/firefighting/fireInfoReport/components/firePoint.vue b/src/views/firefighting/fireInfoReport/components/firePoint.vue
index ed2a17a..95dfe75 100644
--- a/src/views/firefighting/fireInfoReport/components/firePoint.vue
+++ b/src/views/firefighting/fireInfoReport/components/firePoint.vue
@@ -13,6 +13,13 @@
               <el-input v-model="FIRE_POINT_CODE" placeholder="请输入关键字"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="是否标点" label-width="110px">
+              <el-select v-model="IS_PUNCTUATION" clearable placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in punctuationStatusList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label-width="10px">
               <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -47,6 +54,12 @@
           <el-table-column prop="DEVICE_COUNT" label="点位下消防器材数"/>
           <el-table-column prop="DEPARTMENT_NAME" label="负责部门"/>
           <el-table-column prop="USERNAME" label="负责人"/>
+          <el-table-column prop="ISPUNCTUATION" label="是否标点">
+            <template slot-scope="{row}">
+              <el-tag v-if="row.ISPUNCTUATION == 0" type="success">是</el-tag>
+              <el-tag v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="{row}">
               <el-button
@@ -146,7 +159,18 @@ export default {
         value: 'id',
         children: 'nodes',
         label: 'name'
-      }
+      },
+      punctuationStatusList: [
+        {
+          value: 0,
+          label: '是'
+        },
+        {
+          value: 1,
+          label: '否'
+        }
+      ],
+      IS_PUNCTUATION: ''
     }
   },
   watch: {
@@ -195,7 +219,8 @@ export default {
         {
           FIRE_POINT_NAME: this.FIRE_POINT_NAME,
           FIRE_POINT_CODE: this.FIRE_POINT_CODE,
-          CORPINFO_ID: this.getInfo().CORPINFO_ID
+          CORPINFO_ID: this.getInfo().CORPINFO_ID,
+          IS_PUNCTUATION: this.IS_PUNCTUATION
         }
       ).then((data) => {
         this.listLoading = false
@@ -207,6 +232,7 @@ export default {
     }, goKeyReset() {
       this.FIRE_POINT_NAME = ''
       this.FIRE_POINT_CODE = ''
+      this.IS_PUNCTUATION = ''
       this.getList()
     },
     getDict() {