From ce1d45ffad27fc15eb7da244066c4bce62f6f442 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 14 Mar 2024 21:15:43 +0800
Subject: [PATCH] 从业人员问题修改

---
 src/views/place/practitioner.vue |   82 ++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/src/views/place/practitioner.vue b/src/views/place/practitioner.vue
index 17b0457..61f8c8f 100644
--- a/src/views/place/practitioner.vue
+++ b/src/views/place/practitioner.vue
@@ -34,16 +34,10 @@
             <template slot="menuLeft">
                 <!-- <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
                 </el-button> -->
-                <div  class="type-row">
-                    <div  class="type-item">
-                      未成年人 {{countInfo.minors}}人
-                </div>
-
-                <div   class="type-item">
-                    少数民族 {{countInfo.nationalMinority}}人
-                </div>
-                </div> 
-                
+                <el-button type="primary" size="small"  @click="handleQueryAlarm(1)">未成年人 ({{countInfo.minors}}) 人
+                </el-button>
+                <el-button type="primary" size="small"  @click="handleQueryAlarm(2)">少数民族 ({{countInfo.nationalMinority}}) 人
+                </el-button>
             </template>
 
             <template slot-scope="{row, size}" slot="menu">
@@ -129,7 +123,7 @@
                 searchLabelWidth: 96,
                 searchShow: true,
                 searchMenuSpan: 3,
-                menuWidth: 280,
+                // menuWidth: 280,
                 menu: false,
                 height: "auto",
                 calcHeight: 54,
@@ -147,26 +141,23 @@
                 delBtn: false,
                 column: [
                     {
-                        width: 120,
                         overHidden: true,
                         label: "姓名",
                         span: 12,
                         prop: "name",
-                        searchSpan: 5,
+                        searchSpan: 4,
                         search: true,
                         searchLabelWidth: 76,
 
                     },
                     {
-                        width: 120,
                         label: "电话号码",
                         prop: "telephone",
-                        searchSpan: 5,
+                        searchSpan: 4,
                         searchLabelWidth: 110,
                         search: true,
                     },
                     {
-                        width: 120,
                         overHidden: true,
                         label: "微信号",
                         prop: "wxAccount",
@@ -174,18 +165,18 @@
                         slot: true,
                     },
                     {
-                        width: 140,
                         overHidden: true,
                         label: "身份证号",
                         prop: "idCard",
                         // search: true,
+                        width:160,
                         searchSpan: 4,
                         slot: true,
 
                     },
                     {
-                        width: 110,
                         label: "年龄",
+                        width:80,
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
@@ -202,7 +193,6 @@
                         searchSpan: 4
                     },
                     {
-                        width: 110,
                         label: "岗位性质",
                         addDisplay: false,
                         editDisplay: false,
@@ -211,8 +201,8 @@
                         searchSpan: 4
                     },
                     {
-                        width: 160,
-                        label: "暂住地",
+                        minWidth: 160,
+                        label: "现居住地",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
@@ -220,7 +210,7 @@
                         searchSpan: 4
                     },
                     {
-                        width: 160,
+                        minWidth: 160,
                         label: "户籍地址",
                         addDisplay: false,
                         editDisplay: false,
@@ -229,13 +219,12 @@
                         searchSpan: 4
                     },
                     {
-                        width: 160,
                         label: "预警人员",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
                         prop: "type",
-                        searchSpan: 6,
+                        searchSpan: 4,
                         hide: true,
                         type: "select",
                         search: true,
@@ -382,6 +371,9 @@
         }
     },
     methods: {
+        handleQueryAlarm(type){
+            this.onLoad(this.page,{type:type})
+        },
         showStringDispose(row, type) {
             row[type] = !row[type]
         },
@@ -493,23 +485,23 @@
 
                     this.form.location = [this.form.lng, this.form.lat, this.form.location].join(',')
 
-                    if (this.form.imageUrls.length) {
-                        this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
-                    }
+                    // if (this.form.imageUrls.length) {
+                    //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
+                    // }
 
-                    if (this.form.placePoiLabelVOList.length) {
-                        let lebelTwo = this.form.placePoiLabelVOList.find(item => {
-                            return item.type == 2
-                        })
+                    // if (this.form.placePoiLabelVOList.length) {
+                    //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
+                    //         return item.type == 2
+                    //     })
 
-                        if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
+                    //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
 
-                        let lebelThree = this.form.placePoiLabelVOList.find(item => {
-                            return item.type == 3
-                        })
+                    //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
+                    //         return item.type == 3
+                    //     })
 
-                        if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
-                    }
+                    //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
+                    // }
 
                     done()
                 })
@@ -541,14 +533,14 @@
                 this.data.forEach(item => {
                     this.$set(item, 'principalPhoneflag', false)
                     this.$set(item, 'principalIdCardflag', false)
-                    if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
-                        var urls = []
-                        var names = item.imageUrls.split(",").filter(item => item != '')
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.imageUrls = urls.join(",")
-                    }
+                    // if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
+                    //     var urls = []
+                    //     var names = item.imageUrls.split(",").filter(item => item != '')
+                    //     names.forEach(name => {
+                    //         urls.push(website.minioUrl + name)
+                    //     })
+                    //     item.imageUrls = urls.join(",")
+                    // }
                 })
 
                 this.loading = false

--
Gitblit v1.9.3