diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 5c3837141..b2dbead49 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="g-row" v-show="!showedFuncPanel">
+    <div class="g-row">
       <div class="g-row-left">
         <div class="m-box m-search">
           <div class="wrap">
@@ -10,8 +10,6 @@
             <div class="tabs">
               <div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">查居民</div>
               <div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">查房屋</div>
-              <div :class="{ 'z-on': searchData.type == 'xuqiu' }" @click="searchDataTab('xuqiu')">查需求</div>
-
             </div>
 
             <div class="search">
@@ -27,8 +25,8 @@
                 <div class="btn" @click="handleClickSearchBtn">查询</div>
               </div>
             </div>
-
           </div>
+
           <div class="mewq">
             <div class="boxss">
               <div style="margin-top: 10px;" @click="handelClickToResi">
@@ -41,14 +39,14 @@
               </div>
             </div>
             <div class="boxss">
-              <div style="margin-top: 10px;" @click="handelClickToResi({residentCategory:'permanentFlag'})">
+              <div style="margin-top: 10px;"  @click="handelClickToResi({residentCategory:'permanentFlag'})">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">常住人口</span>
               </div>
             </div>
             <div class="boxss">
-              <div style="margin-top: 10px;" @click="handelClickToResi({residentCategory:'FLOATING_FLAG'})">
+              <div style="margin-top: 10px;"  @click="handelClickToResi({residentCategory:'FLOATING_FLAG'})">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">流动人口</span>
@@ -84,39 +82,6 @@
             </div>
           </div>
         </div>
-        <div class="m-box flex_box">
-          <div class="header" style="padding-top: 10px;">
-            <div class="newqsa"><span>常用功能</span></div>
-            <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
-          </div>
-          <div class="wrap" style="padding: 10px;">
-            <div class="m-list" v-if="searchStatus == 'ini'">
-              <div class="list">
-                <div class="item" :key="item.menuId" @click="handleClickFunc(item)" v-for="item in funcList">
-                  <div class="icon">
-                    <div class="icon-wrap" :style="{
-                        color: item.color ? '#fff' : '#333',
-                        backgroundColor: item.color || '#f4f4f4',
-                      }">
-                      <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
-                        <use :xlink:href="`#${item.icon}`" />
-                      </svg>
-                    </div>
-                  </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-pan">
           <div class="m-box flex_box m-pan">
             <div class="header">
@@ -132,226 +97,16 @@
         </div>
 
         <div class="m-box m-tb">
-          <div class="header">
-            <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
-            <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
-          </div>
+            <div class="header">
+              <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
+              <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
+            </div>
           <!-- <div class="more">更多></div> -->
           <div class="cnt">
             <div id="my_chart" style="width: 100%; height: 170px;"></div>
           </div>
         </div>
