Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/api/admin.js

@@ -12,7 +12,7 @@ export default {
    */
   ChangePassword(params) {
     return axios({
-      url: '/permission/api/admin/changePassword',
+      url: '/permission/api/personnel/changePwd',
       method: 'post',
       params: params
     })

RMS-FrontEnd/src/views/layout/components/UserBar.vue

@@ -10,7 +10,7 @@
         <el-dropdown-menu>
           <!-- <el-dropdown-item command="userinfo">个人信息</el-dropdown-item> -->
           <el-dropdown-item command="changePwd" v-if="$permission('/admin/updatePassword')" >修改密码</el-dropdown-item>
-          <el-dropdown-item command="AnalysisSystem">分析系统</el-dropdown-item>
+          <el-dropdown-item command="AnalysisSystem" v-if="$permission('/pcs/analysisSystem')">分析系统</el-dropdown-item>
           <el-dropdown-item command="set">设置</el-dropdown-item>
           <el-dropdown-item divided command="doLogout">退出登录</el-dropdown-item>
         </el-dropdown-menu>