绿色风格+全局加密开关

.env.development

@@ -5,6 +5,7 @@ port= 8080
 # base api
 VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+VUE_APP_IS_SM4ENCODE = false
 
 VUE_APP_BASE_API_ONLYOFFICE_WEB = 'http://192.168.1.27:30082'
 VUE_APP_BASE_API_GETFILE = 'http://192.168.1.71:8082'

.env.production

@@ -4,4 +4,5 @@ ENV = 'production'
 
 # 生产环境
 # base api
+VUE_APP_IS_SM4ENCODE = false
  VUE_APP_BASE_API = 'http://106.3.97.198:20162'

src/api/login.js

@@ -17,6 +17,7 @@ export function login(username, password, code, uuid) {
     data: Qs.stringify({
       sign: encrypt(data)
     }),
+    entrct:true,
     headers: {}
   })
 }
@@ -31,6 +32,7 @@ export function refreshToken(params) {
   return request({
     url: '/authority/system/user/refreshToken',
     method: 'put',
+    entrct:true,
     params: params
   })
 }
@@ -38,6 +40,7 @@ export function refreshToken(params) {
 export function getInfo() {
   return request({
     url: '/system/user/getInfo',
+    entrct:true,
     method: 'get'
   })
 }

src/api/monitor/loginInfo.js

@@ -14,6 +14,7 @@ export function list(query) {
     url: '/monitor/loginInfo/querySysLoginListByPagination',
     method: 'get',
     params: query
+
   })
 }
 

src/api/monitor/operLog.js

@@ -14,6 +14,7 @@ export function list(query) {
     url: '/monitor/operLog/queryOperLogListByPagination',
     method: 'get',
     params: query
+
   })
 }
 

src/api/system/user.js

@@ -156,7 +156,8 @@ export function updateUserPwd(data) {
   return request({
     url: '/system/user/updatePwd',
     method: 'put',
-    params: data
+    params: data,
+    entrct:true
   })
 }
 

src/components/Pagination/index.vue

@@ -30,12 +30,12 @@ export default {
     },
     limit: {
       type: Number,
-      default: 20
+      default: 10
     },
     rows: {
       type: Array,
       default() {
-        return [2,10, 20, 50, 100]
+        return [10, 20, 50, 100]
       }
     },
     layout: {

src/layout/components/Settings/index.vue

@@ -33,19 +33,20 @@ export default {
     return {
       sideTheme: this.$store.state.settings.sideTheme,
       form: {
-        theme: '1' // 主题风格
+        theme: '9' // 主题风格
       },
       // 主题风格下拉
       themeOptions: [
-        { value: '1', label: '风格1' },
-        { value: '2', label: '风格2' },
-        { value: '3', label: '风格3' },
-        { value: '4', label: '风格4' },
-        { value: '5', label: '风格5' },
-        { value: '6', label: '风格6' },
-        { value: '7', label: '风格7' },
-        { value: '8', label: '风格8' },
-        { value: '9', label: '风格9' }
+        // { value: '1', label: '风格1' },
+        // { value: '2', label: '风格2' },
+        // { value: '3', label: '风格3' },
+        // { value: '4', label: '风格4' },
+        // { value: '5', label: '风格5' },
+        // { value: '6', label: '风格6' },
+        // { value: '7', label: '风格7' },
+        // { value: '8', label: '风格8' },
+        { value: '9', label: '蓝白风格' },
+        { value: '10', label: '绿色风格' }
       ]
     }
   },

src/layout/components/Sidebar/Logo.vue

@@ -63,6 +63,8 @@ export default {
         return require('@/assets/themeHImage/menuLogo.png')
       }else if (localStorage.getItem('theme') === '9') {
         return require('@/assets/themeIImage/menuLogo.png')
+      }else if (localStorage.getItem('theme') === '10') {
+        return require('@/assets/themeJImage/menuLogo.png')
       }
     }
   },

src/layout/components/Sidebar/index.vue

@@ -39,6 +39,7 @@ import themeFvariables from '@/styles/themeF/variables.scss'
 import themeGvariables from '@/styles/themeG/variables.scss'
 import themeHvariables from '@/styles/themeH/variables.scss'
 import themeIvariables from '@/styles/themeI/variables.scss'