-        <div class="m-box m-tb1">
-          <div class="header" style="display: flex;justify-content: space-between; flex-direction: row;">
-            <div class="newqsa">
-              <span>用户数据统计</span>
-            </div>
-            <div class="newqsa" style="display: flex;flex-direction: row; margin-right: 10px;">
-              <el-select v-model="dateName" placeholder="请选择" style="width: 100px;" @change="getStatisticsList">
-                <el-option v-for="item in optionsDate" :key="item.value" :label="item.label" :value="item.value"
-                  style="width: 100px;">
-                </el-option>
-              </el-select>
-              <div v-if="dateName==3"><el-date-picker v-model="SelectTime.startTime" type="datetime" placeholder="开始时间"
-              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker><span style="margin: 0 10px">至</span><el-date-picker v-model="SelectTime.endTime"
-              type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="getStatisticsList1">
-            </el-date-picker></div>
-
-            </div>
-            <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
-          </div>
-
-          <div style="display: flex; flex-direction: row">
-            <div style="width: 30%; height: 100%; padding:10px;border-right: 1px solid #E5E5E5;">
-              <div class="mewq">
-                <div class="boxss">
-                  <div style="margin-top: 10px;" @click="handelClickToResi">
-                    <span style="color: #2683DB; font-size: 25px;">
-                      {{ UserStatisticsList.userNum }}
-                    </span>
-
-                    <br>
-                    <span style="color: #858585; font-size: 12px;">用户总数</span>
-                  </div>
-                </div>
-                <div class="boxss">
-                  <div style="margin-top: 10px;" @click="handelClickToResi({ residentCategory: 'permanentFlag' })">
-                    <span style="color: #10bd76; font-size: 25px;">{{ UserStatisticsList.onLineNum }}</span>
-                    <br>
-                    <span style="color: #858585; font-size: 12px;">当前在线</span>
-                  </div>
-                </div>
-                <div class="boxss">
-                  <div style="margin-top: 10px;" @click="handelClickToResi({ residentCategory: 'FLOATING_FLAG' })">
-                    <span style="color: #2683DB; font-size: 25px;">{{ UserStatisticsList.visitorNum }}</span>
-                    <br>
-                    <span style="color: #858585; font-size: 12px;">普通访客</span>
-                  </div>
-                </div>
-                <div class="boxss">
-                  <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
-                    <span style="color: #2683DB; font-size: 25px;">{{ UserStatisticsList.registerNum }}</span>
-                    <br>
-                    <span style="color: #858585; font-size: 12px;">注册用户</span>
-                  </div>
-                </div>
-                <div class="boxss" @click="jumpToHouse('zizhuM')">
-                  <div style="margin-top: 10px;">
-                    <span style="color: #2683DB; font-size: 25px;">{{ UserStatisticsList.realNameNum }}</span>
-                    <br>
-                    <span style="color: #858585; font-size: 12px;">实名用户</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div style="display: flex; flex-direction: column; width: 70%; padding: 10px">
-              <div class="mewq1">
-                <div class="" style="width: 25%;">
-                  <div style="margin-top: 10px;" @click="handelClickToResi">
-                    <span style="color: #2683DB; font-size: 25px;">
-                      {{ getUserRangeList.oldUser }}
-                    </span>
-                    <br>
-                    <div style="display: flex; flex-direction: row;">
-                      <span style="color: #858585; font-size: 12px;">老用户</span>
-                      <span style="color: #2683DB; padding-left: 2px; font-size: 12px;">{{
-                        getUserRangeList.oldUserPercentage }}</span>
-                    </div>
-
-                  </div>
-                </div>
-                <div class="" style="width: 25%;">
-                  <div style="margin-top: 10px;" @click="handelClickToResi({ residentCategory: 'permanentFlag' })">
-                    <span style="color: #2683DB; font-size: 25px;">
-                      {{ getUserRangeList.newUser }}
-                    </span>
-                    <br>
-                    <div style="display: flex; flex-direction: row;">
-                      <span style="color: #858585; font-size: 12px;">新用户</span>
-                      <span style="color: #2683DB; padding-left: 2px; font-size: 12px;">{{
-                        getUserRangeList.newUserPercentage }}</span>
-
-
-                    </div>
-                  </div>
-                </div>
-                <div class="" style="width: 25%;">
-                  <div style="margin-top: 10px;">
-                    <div style="display: flex; flex-direction: row; align-items: center; ">
-                      <div>
-                        <div style="color: #2683DB; font-size: 25px;">
-                          {{ getUserRangeList.newUser }}
-                        </div>
-                        <br>
-                        <div style="display: flex; flex-direction: row; ">
-                          <div style="color: #858585; font-size: 12px;">注册用户</div>
-                          <span style="color: #2683DB; padding-left: 2px; font-size: 12px;">{{
-                            getUserRangeList.registerUser }}</span>
-                        </div>
-                      </div>
-                      <div>
-                        <span style="color: #2683DB; font-size: 16px;">
-                          {{ getUserRangeList.beforeRegisterUserPercentage }}
-                        </span>
-                        <br>
-                        <span style="color: #858585; font-size: 12px;">较上月</span>
-                      </div>
-                    </div>
-
-
-                  </div>
-                </div>
-                <div class="" style="width: 25%;">
-                  <div>
-                    <div style="color: #2683DB; font-size: 25px;">
-                      {{ ActiveUsersList.activeUser }}
-                    </div>
-                    <br>
-                    <div style="display: flex; flex-direction: row; ">
-                      <div style="color: #858585; font-size: 12px;">活跃用户</div>
-                      <span style="color: #2683DB; padding-left: 2px; font-size: 12px;">{{
-                        ActiveUsersList.activeUserPercentage}}%</span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                style="height: 100%; margin-top: 15px; display: flex; flex-direction: row;justify-content: space-around;">
-                <div ref="pieChart" style="width: 200px; height: 220px;"></div>
-                <div ref="pieChart1" style="width: 200px; height: 220px;"></div>
-                <div ref="pieChart2" style="width: 200px; height: 220px;"></div>
-              </div>
-
-
-            </div>
-          </div>
-          <!-- <div class="more">更多></div> -->
-          <!-- <div class="cnt">
-                        <div id="my_chart" style="width: 100%; height: 170px;"></div>
-                    </div> -->
-        </div>
-        <div class="m-box m-tb1">
-          <div class="header" style="display: flex;justify-content: space-between; flex-direction: row;">
-            <div class="newqsa">
-              <span>用户画像分析</span>
-            </div>
-            <div class="newqsa" style="display: flex;flex-direction: row; margin-right: 10px;">
-              <el-select v-model="StatisticsTime" placeholder="请选择" style="width: 100px;" @change="getStatisticsList2">
-                <el-option v-for="item in optionsDate1" :key="item.value" :label="item.label" :value="item.value"
-                  style="width: 100px;">
-                </el-option>
-              </el-select>
-
-            </div>
-            <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
-          </div>
 
