From 0398ebbbc265ac7a3a30bfe4e31472cb95a3b487 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 25 Jan 2022 11:02:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A5=BC=E5=9B=BE=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/qydw.png         | Bin 1913 -> 1635 bytes
 src/assets/scss/modules/search.scss           |   4 +-
 src/router/index.js                           |   2 +-
 src/views/modules/shequ/index.vue             |   2 +-
 src/views/modules/visual/heart/index.vue      |   6 ++-
 .../warning/components/screen-table/index.vue |  36 ++++++++++++------
 src/views/modules/visual/warning/index.vue    |   2 +-
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/assets/img/shuju/measure/qydw.png b/src/assets/img/shuju/measure/qydw.png
index bb4674f9d32846c6a46bbc6479f40536a7103bf9..aa10d299e1bff2ddf24db1dec92c51c8795d7665 100644
GIT binary patch
literal 1635
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+o!3HFmxV|j}Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?_naLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&rCPj(8NN)+)~fb
z%*4RhOh>`Uz|d0Pz(U{9Sl7VN%D~LZ)La1ylz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53ErDhj=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tF+WlN2<<GxJjN
z%ZoL^8hm}NJoAc667!N%JzZ>-fJW$LW~NwK8kiWF8kw4zyO=u}8oD|=IhwjSx;nX;
zI2xO|IGY>6^t$9Hm*%GCmB93-AoQB!)C)=rxdlL*T~doO%TiO^it=+6z<##M#O)Rn
zoaRCGrr>sqDNeomK*#8VViqZ;VM4&<17gC{Esz6G`Kfup<X!|!*N3^?Er2=enx~6n
zNX0FeVDAhOM}f7k&YvkM+dO;5U0;XJrUaJWNt4B0`TsenbSTVovC;78QxXyo<#f`U
zXIl|y)3Kl<$;HOQK_KwY(-e`OruixhjvdKK`}KJCU0%ICFK@p5zA7#>y!iV@^DTdp
z6(XWPpNmttR^90$KJmB9y?Y{2{T_=QxfD!)dY$-x>A~i!Yp!r-t`Zeuo6pj*ZvLAZ
z`<?N-o3>k9i0gDOop^T6!6e^z8{Vzl;PK()(}x-@9OsoLn%=H8s}=ls?ogn!&XUAQ
zo(h>q9Aeh-s=RGWN}liia(f|1t<^VY&*-$tMeIkPu2alx3d?Ph>gZ;>D9b6Bdu^iQ
zwwzm$`&Ad1t!L8Iz4yAM-gx)xd*arYN;Y!Y$IqM@QXSqp%XPz)4^z@gxBW90-IXjP
zwNT86tMuYDm$?fxyqtVn!Y-Z?DP0}^aI1sK+r_J*CkfActNHCydw89HP?x@FlB=GA
zmaDOd)N`j*H(n;pKFMCkdA^+Wc(YdQ#>BeJ#53&<s*?i@^(Kfsm>|Jc=;>i1TqU~Q
z@|1F8yYD`=t#T%F0#3R<s0`8x6ll4(RB`k6B0=u^Z?={HWLtauH%ImMNhkY`z4d9G
zv>?ekOUKxi^;f5(<guCa9hN=5a3W^9{0+AUF&R9470+J1GfFMfX}eLv;nmf2C&}zp
zP(7=rebaW)KgJDV6*8>*9IN@Ky^88g{yP6<Wmm?bkguITSN`(+etl!#5ytGp78XBE
zWZBA|&otcsMe;yo5TozwuRg`x#xGyq<nONiYFW<ge5ZM@=>ho<&l+lCXQ%&T`m&He
zKQUA2tG&xK=NDH~JPvQ^IO_Pu`}LvP9jhC{5C0eXV0OMnw4=c>Ve;39bBhyYTzn^0
z*Di>>QQNRUvc>w~O?Df$c_03{@8o{P*vGKCVSj-^Yw0%AD#JJHvI;*LS8?6R^NDzE
zSI6$wSlTPJ<6^s(>3aWbuTB;}5dDz-Q|P~N0>e=&)wTa?zJsb022WQ%mvv4FO#pQx
Ba6141

literal 1913
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

diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
index ae6c6a6c..7f9c9132 100644
--- a/src/assets/scss/modules/search.scss
+++ b/src/assets/scss/modules/search.scss
@@ -207,10 +207,10 @@
         .cnt {
             display: flex;
             .chart {
-                width: 500px;
+                width: 520px;
             }
             .tb {
-                width: calc(100% - 500px);
+                width: calc(100% - 520px);
             }
         }
     }
diff --git a/src/router/index.js b/src/router/index.js
index eb545fb4..54c903b5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -52,7 +52,7 @@ export const moduleRoutes = {
   component: () => import("@/views/main"),
   name: "main",
   redirect: {
-    path: "/main/base-resi",
+    path: "/main/shequ-index",
   },
   meta: {
     title: "主入口布局",
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 8437ba9d..becf35d4 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -378,7 +378,7 @@
         <div class="cnt">
           <div class="chart">
             <pan-chart
-              :width="480"
+              :width="520"
               :height="420"
               v-if="warningChart.loading"
               :total="warningChart.total"
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index 1267d16b..b911b716 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -229,7 +229,11 @@ export default {
     //加载组织数据
     async getTb1() {
       const { agencyId, areaCode } = this;
-      const url = "/data/report/screen/index/advancedbranchrank";
+
+      const url =
+        localStorage.getItem("customerId") == "b09527201c4409e19d1dbc5e3c3429a1"
+          ? "/data/report/screen/index/advancedbranchrank-shibei"
+          : "/data/report/screen/index/advancedbranchrank";
       let params = {
         agencyId,
         areaCode,
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index a4171708..3a312080 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -23,23 +23,32 @@
             :key="indexs"
             :style="tableContentStyle[indexs]"
           >
-            <span @click="toUserInfo(item)">{{ item }}</span>
+            <div v-if="Array.isArray(item)">
+              <span
+                v-show="rIndex < 1"
+                :key="resi.userId"
+                v-for="(resi, rIndex) in item"
+              >
+                {{ rIndex != 0 ? "、" : "" }}
+                <a @click="toUserInfo(resi.userId)">{{ resi.residentName }}</a>
+              </span>
+            </div>
+            <span v-else>{{ item }}</span>
             <span
-              v-if="indexs + 1 == value.length && item.length > 8"
+              v-if="indexs + 1 == value.length && item.length > 1"
               class="more"
               @click.stop="onClickMorePop(index)"
               ref="morePop"
             >
               更多>
-              <span
-                class="more-pop"
-                @click="toUserInfo(item)"
-                v-if="visiblePopList[index]"
-              >
-                <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
-                  李易峰、赵敏、何军、曲树惠 -->
-                {{ item }}
-              </span>
+              <div class="more-pop" v-if="visiblePopList[index]">
+                <span :key="resi.userId" v-for="(resi, rIndex) in item">
+                  {{ rIndex != 0 ? "、" : "" }}
+                  <a @click="toUserInfo(resi.userId)">{{
+                    resi.residentName
+                  }}</a>
+                </span>
+              </div>
             </span>
           </div>
         </div>
@@ -185,7 +194,7 @@ export default {
 
   methods: {
     toUserInfo(uid) {
-      // this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
 
     onClickMorePop(index) {
@@ -245,6 +254,9 @@ export default {
         .td {
           text-align: center;
           width: calc(100% / 5);
+          a {
+            cursor: pointer;
+          }
           .more {
             font-size: 18px;
             font-weight: 400;
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 8afcae22..587263ba 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -133,7 +133,7 @@ export default {
             item.gridName,
             item.neighborhoodName,
             item.buildingName,
-            item.residentNames ? item.residentNames : "暂无",
+            item.userList,
           ]);
         });
         this.tableData = tableData;

From 4865eedde45647e3d76a787c7277218dd6dcc066 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 26 Jan 2022 09:11:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/elegant/index.vue    | 4 +++-
 src/views/modules/visual/communityParty/community.vue | 2 +-
 src/views/modules/visual/communityParty/party.vue     | 2 +-
 src/views/modules/visual/measure/service.vue          | 2 +-
 src/views/modules/visual/measure/volunteer.vue        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 9c7b5a18..422df400 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -28,7 +28,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetForm('searchForm')">重置</el-button>
+            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -585,6 +585,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
 .resi-container .resi-card-table {
   ::v-deep .el-table th {
     color: #fff;
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 01da97c1..4c708061 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -648,7 +648,7 @@ export default {
       margin-left: 10px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 2aad8ed5..8d4ab043 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -843,7 +843,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 4f01209d..294a8ce7 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -634,7 +634,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 1f4030cc..02e93ecd 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -649,7 +649,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;

From cbf8dacff9971e4cbc61a425840dde07ba4bca88 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 26 Jan 2022 10:08:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 8d431863..ed807fd9 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -14,7 +14,7 @@
         <el-row v-if="fixed" class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item prop="GRID_ID" label="所属网格" required>
+              <el-form-item prop="GRID_ID" label="所属网格">
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">