+import themeJvariables from '@/styles/themeJ/variables.scss'
 export default {
   components: { SidebarItem, Logo },
 
@@ -80,6 +81,8 @@ export default {
         return themeHvariables
       } else if (localStorage.getItem('theme') === '9') {
         return themeIvariables
+      } else if (localStorage.getItem('theme') === '10') {
+        return themeJvariables
       }
     },
     isCollapse() {
@@ -98,23 +101,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.newMenuList {
-  width: 140px;
-  padding-top: 24px;
-  height: 149px;
-  margin: 0 auto 20px;
-  font-size: 24px;
-  color: white;
-  text-align: center;
-  opacity: 0.2;
-  background: #225BDE;
-  box-shadow: 0 2px 2px 0 #ACB2C1;
-  border-radius: 20px;
-}
 
-.newmact {
-  background: linear-gradient(180deg, #679CF6 0%, #4072EE 100%) !important;
-  opacity: 1 !important;
- 
-}
 </style>

src/layout/components/bdHeader.vue

@@ -12,11 +12,10 @@
             {{ timer }}
         </div>
         <div class="title-button">
-            <el-button type="text">板面切换</el-button>
-        </div>
-        <div class="title-button">
+            <el-button type="text">版面切换</el-button>
             <el-button type="text" @click.stop="setting = true">皮肤切换</el-button>
         </div>
+        
         <div class="title-kaiguan">
             <img src="../../assets/themeIImage/kaiguan.png" class="kaiguan-logo" />
         </div>
@@ -24,11 +23,12 @@
 
             <el-dropdown class="avatar-container" trigger="click">
                 <div class="avatar-wrapper">
+                    <img  :src="avatar" class="user-avatar">
                     <div class="username-text">
                         {{ userName }}
                     </div>
-                    <!--          <img :src="avatar" class="user-avatar">-->
-                    <i class="el-icon-caret-bottom" />
+                            
+                    <i class="el-icon-arrow-down" />
                 </div>
                 <el-dropdown-menu slot="dropdown" class="user-dropdown">
                     <el-dropdown-item @click.native="toReset">
@@ -73,6 +73,7 @@ export default {
             'sidebar',
             'avatar'
         ]),
+        
         setting: {
             get() {
                 return this.$store.state.settings.showSettings
@@ -154,177 +155,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.navbar {
-    height: 100px;
-    padding: 21px 15px;
-    overflow: hidden;
-    position: relative;
-    background: #FFF !important;
-    width: 100%;
-    // box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .hamburger-container {
-        line-height: 46px;
-        height: 100%;
-        float: left;
-        cursor: pointer;
-        transition: background 0.3s;
-        -webkit-tap-highlight-color: transparent;
-
-        &:hover {
-            background: rgba(0, 0, 0, 0.025);
-        }
-    }
-
-    .big-logo {
-        width: 382px;
-        height: 65.87px;
-    }
-
-    .title-box {
-        display: flex;
-        align-items: center;
-
-        .change-sys {
-            margin-left: 20px;
-        }
-        // margin-right: 74px;
-    }
-
-    .title-status {
-        display: flex;
-        justify-content: space-between;
-        width: 481px;
-        font-size: 24px;
-        color: #003B8F;
-    }
-
-    .title-time {
-        font-family: PingFangSC-Semibold;
-        font-weight: 600;
-        font-size: 24px;
-        color: #225BDE;
-        letter-spacing: 0;
-        text-align: center;
-    }
-
-    .title-button {
-        font-family: PingFangSC-Semibold;
-        font-weight: 600;
-        font-size: 24px !important;
-        color: #225BDE;
-        letter-spacing: 0;
-        text-align: center;
-
-    }
-
-    .title-kaiguan {
-        .kaiguan-logo {
-            width: 42px;
-            height: 42px;
-        }
-    }
-
-    .app-logo {
-        width: 40px;
-        height: 40px;
-        border-radius: 10px;
-        margin: 6px;
-    }
-
-    .hamburger-container {
-        line-height: 6.3vh;
-        height: 100%;
-        float: left;
-        cursor: pointer;
-        transition: background .3s;
-        -webkit-tap-highlight-color: transparent;
-
-        &:hover {
-            background: rgba(0, 0, 0, .025)
-        }
-    }
-
-    .breadcrumb-container {
-        float: left;
-    }
-
-    .username-text {
-        font-size: 16px;
-        //margin-right: 12px;
-    }
-
-    .username-text :hover {
-        cursor: pointer;
-        //margin-right: 12px;
-    }
-
-    .right-menu {
-        float: right;
-        height: 100%;
-        line-height: 50px;
-        display: flex;
-        align-items: center;
-
-        &:focus {
-            outline: none;
-        }
-
-        &>i {
-            margin-right: 50px;
-            font-size: 18px;
-        }
 
-        .right-menu-item {
-            display: inline-block;
-            padding: 0 8px;
-            height: 100%;
-            font-size: 18px;
-            color: #5a5e66;
-            vertical-align: text-bottom;
-
-            &.hover-effect {
-                cursor: pointer;
-                transition: background .3s;
-
-                &:hover {
-                    background: rgba(0, 0, 0, .025)
-                }
-            }
-        }
-
-        .avatar-container {
-            margin-right: 30px;
-
-            .avatar-wrapper :hover {
-                cursor: pointer;
-            }
-
-            .avatar-wrapper {
-                position: relative;
-                height: 40px;
-
-                .user-avatar {
-                    cursor: pointer;
-                    width: 40px;
-                    height: 40px;
-                    border-radius: 50px;
-                }
-
-                .el-icon-caret-bottom {
-                    cursor: pointer;
-                    position: absolute;
-                    right: -20px;
-                    top: 25px;
-                    font-size: 12px;
-                }
-            }
-        }
-    }
-}
 </style>
 <style lang="scss">
 .navbar {

src/layout/components/bdHeader10.vue

+<template>
+    <div class="navbar">
+        <div class="title-box">
+            <img src="../../assets/themeJImage/big-logo.png" class="big-logo" />
+        </div>
+        <div class="title-status">
+            <div>温度：23°C</div>
+            <div>湿度：60%</div>
+            <div>气压：110KPa</div>
+        </div>
+        <div class="title-time">
+            {{ timer }}
+        </div>
+        <div class="title-button">
+            <el-button type="text">版面切换</el-button>
+            <el-button type="text" @click.stop="setting = true">皮肤切换</el-button>
+        </div>
+        
+        <div class="title-kaiguan">
+            <img src="../../assets/themeJImage/kaiguan.png" class="kaiguan-logo" />
+        </div>
+        <div class="right-menu">
+
+            <el-dropdown class="avatar-container" trigger="click">
+                <div class="avatar-wrapper">
+                    <img  :src="avatar" class="user-avatar">
+                    <div class="username-text">
+                        {{ userName }}
+                    </div>
+                            
+                    <i class="el-icon-arrow-down" />
+                </div>
+                <el-dropdown-menu slot="dropdown" class="user-dropdown">
+                    <el-dropdown-item @click.native="toReset">
+                        
+                            修改密码
+                        <!-- </router-link> -->
+                    </el-dropdown-item>
+                   
+                    <el-dropdown-item divided @click.native="logout">
+                        <span style="display:block;">退出</span>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-dialog :title="'修改密码'" :visible.sync="restopen" width="600px" append-to-body>
+            <resetPwd @reback="toResetClose"></resetPwd>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import Hamburger from '@/components/Hamburger'
+import resetPwd from './resetPwd'
+export default {
+    components: {
+        Hamburger,
+        resetPwd
+    },
+    data() {
+        return {
+            appList: [],
+            userName: this.$store.state.user.name,
+            specialTag: this.$store.state.user.specialTag,
+            timer: "",
+            timny: null,
+            restopen:false
+        }
+    },
+    computed: {
+        ...mapGetters([
+            'sidebar',
+            'avatar'
+        ]),
+        
+        setting: {
+            get() {
+                return this.$store.state.settings.showSettings
+            },
+            set(val) {
+                this.$store.dispatch('settings/changeSetting', {
+                    key: 'showSettings',
+                    value: val
+                })
+            }
+        }
+       
+
+    },
+    mounted() {
+        // this.getInAdhibitions()
+        this.updateTime()
+        this.timny = setInterval(() => {
+            this.updateTime()
+        }, 1000)
+    },
+    destroyed() {
+        clearInterval(this.timny);
+    },
+    methods: {
+        handleCommand(param) {
+            if (param) {
+                window.location.href = param
+            }
+        },
+        toReset(){
+            this.restopen = true
+        },
+        toResetClose(){
+            this.restopen = false
+        },
+        setSte(val) {
+            this.$store.dispatch('settings/changeSetting', {
+                key: 'showSettings',
+                value: val
+            })
+        },
+        // getInAdhibitions() {
+        //   queryInAdhibitions({ businessId: 'zt' }).then(res => {
+        //     this.appList.splice(0, 0, ...res.data)
+        //   })
+        // },
+        toggleSideBar() {
+            this.$store.dispatch('app/toggleSideBar')
+        },
+        async logout() {
+            this.$confirm('确定注销并退出系统吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$store.dispatch('FedLogOut').then(() => {
+                    location.reload()
+                })
+            })
+            // await this.$store.dispatch('user/logout')
+            // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+        },
+        updateTime() {
+            const now = new Date();
+            // 日期部分
+            const year = now.getFullYear();
+            const month = (now.getMonth() + 1).toString().padStart(2, '0'); // 月份+1补零
+            const day = now.getDate().toString().padStart(2, '0');
+            // 时间部分
+            const hours = now.getHours().toString().padStart(2, '0');
+            const minutes = now.getMinutes().toString().padStart(2, '0');
+            const seconds = now.getSeconds().toString().padStart(2, '0');
+
+            this.timer = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+<style lang="scss">
+.navbar {
+    .right-menu {
+        .el-badge {
+            margin-right: 50px;
+            font-size: 22px;
+
+            .el-badge__content.is-fixed {
+                top: 12px !important;
+            }
+        }
+    }
+}
+
+.title-button .el-button {
+    font-size: 24px !important;
+}
+</style>
\ No newline at end of file

src/layout/components/resetPwd.vue

 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="4.2vw">
+  <div>
+  <el-form ref="form" :model="user" :rules="rules" label-width="4.8vw">
     <el-form-item label="旧密码" prop="oldPassword">
       <el-input v-model.trim="user.oldPassword" placeholder="请输入旧密码" type="password" />
     </el-form-item>
@@ -9,11 +10,13 @@
     <el-form-item label="确认密码" prop="confirmPassword">
       <el-input v-model.trim="user.confirmPassword" placeholder="请确认密码" type="password" />
     </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">确 定</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
+    
   </el-form>
+  <div  class="el-dialog__footer ">
+      <el-button type="primary" size="mini" @click="submit">确 定</el-button>
+      <el-button  size="mini" @click="close">关闭</el-button>
+  </div>
+</div>
 </template>
 
 <script>

src/layout/index.vue

@@ -10,8 +10,9 @@
     class="app-wrapper"
   >
   <div class="nav-container fixed-header">
-        <Header v-if="themeType && themeType !== '9'" />
-        <bdHeader v-else/>
+        <Header v-if="themeType && themeType !== '9'&& themeType !== '10'" />
+        <bdHeader v-else-if="themeType && themeType == '9'"/>
+        <bdHeader10 v-else-if="themeType && themeType == '10'"/>
       </div>
     <div
       v-if="device === 'mobile' && sidebar.opened"
@@ -23,10 +24,10 @@
     <div class="main-container">
       
       
-      <div class="nav-container-two" v-if="themeType && themeType !== '9'">
+      <div class="nav-container-two" v-if="themeType && themeType !== '9' && themeType !== '10'">
         <div class="placeholder" />
-        <tags-view  v-if="themeType && themeType !== '8' && themeType !== '9'" />
-        <navbar v-if="themeType && themeType !== '8' && themeType !== '9'" />
+        <tags-view  v-if="themeType && themeType !== '8' && themeType !== '9' && themeType !== '10'" />
+        <navbar v-if="themeType && themeType !== '8' && themeType !== '9' && themeType !== '10'" />
       </div>
       <el-card v-if="themeType && themeType === '8'" style="margin:.75rem">
         <app-main />
@@ -49,6 +50,7 @@ import RightPanel from '@/components/RightPanel'
 import settings from '@/layout/components/Settings/index.vue'
 import { Navbar, Sidebar, AppMain, TagsView, Header } from './components'
 import bdHeader from './components/bdHeader'
+import bdHeader10 from './components/bdHeader10'
 import bdMenu from './components/bdMenu'
 import ResizeMixin from './mixin/ResizeHandler'
 import { Card } from 'element-ui'
@@ -58,6 +60,7 @@ export default {
   components: {
     Navbar,
     bdHeader,
+    bdHeader10,
     Sidebar,
     AppMain,
     bdMenu,

src/main.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import moment from 'moment'
 import Element from 'element-ui'
+Element.Dialog.props.lockScroll.default = false;
 // import './utils/rem.js' // 自适应分辨率
 // import ElementUI from 'element-ui'
 // import './styles/element-variables.scss'
@@ -36,6 +37,8 @@ if (!storageValue || storageValue === '1') {
   import('@/styles/themeH/index.scss')
 }else if (storageValue === '9') {
   import('@/styles/themeI/index.scss')
+}else if (storageValue === '10') {
+  import('@/styles/themeJ/index.scss')
 }
 
 import halberd from '@/utils/halberd'

src/store/modules/user.js

@@ -58,7 +58,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo(state.token).then(res => {
           const user = res.data.user
-          const avatar = user.avatar === null ? require('@/assets/image/profile.jpg') : user.avatar
+          const avatar = user.avatarUrl === null ? require('@/assets/image/profile.jpg') : user.avatar
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
           } else {

src/styles/themeI/common.scss

-body{
+body {
   background-image: linear-gradient(180deg, #fff 0%, #C3D5FD 100%) !important;
 }
+
 //table区域样式
 .tablearea {
   width: 98%;
@@ -52,7 +53,43 @@ body{
   left: 576px !important;
   padding: 12px 10px;
 }
+.topSubMenu {
+  display: flex;
+  width: 98%;
+  margin: 0 1%;
+
+  .tsmBtn {
+      width: 180px;
+      height: 72px;
+      background: #EBF1FF;
+      border-radius: 10px;
+      margin-right: 24px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 20px;
+      color: #98A4BF;
+      letter-spacing: 0;
+      line-height: 15px;
+      border: none !important;
+  }
 
+  .tsmactive {
+      background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+      box-shadow: 0 2px 2px 0 #ACB2C1;
+      border-radius: 10px;
+      font-family: PingFangSC-Semibold;
+      font-weight: 600;
+      font-size: 20px;
+      color: #FFFFFF;
+      letter-spacing: 0;
+      line-height: 15px;
+      text-decoration: underline;
+  }
+
+}
+.BdoySubMenu{
+  margin-top: 20px;
+}
 .search {
   // border-radius: 0.25rem 0.25rem 0rem 0rem;
   background: #FFFFFF;
@@ -110,7 +147,8 @@ body{
   &:hover {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+    box-shadow: 0 2px 2px 0 #ACB2C1;
     color: #fff;
     border-radius: 10px;
   }
@@ -118,8 +156,9 @@ body{
   &:focus {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
-    color: #696974;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+    box-shadow: 0 2px 2px 0 #ACB2C1;
+    color: #fff;
     border-radius: 10px;
   }
 }
@@ -138,7 +177,8 @@ body{
   &:hover {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
+    background: #4173EE;
+    border: 1px solid #4173EE;
     color: #fff;
     border-radius: 10px;
   }
@@ -146,12 +186,34 @@ body{
   &:focus {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
+    background: #4173EE;
+    border: 1px solid #4173EE;
     color: #696974;
     border-radius: 10px;
   }
 }
-
+.clearBtn{
+  height: 40px;
+  padding: 11px 15px 12px 17px!important;
+  background: #F4F5F9!important;
+  border-radius: 4px;
+  border: none;
+  font-family: Alibaba PuHuiTi;
+  font-weight: 400;
+  font-size: 18px;
+  color: #7D8594;
+  line-height: 18px;
+  &:hover {
+    opacity: 0.85;
+    background: #F4F5F9!important;
+    color: #7D8594;
+  }
+  &:focus {
+    opacity: 0.85;
+    background: #F4F5F9!important;
+    color: #7D8594;
+  }
+}
 .addBtn {
   border: none;
   background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
@@ -165,16 +227,18 @@ body{
   &:hover {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
     color: #fff;
+    box-shadow: 0 2px 2px 0 #ACB2C1;
     border-radius: 10px;
   }
 
   &:focus {
     opacity: 0.85;
     border: none;
-    background: #2288ff;
-    color: #696974;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+    color: #fff;
+    box-shadow: 0 2px 2px 0 #ACB2C1;
     border-radius: 10px;
   }
 }
@@ -218,7 +282,8 @@ body{
   &:hover {
     opacity: 0.85;
     border: none;
-    background: #2288ff !important;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+    box-shadow: 0 2px 2px 0 #ACB2C1;
     color: #fff !important;
     border-radius: 10px !important;
   }
@@ -226,8 +291,9 @@ body{
   &:focus {
     opacity: 0.85;
     border: none;
-    background: #f1f1f5 !important;
-    color: #696974 !important;
+    background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+    box-shadow: 0 2px 2px 0 #ACB2C1;
+    color: #fff !important;
     border-radius: 10px !important;
   }
 }
@@ -287,10 +353,11 @@ body{
   display: flex;
   justify-content: center !important;
   height: 57px !important;
-  border-right: 1px solid #B9CDF8 !important;
+  // border-top: 1px solid #B9CDF8 !important;
+  // border-right: 1px solid #B9CDF8 !important;
+
 
 
-  border-bottom: 1px solid #B9CDF8 !important;
 
 }
 
@@ -315,16 +382,19 @@ body{
 
 .el-table th.is-leaf,
 .el-table td {
+  border-top: 1px solid #C0D1F8 !important;
   border-right: 1px solid #C0D1F8 !important;
-  border-bottom: 1px solid #C0D1F8 !important;
+  // border-bottom: 1px solid #C0D1F8 !important;
 }
 
 .navbar {
   background-color: #fafafb !important;
 }
-.navbar .right-menu .avatar-container .avatar-wrapper{
+
+.navbar .right-menu .avatar-container .avatar-wrapper {
   color: #225BDE;
 }
+
 .app-main {
   // background-color: #fafafb !important;
   background: none !important
@@ -363,10 +433,11 @@ body{
 }
 
 //分页功能样式
-.el-pagination{
+.el-pagination {
   text-align: center;
   margin-top: 21px;
 }
+
 .el-pagination button:disabled {
   background: none !important;
 }
@@ -416,12 +487,14 @@ body{
   line-height: 44px !important;
   margin-left: 22px;
 }
-.el-pagination .el-select .el-input{
+
+.el-pagination .el-select .el-input {
   height: 44px !important;
   line-height: 44px !important;
   margin-left: 22px;
 }
-.el-pagination__sizes .el-input .el-input__inner{
+
+.el-pagination__sizes .el-input .el-input__inner {
   height: 44px !important;
   background: none !important;
   border-radius: 10px !important;
@@ -429,17 +502,20 @@ body{
   font-size: 18px !important;
   color: #1F283A !important;
 }
-.el-pagination__editor.el-input{
+
+.el-pagination__editor.el-input {
   min-width: 66px;
   height: 44px !important;
   margin-left: 10.5px;
   margin-right: 14px;
 }
-.el-pagination__jump{
+
+.el-pagination__jump {
   font-size: 18px !important;
   color: #1F283A;
 }
-.el-pagination__editor.el-input .el-input__inner{
+
+.el-pagination__editor.el-input .el-input__inner {
   height: 44px !important;
   background: none !important;
   border-radius: 10px !important;
@@ -447,4 +523,39 @@ body{
   font-size: 18px !important;
   color: #1F283A !important;
   min-width: 66px;
+}
+
+//弹窗表单样式设置
+.el-dialog__body .el-form-item__label {
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 16px;
+  color: #0D162A;
+}
+
+.el-dialog__body .el-input__inner {
+  height: 36px;
+}
+ .el-dialog__footer{
+  text-align: center;
+}
+ .el-dialog__footer .el-button {
+  width: 116px;
+  height: 40px;
+  border: 1px solid #4173EE;
+  font-size: 16px;
+  border-radius: 10px;
+}
+
+.el-dialog__footer .el-button--primary {
+  background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
+  box-shadow: 0 2px 2px 0 #ACB2C1;
+  border: 1px solid #4173EE;
+  border-radius: 10px;
+}
+.el-button .el-button--primary{
+  background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%) !important;
+}
+.el-button--primary:hover, .el-button--primary:focus{
+  background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%) !important;
 }
\ No newline at end of file

src/styles/themeI/form.scss

+.info-main {
+    width: 98%;
+    margin: 10px 1%;
+  
+    .info-title {
+      font-family: PingFangSC-Semibold;
+      font-weight: 600;
+      font-size: 22px;
+      color: #3D3D3D;
+      letter-spacing: 0;
+      margin-bottom: 27px;
+      margin-left: 12px;
+      position: relative;
+  
+      .smallbox {
+        width: 4px;
+        height: 18px;
+        background: #225BDE;
+        position: absolute;
+        top: 5px;
+      }
+  
+      span {
+        margin-left: 14px;
+      }
+    }
+  
+    .info-content {
+      background: #EBF1FF;
+      margin-bottom: 34px;
+      border-radius: 20px;
+      padding: 26px;
+  
+      .contentTitle {
+        color: #0D162A;
+        font-size: 22px;
+        font-family: Microsoft YaHei;
+        font-weight: 700;
+        text-align: LEFT;
+        // position: absolute;
+        // left: 0.25rem;
+        // top: 0.45rem;
+        // background-color: #000;
+      }
+  
+      //title下划线样式
+      .contentLine {
+        margin-bottom: 27px;
+        width: 88px;
+        height: 4px;
+        background: #0062FF;
+        margin-top: 9px;
+  
+      }
+      .cbox-item{
+        margin-left: 5px;
+      }
+    }
+  
+  }
+  .cbox-item .el-form-item--small .el-form-item__label {
+    font-family: PingFangSC-Semibold;
+    font-weight: 600;
+    font-size: 20px;
+    color: #225BDE;
+  }
+  
+  .cbox-item .el-form-item--small .el-form-item__content {
+    font-family: PingFangSC-Semibold;
+    font-weight: 600;
+    font-size: 20px;
+    color: #000000;
+  }
\ No newline at end of file

src/styles/themeI/header.scss

+.navbar {
+    height: 100px;
+    padding: 21px 15px;
+    overflow: hidden;
+    position: relative;
+    background: #FFF !important;
+    width: 100%;
+    // box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .hamburger-container {
+        line-height: 46px;
+        height: 100%;
+        float: left;
+        cursor: pointer;
+        transition: background 0.3s;
+        -webkit-tap-highlight-color: transparent;
+
+        &:hover {
+            background: rgba(0, 0, 0, 0.025);
+        }
+    }
+
+    .big-logo {
+        width: 382px;
+        height: 65.87px;
+    }
+
+    .title-box {
+        display: flex;
+        align-items: center;
+
+        .change-sys {
+            margin-left: 20px;
+        }
+        // margin-right: 74px;
+    }
+
+    .title-status {
+        display: flex;
+        justify-content: space-between;
+        width: 481px;
+        font-size: 24px;
+        color: #003B8F;
+    }
+
+    .title-time {
+        font-family: PingFangSC-Semibold;
+        font-weight: 600;
+        font-size: 24px;
+        color: #225BDE;
+        letter-spacing: 0;
+        text-align: center;
+    }
+
+    .title-button {
+        font-family: PingFangSC-Semibold;
+        font-weight: 600;
+        font-size: 24px !important;
+        color: #225BDE;
+        letter-spacing: 0;
+        text-align: center;
+        span{
+            color: #225BDE;
+        }
+    }
+
+    .title-kaiguan {
+        .kaiguan-logo {
+            width: 42px;
+            height: 42px;
+        }
+    }
+
+    .app-logo {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+        margin: 6px;
+    }
+
+    .hamburger-container {
+        line-height: 6.3vh;
+        height: 100%;
+        float: left;
+        cursor: pointer;
+        transition: background .3s;
+        -webkit-tap-highlight-color: transparent;
+
+        &:hover {
+            background: rgba(0, 0, 0, .025)
+        }
+    }
+
+    .breadcrumb-container {
+        float: left;
+    }
+
+    .username-text {
+        font-size: 16px;
+        //margin-right: 12px;
+    }
+
+    .username-text :hover {
+        cursor: pointer;
+        //margin-right: 12px;
+    }
+
+    .right-menu {
+        float: right;
+        height: 100%;
+        line-height: 50px;
+        display: flex;
+        align-items: center;
+
+        &:focus {
+            outline: none;
+        }
+
+        &>i {
+            margin-right: 50px;
+            font-size: 18px;
+        }
+
+        .right-menu-item {
+            display: inline-block;
+            padding: 0 8px;
+            height: 100%;
+            font-size: 18px;
+            color: #5a5e66;
+            vertical-align: text-bottom;
+
+            &.hover-effect {
+                cursor: pointer;
+                transition: background .3s;
+
+                &:hover {
+                    background: rgba(0, 0, 0, .025)
+                }
+            }
+        }
+
+        .avatar-container {
+            margin-right: 30px;
+
+            .avatar-wrapper :hover {
+                cursor: pointer;
+               
+            }
+
+            .avatar-wrapper {
+                position: relative;
+                height: 42px;
+                display: flex;
+                margin-left: 30px;
+                align-items: center;
+                padding-right: 20px;
+                font-size: 24px;
+                .user-avatar {
+                    cursor: pointer;
+                    width: 42px;
+                    height: 42px;
+                    border-radius: 50px;
+                    margin-right: 11px;
+                }
+                .username-text{
+                    font-size: 24px;
+                }
+                .el-icon-arrow-down {
+                    cursor: pointer;
+                    position: absolute;
+                    right: -3px;
+                    top: 10px;
+                    font-size: 24px;
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

src/styles/themeI/index.scss

@@ -8,6 +8,7 @@
 @import "./tagsView.scss"; // 顶部面包屑tag签css样式文件
 @import "./layout.scss"; // layout的css样式文件
 @import "./common.scss"; // // 通用样式，如：按钮，列表，form表单等样式文件
+@import "./header.scss"; // // 头部样式
 
 
 
@@ -22,3 +23,4 @@
 @import "./errorLog.scss"; // 异常日志模块css样式文件
 @import "./reSetPsw.scss"; // 修改密码模块css样式文件
 @import "./login.scss"; // 登录页面css样式文件
+@import "./form.scss"; // 表单页面css样式文件

src/styles/themeI/sidebar.scss

@@ -229,7 +229,25 @@
     }
   }
 }
+.newMenuList {
+  width: 140px;
+  padding-top: 24px;
+  height: 149px;
+  margin: 0 auto 20px;
+  font-size: 24px;
+  color: white;
+  text-align: center;
+  opacity: 0.2;
+  background: #225BDE;
+  box-shadow: 0 2px 2px 0 #ACB2C1;
+  border-radius: 20px;
+}
 
+.newmact {
+  background: linear-gradient(180deg, #679CF6 0%, #4072EE 100%) !important;
+  opacity: 1 !important;
+ 
+}
 .el-submenu__icon-arrow {
   color: #ffffff !important;
 }

src/styles/themeJ/dept.scss

+$color-theme: #f4ac10;
+.dept-manage{
+
+}

src/styles/themeJ/dict.scss

+$color-theme: #f4ac10;
+.dict-manage {
+  font-size: 18px;
+  padding: 0;
+  .dictBtnRow{
+    text-align: end;
+    margin-right: 9px;
+  }
+  .el-form {
+    padding: 0 0 0 10px;
+    .el-form-item {
+      margin-top: 0;
+      margin-left: 0;
+      margin-bottom: 15px;
+      margin-right: 10px;
+    }
+  }
+
+  .placeholder{
+    height:1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+}
+.dictUpdata{
+  margin-left: 10px;
+  margin-right: 20px;
+}
+ // 字典管理-字典类型管理页面
+.dictData-manage {
+  font-size: 18px;
+  padding: 0;
+  .placeholder{
+    height:1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+  .optionsContent{
+    box-sizing: border-box;
+    width: 100%;
+    padding: 0 0 0 10px;
+    display: flex;
+    flex-direction: row;
+  }
+}

src/styles/themeJ/errorLog.scss

+$color-theme: #f4ac10;
+.errLog-manage {
+  padding: 0;
+  font-size: 18px;
+  .placeholder{
+    height:14px;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+}
+.errorCat{
+  margin-left: 10px;
+  margin-right: 20px;
+}

src/styles/themeJ/form.scss

+.info-main {
+    width: 98%;
+    margin: 10px 1%;
+  
+    .info-title {
+      font-family: PingFangSC-Semibold;
+      font-weight: 600;
+      font-size: 22px;
+      color: #3D3D3D;
+      letter-spacing: 0;
+      margin-bottom: 27px;
+      margin-left: 12px;
+      position: relative;
+  
+      .smallbox {
+        width: 4px;
+        height: 18px;
+        background: #225BDE;
+        position: absolute;
+        top: 5px;
+      }
+  
+      span {
+        margin-left: 14px;
+      }
+    }
+  
+    .info-content {
+      background-image: linear-gradient(180deg, #FFFFFF 0%, #FFFFFF 100%);
+      margin-bottom: 34px;
+      border-radius: 20px;
+      padding: 26px;
+  
+      .contentTitle {
+        color: #0D162A;
+        font-size: 22px;
+        font-family: Microsoft YaHei;
+        font-weight: 700;
+        text-align: LEFT;
+        // position: absolute;
+        // left: 0.25rem;
+        // top: 0.45rem;
+        // background-color: #000;
+      }
+  
+      //title下划线样式
+      .contentLine {
+        margin-bottom: 27px;
+        width: 88px;
+        height: 4px;
+        background-image: linear-gradient(179deg, #FFFFFF 0%, #C0DBC4 100%);
+        margin-top: 9px;
+  
+      }
+      .cbox-item{
+        margin-left: 5px;
+      }
+    }
+  
+  }
+  .cbox-item .el-form-item--small .el-form-item__label {
+    font-family: PingFangSC-Semibold;
+    font-weight: 600;
+    font-size: 20px;
+    color: #004A00;
+  }
+  
+  .cbox-item .el-form-item--small .el-form-item__content {
+    font-family: PingFangSC-Semibold;
+    font-weight: 600;
+    font-size: 20px;
+    color: #000000;
+  }
\ No newline at end of file

src/styles/themeJ/header.scss

+.navbar {
+    height: 100px;
+    padding: 21px 15px;
+    overflow: hidden;
+    position: relative;
+    background: #FFF !important;
+    width: 100%;
+    // box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .hamburger-container {
+        line-height: 46px;
+        height: 100%;
+        float: left;
+        cursor: pointer;
+        transition: background 0.3s;
+        -webkit-tap-highlight-color: transparent;
+
+        &:hover {
+            background: rgba(0, 0, 0, 0.025);
+        }
+    }
+
+    .big-logo {
+        width: 382px;
+        height: 65.87px;
+    }
+
+    .title-box {
+        display: flex;
+        align-items: center;
+
+        .change-sys {
+            margin-left: 20px;
+        }
+        // margin-right: 74px;
+    }
+
+    .title-status {
+        display: flex;
+        justify-content: space-between;
+        width: 481px;
+        font-size: 24px;
+        color: #005508;
+    }
+
+    .title-time {
+        font-family: PingFangSC-Semibold;
+        font-weight: 600;
+        font-size: 24px;
+        color: #02560A;
+        letter-spacing: 0;
+        text-align: center;
+    }
+
+    .title-button {
+        font-family: PingFangSC-Semibold;
+        font-weight: 600;
+        font-size: 24px !important;
+        color: #02560A;
+        letter-spacing: 0;
+        text-align: center;
+        span{
+            color: #02560A;
+        }
+    }
+
+    .title-kaiguan {
+        .kaiguan-logo {
+            width: 42px;
+            height: 42px;
+        }
+    }
+
+    .app-logo {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+        margin: 6px;
+    }
+
+    .hamburger-container {
+        line-height: 6.3vh;
+        height: 100%;
+        float: left;
+        cursor: pointer;
+        transition: background .3s;
+        -webkit-tap-highlight-color: transparent;
+
+        &:hover {
+            background: rgba(0, 0, 0, .025)
+        }
+    }
+
+    .breadcrumb-container {
+        float: left;
+    }
+
+    .username-text {
+        font-size: 16px;
+        //margin-right: 12px;
+    }
+
+    .username-text :hover {
+        cursor: pointer;
+        //margin-right: 12px;
+    }
+
+    .right-menu {
+        float: right;
+        height: 100%;
+        line-height: 50px;
+        display: flex;
+        align-items: center;
+
+        &:focus {
+            outline: none;
+        }
+
+        &>i {
+            margin-right: 50px;
+            font-size: 18px;
+        }
+
+        .right-menu-item {
+            display: inline-block;
+            padding: 0 8px;
+            height: 100%;
+            font-size: 18px;
+            color: #5a5e66;
+            vertical-align: text-bottom;
+
+            &.hover-effect {
+                cursor: pointer;
+                transition: background .3s;
+
+                &:hover {
+                    background: rgba(0, 0, 0, .025)
+                }
+            }
+        }
+
+        .avatar-container {
+            margin-right: 30px;
+
+            .avatar-wrapper :hover {
+                cursor: pointer;
+               
+            }
+
+            .avatar-wrapper {
+                position: relative;
+                height: 42px;
+                display: flex;
+                margin-left: 30px;
+                align-items: center;
+                padding-right: 20px;
+                font-size: 24px;
+                .user-avatar {
+                    cursor: pointer;
+                    width: 42px;
+                    height: 42px;
+                    border-radius: 50px;
+                    margin-right: 11px;
+                }
+                .username-text{
+                    color: #02560A !important;
+                    font-size: 24px;
+                }
+                .el-icon-arrow-down {
+                    cursor: pointer;
+                    position: absolute;
+                    right: -3px;
+                    color: #02560A !important;
+                    top: 10px;
+                    font-size: 24px;
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

src/styles/themeJ/index.scss

+
+
+
+//------------公共的样式文件---------------------------------------------------
+@import "./navigationBar.scss"; // 左侧导航栏css样式文件
+@import "./sidebar.scss"; // 自带的左侧导航栏css样式文件
+@import "./variables.scss"; // 风格变量css样式文件
+@import "./tagsView.scss"; // 顶部面包屑tag签css样式文件
+@import "./layout.scss"; // layout的css样式文件
+@import "./common.scss"; // // 通用样式，如：按钮，列表，form表单等样式文件
+@import "./header.scss"; // // 头部样式
+
+
+
+//-----------各个模块的样式文件--------------------------------------------
+@import "./user.scss"; // 用户管理模块css样式文件
+@import "./role.scss"; // 角色管理模块css样式文件
+@import "./menu.scss"; // 菜单管理模块css样式文件
+@import "./dept.scss"; // 部门管理模块css样式文件
+@import "./dict.scss"; // 字典管理模块css样式文件
+@import "./loginInfo.scss"; // 登录日志模块css样式文件
+@import "./operLog.scss"; // 操作日志模块css样式文件
+@import "./errorLog.scss"; // 异常日志模块css样式文件
+@import "./reSetPsw.scss"; // 修改密码模块css样式文件
+@import "./login.scss"; // 登录页面css样式文件
+@import "./form.scss"; // 表单页面css样式文件

src/styles/themeJ/layout.scss

+@import '../../styles/mixin';
+@import './variables';
+
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
+  }
+ 
+}
+.nav-container {
+  /*height: 70px;*/
+  //position: absolute;
+  top: 0;
+  width: 100%;
+  z-index: 1001;
+}
+.nav-container-two {
+  width: 100%;
+  z-index: 1001;
+  // background-color: #ecf0f1;
+  .placeholder {
+    height: 1.2vh;
+    width: 100%;
+    // background-color: #f4f4f4;
+  }
+}
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
+
+.fixed-header {
+  position: fixed;
+  //top: 0;
+  //right: 0;
+  //z-index: 9;
+  width:100%;
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: 100%;
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}

src/styles/themeJ/login.scss

+.login {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: url('../../assets/themeJImage/bg.png') 20% 20%;
+  background-size: cover;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+
+  //.title {
+  //  margin: 7vh auto 7vh auto;
+  //  text-align: center;
+  //  color: black;
+  font-size: 36px;
+
+  //}
+  .el-input__prefix {
+    left: 14px;
+  }
+
+  .el-input--prefix .el-input__inner {
+    padding-left: 44px;
+    font-size: 16px;
+  }
+
+  .el-form-item {
+    margin-bottom: 1.5rem;
+  }
+}
+
+// .loginBtn_formItem {
+//   margin-top: 20px;
+// }
+.login_logoRow {
+  position: absolute;
+  top: 2.5rem;
+  left: 2.5rem;
+
+  .login_form_logo {
+    background-image: url('../../assets/themeJImage/login_logo.png');
+    background-size: cover;
+    height: 2.5rem;
+    width: 2.5rem;
+  }
+}
+
+.loginTitle {
+  position: absolute;
+  top: 44px;
+  left: 66px;
+
+  .login-logo {
+    width: 463px;
+    height: 80px;
+  }
+
+}
+
+.login-form {
+  width: 674px;
+  // height: 36rem;
+  position: relative;
+  display: flex;
+  align-items: center;
+
+
+
+
+  .loginTitleRow {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+    padding: 0 2.5rem;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+
+    .sub_title {
+      font-size: 1.5rem;
+      color: rgba(255, 255, 255, 0.75);
+      margin-bottom: 1rem;
+    }
+
+    .title {
+      font-size: 2.25rem;
+      color: white;
+      line-height: 2.63rem;
+    }
+  }
+
+  .login-form-content {
+    background-color: #fff;
+    width: 100%;
+    height: 100%;
+    //position: absolute;
+    //top: 40%;
+    //right: 28%;
+    //width: 45%;
+    display: flex;
+    padding-bottom: 20px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    .zhongduan {
+      font-family: PingFangSC-Semibold;
+      font-weight: 600;
+      font-size: 32px;
+      color: #3A3F63;
+      letter-spacing: 0;
+      text-align: center;
+      line-height: 40px;
+      margin-bottom: 38px;
+      margin-top: 38px;
+    }
+
+    .huanyi {
+      font-family: PingFangSC-Regular;
+      font-weight: 400;
+      font-size: 20px;
+      color: #6A74A5;
+      letter-spacing: 0;
+      line-height: 24px;
+      margin-bottom: 38px;
+    }
+
+    .el-form-item {
+      width: 90%;
+      height: 80px;
+      background: #fff;
+      // border-radius: 0.06rem;
+
+      margin-bottom: 60px;
+
+      .el-input__inner {
+        background-color: #FFFFFF;
+        border-radius: 0.06rem;
+        height: 80px;
+        line-height: 80px;
+        border: 1px solid #96ABEB;
+        font-size: 20px;
+        color: #858EBD;
+        letter-spacing: 0;
+
+      }
+    }
+
+    .loginCode_formItem {
+      width: 320px;
+      display: flex;
+      justify-content: space-between;
+      //align-items: center;
+      line-height: 0;
+
+      .el-form-item {
+        width: 200px;
+      }
+    }
+
+    .blue-btn {
+      width: 600px;
+      height: 80px;
+      background-image: linear-gradient(180deg, #8EEABF 0%, #3FA79E 100%, #3FA79E 100%);
+      box-shadow: 0 4px 16px 0 #ACB2C1;;
+      border-radius: 22px;
+      font-size: 30px;
+      color: #FFFFFF;
+    }
+  }
+
+  .el-input {
+    height: 38px;
+
+    input {
+      height: 38px;
+    }
+  }
+
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+    color: #000;
+    font-size: 2rem;
+  }
+}
+
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+
+.login-code {
+  //width: 33%;
+  height: 38px;
+
+  //float: right;
+  img {
+    height: 38px;
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+
+.login_buttons-content {
+  display: flex;
+  width: 343px;
+  justify-content: center;
+
+  .rem-code span {
+    color: $font-dark;
+  }
+
+  .rem-code span,
+  .el-link span {
+    font-size: 16px;
+  }
+}
\ No newline at end of file

src/styles/themeJ/loginInfo.scss

+$color-theme: #f4ac10;
+.loginInfo-manage {
+  padding: 0;
+  font-size: 18px;
+  .placeholder{
+    height:14px;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+}

src/styles/themeJ/menu.scss

+$color-theme: #f4ac10;
+.menu-manage {
+  font-size: 18px;
+  padding: 0;
+  .placeholder{
+    height:1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+  .table-drop{
+    vertical-align: 2px;
+    line-height: 20px;
+    margin-left: 25px
+  }
+  .el-switch{
+    margin-left: 25px;
+  }
+  .icon-list {
+    div {
+      white-space: nowrap;
+    }
+  }
+}

src/styles/themeJ/navigationBar.scss

+
+.sidebarLogoFade-enter-active {
+  transition: opacity 1.5s;
+}
+
+.sidebarLogoFade-enter,
+.sidebarLogoFade-leave-to {
+  opacity: 0;
+}
+
+.sidebar-logo-container {
+  position: relative;
+  width: 100%;
+  height: 100px;
+  line-height: 50px;
+  background: #171725;
+  text-align: center;
+  // padding-left: 11px;
+  overflow: hidden;
+  .sidebar-logoTitle{
+    display: flex;
+    justify-content: center;
+  }
+  & .sidebar-logo-link {
+    height: 100%;
+    width: 100%;
+
+    & .sidebar-logo {
+      width: 28px;
+      height: 28px;
+      vertical-align: middle;
+      margin-right: 12px;
+    }
+
+    & .sidebar-title {
+      display: inline-block;
+      margin: 0;
+      color: #fff;
+      font-weight: 600;
+      line-height: 50px;
+      font-size: 20px;
+      font-family: Poppins, Poppins;
+      vertical-align: middle;
+      font-weight: bold;
+    }
+  }
+
+  &.collapse {
+    .sidebar-logo {
+      margin-right: 0px;
+    }
+  }
+}

src/styles/themeJ/operLog.scss

+$color-theme: #f4ac10;
+.operlog-manage {
+  padding: 0;
+  font-size: 18px;
+  .placeholder{
+    height:14px;
+    background-color: #F4F4F4;
+    margin-bottom:10px
+  }
+}
+.operCat{
+  margin-right: 20px;
+  margin-left: 10px;
+}

src/styles/themeJ/reSetPsw.scss

+
+.forget-pwd-content{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-height: calc(100vh - 110px);
+  .title{
+    font-size: 24px;
+    font-weight: bold;
+    margin-top: 40px;
+  }
+  .el-form{
+    margin-top: 40px;
+    width: 40%;
+    .el-form-item__label{
+      color: #333333;
+      font-weight: normal;
+    }
+    .el-input__inner{
+      border-radius: 4px;
+    }
+    .blue-btn{
+      height: 32px;
+      border-radius: 4px;
+    }
+  }
+}

src/styles/themeJ/role.scss

+$color-theme: #f4ac10;
+.role-manage {
+  font-size: 18px;
+  padding: 0;
+
+  .placeholder {
+    height: 1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom: 10px
+  }
+
+  .table-drop {
+    vertical-align: 2px;
+    line-height: 20px;
+    margin-left: 15px
+  }
+
+  .el-switch {
+    margin-left: 15px;
+  }
+}
+.role_dividerStyle{
+  .el-divider--vertical{
+    height: 12em!important;
+    width: 4px!important;
+  }
+}

src/styles/themeJ/sidebar.scss

+@import './variables';
+#app {
+  .main-container {
+    padding-top: 120px;
+    // background-color: #ffffff !important;
+    min-height: 100%;
+    transition: margin-left 0.28s;
+    margin-left: $sideBarWidth;
+    position: relative;
+  }
+
+  .sidebar-container {
+    transition: width 0.28s;
+    width: $sideBarWidth !important;
+    background-color: $menuBg;
+    height: 100%;
+    position: fixed;
+    font-size: 0px;
+    top: 100px;
+    padding-top: 40px;
+    bottom: 0;
+    left: 0;
+    z-index: 1001;
+    overflow: hidden;
+
+    // reset element-ui css
+    .horizontal-collapse-transition {
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out,
+        0s padding-right ease-in-out;
+    }
+
+    .scrollbar-wrapper {
+      overflow-x: hidden !important;
+    }
+
+    .el-scrollbar__bar.is-vertical {
+      right: 0px;
+    }
+
+    .el-scrollbar {
+      height: calc(100% - 50px);
+    }
+
+    &.has-logo {
+      .el-scrollbar {
+        height: calc(100% - 50px);
+      }
+    }
+
+    .is-horizontal {
+      display: none;
+    }
+
+    a {
+      display: inline-block;
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .svg-icon {
+      margin-right: 17px;
+      font-size: 20px;
+    }
+
+    .el-menu {
+      border: none;
+      height: 100%;
+      width: 100% !important;
+    }
+
+    // menu hover
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      
+      &:hover {
+        background-color: $menuHover !important;
+      }
+    }
+
+    .is-active > .el-submenu__title {
+      color: $subMenuActiveText;
+    }
+
+    & .nest-menu .el-submenu > .el-submenu__title,
+    & .el-submenu .el-menu-item {
+      font-family: Poppins, Poppins;
+      font-weight: 400 !important;
+      font-size: 14px !important;
+      color: #fff !important;
+      min-width: $sideBarWidth !important;
+      background-color: $subMenuBg;
+      span {
+        display: flex;
+        align-items: center;
+      }
+      span:before {
+        content: '●';
+        color: #939595;
+        border-radius: 50%;
+        font-size: 5px;
+        margin-right: 5px;
+        display: block;
+        line-height: 1rem;
+      }
+      &:hover {
+        color: #fff !important;
+        background-color: $subMenuHover !important;
+      }
+    }
+  }
+
+  .hideSidebar {
+    .sidebar-container {
+      width: $sideHideWidth !important;
+    }
+
+    .main-container {
+      margin-left: 13.25rem;
+    }
+
+    .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 17px;
+        }
+      }
+    }
+
+    .el-submenu {
+      overflow: hidden;
+
+      & > .el-submenu__title {
+        padding: 0 !important;
+
+        .svg-icon {
+          margin-left: 17px;
+        }
+
+        .el-submenu__icon-arrow {
+          display: none;
+        }
+      }
+    }
+
+    .el-menu--collapse {
+      .el-submenu {
+        & > .el-submenu__title {
+          & > span {
+            height: 0;
+            width: 0;
+            overflow: hidden;
+            visibility: hidden;
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+
+  .el-menu--collapse .el-menu .el-submenu {
+    min-width: $sideBarWidth !important;
+  }
+
+  // mobile responsive
+  .mobile {
+    .main-container {
+      margin-left: 0px;
+    }
+
+    .sidebar-container {
+      transition: transform 0.28s;
+      width: $sideBarWidth !important;
+    }
+
+    &.hideSidebar {
+      .sidebar-container {
+        pointer-events: none;
+        transition-duration: 0.3s;
+        transform: translate3d(-$sideBarWidth, 0, 0);
+      }
+    }
+  }
+
+  .withoutAnimation {
+    .main-container,
+    .sidebar-container {
+      transition: none;
+    }
+  }
+}
+
+// when menu collapsed
+.el-menu--vertical {
+  & > .el-menu {
+    .svg-icon {
+      margin-right: 16px;
+    }
+  }
+
+  .nest-menu .el-submenu > .el-submenu__title,
+  .el-menu-item {
+    &:hover {
+      // you can use $subMenuHover
+      background-color: $menuHover !important;
+    }
+  }
+
+  // the scroll bar appears when the subMenu is too long
+  > .el-menu--popup {
+    max-height: 100vh;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar-track-piece {
+      background: #d3dce6;
+    }
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #99a9bf;
+      border-radius: 20px;
+    }
+  }
+}
+.newMenuList {
+  width: 140px;
+  padding-top: 24px;
+  height: 149px;
+  margin: 0 auto 20px;
+  font-size: 24px;
+  color: white;
+  text-align: center;
+  opacity: 0.2;
+  background: #094909;
+  box-shadow: 0 2px 2px 0 #ACB2C1;
+  border-radius: 20px;
+}
+
+.newmact {
+  background-image: linear-gradient(180deg, #8EEABF 0%, #3FA79E 100%, #3FA79E 100%);
+  opacity: 1 !important;
+ 
+}
+.el-submenu__icon-arrow {
+  color: #ffffff !important;
+}
+
+.is-active.submenu-title-noDropdown {
+  background-color: #fff !important;
+}
+
+#app .sidebar-container .el-submenu .el-menu-item.is-active {
+  background-color: #1D2B36 !important;
+}
+
+.router-link-active .el-menu-item.is-active {
+  background-color: #0062ff !important;
+}
+
+// hover样式
+.el-submenu__title:hover {
+  color: #0062ff !important;
+  .el-submenu__icon-arrow {
+    color: #0062ff !important;
+  }
+}
+.nest-menu .el-submenu > .el-submenu__title:hover {
+  background-color: #fff !important;
+  color: #0062ff !important;
+}
+.is-active > .el-submenu__title:hover {
+  color: #0062ff !important;
+}
+.el-submenu .el-menu-item:hover {
+  color: #0062ff !important;
+  span {
+    color: #fff;
+  }
+  span:before {
+    color: #fff;
+  }
+}
+.el-menu-item.submenu-title-noDropdown:hover {
+  color: #0062ff !important;
+}
+.el-menu--vertical .el-menu-item:hover {
+  color: #0062ff !important;
+}
+
+.el-submenu.is-opened {
+  background-color: #ffffff !important;
+
+  > .el-submenu__title {
+    font-weight: 600 !important;
+    background-color: #2288ff !important;
+    color: #fff !important;
+
+    .el-submenu__icon-arrow {
+      color: #0062ff !important;
+    }
+  }
+
+  .el-menu {
+    .el-menu-item {
+      background-color: #171725 !important;
+      color: #fff !important;
+      width: 140px !important;
+      height: 149px !important;
+      &.is-active {
+        color: #e7e7e7 !important;
+      }
+    }
+  }
+
+  .nest-menu {
+    .el-submenu__title {
+      background-color: #fff !important;
+      color: #000000 !important;
+
+      .el-submenu__icon-arrow {
+        color: #0062ff !important;
+      }
+    }
+  }
+}

src/styles/themeJ/tagsView.scss

+.tags-view-container {
+  height: 31px;
+  width: 100%;
+  background: #F4F4F4;
+  //border-bottom: 1px solid #d8dce5;
+  //box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  margin: 0 14px;
+  .tags-view-wrapper {
+    .tags-view-item {
+      display: inline-block;
+      position: relative;
+      cursor: pointer;
+      height: 27px;
+      line-height: 26px;
+      //border: 1px solid #d8dce5;
+      color: #495060;
+      background: #fff;
+      padding: 0 10px;
+      font-size: 14px;
+      margin-left: 5px;
+      margin-top: 4px;
+      &:first-of-type {
+        margin-left: 0;
+      }
+      &:last-of-type {
+        margin-right: 15px;
+      }
+      &.active {
+        background-color: #fff;
+        color: #0062FF;
+        border-color: transparent;
+        //&::before {
+        //  content: '';
+        //  background: #fff;
+        //  display: inline-block;
+        //  width: 8px;
+        //  height: 8px;
+        //  border-radius: 50%;
+        //  position: relative;
+        //  margin-right: 2px;
+        //}
+      }
+    }
+  }
+  .contextmenu {
+    margin: 0;
+    background: #fff;
+    z-index: 3000;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    li {
+      margin: 0;
+      padding: 7px 16px;
+      cursor: pointer;
+      &:hover {
+        background: #eee;
+      }
+    }
+  }
+}
+.tags-view-wrapper {
+  .tags-view-item {
+    .el-icon-close {
+      width: 16px;
+      height: 16px;
+      vertical-align: 2px;
+      border-radius: 50%;
+      text-align: center;
+      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transform-origin: 100% 50%;
+      &:before {
+        transform: scale(.6);
+        display: inline-block;
+        vertical-align: -3px;
+      }
+      &:hover {
+        background-color: #b4bccc;
+        color: #fff;
+      }
+    }
+  }
+}

src/styles/themeJ/user.scss

+$color-theme: #f4ac10;
+.user-manage{
+    font-size: 18px;
+    .placeholder{
+      height:14px;
+      background-color: #F4F4F4
+    }
+  .table-drop{
+    margin-left: 15px;
+    font-size: 16px;
+    font-weight: bold;
+    color: #46BCF3;
+  }
+  .paddingFixed {
+    .el-dialog__body {
+      padding-bottom: 17px;
+    }
+  }
+  .el-form-item__label-wrap {
+    margin-left: 0!important;
+  }
+}
+

src/styles/themeJ/variables.scss

+// 主题色
+$color-theme: #3691fc;
+$color-red: #F57b7b;
+$color-purple: #ff33a9;
+$color-orange: #f4ac10;
+$color-blue: #409EFF;
+// 我的单据背景色 考勤统计
+$color-cambridge-blue: #29a2db;
+// 我的单据背景色 考勤统计
+$color-cambridge-red: #ffbebe;
+// 我的单据背景色 考勤统计
+$color-cambridge-yellow: #fcd89f;
+// 我的单据背景色 考勤统计
+$color-cambridge-yellow: #fcd89f;
+// 我的单据背景色 考勤统计
+$color-indigo: #9fc6fc;
+// 考勤统计
+$color-indigo-deep: #5cbce5;
+// 考勤统计未选中项
+$color-grey: #d1d1d1;
+// 系统背景色
+$color-grey-light: #851c1c;
+// 列表表头底色
+$color-grey-light: #ecf9fe;
+// 统计折线图背景色
+$color-green: #49cec9;
+// 统计折线图折线
+$color-green-deep: #1cc2bc;
+$color-green-light-btn: #6dd8e4;
+// 统计折线图背景色
+$color-blue-bg: #1cc2bc;
+// 统计折线图折线
+$color-blue-line: #0098de;
+// 考勤统计
+$color-green-light: #80e4e9;
+// 线框、线段、列表 虚线分割线、表单不可修改
+$color-border: #e5e5e5;
+// 查询 新增 申请 tab标签 分页列表中除修改之外的其他按钮
+$blue-prime: #46BCF3;
+$blue-prime-hover: #6bc9f5;
+$blue-prime-active: #0098de;
+// 导出 导入 修改
+$green-prime: #49cec9;
+$green-prime-hover: #6dd8d4;
+$green-prime-active: #1cc2bc;
+// 文件上传
+$yellow-prime: #f6c761;
+$yellow-prime-hover: #f8d281;
+$yellow-prime-active: #f4ac10;
+// 删除
+$red-prime: #f68f8f;
+$red-prime-hover: #f8a5a5;
+$red-prime-active: #ff7b7b;
+
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+// 文字色
+$font-black: #000;
+// 主文字
+$font-dark: #333;
+// 次文字 表单内容、面包屑当前
+$font-deep: #666666;
+// 说明文字
+$font-pl: #999999;
+// 错误的提示文字 需要注意的提示文字
+$font-error: #f52929;
+$font-weak: #b3b3b3;
+// 反白文字
+$font-white: #fff;
+// 背景色
+$bg-bar: #f9f9f9;
+$bg-page: #f3f3f3;
+$bg-page-light: #f9f9f9;
+$bg-menu-hover: #f2f6fc;
+
+// sidebar
+$menuText:#fff;
+$menuActiveText:#fff;
+$subMenuActiveText:#fff; //https://github.com/ElemeFE/element/issues/12951
+
+$menuBg: #FFF;
+$menuHover:#2288ff;
+
+$subMenuBg:#FFF;
+$subMenuHover:#1D2B36;
+
+$sideBarWidth: 13.25rem;
+$sideHideWidth: 13.25rem;
+
+// the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+:export {
+  menuText: $menuText;
+  menuActiveText: $menuActiveText;
+  subMenuActiveText: $subMenuActiveText;
+  menuBg: $menuBg;
+  menuHover: $menuHover;
+  subMenuBg: $subMenuBg;
+  subMenuHover: $subMenuHover;
+  sideBarWidth: $sideBarWidth;
+}

src/utils/request.js

@@ -9,6 +9,7 @@ import router from '../router'
 import { refreshToken } from '@/api/login.js'
 
 axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+const issm4encode = process.env.VUE_APP_IS_SM4ENCODE
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
@@ -34,6 +35,23 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  console.log("全局加密开关",issm4encode)
+  if(issm4encode){
+   
+    if(!config.entrct){
+      if (config.params) {
+        config.params = { sign: (new SM4(JSON.stringify(config.params)).encryptEcb()) }
+      } else {
+        if (config.data) {
+          config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+          console.log(JSON.stringify(config.data))
+          const temp = { sign: (new SM4(JSON.stringify(config.data)).encryptEcb()) }
+          config.data = Qs.stringify(temp, { arrayFormat: 'indices', allowDots: true })
+        }
+      }
+    }
+  }
+  
   // 参数发出前统一进行加密 白名单内的不进行加密
   /* console.log(config)
   if ((config.baseURL + config.url).indexOf('authority') < 0 && (config.baseURL + config.url).indexOf('internal') < 0) {

src/views/login/login.vue

@@ -8,6 +8,10 @@
     <div v-if="themeType && themeType === '9'" class="loginTitle">
       <img class="login-logo" src="../../assets/themeIImage/big-logo.png" />
       
+    </div>
+    <div v-if="themeType && themeType === '10'" class="loginTitle">
+      <img class="login-logo" src="../../assets/themeJImage/big-logo.png" />
+      
     </div>
     <el-form
       ref="loginForm"
@@ -16,9 +20,9 @@
       class="login-form"
     >
       <div class="login_logoRow">
-        <div class="login_form_logo" v-if="themeType && themeType !== '9'" />
+        <div class="login_form_logo" v-if="themeType && themeType !== '9' && themeType !== '10'" />
       </div>
-      <div class="loginTitleRow" v-if="themeType && themeType !== '9'">
+      <div class="loginTitleRow" v-if="themeType && themeType !== '9' && themeType !== '10'">
         <div v-if="themeType && themeType === '7'" class="title">
           Sign Up to your acco
         </div>

src/views/monitor/log.vue

@@ -48,42 +48,3 @@ export default {
     }
 }
 </script>
-<style lang="scss" scoped>
-.topSubMenu {
-    display: flex;
-    width: 98%;
-    margin: 0 1%;
-
-    .tsmBtn {
-        width: 180px;
-        height: 72px;
-        background: #EBF1FF;
-        border-radius: 10px;
-        margin-right: 24px;
-        font-family: PingFangSC-Medium;
-        font-weight: 500;
-        font-size: 20px;
-        color: #98A4BF;
-        letter-spacing: 0;
-        line-height: 15px;
-        border: none !important;
-    }
-
-    .tsmactive {
-        background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
-        box-shadow: 0 2px 2px 0 #ACB2C1;
-        border-radius: 10px;
-        font-family: PingFangSC-Semibold;
-        font-weight: 600;
-        font-size: 20px;
-        color: #FFFFFF;
-        letter-spacing: 0;
-        line-height: 15px;
-        text-decoration: underline;
-    }
-
-}
-.BdoySubMenu{
-    margin-top: 20px;
-}
-</style>
\ No newline at end of file

src/views/screen/info.vue

@@ -251,80 +251,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-.info-main {
-  width: 98%;
-  margin: 10px 1%;
-
-  .info-title {
-    font-family: PingFangSC-Semibold;
-    font-weight: 600;
-    font-size: 22px;
-    color: #3D3D3D;
-    letter-spacing: 0;
-    margin-bottom: 27px;
-    margin-left: 12px;
-    position: relative;
-
-    .smallbox {
-      width: 4px;
-      height: 18px;
-      background: #225BDE;
-      position: absolute;
-      top: 5px;
-    }
-
-    span {
-      margin-left: 14px;
-    }
-  }
-
-  .info-content {
-    background: #EBF1FF;
-    margin-bottom: 34px;
-    border-radius: 20px;
-    padding: 26px;
-
-    .contentTitle {
-      color: #0D162A;
-      font-size: 22px;
-      font-family: Microsoft YaHei;
-      font-weight: 700;
-      text-align: LEFT;
-      // position: absolute;
-      // left: 0.25rem;
-      // top: 0.45rem;
-      // background-color: #000;
-    }
-
-    //title下划线样式
-    .contentLine {
-      margin-bottom: 27px;
-      width: 88px;
-      height: 4px;
-      background: #0062FF;
-      margin-top: 9px;
-
-    }
-    .cbox-item{
-      margin-left: 5px;
-    }
-  }
-
-}
-</style>
-<style>
-.cbox-item .el-form-item--small .el-form-item__label {
-  font-family: PingFangSC-Semibold;
-  font-weight: 600;
-  font-size: 20px;
-  color: #225BDE;
-}
-
-.cbox-item .el-form-item--small .el-form-item__content {
-  font-family: PingFangSC-Semibold;
-  font-weight: 600;
-  font-size: 20px;
-  color: #000000;
-}
-</style>
\ No newline at end of file

src/views/system/system.vue

@@ -47,42 +47,3 @@ export default {
     }
 }
 </script>
-<style lang="scss" scoped>
-.topSubMenu {
-    display: flex;
-    width: 98%;
-    margin: 0 1%;
-
-    .tsmBtn {
-        width: 180px;
-        height: 72px;
-        background: #EBF1FF;
-        border-radius: 10px;
-        margin-right: 24px;
-        font-family: PingFangSC-Medium;
-        font-weight: 500;
-        font-size: 20px;
-        color: #98A4BF;
-        letter-spacing: 0;
-        line-height: 15px;
-        border: none !important;
-    }
-
-    .tsmactive {
-        background-image: linear-gradient(180deg, #679CF6 0%, #4072EE 100%);
-        box-shadow: 0 2px 2px 0 #ACB2C1;
-        border-radius: 10px;
-        font-family: PingFangSC-Semibold;
-        font-weight: 600;
-        font-size: 20px;
-        color: #FFFFFF;
-        letter-spacing: 0;
-        line-height: 15px;
-        text-decoration: underline;
-    }
-
-}
-.BdoySubMenu{
-    margin-top: 20px;
-}
-</style>
\ No newline at end of file

src/views/system/user/index.vue

@@ -38,7 +38,7 @@
         <el-col :span="24" :xs="24">
           <div class="tableTitle">用户管理列表</div>
           <div class="titleLine"></div>
-          <el-table v-loading="loading" style="padding-right: 10px" :data="userList">
+          <el-table v-loading="loading"  :data="userList">
             <el-table-column type="index" label="序号" width="90" />
             <el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
               <template slot-scope="scope">