-          <div style="display: flex; flex-direction: row">
-            <div style="display: flex; flex-direction: column; width: 60%; padding: 10px">
-              <div
-                style="height: 100%; margin-top: 15px; display: flex; flex-direction: row;justify-content: space-around;">
-                <div ref="pieChart3" style="width: 200px; height: 220px;"></div>
-                <div ref="pieChart4" style="width: 200px; height: 220px;"></div>
-                <div ref="pieChart5" style="width: 200px; height: 220px;"></div>
-              </div>
-
-
-            </div>
-            <div style="width: 40%; height: 100%; padding:10px;border-right: 1px solid #E5E5E5;">
-              <div>地区统计</div>
-              <div >
-          <div
-            style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box">
-            <el-table :data="StatisticsList" border :cell-style="columnbackgroundStyle" class="m-table-item">
-              <el-table-column label="省份" align="center" >
-                <template slot-scope="scope">
-                  <span style="color:#989898">{{ scope.row.province }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="新增用户" align="center">
-                <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;"
-                    @click="handelClickToResi(scope.row)">{{scope.row.userCount}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="占比" align="center" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"
-                    @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
-                </template>
-              </el-table-column>
-            
-            </el-table>
-          </div>
-        </div>
-            </div>
-          </div>
-          <!-- <div class="more">更多></div> -->
-          <!-- <div class="cnt">
-                        <div id="my_chart" style="width: 100%; height: 170px;"></div>
-                    </div> -->
-        </div>
       </div>
       <div class="g-row-right" style="margin-right: 20px;">
         <div class="m-box m-tx">
@@ -371,7 +126,7 @@
                   style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">
                   <img v-if="item.msgType == 'resident_category'" class="thumbnail_1" style="width: 17px;"
                     referrerpolicy="no-referrer" src="~@/assets/images/shuju/renfang/index/zhiding.png" />{{
-                  item.content }}
+                item.content }}
                 </div>
               </div>
               <div class="item_left">
@@ -389,164 +144,47 @@
         </div>
 
         <div class="m-box m-tx" style="position: relative;">
