存档，尝试提取弹窗

src/i18n/langs/zh_CN.js

@@ -104,7 +104,7 @@ const zh_CN = {
     toolFullScreen: "全屏",
     toolExitFullScreen: "退出全屏",
     userDeviceStatistics: "重要有害植物统计",
-    userGroupManage: "分组管理",
+    userGroupManage: "分区管理",
     userUpdatePass: "修改密码",
     userUserManual: "用户手册",
     userUserGuide: "操作引导",
@@ -157,7 +157,7 @@ const zh_CN = {
     },
     user: {
       group: {
-        title: "分组管理",
+        title: "分区管理",
         tips: "支持拖拽到任意分支分组",
         createMainGroup: "创建顶级分组",
       },

src/views/map/components/menu/Menu.vue

@@ -50,7 +50,7 @@
             </el-tooltip>
           </div>
         </template>
-        <!-- <el-row>
+        <el-row>
           <el-col :span="24">
             <div class="title">
               <el-button-group>
@@ -64,9 +64,9 @@
                     class="steps-delDevice"
                     type="primary"
                     size="small"
-                    icon="el-icon-menu"
                   >
                     <el-dropdown @command="deviceHandler">
+                      <span style="color: #fff">生物管理</span>
                       <span class="el-dropdown-link">
                         <i class="el-icon-arrow-down el-icon--right"></i>
                       </span>
@@ -94,7 +94,19 @@
                     </el-dropdown>
                   </el-button>
                 </el-tooltip>
-                <el-tooltip
+                <el-button
+                  v-if="hasPermission('user:group:view')"
+                  type="primary"
+                  size="small"
+                  @click.native="
+                    $store.dispatch('setVisblesFlag', [
+                      { key: 'groupsDialog', value: true },
+                    ])
+                  "
+                >
+                  {{ $t("map.userGroupManage") }}
+                </el-button>
+                <!-- <el-tooltip
                   class="item"
                   effect="dark"
                   content="历史轨迹"
@@ -177,11 +189,11 @@
                       </el-dropdown-menu>
                     </el-dropdown>
                   </el-button>
-                </el-tooltip>
+                </el-tooltip> -->
               </el-button-group>
             </div>
           </el-col>
-        </el-row> -->
+        </el-row>
 
         <el-row>
           <el-col :span="22" :offset="1">

src/views/map/components/user/Index.vue

 <template>
   <div id="gps-user" class="gps-user-box">
+    <div style="display: none">
       <el-popover ref="popover5" placement="top-end" width="220">
         <el-row>
           <el-col :span="6"
@@ -156,6 +157,7 @@
       <el-button type="primary" v-popover:popover5 circle>
         <font-awesome-icon :icon="['fas', 'user']" />
       </el-button>
+    </div>
     <UpdatePass></UpdatePass>
     <Groups></Groups>
     <DeviceStatistics></DeviceStatistics>

src/views/map/index.vue

@@ -119,7 +119,7 @@
     </el-alert>
     <tools-box ref="tools"></tools-box>
     <menu-box :selectDeviceId="selectDeviceId"></menu-box>
-    <!-- <user-box></user-box> -->
+    <user-box></user-box>
     <control-box v-show="this.$store.state.user.map.mode == 2"></control-box>
     <Feedback></Feedback>
     <VideoPlayBack></VideoPlayBack>

src/views/system/devices.vue

@@ -311,7 +311,7 @@ export default {
     handlerSubmit() {
       this.$refs["editFormRef"].validate((valid) => {
         if (valid) {
-          const empty = "-";
+          const empty = "";
           const placeholderData = {
             attributes: {
               todaytrip: 0,

src/vuex/modules/user.js

@@ -43,7 +43,7 @@ export const moduleUser = {
       districtGeoDialog: false, //行政区域围栏
       groupAddForm: false, //添加分组
       groupEditForm: false, //编辑分组
-      groupsDialog: false, //分组管理
+      groupsDialog: false, //分区管理
       statisticsTripDialog: false, //里程统计
       userConfigDialog: false, //用户配置
       mapLayersDialog: false, //图层管理,