Browse Source

修改密码屏蔽及反馈问题调整

liangluogis 1 year ago
parent
commit
1dc822cf12

+ 3 - 3
src/layout/components/Header/index.vue

@@ -141,11 +141,11 @@
               @click.native="userEdit = true"
               >账号编辑</el-dropdown-item
             >
-            <el-dropdown-item
+            <!-- <el-dropdown-item
               :divided="showAccountApply"
               @click.native="changePassword"
               >修改密码</el-dropdown-item
-            >
+            > -->
             <el-dropdown-item divided @click.native="logout">
               <span style="display: block">退出登录</span>
             </el-dropdown-item>
@@ -509,6 +509,7 @@ export default {
       }
     },
     handleSys(event) {
+      debugger
       if (event.name === "mis") {
         // 跳转到营销系统
         getUserMiddle({ userName: this.$store.state.user.userId })
@@ -556,7 +557,6 @@ export default {
         ) {
           this.$router.push("/map");
         }
-        debugger
         const sideBarShow = this.$store.state.app.sidebar.show;
         if (!sideBarShow) this.$store.dispatch("app/toggleSideBarShow", true);
         this.$store.dispatch("routeSetting/changeSys", event.name || event);

+ 2 - 2
src/layout/components/Navbar.vue

@@ -21,9 +21,9 @@
             <!-- <el-dropdown-item @click.native="personalCenter">
               个人中心
             </el-dropdown-item> -->
-            <el-dropdown-item @click.native="changePassword">
+            <!-- <el-dropdown-item @click.native="changePassword">
               修改密码
-            </el-dropdown-item>
+            </el-dropdown-item> -->
             <el-dropdown-item divided @click.native="logout">
               <span style="display:block;">退出登录</span>
             </el-dropdown-item>

+ 1 - 1
src/permission.js

@@ -98,7 +98,7 @@ router.beforeEach(async(to, from, next) => {
               tempFunction(to.path , 'hotline')
             }else if(to.path.indexOf('dmaManage')!=-1){
               tempFunction(to.path , 'regionalMetering')
-            }else   if (['/map', '/xjxt',  '/scada'].indexOf(to.path) > -1){
+            }else if (['/map', '/xjxt',  '/scada'].indexOf(to.path) > -1){
               tempFunction('/map' ,to.path.replace(/\//,''))
             }else {
               next({ ...to })

+ 1 - 1
src/utils/request.js

@@ -22,7 +22,7 @@ export const IP = tempIP;
 // export const IP=tempIP
 // export const NewIp = 'http://58.17.241.6:1212'
 const service = axios.create({
-  baseURL: tempIP,
+  // baseURL: tempIP,
   // baseURL:"",
   withCredentials: true, // 跨域请求时发送cookiesokies
   timeout: 60000 // 请求超时

+ 1 - 1
src/views/currentSystem/authorityManagement/userRights/index.vue

@@ -118,7 +118,7 @@
           <el-button size="small" type="primary">批量导入</el-button>
         </el-upload>
         <el-button type="primary" size="small" @click="exportDownload">导出</el-button>
-        <el-button type="primary" size="small" :disabled="multipleSelection.length === 0" @click="resetPwd">重置密码</el-button>
+        <!-- <el-button type="primary" size="small" :disabled="multipleSelection.length === 0" @click="resetPwd">重置密码</el-button> -->
         <el-button type="primary" size="small" :disabled="existEnableFlag" @click="handleAuthOperation('enable')">启用</el-button>
         <el-button type="primary" size="small" :disabled="existDisableFlag" @click="handleAuthOperation('disable')">禁用</el-button>
         <el-button type="primary" size="small" :disabled="existLockFlag" @click="handleAuthOperation('unlock')">解锁</el-button>

+ 2 - 2
src/views/login/index.vue

@@ -323,8 +323,8 @@ export default {
             this.$router.push({path:"/goToModuleInfo&&"+ip});
           }
         }else{
-          // this.$router.push({ path: "/" });
-          this.$router.push({ path: "/dmaManage/DMAHomePage" });
+          this.$router.push({ path: "/" });
+          // this.$router.push({path:"scada","routeSettingChangeSys":"scada"});
         }
       }
     },