-          <div class="header" style="display: flex;align-items: center;justify-content: space-between;">
-            <div class="newqsa"><span>居民信息更新情况</span> <span style="color: #cccccc;">（数据截止到{{yesterdayDate}}）</span>
-            </div>
-            <div class="update-settings" @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置
-            </div>
-          </div>
-          <div
-            style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box">
-            <el-table :data="tableList" border :cell-style="columnbackgroundStyle" class="m-table-item">
-              <el-table-column label="居民类别" align="center" width="105">
-                <template slot-scope="scope">
-                  <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="总人数" width="105" align="center">
-                <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;"
-                    @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"
-                    @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
-                <template slot-scope="scope">
-                  <span style="color:#989898;">{{scope.row.userName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="更新周期" align="center" width="105">
-                <template slot-scope="scope">
-                  <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
-                    == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
-                    == 'week' ? '每周' : '' : '' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="更新人数" align="center" width="105">
-                <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;"
-                    @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span
-                    style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div class="m-box m-tx" style="position: relative;">
-          <div class="header" style="display: flex;align-items: center;justify-content: space-between;">
-            <div class="newqsa"><span>人员预警</span> <span style="color: #cccccc;">（数据截止到{{yesterdayDate}}）</span></div>
-            <div class="update-settings" @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置
-            </div>
+          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span> <span style="color: #cccccc;">（数据截止到{{yesterdayDate}}）</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
+                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</div>
           </div>
-          <div
-            style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box">
-            <el-table :data="tableList" border :cell-style="columnbackgroundStyle" class="m-table-item">
-              <el-table-column label="社区" align="center" width="105">
-                <template slot-scope="scope">
-                  <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="小区" width="105" align="center">
-                <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;"
-                    @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="楼栋" align="center" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"
-                    @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="分类人员" :show-overflow-tooltip="true" align="center" v-if="showAll">
-                <template slot-scope="scope">
+          <div style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box" >
+            <el-table :data="tableList" 
+            border :cell-style="columnbackgroundStyle" class="m-table-item">
+            <el-table-column label="居民类别" align="center" width="105">
+              <template slot-scope="scope">
+                <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="总人数" width="105" align="center">
+              <template slot-scope="scope">
+                  <span style="color:#006fd6;cursor: pointer;" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
+              <template slot-scope="scope">
                   <span style="color:#989898;">{{scope.row.userName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="预警人数" align="center" width="105">
-                <template slot-scope="scope">
-                  <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
-                    == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
-                    == 'week' ? '每周' : '' : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
-
-      </div>
-
-    </div>
-    <!-- 修改弹出框 -->
-    <div v-show="showedFuncPanel" v-if="
-          Array.isArray($store.state.sidebarMenuList) &&
-          $store.state.sidebarMenuList.length > 0
-        ">
-      <div class="m-panel">
-        <div class="m-list" v-if="selectedFuncList && selectedFuncList.length > 0">
-          <div class="list-title">常用功能</div>
-          <div class="list">
-            <div class="item" :key="item.menuId" @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">
-                <div class="icon-wrap" :style="{
-                      color: item.color ? '#fff' : '#333',
-                      backgroundColor: item.color || '#f4f4f4',
-                    }">
-                  <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
-                    <use :xlink:href="`#${item.icon}`" />
-                  </svg>
-                </div>
-              </div>
-              <p>{{ item.menuName }}</p>
-            </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="corner-mark" :class="{
-                      'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
-                    }">
-                  <i class="el-icon-success"></i>
-                </div>
-
-                <div class="icon">
-                  <div class="icon-wrap" :style="{
-                        color: item.color ? '#fff' : '#333',
-                        backgroundColor: item.color || '#f4f4f4',
-                      }">
-                    <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
-                      <use :xlink:href="`#${item.icon}`" />
-                    </svg>
-                  </div>
-                </div>
-                <p>{{ item.name }}</p>
-              </div>
-            </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="更新周期" align="center" width="105">
+              <template slot-scope="scope">
+                <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
+                == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
+                  == 'week' ? '每周' : '' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="更新人数" align="center" width="105">
+              <template slot-scope="scope">
+                  <span style="color:#006fd6;cursor: pointer;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
+              </template>
+            </el-table-column>
+          </el-table>
           </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>
     <fastcall ref="fastcall" />
@@ -559,49 +197,12 @@ import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import fastcall from "@/views/modules/cpts/fastcall";
 import * as echarts from "echarts";
-import dayjs from 'dayjs';
 
 export default {
-    components: { fastcall },
+  components: { fastcall },
 
   data() {
     return {
-      StatisticsTime:'3',
-      showTimeDate:false,
-      SelectTime:{
-        startTime:"",
-        endTime:"",
-        timeType:"0",
-      },
-      SelectTime1:{
-        endTime:dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        startTime:dayjs().subtract(30, 'day').format('YYYY-MM-DD HH:mm:ss'),
-      },
-      dateName:"1",
-      optionsDate:[
-        {value:'1',label:'今天'},
-        {value:'2',label:'当月'},
-        {value:'3',label:'自定义'},
-    ],
-    optionsDate1:[
-        {value:'1',label:'昨天'},
-        {value:'2',label:'近7天'},
-        {value:'3',label:'近30天'},
-    ],
-      getAccessChannelsList:[],
-      ActiveUsersList:{},//活跃用户
-      getUserRangeList:{},
-      UserStatisticsList:{},//用户统计
-      selectedFuncIdList: [],
-      showedFuncPanel:false,
-      funcList: [
-        // {
-        //   url: '',
-        //   menuId: '',
-        //   menuName: '',
-        //   icon: '',
-        // }
-      ],
       yesterdayDate:null,
       searchStatus: "ini", //ing over
       searchData: {
@@ -609,29 +210,30 @@ export default {
         searchKey: "",
       },
       showAll: false,
-            typePlaceholder: {
-                jumin: "请输入姓名或联系电话或证件号",
-                fangwu: "请输入小区名称或楼栋名称",
-                xuqiu: "请输入需求人或需求内容或服务组织",
-            },
 
-            resiCategory: {
-                loading: false,
-                total: "",
-                list: [],
-            },
-            tableList: [
-            ],
-            znycCategory: {
-                loading: false,
-                total: "",
-                list: [],
-            },
+      typePlaceholder: {
+        jumin: "请输入姓名或联系电话或证件号",
+        fangwu: "请输入小区名称或楼栋名称",
+        xuqiu: "请输入需求人或需求内容或服务组织",
+      },
 
-            orgData: {
-                id: "",
-                level: "agency",
-            },
+      resiCategory: {
+        loading: false,
+        total: "",
+        list: [],
+      },
+      tableList: [
+      ],
+      znycCategory: {
+        loading: false,
+        total: "",
+        list: [],
+      },
+
+      orgData: {
+        id: "",
+        level: "agency",
+      },
 
       pandectData: {
         communityName: "",
@@ -647,54 +249,37 @@ export default {
       myChart: {},
       myBarchart: {},
       agencyLevel: '',
-      yData: [],
+      yData: [
+        // {
+        //   value: 720,
+        //   itemStyle: {
+        //     color: {
+        //       type: 'linear',
+        //       x: 0,
+        //       y: 0,
+        //       x2: 0,
+        //       y2: 1,
+        //       colorStops: [{
+        //         offset: 0, color: '#2D7DF2' // 上部颜色
+        //       }, {
+        //         offset: 0.45, color: '#7EB1FE' // 中部颜色
+        //       }, {
+        //         offset: 0.45, color: '#EFB632' // 中部颜色
+        //       }, {
+        //         offset: 1, color: '#FDD77D' // 下部颜色
+        //       }],
+        //       global: false // 默认为 false
+        //     },
+        //     shadowColor: "#91cc75",
+        //     borderType: "dashed",
+        //     // opacity: 0.5
+        //   }
+        // },725,165,765,742,710,720,730,735,762,754
+      ],
       myChartStyle: { float: "left", width: "140%", height: "100%" },
-      activeIndex: 0,
-      activeLevel: "1",
-      warningTb: {
-        pageNo: 1,
-        pageSize: window.localStorage.getItem("pageSize") || 20,
-        total: 1,
-        list: [],
-      },
-
     }
   },
-  computed: {
-
-    selectedFuncList() {
-      const {
-        selectedFuncIdList,
-        $store: {
-          state: { sidebarMenuList },
-        },
-      } = this;
-      let obj = {};
-      sidebarMenuList.forEach((menu) => {
-        if (selectedFuncIdList.indexOf(menu.id) !== -1) {
-          obj[menu.id] = {
-            menuId: menu.id,
-            menuName: menu.name,
-            icon: menu.icon,
-            url: menu.url,
-          };
-        }
-        if (menu.children && menu.children.length > 0) {
-          menu.children.forEach((item) => {
-            if (selectedFuncIdList.indexOf(item.id) !== -1) {
-              obj[item.id] = {
-                menuId: item.id,
-                menuName: item.name,
-                icon: item.icon,
-                url: item.url,
-              };
-            }
-          });
-        }
-      });
-      return selectedFuncIdList.map((id) => obj[id]);
-    },
-  },
+  computed: {},
   watch: {
     "searchData.searchKey": function (val) {
       if (val == "") {
@@ -715,29 +300,15 @@ export default {
   created() {
   },
   mounted() {
-    this.getStatistics()
-    this.getUserRange()
-    this.getWarningTb()
-    this.getBuildingwarnlist()
-    this.getFuncList()
-    this.getUserwarnlist()
-    this.getUserStatisticsData()
     // this.ehso();
     //图形
 
-this.getActiveUsers()
+
     this.getApiData();
     this.$nextTick(() => {
       this.initChart()
-      this.initChart1()
-      this.initChart2()
-      this.initChart3()
-      this.initChart4()
-      this.initChart5()
-      this.initChart6()
       this.initEcharts();
     })
-
     this.getYesterdayDate()
     // this.agencyLevel = localStorage.getItem("level", data.level);
     console.log(
@@ -746,245 +317,14 @@ this.getActiveUsers()
     );
   },
   methods: {
-    getStatisticsList1(value){
-      this.initChart1()
-      this.initChart2()
-      this.initChart3()
-      // this.initChart4()
-      // this.initChart5()
-      // this.initChart6()
-        this.getActiveUsers()
-    },
-    getStatisticsList(value){
-
-      console.log(value,":dskjfkljkdsf");
-      this.SelectTime.timeType= value;
-      if (value==3) {
-        this.showTimeDate=true
-      }else{
-        this.initChart1()
-      this.initChart2()
-      this.initChart3()
-      // this.initChart4()
-      // this.initChart5()
-      // this.initChart6()
-        this.getUserRange()
-        this.getActiveUsers()
-      }
-    },
-    getStatisticsList2(value){
-// this.SelectTime.timeType= value;
-if (value==1) {
-this.SelectTime1.startTime=dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss');
-this.SelectTime1.endTime=dayjs().format('YYYY-MM-DD HH:mm:ss');
-this.initChart4()
-this.initChart5()
-this.initChart6()
-  // this.getUserRange()
-  this.getStatistics()
-  // this.getActiveUsers()
-  // this.showTimeDate=true
-}  else if(value==2){
-this.SelectTime1.startTime=dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss');
-this.SelectTime1.endTime=dayjs().format('YYYY-MM-DD HH:mm:ss');
-this.initChart4()
-this.initChart5()
-this.initChart6()
-this.getStatistics()
-  // this.getUserRange()
-  // this.getActiveUsers()
-} else{
-  this.SelectTime1.startTime=dayjs().subtract(30, 'day').format('YYYY-MM-DD HH:mm:ss');
-this.SelectTime1.endTime=dayjs().format('YYYY-MM-DD HH:mm:ss');
-this.initChart4()
-this.initChart5()
-this.initChart6()
-this.getStatistics()
-  // this.getUserRange()
-  // this.getActiveUsers()
-
-}
-
-},
-    //活跃用户占比
-    async getActiveUsers() {
-      const url = "/epmetuser/user/getActiveUsers";
-      const params = {
-        ...this.SelectTime
-        // startTime: "2024-07-11",
-        // endTime: "2024-10-23",
-        // timeType: "starttime endtime" // 0 今日 1 本周 2 本月,自定义的时候输入starttime 跟endtime
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.ActiveUsersList = data
-      } else {
-
-      }
-    },
-    //新老用户所占比例
-    async getUserRange() {
-      const url = "/epmetuser/user/getUserRange";
-      const params = {
-        ...this.SelectTime
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.getUserRangeList = data
-      } else {
-
-      }
-    },
-    //用户数据统计
-    async getUserStatisticsData() {
-      const url = "/epmetuser/user/getUserStatisticsData";
-      const { data, code, msg } = await requestPost(url, {
-      });
-      if (code === 0) {
-        this.UserStatisticsList = data
-      } else {
-
-      }
-    },
-    //预警人数列表
-    async getWarningTb() {
-      const url = "/epmetuser/icresiuser/personwarn/rightlist";
-      const {
-        warningTb: { pageSize, pageNo },
-      } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        categoryCode: this.currentCategoryCode,
-      });
-      if (code === 0) {
-
-        this.warningTb.total = data.total || 0;
-        this.warningTb.list = data.list
-          ? data.list.map((item) => {
-            item.typeName = item.type.join("、");
-            return item;
-          })
-          : [];
-      } else {
-      }
-    },
-    //具体人员列表
-    async getUserwarnlist() {
-      const { activeIndex, activeLevel, warningList } = this;
-      const reqItem = warningList[activeIndex];
-      let tableData = [];
-      const url = "/epmetuser/statsresiwarn/userwarnlist";
-      let params = {
-        configId: reqItem.configId,
-        buildingIdList: reqItem["buildingIdList" + activeLevel],
-        pageNo: 1,
-        pageSize: 20,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        data.list.forEach((item, index) => {
-          tableData.push([
-            index + 1,
-            item.gridName,
-            item.neighborhoodName,
-            item.buildingName,
-            item.count,
-            {
-              type: "btn",
-              name: "查看人员",
-              buildingId: item.buildingId,
-              configId: item.configId,
-              gridName: item.gridName,
-            },
-          ]);
-        });
-        this.tableData = tableData;
-        this.total = data.total;
-      } else {
-      }
-    },
-    //人员预警
-    // 【人员预警】 楼宇预警数量列表
-    async getBuildingwarnlist() {
-      const url = "/epmetuser/statsresiwarn/buildingwarnlist";
-      let params = {
-        agencyId: this.$store.state.user.agencyId,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.warningList = data;
-        this.visibleLoading = false;
-        this.getUserwarnlist();
-      } else {
-      }
-    },
-    //选中常用功能
-    selectFuncItem(id) {
-      let index = this.selectedFuncIdList.indexOf(id);
-      if (index === -1) {
-        this.selectedFuncIdList.push(id);
-      } else {
-        this.selectedFuncIdList.splice(index, 1);
-      }
-    },
-
-    //加载组织数据
-    async getFuncList() {
-      const url = "/gov/access/icoftenusefunction/oftenusefunctionlist";
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.funcList = data || [];
-        this.selectedFuncIdList = this.funcList.map((item) => item.menuId);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //加载组织数据
-    async editFuncList() {
-      const url = "/gov/access/icoftenusefunction/addoftenusefunction";
-      const { selectedFuncIdList } = this;
-      let params = selectedFuncIdList.map((menuId, sort) => {
-        return { menuId, sort };
-      });
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("修改成功");
-        this.showedFuncPanel = false;
-        this.getFuncList();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //常用功能添加
-    handleClickFunc(menu) {
-      console.log(menu, "dskjlfdsjkljkfs");
-      const menuId = menu.menuId;
-      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
-        (item) => item.meta.menuId === menuId
-      )[0];
-      if (route) {
-        if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
-          window.open(route.meta.iframeURL.slice(0, -7));
-        } else {
-          this.$router.push({ name: route.name });
-        }
-      }
-    },
-
     // 获取昨天时间
     getYesterdayDate() {
-      const now = new Date();
-      now.setDate(now.getDate() - 1);
-      const year = now.getFullYear();
-      const month = (now.getMonth() + 1).toString().padStart(2, '0');
-      const day = now.getDate().toString().padStart(2, '0');
-      this.yesterdayDate = `${year}-${month}-${day}`;
+    const now = new Date();
+    now.setDate(now.getDate() - 1);
+    const year = now.getFullYear();
+    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+    const day = now.getDate().toString().padStart(2, '0');
+    this.yesterdayDate = `${year}-${month}-${day}`;
     },
     formatNumber(number) {
       if (typeof number === 'string') {
@@ -1026,7 +366,7 @@ this.getStatistics()
             left: "3%",
             right: "4%",
             bottom: "13%",
-            top: '5',
+            top:'5',
             containLabel: true,
           },
           toolbox: {
@@ -1148,27 +488,27 @@ this.getStatistics()
           name: '居民详情',
           resiId: targetId,
         });
-      } else if (item.msgType == "resident_category") {
-        this.$router.push({
+      }else if(item.msgType == "resident_category"){
+          this.$router.push({
           name: "base-resi",
           query: {
             category: item.category || null,
-            type: "residentCategory"
+            type:"residentCategory"
           },
         });
-      } else if (item.msgType == "sys_version_upgrade_publish") {
-        let { targetId } = item
-        this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
-        this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
-          if (item.name === "notice-version") {
-            return { ...item };
-          }
-          return item;
-        });
-      }
+      } else if(item.msgType == "sys_version_upgrade_publish"){
+				let {  targetId } = item
+				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+					if (item.name === "notice-version") {
+						return { ...item };
+					}
+					return item;
+				});
+			}
       this.getNoticeData()
     },
-
+   
     toNoticePage() {
       this.$router.push({
         path: "/main/home-notice",
@@ -1280,7 +620,7 @@ this.getStatistics()
         this.$message.error(msg);
       }
     },
-    handelClickToResi(e) {
+    handelClickToResi(e){
       this.$router.push({
         name: "base-resi",
         query: {
@@ -1288,25 +628,25 @@ this.getStatistics()
         },
       });
     },
-    handelCLickJump(e, type) {
-      if (type === 'updateResiList') {
+    handelCLickJump(e,type){
+      if(type === 'updateResiList'){
         this.$router.push({
-          path: "base-resi",
-          query: {
-            category: e.residentCategory,
-            type: 'updateResi'
-          }
-        });
-      } else {
+            path: "base-resi",
+            query: {
+              category: e.residentCategory,
+              type:'updateResi'
+            }
+          });
+      }else{
         this.$router.push({
-          path: "/main/base-nonIntResi",
-          query: {
-            resiCategory: e.residentCategory,
-            type: type
-          }
-        });
+            path: "/main/base-nonIntResi",
+            query: {
+              resiCategory: e.residentCategory,
+              type:type
+            }
+          });
       }
-
+     
     },
 
     //加载组织数据
@@ -1386,6 +726,7 @@ this.getStatistics()
               type: 'shadow'
             }
           },
+
           legend: {
             x: 'center',
             bottom: '8%',
@@ -1415,7 +756,7 @@ this.getStatistics()
             type: 'category',
             data: xData,
             axisLabel: {
-              rotate: 50  // 设置旋转角度为45度
+                rotate: 50  // 设置旋转角度为45度
             }
           }],
           series: [{
@@ -1432,7 +773,6 @@ this.getStatistics()
             name: '分类信息不完整数',
             type: 'bar',
             stack: '总量',
-            barWidth: '30px',
             data: data.categoryStatsDatas.map((item, index) => ({
               value: item.nonIntegratedNum,
               extraProperty: item.resiCategory
@@ -1441,7 +781,7 @@ this.getStatistics()
           ]
         };
         const resizeHandler = () => {
-          this.myBarchart.resize();
+            this.myBarchart.resize();
         };
         this.myBarchart.setOption(option);
         window.addEventListener("resize", this.handleWindowResize);
@@ -1450,7 +790,7 @@ this.getStatistics()
           this.$router.push({
             path: "/main/base-nonIntResi",
             query: {
-              type: 'cateNonIntegrity',
+              type:'cateNonIntegrity',
               resiCategory: e.data.extraProperty,
             }
           });
@@ -1459,671 +799,15 @@ this.getStatistics()
         });
       });
     },
