bug修改

src/pages/data-auth-module/data-permission-manage/data-auth-manage/person-auth.vue

@@ -31,7 +31,7 @@
                         <dg-select
                             style="width: 100px"
                             v-model="searchPersonCondition.userType.value"
-                            code="DM_USER_TYPE"
+                            enum="UserTypeEnum"
                             clearable
                         ></dg-select>
                     </el-form-item>
@@ -63,7 +63,7 @@
                     <dg-table-column type="index" width="70" label="序号"></dg-table-column>
                     <dg-table-column prop="name" label="姓名"></dg-table-column>
                     <dg-table-column prop="idcard" label="身份证号码"></dg-table-column>
-                    <dg-table-column prop="userType" label="用户类型" code="DM_USER_TYPE"></dg-table-column>
+                    <dg-table-column prop="userType" label="用户类型" enum="UserTypeEnum"></dg-table-column>
                 </dg-table>
             </dg-card>
         </dg-col>

src/pages/layout/components/navbar.vue

@@ -7,7 +7,11 @@
     <div class="l-main-header" style="position: relative">
         <div class="l-main-header__left">
             <div class="l-main-header__box">
-                <img style="width: 40px;height: 40px" class="l-main-header__logo" src="@/assets/images/layout/logo.png" />
+                <img
+                    style="width: 40px; height: 40px"
+                    class="l-main-header__logo"
+                    src="@/assets/images/layout/logo.png"
+                />
             </div>
             <p class="l-main-header__title">警务云统一授权管理中心</p>
         </div>
@@ -21,9 +25,9 @@
                     v-bind:class="{ 'is-active-search-show': activeShow, 'is-active-search-hide': activeHide }"
                 />
             </div>
-            <div style="display: inline-block;vertical-align: top">
+            <div style="display: inline-block; vertical-align: top">
                 <!--<el-tooltip :content="$t('navbar.screenfull')" effect="dark" placement="bottom">-->
-                    <!--<screenfull class="l-screen-full" />-->
+                <!--<screenfull class="l-screen-full" />-->
                 <!--</el-tooltip>-->
                 <!-- 换肤组件 -->
                 <dui-skins :options="skinOption" :currentSkin="'theme-default'" isCookie></dui-skins>
@@ -80,7 +84,13 @@ export default {
         },
         logout() {
             this.$confirm("是否确定退出系统").then(() => {
-                 window.location.href = `https://login.iam.com/apphub/logout`;
+                if (process.env.NEED_LOGIN == "true") {
+                    this.$confirm("是否确定退出系统").then(() => {
+                        window.loginUtil.logout(this);
+                    });
+                } else {
+                    window.location.href = `https://login.iam.com/apphub/logout`;
+                }
             });
         },
         handleClickSearch() {