From 9f9868c4a0889f61acbb70a8c0d2c0a47823e769 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 26 Jan 2022 13:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=B3=BB=E5=88=97bu?=
 =?UTF-8?q?g2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/qydw.png         | Bin 1635 -> 3212 bytes
 src/assets/scss/modules/search.scss           |   4 +-
 src/views/modules/shequ/index.vue             | 753 +++++++++---------
 .../warning/components/screen-table/index.vue |  32 +-
 4 files changed, 405 insertions(+), 384 deletions(-)

diff --git a/src/assets/img/shuju/measure/qydw.png b/src/assets/img/shuju/measure/qydw.png
index aa10d299e1bff2ddf24db1dec92c51c8795d7665..2e068f8af0a6872f80702e29efd45a72b67dbba6 100644
GIT binary patch
literal 3212
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
NczyxgQs3xJe*j9Q1+)MF

delta 1102
zcmeB?e9Yt38Q|y6%O%Cdz`(%k>ERLtr1^nZkb@0KGI4!d2&5!STq8<?^V3So6N^$A
z98>a>QWZRN6Vp?JQWH}u3s0unFfcGHZ?y7docw~(fH^2NZE_-`++<58J}}#d$$WAw
zvv|Fwfr*i+k*S%vi@B4bp{ui#qp6FdtCO3Fqp_Kbv$>IyLPc(YudkI$esXDUYF>$_
zi>(q+L@y;X#R{s|9H(A81skaD)S}F?)D*X({9J|N5};eGGV_W{67!NLr!(`$LCrD2
zX%19R3T`);;?%1@`8}&c{b6o*3t-S)^K@|xskr45?42RvD6sa``7<SDn`h6s>+8_j
zl)%zEX|lL0|33$n4uyFxHX0s%N<spnoKAZ4Y%2n7Iu>*!x!8C(2n7Clnj+HEG+$-G
zu_HNYzaG!N%d5BN<;|DhSH*>f7k}SqzU5D{LPYfEb8!mSsyki8C;oQ1SAS0=s^4R=
zBbS2dPp=dIFFn|Nb<Gv-%vGX7Z1Y(<*3ExYW4|+gchh!j3vr$9r4!H2Ihf@8Zo|8k
z8$3RoeELwMh2y-^MAO@~X0?JJ&m9VM)>)D`$x|Woh(pXeUX{0PNy+oQUv4ktsI~g$
z>=~UlxrqJf({+lOO<}oBQXSoF7iBr?1#_=WbljG6D{{Z;0<-l@n!5L1x6~W&etl2e
z`clb8F8lbIGefGwTW7g$nDSvtTIsfb=Ayfjg`^gW8F7_foaQojfrgipZ%f$4QzE6S
z;~#EyFnPOpRrDm`d2cnpeQFP{^AGCM7fo{2Q_ylX7Lj`HwCcvogxM$A>p0JsvmS5O
ziml(6SeKc2rrkkxa)6=U1d#_5B-jc)JxqkFM7LX>Qf_Sb-KVxy&SXx&N!JIJK{|l~
zE%%lxZr)xb$bJ9Kw(_5BYmfitsNO#5WZ$v3KCP1$Bw1(a7`w9m>U5MmHgmqivd0%r
z#7vjJ;r1XVgQu_J*{gR(sbxBCH%d6Xx|;4JnY{|CuV>Y?Z`v;U$G9P^LWXspV>SP@
zS5ckGU+2H9?8-P4^0o8l%3q$}uW#%-!kB&7!s4fiEL++0nTGqnNFIm`V)T9e)u))-
z_~px+{N1%*Ez6mm?=<f<Js|(#Swl_i?DT(3Ul#J`CuRzLwRf53{Nieg$Kfp<M;+gI
zzdlsEV|7FL;s51AAI#3zh;}qMCQSbNaBgv;jEnE2>e>a7H)<OeNVZrXyvc6EHt)kf
z_nq9Y82cDjH|#GkXf54lT4nfVT~^^I<0`H@c|H-Z?dsUw8cTbHc3f=NGF|U~?bXTR
i2cjRce+vB<PGC4{rMmWi&390t!QkoY=d#Wzp$Py-yu{}K

diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
index 7f9c91320..d0222b5ca 100644
--- a/src/assets/scss/modules/search.scss
+++ b/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;
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 16a8cc5c6..0be1481bd 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -1,269 +1,378 @@
 <template>
   <div>
-    <div class="m-info">
-      <div class="wrap">
-        <div class="logo">
-          <img src="@/assets/img/shequ/logo.png" />
-        </div>
+    <div v-show="!showedFuncPanel">
+      <div class="m-info">
+        <div class="wrap">
+          <div class="logo">
+            <img src="@/assets/img/shequ/logo.png" />
+          </div>
 
-        <div class="search">
-          <div class="input">
-            <select v-model="searchData.type">
-              <option value="jumin">居民</option>
-              <option value="fangwu">房屋</option>
-              <option value="xuqiu">需求</option>
-            </select>
-
-            <input
-              type="text"
-              :placeholder="typePlaceholder[searchData.type]"
-              v-model="searchData.keyword"
-              @keyup.enter="handleClickSearchBtn"
-            />
+          <div class="search">
+            <div class="input">
+              <select v-model="searchData.type">
+                <option value="jumin">居民</option>
+                <option value="fangwu">房屋</option>
+                <option value="xuqiu">需求</option>
+              </select>
+
+              <input
+                type="text"
+                :placeholder="typePlaceholder[searchData.type]"
+                v-model="searchData.keyword"
+                @keyup.enter="handleClickSearchBtn"
+              />
 
-            <div
-              class="close-btn"
-              v-if="searchData.keyword != ''"
-              @click="searchData.keyword = ''"
-            >
-              <img src="@/assets/img/shequ/close.png" />
+              <div
+                class="close-btn"
+                v-if="searchData.keyword != ''"
+                @click="searchData.keyword = ''"
+              >
+                <img src="@/assets/img/shequ/close.png" />
+              </div>
             </div>
+            <div class="btn" @click="handleClickSearchBtn">搜索</div>
           </div>
-          <div class="btn" @click="handleClickSearchBtn">搜索</div>
-        </div>
 
-        <div
-          class="m-tb"
-          v-if="
-            searchData.type == 'jumin' &&
-            searchData.keyword != '' &&
-            searchStatus == 'ing'
-          "
-        >
-          <div class="tb">
-            <el-table
-              :data="searchJumin.list"
-              border
-              style="width: 100%"
-              class="resi-table"
-              :max-height="1000"
-            >
-              <el-table-column
-                label="序号"
-                type="index"
-                align="center"
-                width="50"
-              />
-              <el-table-column
-                v-for="item in searchJumin.header"
-                :key="item.columnName"
-                :prop="item.columnName"
-                :label="item.label"
-                align="center"
-                :show-overflow-tooltip="true"
-                :width="
-                  item.itemType === 'radio' ? computedWidth(item.label) : 180
-                "
+          <div
+            class="m-tb"
+            v-if="
+              searchData.type == 'jumin' &&
+              searchData.keyword != '' &&
+              searchStatus == 'ing'
+            "
+          >
+            <div class="tb">
+              <el-table
+                :data="searchJumin.list"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :max-height="1000"
               >
-                <template slot-scope="scope">
-                  <span>{{ handleFilterSpan(scope.row, item) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column fixed="right" label="操作" align="center">
-                <template slot-scope="scope">
-                  <el-button
-                    @click="handleWatchSearchJumin(scope.$index)"
-                    type="text"
-                    size="small"
-                    >查看</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <div>
-              <el-pagination
-                @size-change="handleSizeChangeSearchJumin"
-                @current-change="handleCurrentChangeSearchJumin"
-                :current-page.sync="searchJumin.pageNo"
-                :page-sizes="[20, 50, 100, 200]"
-                :page-size="parseInt(searchJumin.pageSize)"
-                layout="sizes, prev, pager, next"
-                :total="searchJumin.total"
+                <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="50"
+                />
+                <el-table-column
+                  v-for="item in searchJumin.header"
+                  :key="item.columnName"
+                  :prop="item.columnName"
+                  :label="item.label"
+                  align="center"
+                  :show-overflow-tooltip="true"
+                  :width="
+                    item.itemType === 'radio' ? computedWidth(item.label) : 180
+                  "
+                >
+                  <template slot-scope="scope">
+                    <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column fixed="right" label="操作" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      @click="handleWatchSearchJumin(scope.$index)"
+                      type="text"
+                      size="small"
+                      >查看</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChangeSearchJumin"
+                  @current-change="handleCurrentChangeSearchJumin"
+                  :current-page.sync="searchJumin.pageNo"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="parseInt(searchJumin.pageSize)"
+                  layout="sizes, prev, pager, next"
+                  :total="searchJumin.total"
+                >
+                </el-pagination>
+              </div>
+            </div>
+          </div>
+
+          <div
+            class="m-tb"
+            v-if="
+              searchData.type == 'fangwu' &&
+              searchData.keyword != '' &&
+              searchStatus == 'ing'
+            "
+          >
+            <div class="tb">
+              <el-table
+                :data="searchFangwu.list"
+                v-loading="searchFangwu.loading"
+                border
+                :max-height="1000"
+                style="width: 100%"
               >
-              </el-pagination>
+                <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="50"
+                />
+                <el-table-column prop="houseName" label="房屋名称" width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="neighborHoodName"
+                  label="所属小区"
+                  width="160"
+                >
+                </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="doorName" 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>
+                <el-table-column prop="ownerName" label="房主姓名">
+                </el-table-column>
+                <el-table-column prop="ownerPhone" label="房主电话" width="110">
+                </el-table-column>
+                <el-table-column prop="ownerIdCard" label="身份证" width="170">
+                </el-table-column>
+                <el-table-column
+                  label="操作"
+                  fixed="right"
+                  header-align="center"
+                  align="center"
+                  class="operate"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      style="color: #1c6afd; text-decoration: underline"
+                      size="small"
+                      @click="handleWatchSearchFangwu(scope.row)"
+                      >查看</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChangeSearchFangwu"
+                  @current-change="handleCurrentChangeSearchFangwu"
+                  :current-page.sync="searchFangwu.pageNo"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="parseInt(searchFangwu.pageSize)"
+                  layout="sizes, prev, pager, next"
+                  :total="searchFangwu.total"
+                >
+                </el-pagination>
+              </div>
             </div>
           </div>
-        </div>
 
-        <div
-          class="m-tb"
-          v-if="
-            searchData.type == 'fangwu' &&
-            searchData.keyword != '' &&
-            searchStatus == 'ing'
-          "
-        >
-          <div class="tb">
-            <el-table
-              :data="searchFangwu.list"
-              v-loading="searchFangwu.loading"
-              border
-              :max-height="1000"
-              style="width: 100%"
-            >
-              <el-table-column
-                label="序号"
-                type="index"
-                align="center"
-                width="50"
-              />
-              <el-table-column prop="houseName" label="房屋名称" width="120">
-              </el-table-column>
-              <el-table-column
-                prop="neighborHoodName"
-                label="所属小区"
-                width="160"
+          <div
+            class="m-tb"
+            v-if="
+              searchData.type == 'xuqiu' &&
+              searchData.keyword != '' &&
+              searchStatus == 'ing'
+            "
+          >
+            <div class="tb">
+              <el-table
+                :data="searchXuqiu.list"
+                v-loading="searchXuqiu.loading"
+                border
+                :max-height="1000"
+                style="width: 100%"
               >
-              </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="doorName" 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>
-              <el-table-column prop="ownerName" label="房主姓名">
-              </el-table-column>
-              <el-table-column prop="ownerPhone" label="房主电话" width="110">
-              </el-table-column>
-              <el-table-column prop="ownerIdCard" label="身份证" width="170">
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                fixed="right"
-                header-align="center"
-                align="center"
-                class="operate"
+                <el-table-column
+                  label="序号"
+                  type="index"
+                  align="center"
+                  width="50"
+                />
+
+                <el-table-column
+                  v-for="item in searchXuqiu.header"
+                  :key="item.columnName"
+                  :prop="item.columnName"
+                  :label="item.label"
+                  :align="item.align"
+                  :width="item.width"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  label="操作"
+                  fixed="right"
+                  header-align="center"
+                  align="center"
+                  class="operate"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      style="color: #1c6afd; text-decoration: underline"
+                      size="small"
+                      @click="handleWatchSearchXuqiu(scope.row)"
+                      >查看</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChangeSearchXuqiu"
+                  @current-change="handleCurrentChangeSearchXuqiu"
+                  :current-page.sync="searchXuqiu.pageNo"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="parseInt(searchXuqiu.pageSize)"
+                  layout="sizes, prev, pager, next"
+                  :total="searchXuqiu.total"
+                >
+                </el-pagination>
+              </div>
+            </div>
+          </div>
+
+          <div
+            class="m-tb"
+            v-if="
+              searchData.type == 'xuqiu' &&
+              searchData.keyword != '' &&
+              searchStatus == 'ing'
+            "
+          >
+            <div class="tb"></div>
+          </div>
+
+          <div class="m-list" v-if="searchStatus == 'ini'">
+            <div class="list-title">常用功能</div>
+            <div class="list">
+              <div
+                class="item"
+                :key="item.menuId"
+                @click="handleClickFunc(item)"
+                v-for="item in funcList"
               >
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    style="color: #1c6afd; text-decoration: underline"
-                    size="small"
-                    @click="handleWatchSearchFangwu(scope.row)"
-                    >查看</el-button
+                <div class="icon">
+                  <svg
+                    class="icon-svg aui-sidebar__menu-icon"
+                    aria-hidden="true"
                   >
-                </template>
-              </el-table-column>
-            </el-table>
-            <div>
-              <el-pagination
-                @size-change="handleSizeChangeSearchFangwu"
-                @current-change="handleCurrentChangeSearchFangwu"
-                :current-page.sync="searchFangwu.pageNo"
-                :page-sizes="[20, 50, 100, 200]"
-                :page-size="parseInt(searchFangwu.pageSize)"
-                layout="sizes, prev, pager, next"
-                :total="searchFangwu.total"
-              >
-              </el-pagination>
+                    <use :xlink:href="`#${item.icon}`" />
+                  </svg>
+                </div>
+                <p>{{ item.menuName }}</p>
+              </div>
+
+              <div class="item" @click="showedFuncPanel = true">
+                <div class="icon">
+                  <img src="@/assets/img/shequ/function/tianjiayingyong.png" />
+                </div>
+                <p>添加应用</p>
+              </div>
             </div>
           </div>
         </div>
+      </div>
 
-        <div
-          class="m-tb"
-          v-if="
-            searchData.type == 'xuqiu' &&
-            searchData.keyword != '' &&
-            searchStatus == 'ing'
-          "
-        >
-          <div class="tb">
-            <el-table
-              :data="searchXuqiu.list"
-              v-loading="searchXuqiu.loading"
-              border
-              :max-height="1000"
-              style="width: 100%"
-            >
-              <el-table-column
-                label="序号"
-                type="index"
-                align="center"
-                width="50"
+      <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"
               />
-
-              <el-table-column
-                v-for="item in searchXuqiu.header"
-                :key="item.columnName"
-                :prop="item.columnName"
-                :label="item.label"
-                :align="item.align"
-                :width="item.width"
-                :show-overflow-tooltip="true"
-              >
-                <template slot-scope="scope">
-                  <span>{{ handleFilterSpan(scope.row, item) }}</span>
-                </template>
-              </el-table-column>
-
-              <el-table-column
-                label="操作"
-                fixed="right"
-                header-align="center"
-                align="center"
-                class="operate"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    style="color: #1c6afd; text-decoration: underline"
-                    size="small"
-                    @click="handleWatchSearchXuqiu(scope.row)"
-                    >查看</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <div>
-              <el-pagination
-                @size-change="handleSizeChangeSearchXuqiu"
-                @current-change="handleCurrentChangeSearchXuqiu"
-                :current-page.sync="searchXuqiu.pageNo"
-                :page-sizes="[20, 50, 100, 200]"
-                :page-size="parseInt(searchXuqiu.pageSize)"
-                layout="sizes, prev, pager, next"
-                :total="searchXuqiu.total"
+            </div>
+            <div class="tb">
+              <el-table
+                :data="warningTb.list"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :max-height="maxTableHeight"
               >
-              </el-pagination>
+                <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-tb"
-          v-if="
-            searchData.type == 'xuqiu' &&
-            searchData.keyword != '' &&
-            searchStatus == 'ing'
-          "
+          class="m-list"
+          v-if="selectedFuncList && selectedFuncList.length > 0"
         >
-          <div class="tb"></div>
-        </div>
-
-        <div class="m-list" v-if="searchStatus == 'ini'">
           <div class="list-title">常用功能</div>
           <div class="list">
             <div
               class="item"
               :key="item.menuId"
-              @click="handleClickFunc(item)"
-              v-for="item in funcList"
+              @click="selectFuncItem(item.menuId)"
+              v-for="item in selectedFuncList"
             >
+              <div class="corner-mark z-on">
+                <i class="el-icon-success"></i>
+              </div>
+
               <div class="icon">
                 <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
                   <use :xlink:href="`#${item.icon}`" />
@@ -271,165 +380,51 @@
               </div>
               <p>{{ item.menuName }}</p>
             </div>
-
-            <div class="item" @click="showedFuncPanel = true">
-              <div class="icon">
-                <img src="@/assets/img/shequ/function/tianjiayingyong.png" />
-              </div>
-              <p>添加应用</p>
-            </div>
           </div>
         </div>
 
-        <!-- 修改弹出框 -->
-        <el-dialog
-          :visible.sync="showedFuncPanel"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          title=""
-          width="850px"
-          top="5vh"
-          @closed="showedFuncPanel = false"
-        >
-          <div class="m-panel">
-            <div
-              class="m-list"
-              v-if="selectedFuncList && selectedFuncList.length > 0"
-            >
-              <div class="list-title">常用功能</div>
-              <div class="list">
+        <div class="m-list">
+          <div class="list-title">所有功能</div>
+
+          <div
+            :key="'one' + menu.id"
+            v-show="menu.children && menu.children.length > 0"
+            v-for="menu in $store.state.sidebarMenuList"
+          >
+            <div class="list-title2">{{ menu.name }}</div>
+            <div class="list">
+              <div
+                class="item"
+                :key="'two' + item.id"
+                @click="selectFuncItem(item.id)"
+                v-for="item in menu.children"
+              >
                 <div
-                  class="item"
-                  :key="item.menuId"
-                  @click="selectFuncItem(item.menuId)"
-                  v-for="item in selectedFuncList"
+                  class="corner-mark"
+                  :class="{
+                    'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
+                  }"
                 >
-                  <div class="corner-mark z-on">
-                    <i class="el-icon-success"></i>
-                  </div>
-
-                  <div class="icon">
-                    <svg
-                      class="icon-svg aui-sidebar__menu-icon"
-                      aria-hidden="true"
-                    >
-                      <use :xlink:href="`#${item.icon}`" />
-                    </svg>
-                  </div>
-                  <p>{{ item.menuName }}</p>
+                  <i class="el-icon-success"></i>
                 </div>
-              </div>
-            </div>
-
-            <div class="m-list">
-              <div class="list-title">所有功能</div>
 
-              <div
-                :key="'one' + menu.id"
-                v-show="menu.children && menu.children.length > 0"
-                v-for="menu in $store.state.sidebarMenuList"
-              >
-                <div class="list-title2">{{ menu.name }}</div>
-                <div class="list">
-                  <div
-                    class="item"
-                    :key="'two' + item.id"
-                    @click="selectFuncItem(item.id)"
-                    v-for="item in menu.children"
+                <div class="icon">
+                  <svg
+                    class="icon-svg aui-sidebar__menu-icon"
+                    aria-hidden="true"
                   >
-                    <div
-                      class="corner-mark"
-                      :class="{
-                        'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
-                      }"
-                    >
-                      <i class="el-icon-success"></i>
-                    </div>
-
-                    <div class="icon">
-                      <svg
-                        class="icon-svg aui-sidebar__menu-icon"
-                        aria-hidden="true"
-                      >
-                        <use :xlink:href="`#${item.icon}`" />
-                      </svg>
-                    </div>
-                    <p>{{ item.name }}</p>
-                  </div>
+                    <use :xlink:href="`#${item.icon}`" />
+                  </svg>
                 </div>
+                <p>{{ item.name }}</p>
               </div>
             </div>
-
-            <div class="operate">
-              <el-button round @click="showedFuncPanel = false">取消</el-button>
-              <el-button type="primary" round @click="editFuncList"
-                >确认</el-button
-              >
-            </div>
           </div>
-        </el-dialog>
-      </div>
-    </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 class="operate">
+          <el-button round @click="showedFuncPanel = false">返回</el-button>
+          <el-button type="primary" round @click="editFuncList">确认</el-button>
         </div>
       </div>
     </div>
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 3a3120808..11d0b7831 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/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;
           }