-    async initChart1() {
-      const url = "/epmetuser/user/getAccessChannels";
-      const params = {
-        ...this.SelectTime
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-        const chartDom = this.$refs.pieChart;
-        const myChart = echarts.init(chartDom);
-
-        const option = {
-          title: {
-            text: '用户访问渠道',
-            left: 'center',
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData,
-              color: ['#00c48c', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      } else {
-        console.error(`获取数据错误: ${msg}`); // 处理错误情况
-        // 可选择显示消息或备用图表
-      }
-    },
-    async initChart2() {
-      const url = "/epmetuser/user/getNewUserType";
-      const params = {
-        ...this.SelectTime
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-        const chartDom = this.$refs.pieChart1;
-        const myChart = echarts.init(chartDom);
-
-        const option = {
-          title: {
-            text: '新用户类型',
-            left: 'center',
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData,
-              color: ['#00c48c', '#0075ff', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      } else {
-        console.error(`获取数据错误: ${msg}`); // 处理错误情况
-        // 可选择显示消息或备用图表
-      }
-    },
-    async initChart3() {
-      const url = "/epmetuser/user/getUserActiveType";
-      const params = {
-        ...this.SelectTime
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData1 = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-
-        const chartDom = this.$refs.pieChart2;
-        const myChart = echarts.init(chartDom);
-        const option = {
-          title: {
-            text: '活跃用户类型',
-            left: 'center',
-            // top: 15,
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData1,
-              color: ['#00c48c', '#0075ff', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      }
 
 
-    },
-    async initChart4() {
-      const url = "/epmetuser/user/getUserSourceRange";
-      const params = {
-        ...this.SelectTime1
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData1 = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-
-        const chartDom = this.$refs.pieChart3;
-        const myChart = echarts.init(chartDom);
-        const option = {
-          title: {
-            text: '终端统计',
-            left: 'center',
-            // top: 15,
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData1,
-              color: ['#00c48c', '#0075ff', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      }
-
-
-    },
-    async initChart5() {
-      const url = "/epmetuser/user/getUserSexRange";
-      const params = {
-        ...this.SelectTime1
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData1 = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-
-        const chartDom = this.$refs.pieChart4;
-        const myChart = echarts.init(chartDom);
-        const option = {
-          title: {
-            text: '性别统计',
-            left: 'center',
-            // top: 15,
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData1,
-              color: ['#00c48c', '#0075ff', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      }
-
-
-    }
-    ,
-    async initChart6() {
-      const url = "/epmetuser/user/getUserPortrait";
-      const params = {
-        ...this.SelectTime1
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        const xData1 = data.map(item => ({
-          value: item.count,
-          name: item.keyRange
-        }));
-
-        const chartDom = this.$refs.pieChart5;
-        const myChart = echarts.init(chartDom);
-        const option = {
-          title: {
-            text: '年龄统计',
-            left: 'center',
-            // top: 15,
-            textStyle: {
-              fontSize: 14,
-              color: '#666'
-            }
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'horizontal',
-            bottom: 5,
-            left: 'center'
-          },
-          series: [
-            {
-              name: '访问来源',
-              type: 'pie',
-              radius: ['40%', '60%'], // 设置内外半径，形成环形图
-              center: ['50%', '50%'], // 将饼图居中放置
-              avoidLabelOverlap: false,
-              label: {
-                show: false, // 隐藏每个扇形的标签
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '30',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false // 隐藏连接线
-              },
-              itemStyle: {
-                borderColor: '#ffffff', // 设置分割线颜色
-                borderWidth: 2 // 设置分割线宽度
-              },
-              data: xData1,
-              color: ['#00c48c', '#0075ff', '#ff7f50'] // 可以根据需要自定义颜色
-            }
-          ],
-          // 在中心添加显示总数的文本
-          graphic: {
-            type: 'text',
-            left: 'center',
-            top: '45%',
-            style: {
-              text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
-              textAlign: 'center',
-              fill: '#333',
-              fontSize: 24,
-              fontWeight: 'bold'
-            }
-          }
-        };
-
-        myChart.setOption(option);
-        window.addEventListener('resize', myChart.resize); // 自适应窗口调整
-      }
-
-
-    },
-    async getStatistics() {
-      const url = "/epmetuser/user/getRegionalStatistics";
-      const params = {
-        ...this.SelectTime1,
-        pageNo: 1,
-        pageSize: 100,
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        // 确保 xData 正确格式化
-        //  const xData1 = data.map(item => ({
-        //    value: item.count,
-        //    name: item.keyRange
-        //  }));
-        this.StatisticsList = data.list
-
-      }
-
-
-    }
   },
-}
-
+};
 </script>
 
 <style lang="scss" src="@/assets/scss/modules/index.scss" scoped></style>
-
 <style lang="scss" scoped>
-.mewq {
-  height: 150px;
-  box-sizing: border-box;
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 5px;
-  text-align: center;
-  grid-auto-flow: row;
-  /* 允许换行 */
-}
-
-.mewq1 {
-  height: 90px;
-  box-sizing: border-box;
-  display: flex;
-  grid-template-columns: repeat(4, 1fr);
-  gap: 5px;
-  // text-align: center;
-  // grid-auto-flow: row; /* 允许换行 */
-  // grid-auto-rows: auto; /* 根据内容高度自动调整行高 */
-}
-
-.boxss {
-  // height: 33%;
-  background-color: #F8F8F8;
-  border-radius: 10px;
-}
-
-
-.z-on {
+.z-on{
   margin-left: 0 !important;
 }
-
-.m-list {
-  .list-title {
-    margin-bottom: 20px;
-    font-size: 24px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #333333;
-  }
-
-  .list-title2 {
-    margin-bottom: 10px;
-    font-size: 16px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #333333;
-  }
-
-  .list {
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      position: relative;
-      margin-right: 46px;
-      margin-bottom: 20px;
-      width: 80px;
-      text-align: center;
-      cursor: pointer;
-
-      .corner-mark {
-        position: absolute;
-        top: -4px;
-        right: -4px;
-        color: #ccc;
-        font-size: 20px;
-        z-index: 1;
-
-        &.z-on {
-          color: #0082fb;
-        }
-      }
-
-      .icon {
-        position: relative;
-        display: block;
-        margin: 0 auto;
-        width: 78px;
-        height: 78px;
-
-        .icon-wrap {
-          position: absolute;
-          z-index: 0;
-          display: block;
-          top: 0;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          margin: auto;
-          width: 64px;
-          height: 64px;
-          border-radius: 10px;
-          background-color: #f4f4f4;
-        }
-
-        img {
-          position: relative;
-          width: 78px;
-          height: 78px;
-          object-fit: cover;
-        }
-
-        .icon-svg {
-          position: relative;
-          display: block;
-          margin: auto;
-          width: 64px;
-          height: 64px;
-          object-fit: cover;
-        }
-      }
-
-      p {
-        margin: 0;
-        line-height: 24px;
-        font-size: 16px;
-        font-family: PingFang SC;
-        font-weight: 400;
-        color: #333333;
-      }
-    }
-  }
-}
-
-.m-panel {
-  background-color: #fff;
-  border-radius: 10px;
-  padding: 30px 40px;
-
-  .operate {
-    text-align: right;
-  }
-}
 </style>