From d6b0edcc93e4273c3fdac0b65c078d4ca706c98b Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 30 Aug 2023 17:02:24 +0800
Subject: [PATCH] up

---
 src/views/jsc/index.vue                            |  8 ++++----
 src/views/record/components/addRecord.vue          |  8 ++++----
 src/views/record/index.vue                         | 10 +++++-----
 src/views/record/map.vue                           |  4 ++--
 src/views/record/personinfo.vue                    |  2 +-
 src/views/viewrecords/components/addViewRecord.vue | 10 +++++-----
 src/views/viewrecords/index.vue                    |  2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue
index 2dda8e8..666fa2d 100644
--- a/src/views/jsc/index.vue
+++ b/src/views/jsc/index.vue
@@ -127,7 +127,7 @@
         select: {
           page_size: 5,
           page: 1,
-          street: '',
+          jiedao: '',
           name: '',
           table_name: 'records',
           show_relation: ['admin', 'department'],
@@ -296,8 +296,8 @@
           }
           // 镇街道 月度访视
           for(var view of res.viewrecords){
-            let value = view.value=='茅山旅游度假区'?'茅山':view.value
-            this.monthX.push(value)
+            // let value = view.value=='茅山旅游度假区'?'茅山':view.value
+            this.monthX.push(view.value)
             this.monthY.push(view.total===1?1.55:view.total)
           }
 
@@ -322,7 +322,7 @@
           table_name: this.select.table_name,
           show_relation: this.select.show_relation,
           filter: [{
-            "key": "street",
+            "key": "jiedao",
             "op": "eq",
             "value": street
           }],
diff --git a/src/views/record/components/addRecord.vue b/src/views/record/components/addRecord.vue
index d62d394..e11fef7 100644
--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@@ -9,13 +9,13 @@
           </div>
         </div>
       </template>
-      <template v-slot:street>
+      <template v-slot:jiedao>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属街道：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.street" filterable style="width: 300px;" placeholder="请选择所属街道">
+            <el-select v-model="form.jiedao" filterable style="width: 300px;" placeholder="请选择所属街道">
               <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value"
                 :value="item.value">
               </el-option>
@@ -384,7 +384,7 @@
         mapform: [],
         form: {
           infotext: '',
-          street:'',
+          jiedao:'',
           name: '',
           nation: '',
           sex: "",
@@ -476,7 +476,7 @@
         })
         this.form = {
           infotext: '',
-          street:res?.street,
+          jiedao:res?.jiedao,
           name: res?.name,
           nation: res?.nation,
           sex: res?.sex,
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index d6d31e3..e645333 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -6,7 +6,7 @@
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
-            <el-select class='street' v-model="select.street" placeholder="请选择街道" clearable>
+            <el-select class='street' v-model="select.jiedao" placeholder="请选择街道" clearable>
               <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -102,7 +102,7 @@
           pageSize: 40,
           pageIndex: 1,
           keyword: "",
-          street: '',
+          jiedao: '',
           disabilityLevel: "",
           disabilityType: "",
           link_tables: [{
@@ -282,7 +282,7 @@
           pageSize: 40,
           pageIndex: 1,
           keyword: "",
-          street: '',
+          jiedao: '',
           disabilityLevel: "",
           disabilityType: "",
           link_tables: [{
@@ -305,9 +305,9 @@
             "op": "like",
             "value": this.select.keyword
           }, {
-            "key": "street",
+            "key": "jiedao",
             "op": "eq",
-            "value": this.select.street
+            "value": this.select.jiedao
           }, {
             "key": "disabilitytype",
             "op": "eq",
diff --git a/src/views/record/map.vue b/src/views/record/map.vue
index aea3b32..0064c8d 100644
--- a/src/views/record/map.vue
+++ b/src/views/record/map.vue
@@ -95,7 +95,7 @@
           }
         }, {
           title: '所属街道',
-          key: 'street',
+          key: 'jiedao',
         }, {
           title: '残疾类别',
           key: 'disabilitytype',
@@ -329,7 +329,7 @@
             "op": "like",
             "value": this.select.name
           }, {
-            "key": "street",
+            "key": "jiedao",
             "op": "eq",
             "value": this.select.street
           },{
diff --git a/src/views/record/personinfo.vue b/src/views/record/personinfo.vue
index 802656b..886ce62 100644
--- a/src/views/record/personinfo.vue
+++ b/src/views/record/personinfo.vue
@@ -209,7 +209,7 @@
         })
         let names = `<div class="persons"><img src='${imgUrl}'><div>${res.name}<div></div>`
         let contents =
-          `<div class='workhover' onclick="goUrls(${res.id},'records')"><p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>年龄：${age}</p><p>联系方式：${res.mobile?res.mobile:''}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p>现居住地：${res.reside}</p></div>`
+          `<div class='workhover' onclick="goUrls(${res.id},'records')"><p>姓名：${res.name}</p><p>性别：${res.sex}</p><p>年龄：${age}</p><p>街道：${res.jiedao?res.jiedao:''}</p><p>联系方式：${res.mobile?res.mobile:''}</p><p>残疾类别：${res.disabilitytype}</p><p>残疾等级：${res?.disabilitylevel}</p><p>现居住地：${res.reside}</p></div>`
 
         let views = ''
         let workflows = ''
diff --git a/src/views/viewrecords/components/addViewRecord.vue b/src/views/viewrecords/components/addViewRecord.vue
index 8d78958..eb23402 100644
--- a/src/views/viewrecords/components/addViewRecord.vue
+++ b/src/views/viewrecords/components/addViewRecord.vue
@@ -77,13 +77,13 @@
           </div>
         </div>
       </template>
-      <template v-slot:street>
+      <template v-slot:jiedao>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属街道：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.street" filterable style="width: 300px;" placeholder="请选择所属街道">
+            <el-select v-model="form.jiedao" filterable style="width: 300px;" placeholder="请选择所属街道">
               <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value"
                 :value="item.value">
               </el-option>
@@ -466,7 +466,7 @@
           viewstatus: '',
           uploads:'',
           infotext: '',
-          street:'',
+          jiedao:'',
           name: '',
           nation: '',
           sex: "",
@@ -584,7 +584,7 @@
           viewscene: "",
           viewstatus: '',
           infotext: '',
-          street:res?.street,
+          jiedao:res?.jiedao,
           name: res?.name,
           nation: res?.nation,
           sex: res?.sex,
@@ -635,7 +635,7 @@
           checkstatus: res?.checkstatus,
           uploads:res?.uploads,
           infotext: res?.infotext,
-          street:res?.street,
+          jiedao:res?.jiedao,
           name: res?.name,
           nation: res?.nation,
           sex: res?.sex,
diff --git a/src/views/viewrecords/index.vue b/src/views/viewrecords/index.vue
index 690da7c..7230a50 100644
--- a/src/views/viewrecords/index.vue
+++ b/src/views/viewrecords/index.vue
@@ -120,7 +120,7 @@
           {
             label: "所属街道",
             width: 120,
-            prop: 'street',
+            prop: 'jiedao',
             align: 'center'
           },
           {