Merge branch 'limingyu-20240423-消防安全管理标点' into pet

src/views/firefighting/points/components/list.vue

@@ -26,6 +26,13 @@
                 style="width: 100%;"/>
             </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">
@@ -60,6 +67,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="操作" width="380">
             <template slot-scope="{row}">
               <el-button
@@ -204,7 +217,18 @@ export default {
         USER_ID: [{ required: true, message: '请选择负责人', trigger: 'change' }]
       },
       deptTreeData: [],
-      userList: []
+      userList: [],
+      punctuationStatusList: [
+        {
+          value: 0,
+          label: '是'
+        },
+        {
+          value: 1,
+          label: '否'
+        }
+      ],
+      IS_PUNCTUATION: ''
     }
   },
   watch: {
@@ -263,7 +287,8 @@ export default {
         {
           FIRE_POINT_NAME: this.FIRE_POINT_NAME,
           FIRE_POINT_CODE: this.FIRE_POINT_CODE,
-          DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID
+          DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID,
+          IS_PUNCTUATION: this.IS_PUNCTUATION
         }
       ).then((data) => {
         this.listLoading = false
@@ -276,6 +301,7 @@ export default {
     }, goKeyReset() {
       this.FIRE_POINT_NAME = ''
       this.FIRE_POINT_CODE = ''
+      this.IS_PUNCTUATION = ''
       this.selectForm = {
         DEPARTMENT_ID: ''
       }