林倩 3 gadi atpakaļ
vecāks
revīzija
0ac09ad025

+ 36 - 36
config/dev.env.js

@@ -1,43 +1,43 @@
-"use strict";
-const merge = require("webpack-merge");
-const prodEnv = require("./prod.env");
+'use strict';
+const merge = require('webpack-merge');
+const prodEnv = require('./prod.env');
 module.exports = merge(prodEnv, {
-    NODE_ENV: '"development"',
-    IS_BASE_PACKAGE: "true",
-    FILE_BASE_PATH: '"http://192.168.10.14:1665"',
-    //以上配置一般不需要修改
+  NODE_ENV: '"development"',
+  IS_BASE_PACKAGE: 'true',
+  FILE_BASE_PATH: '"http://192.168.10.14:1665"',
+  //以上配置一般不需要修改
 
-    //使用easymock时,请将BASE_API设置为'"/easy-mock"'
-    // BASE_API: '"/easy-mock"',
-    BASE_API: '"/dcucauth"',
-    QQQ: '"/easy-mock2"',
+  //使用easymock时,请将BASE_API设置为'"/easy-mock"'
+  // BASE_API: '"/easy-mock"',
+  BASE_API: '"/dcucauth"',
+  QQQ: '"/easy-mock2"',
 
-    //是否需要登录验证
-    NEED_LOGIN: "false",
+  //是否需要登录验证
+  NEED_LOGIN: 'false',
 
-    //需要依赖的系统名称
-    // INSTALLED_PROJECT: "'zfba,demo2,cross-env'",
+  //需要依赖的系统名称
+  // INSTALLED_PROJECT: "'zfba,demo2,cross-env'",
 
-    //当使用Oauth2方式登录时需要配置CLIENT_ID和CLIENT_SECRET
-    IS_OAUTH2: "false",
-    // CLIENT_ID: '"apigw91419331"',
-    // CLIENT_SECRET: '"apigw94003010"',
-    // APP_CODE: '"apigw10000003"',
-    //LOGIN_PAGE:'"bjscLogin.jsp"',//是否自定义登录页
+  //当使用Oauth2方式登录时需要配置CLIENT_ID和CLIENT_SECRET
+  IS_OAUTH2: 'false',
+  // CLIENT_ID: '"apigw91419331"',
+  // CLIENT_SECRET: '"apigw94003010"',
+  // APP_CODE: '"apigw10000003"',
+  //LOGIN_PAGE:'"bjscLogin.jsp"',//是否自定义登录页
 
-    // 布局结构配置,可选项包含 `layout-menu-top`, `layout`
-    LAYOUT: '"layout"',
-    PORT: "8871",
-    //是否启用本地mock
-    IS_MOCK: "false",
-    PROT: "8871",
-    PROXY_TABLE: JSON.stringify({
-        "/dcucauth": {
-            // target: "http://10.11.1.237:8861"
-            // target: "http://10.254.11.203:8861"
-             target: "http://192.168.10.2:8871"
-            //  target: "http://192.168.6.133:3471"
-
-        }
-    })
+  // 布局结构配置,可选项包含 `layout-menu-top`, `layout`
+  LAYOUT: '"layout"',
+  PORT: '8871',
+  //是否启用本地mock
+  IS_MOCK: 'false',
+  PROT: '8871',
+  PROXY_TABLE: JSON.stringify({
+    '/dcucauth': {
+      // target: "http://10.11.1.237:8861"
+      // target: "http://10.254.11.203:8861"
+      //  target: "http://192.168.10.2:8871"
+      //  target: "http://192.168.6.133:3471"
+      target: 'http://192.168.6.131:3561'
+    }
+  })
 });

+ 5 - 2
src/components/search-bar/index.vue

@@ -76,6 +76,7 @@
 <script>
 import selectOrgTree from '@/components/select-org-tree';
 import selectApp from '@/components/select-app';
+import _ from 'lodash';
 export default {
   props: {
     conditionForm: {
@@ -120,7 +121,8 @@ export default {
     },
     handleReset() {
       const vm = this;
-      this.form.forEach((item) => {
+      let form = _.cloneDeep(this.form);
+      form.forEach((item) => {
         if (item.component) {
           item.value = '';
           if (item.component == 'SelectOrgTree') {
@@ -130,6 +132,7 @@ export default {
           }
         }
       });
+      this.form = form;
     },
     // 获取机构树选中值
     getOrgTreeValue(val, key = 'id') {
@@ -138,7 +141,7 @@ export default {
     },
     getOrgRootValue(val, key) {
       this.getOrgTreeValue(val, key);
-       this.$emit('submitDefaultSearch', this.setCondition());
+      this.$emit('submitDefaultSearch', this.setCondition());
     },
     // 获取应用系统选中值
     getAppValue(val, name) {

+ 1 - 0
src/pages/appfun-auth-manage/role-auth-manage/roleView.vue

@@ -216,6 +216,7 @@ export default {
     async handleRoleRowClick({ id, appId }) {
       this.saveRoleAuthParams.roleId = this.userCondition.roleId.value = id;
       this.saveRoleAuthParams.appId = appId;
+      this.$refs.userTable.clearAll();
       await this.getUserChecked();
       this.loadUserTable();
     },

+ 0 - 13
src/pages/layout/components/navbar.vue

@@ -17,20 +17,7 @@
         </div>
         <div class="l-main-header__center"></div>
         <div class="l-main-header__right">
-            <div class="l-search" @click.stop="handleClickSearch">
-                <span class="el-icon-search"></span>
-                <input
-                    v-model="searchValue"
-                    type="text"
-                    v-bind:class="{ 'is-active-search-show': activeShow, 'is-active-search-hide': activeHide }"
-                />
-            </div>
             <div style="display: inline-block; vertical-align: top">
-                <!--<el-tooltip :content="$t('navbar.screenfull')" effect="dark" placement="bottom">-->
-                <!--<screenfull class="l-screen-full" />-->
-                <!--</el-tooltip>-->
-                <!-- 换肤组件 -->
-                <dui-skins :options="skinOption" :currentSkin="'theme-default'" isCookie></dui-skins>
                 <!-- 用户操作区域 -->
                 <div class="l-avatar-box">
                     <i class="icon icon-user2"></i>

+ 1 - 1
src/router/index.js

@@ -18,7 +18,7 @@ import appfunAuthManageRouter from './modules/appfun-auth-manage';
 // 数据授权管理
 // import dataAuthManageRouter from './modules/data-auth-manage';
 // 名单管理
-// import listManageRouter from './modules/list-manage';
+import listManageRouter from './modules/list-manage';
 // 日志管理
 import logManage from './modules/log-manage';
 // 统计报表