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

src/assets/scss/modules/search.scss

@@ -85,7 +85,9 @@
     }
 }
 .m-panel {
-    padding: 0 10px;
+    background-color: #fff;
+    border-radius: 10px;
+    padding: 30px 40px;
 
     .operate {
         text-align: right;

src/views/modules/shequ/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <div v-show="!showedFuncPanel">
       <div class="m-info">
         <div class="wrap">
           <div class="logo">
@@ -128,10 +129,12 @@
                 </el-table-column>
                 <el-table-column prop="buildingName" label="所属楼栋">
                 </el-table-column>
-              <el-table-column prop="unitNum" label="单元号"> </el-table-column>
+                <el-table-column prop="unitNum" label="单元号">
+                </el-table-column>
                 <el-table-column prop="doorName" label="门牌号">
                 </el-table-column>
-              <el-table-column prop="houseType" label="类型"> </el-table-column>
+                <el-table-column prop="houseType" label="类型">
+                </el-table-column>
                 <el-table-column prop="purpose" label="用途"> </el-table-column>
                 <el-table-column prop="rentFlag" label="是否出租">
                 </el-table-column>
@@ -265,7 +268,10 @@
                 v-for="item in funcList"
               >
                 <div class="icon">
-                <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+                  <svg
+                    class="icon-svg aui-sidebar__menu-icon"
+                    aria-hidden="true"
+                  >
                     <use :xlink:href="`#${item.icon}`" />
                   </svg>
                 </div>
@@ -280,17 +286,76 @@
               </div>
             </div>
           </div>
+        </div>
+      </div>
 
-        <!-- 修改弹出框 -->
+      <div class="m-data" v-if="searchStatus == 'ini'">
-        <el-dialog
+        <div class="wrap">
-          :visible.sync="showedFuncPanel"
+          <div class="headline">人员预警</div>
-          :close-on-click-modal="false"
+
-          :close-on-press-escape="false"
+          <div class="cnt">
-          title=""
+            <div class="chart">
-          width="850px"
+              <pan-chart
-          top="5vh"
+                :width="520"
-          @closed="showedFuncPanel = false"
+                :height="420"
+                v-if="warningChart.loading"
+                :total="warningChart.total"
+                :list="warningChart.list"
+              />
+            </div>
+            <div class="tb">
+              <el-table
+                :data="warningTb.list"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :max-height="maxTableHeight"
+              >
+                <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="50"
+                />
+                <el-table-column prop="typeName" label="类型">
+                </el-table-column>
+                <el-table-column prop="gridName" label="所属网格">
+                </el-table-column>
+                <el-table-column prop="name" label="姓名"> </el-table-column>
+                <el-table-column prop="family" label="所属家庭">
+                </el-table-column>
+                <el-table-column prop="mobile" label="电话"> </el-table-column>
+                <el-table-column fixed="right" label="操作" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      @click="handleWatchWarning(scope.$index)"
+                      type="text"
+                      size="small"
+                      >查看</el-button
                     >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChangeWarning"
+                  @current-change="handleCurrentChangeWarning"
+                  :current-page.sync="warningTb.pageNo"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="parseInt(warningTb.pageSize)"
+                  layout="sizes, prev, pager, next"
+                  :total="warningTb.total"
+                >
+                </el-pagination>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <div v-show="showedFuncPanel">
       <div class="m-panel">
         <div
           class="m-list"
@@ -309,10 +374,7 @@
               </div>
 
               <div class="icon">
-                    <svg
+                <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
-                      class="icon-svg aui-sidebar__menu-icon"
-                      aria-hidden="true"
-                    >
                   <use :xlink:href="`#${item.icon}`" />
                 </svg>
               </div>
@@ -361,75 +423,8 @@
         </div>
 
         <div class="operate">
-              <el-button round @click="showedFuncPanel = false">取消</el-button>
+          <el-button round @click="showedFuncPanel = false">返回</el-button>
-              <el-button type="primary" round @click="editFuncList"
+          <el-button type="primary" round @click="editFuncList">确认</el-button>
-                >确认</el-button
-              >
-            </div>
-          </div>
-        </el-dialog>
-      </div>
-    </div>
-
-    <div class="m-data" v-if="searchStatus == 'ini'">
-      <div class="wrap">
-        <div class="headline">人员预警</div>
-
-        <div class="cnt">
-          <div class="chart">
-            <pan-chart
-              :width="520"
-              :height="420"
-              v-if="warningChart.loading"
-              :total="warningChart.total"
-              :list="warningChart.list"
-            />
-          </div>
-          <div class="tb">
-            <el-table
-              :data="warningTb.list"
-              border
-              style="width: 100%"
-              class="resi-table"
-              :max-height="maxTableHeight"
-            >
-              <el-table-column
-                label="序号"
-                type="index"
-                align="center"
-                width="50"
-              />
-              <el-table-column prop="typeName" label="类型"> </el-table-column>
-              <el-table-column prop="gridName" label="所属网格">
-              </el-table-column>
-              <el-table-column prop="name" label="姓名"> </el-table-column>
-              <el-table-column prop="family" label="所属家庭">
-              </el-table-column>
-              <el-table-column prop="mobile" label="电话"> </el-table-column>
-              <el-table-column fixed="right" label="操作" align="center">
-                <template slot-scope="scope">
-                  <el-button
-                    @click="handleWatchWarning(scope.$index)"
-                    type="text"
-                    size="small"
-                    >查看</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <div>
-              <el-pagination
-                @size-change="handleSizeChangeWarning"
-                @current-change="handleCurrentChangeWarning"
-                :current-page.sync="warningTb.pageNo"
-                :page-sizes="[20, 50, 100, 200]"
-                :page-size="parseInt(warningTb.pageSize)"
-                layout="sizes, prev, pager, next"
-                :total="warningTb.total"
-              >
-              </el-pagination>
-            </div>
-          </div>
         </div>
       </div>
     </div>

src/views/modules/visual/communityParty/community.vue

@@ -397,6 +397,7 @@ export default {
       if (val.length > 0) {
         const _arr = val[val.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
+        this.agencyId = _arr[0]
         this.getList(_arr[0])
         this.getMapUnitList(_arr[0])
         this.getCateCount(_arr[0])
@@ -571,16 +572,16 @@ export default {
     },
 
     handleSelectChange (val) {
-      this.getList();
+      this.getList(this.agencyId);
     },
     pageSizeChangeHandleNew (val) {
       this.pageNo = 1;
       this.pageSize = val;
-      this.getList();
+      this.getList(this.agencyId);
     },
     pageCurrentChangeHandleNew (val) {
       this.pageNo = val;
-      this.getList();
+      this.getList(this.agencyId);
     },
   },
 };

src/views/modules/visual/warning/components/screen-table/index.vue

@@ -25,7 +25,7 @@
           >
             <div v-if="Array.isArray(item)">
               <span
-                v-show="rIndex < 1"
+                v-show="rIndex < 3"
                 :key="resi.userId"
                 v-for="(resi, rIndex) in item"
               >
@@ -35,7 +35,7 @@
             </div>
             <span v-else>{{ item }}</span>
             <span
-              v-if="indexs + 1 == value.length && item.length > 1"
+              v-if="indexs + 1 == value.length && item.length > 3"
               class="more"
               @click.stop="onClickMorePop(index)"
               ref="morePop"
@@ -231,7 +231,19 @@ export default {
 
       &-th {
         text-align: center;
-        width: calc(100% / 5);
+        width: 20%;
+        &:nth-child(1) {
+          width: 5%;
+        }
+        &:nth-child(2) {
+          width: 25%;
+        }
+        &:nth-child(3) {
+          width: 25%;
+        }
+        &:nth-child(5) {
+          width: 25%;
+        }
       }
     }
 
@@ -253,7 +265,19 @@ export default {
 
         .td {
           text-align: center;
-          width: calc(100% / 5);
+          width: 20%;
+          &:nth-child(1) {
+            width: 5%;
+          }
+          &:nth-child(2) {
+            width: 25%;
+          }
+          &:nth-child(3) {
+            width: 25%;
+          }
+          &:nth-child(5) {
+            width: 25%;
+          }
           a {
             cursor: pointer;
           }