Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

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);
             }
         }
     }

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: "主入口布局",

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">

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;

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"

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;

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;

src/views/modules/visual/heart/index.vue

@@ -221,7 +221,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,

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;

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;

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
+              <div class="more-pop" v-if="visiblePopList[index]">
-                class="more-pop"
+                <span :key="resi.userId" v-for="(resi, rIndex) in item">
-                @click="toUserInfo(item)"
+                  {{ rIndex != 0 ? "、" : "" }}
-                v-if="visiblePopList[index]"
+                  <a @click="toUserInfo(resi.userId)">{{
-              >
+                    resi.residentName
-                <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
+                  }}</a>
-                  李易峰、赵敏、何军、曲树惠 -->
+                </span>
-                {{ item }}
+              </div>
-              </span>
             </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;

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;