sasp-admin 0.2.63 → 0.2.64

package/src/views/log/loginlog/logManageEnt.vue

@@ -5,56 +5,63 @@
             <div class="search-form-parent el-card">
                 <el-form :inline="true" :model="crud.searchForm" size="small"
                          class="demo-form-inline"  @keyup.enter.native="crud.doSearch()" onSubmit="return false;">
-                    <el-form-item  label="登录时间"   >
-                        <el-date-picker   type="date" v-model="crud.searchForm.loginTimeQ"
-                                          range-separator="至"
-                                          start-placeholder="开始日期"
-                                          end-placeholder="结束日期"
-                                          style="width: 140px" >
-
-                        </el-date-picker> -
-                        <el-date-picker  type="date"  v-model="crud.searchForm.loginTimeZ"    style="width: 140px"  ></el-date-picker>
-                    </el-form-item>
-
-                    <el-form-item label="账号"  style="margin-left: 20px">
-                        <el-input   v-model="crud.searchForm.userAccount"  style="width:120px" ></el-input>
-                    </el-form-item>
+<!--                    <el-form-item  label="登录时间"   >-->
+<!--                        <el-date-picker   type="date" v-model="crud.searchForm.loginTimeQ"-->
+<!--                                          range-separator="至"-->
+<!--                                          start-placeholder="开始日期"-->
+<!--                                          end-placeholder="结束日期"-->
+<!--                                          style="width: 140px" >-->
+
+<!--                        </el-date-picker> - -->
+<!--                        <el-date-picker  type="date"  v-model="crud.searchForm.loginTimeZ"    style="width: 140px"  ></el-date-picker>-->
+<!--                    </el-form-item>-->
+
+<!--                    <el-form-item label="账号"  style="margin-left: 20px">-->
+<!--                        <el-input   v-model="crud.searchForm.userAccount"  style="width:120px" ></el-input>-->
+<!--                    </el-form-item>-->
                     <el-form-item label="姓名"  style="margin-left: 20px">
-                        <el-input  v-model="crud.searchForm.userName"  style="width: 120px" ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="所在地区"   label-position="right"  style="margin-left: 20px" >
-                        <el-select v-model="crud.searchForm.city"  style="width: 150px"  @change="formTypeChangeCity">
-                            <el-option
-                                    v-for="item in formTypeCityOptions"
-                                    :key="item.id"
-                                    :label="item.dataName"
-                                    :value="item.id"
-                            >
-                            </el-option>
-                        </el-select>-
-                        <el-select  v-model="crud.searchForm.area"   style="width: 150px"  @change="formTypeChangeArea" >
-                            <el-option
-                                    v-for="item in formTypeAreaOptions"
-                                    :key="item.id"
-                                    :label="item.dataName"
-                                    :value="item.id"
-                            >
-                            </el-option>
-                        </el-select>-
-                        <el-select  v-model="crud.searchForm.street"  style="width: 150px" >
-                            <el-option
-                                    v-for="item in formTypeStreetOptions"
-                                    :key="item.id"
-                                    :label="item.dataName"
-                                    :value="item.id">
-                            </el-option>
+                        <el-select v-model="crud.searchForm.userId" clearable filterable placeholder="请选择">
+                          <el-option
+                              v-for="item in sysUserArr"
+                              :key="item.id"
+                              :label="item.userName"
+                              :value="item.userId">
+                          </el-option>
                         </el-select>
                     </el-form-item>
 
+<!--                    <el-form-item label="所在地区"   label-position="right"  style="margin-left: 20px" >-->
+<!--                        <el-select v-model="crud.searchForm.city"  style="width: 150px"  @change="formTypeChangeCity">-->
+<!--                            <el-option-->
+<!--                                    v-for="item in formTypeCityOptions"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.dataName"-->
+<!--                                    :value="item.id"-->
+<!--                            >-->
+<!--                            </el-option>-->
+<!--                        </el-select>- -->
+<!--                        <el-select  v-model="crud.searchForm.area"   style="width: 150px"  @change="formTypeChangeArea" >-->
+<!--                            <el-option-->
+<!--                                    v-for="item in formTypeAreaOptions"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.dataName"-->
+<!--                                    :value="item.id"-->
+<!--                            >-->
+<!--                            </el-option>-->
+<!--                        </el-select>- -->
+<!--                        <el-select  v-model="crud.searchForm.street"  style="width: 150px" >-->
+<!--                            <el-option-->
+<!--                                    v-for="item in formTypeStreetOptions"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.dataName"-->
+<!--                                    :value="item.id">-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
+
 
                     <el-form-item>
-                        <el-button   type="primary" icon="el-icon-search" @click="crud.doSearch()">查询</el-button>
+                        <el-button  type="primary" icon="el-icon-search" @click="crud.doSearch()">查询</el-button>
                         <el-button  icon="el-icon-close" @click="crud.resetSearch()">清空</el-button>
                     </el-form-item>
 
@@ -73,12 +80,12 @@
 <!--                        <el-table-column label="单位及部门" prop="orgName" align="center"></el-table-column>-->
                         <el-table-column label="账号" prop="userAccount" align="center"    >
                             <template slot-scope="scope">
-                                {{loginUser.userAccount}}
+                                {{userNameFormat(scope.row,'account')}}
                             </template>
                         </el-table-column>
-                        <el-table-column  label="姓名" prop="userName"   align="center" >
+                        <el-table-column  label="姓名" prop="userName" align="center" >
                             <template slot-scope="scope">
-                                {{loginUser.userName}}
+                                {{userNameFormat(scope.row,'name')}}
                             </template>
                         </el-table-column>
                         <el-table-column  label="登录时间" prop="loginTime" :formatter="viewDateFormat"  align="center" >
@@ -144,7 +151,7 @@
                 formData:{
                     id:"", 'orgName':"",'userAccount':"",'userName':"",'loginTime':"",'totalTime':"", 'clientIp':""
                 }, //弹出框初始值
-
+                sysUserArr:[],
 
             }
         },
@@ -152,7 +159,20 @@
 
         created(){
             let vm = this;
-            this.initData();
+            vm.axios.post(this.api.sysOrgPosUser.findNoPage).then(res=>{
+                if(res && res.data){
+
+                    let obj = {
+                        id:vm.loginUser.id,
+                        userId:vm.loginUser.id,
+                        userName: vm.loginUser.userName,
+                        userNameQp: vm.loginUser.userAccount,
+                    }
+                    vm.sysUserArr = res.data;
+                    vm.sysUserArr.push(obj);
+                }
+                this.initData();
+            })
         },
         watch: {
             //监听日期表单变化 crud.searchForm.area
@@ -220,7 +240,25 @@
                 crud.search(vm.checkSelectedMsg);
             },
 
-
+            userNameFormat(val,type){
+                let returnValue = '';
+                if(type == 'name'){
+                    returnValue = this.loginUser.userName;
+                }else{
+                    returnValue = this.loginUser.userAccount;
+                }
+                (this.sysUserArr || []).forEach(item=>{
+                    if(item.userId == val.userId){
+                        if(type == 'name'){
+                            returnValue = item.userName;
+                        }
+                        if(type == 'account'){
+                            returnValue = item.userNameQp;
+                        }
+                    }
+                })
+                return returnValue;
+            },
             //日期格式化
             viewDateFormat(value, time) {
                 let d =  new Date(value.createTime);
@@ -236,11 +274,14 @@
                         "q+": Math.floor((date.getMonth() + 3) / 3), //季度
                         "S": date.getMilliseconds()             //毫秒
                     };
-                    if (/(y+)/.test(fmt))
-                        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-                    for (let k in o)
-                        if (new RegExp("(" + k + ")").test(fmt))
-                            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                    if (/(y+)/.test(fmt)) {
+                      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+                    }
+                    for (let k in o) {
+                      if (new RegExp("(" + k + ")").test(fmt)) {
+                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                      }
+                    }
                 } else {
                     fmt = '无';
                 }

package/src/views/log/loginlog/logManageGov.vue

@@ -224,11 +224,14 @@
                         "q+": Math.floor((date.getMonth() + 3) / 3), //季度
                         "S": date.getMilliseconds()             //毫秒
                     };
-                    if (/(y+)/.test(fmt))
-                        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-                    for (let k in o)
-                        if (new RegExp("(" + k + ")").test(fmt))
-                            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                    if (/(y+)/.test(fmt)) {
+                      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+                    }
+                    for (let k in o) {
+                      if (new RegExp("(" + k + ")").test(fmt)) {
+                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                      }
+                    }
                 } else {
                     fmt = '无';
                 }

package/src/views/menu/component/menuManageComponent.vue

@@ -1974,11 +1974,9 @@
              */
             initTreeCheck(dataArr,keysArr){
                 (dataArr || []).forEach(item =>{
-                    if(!item["childrens"]){ //因为下级全部选中上级自动选中，所以不用考虑上级
+                    if(!item["childrens"]&&item['enable']){ //因为下级全部选中上级自动选中，所以不用考虑上级
                         // this.$refs.operatePermisRef.setCheckedKeys([item['key']]);
-                        if(item['enable']){ //当前已选择
-                            keysArr.push(item['key']);
-                        }
+                        keysArr.push(item['key']);
                     }
                     if(item["childrens"]){
                         this.initTreeCheck(item["childrens"],keysArr);
@@ -2111,7 +2109,7 @@
                                 item["childrens"].splice(index,1);
                                 keyArr.splice(index,1);
                             }else{
-                                this.$set(child,'enable',true); ;//设置可编辑状态
+                                this.$set(child,'enable',true);//设置可编辑状态
                                 this.isHalfOperationKeyArr.push(child.key);
                             }
                             halfOperatArr = item["childrens"];

package/src/views/menuRouter/menuView.vue

@@ -1,129 +1,238 @@
 <template>
-    <ifm-link :link-url="linkUrl" v-if="isIfm">
-    </ifm-link>
+  <ifm-link :link-url="linkUrl" v-if="isIfm">
+  </ifm-link>
 </template>
 
 <script>
-    import IfmLink from "../../components/ifmLink";
-    export default {
-        name: "menuView",
-        components: {IfmLink},
-        data(){
-            return{
-                oldFullPath:this.$route.fullPath,
-                resourceId:this.$route.params.resourceId,
-                menuId:this.$route.query.menuId,
-                menuResourceUrl:{},
-                linkUrl:'', //外部链接地址
-                isIfm:false
+import IfmLink from "../../components/ifmLink";
+
+export default {
+  name: "menuView",
+  components: {IfmLink},
+  data() {
+    return {
+      oldFullPath: "",
+      resourceId: this.$route.params.resourceId,
+      menuId: this.$route.query.menuId,
+      menuResourceUrl: {},
+      linkUrl: '', //外部链接地址
+      isIfm: false,
+      operateAuthArr: [], // 操作权限Arr（这里主要是为了自定义跳转时添加上router参数）
+      dataPowerKeyArr: [] // 数据权限Arr
+
+    }
+  },
+  created() {
+    this.initRouter();
+      this.oldFullPath = this.$route.fullPath;
+  },
+  watch: {
+    '$route.fullPath'() {
+      if (this.$route.fullPath.indexOf("/menuView/") == -1) {
+        return;
+      }
+      if (this.$route.fullPath !== this.oldFullPath) {
+        return;
+      }
+      window.menuViewWatch = window.menuViewWatch || {};
+      if (window.menuViewWatch[this.$route.fullPath] && new Date().getTime() - window.menuViewWatch[this.$route.fullPath] < 10) {
+        return;
+      }
+      window.menuViewWatch[this.$route.fullPath] = new Date().getTime();
+      // console.log("...oldFullPath...", this.oldFullPath);
+      // console.log("...fullPath...", this.$route.fullPath);
+      this.menuId = this.$route.query.menuId;
+      if (this.$route.params.resourceId && this.resourceId != this.$route.params.resourceId) {
+        this.resourceId = this.$route.params.resourceId;
+      }
+      this.initRouter();
+    },
+  },
+  methods: {
+    initRouter() { //初始化跳转
+      this.linkUrl = '';
+      this.isIfm = false;
+      // 会涉及到同异步问题，所以需要多次判断
+      if (this.$route.fullPath.indexOf("/menuView/") == -1) {
+        this.routerPush(this.$route.fullPath);
+        return;
+      }
+      if (this.menuResourceUrl[this.menuId]) {
+        if (this.menuResourceUrl[this.menuId].indexOf("http://") > -1 || this.menuResourceUrl[this.menuId].indexOf("https://") > -1 ||
+            this.menuResourceUrl[this.menuId].indexOf(".jsp") > -1 || this.menuResourceUrl[this.menuId].indexOf(".html") > -1) {
+          this.linkUrl = this.menuResourceUrl[this.menuId];
+          this.isIfm = true;
+          return false;
+        } else {
+          this.routerPush(this.menuResourceUrl[this.menuId]);
+        }
+        return;
+      }
+      this.RES_GLOBAL.getById(this.resourceId).then(resData => {
+        let url = "";
+        if (resData) {
+          if (resData.rstatus == '0') {
+            this.$message({
+              message: "该资源已禁用，无法访问！",
+              type: 'warning'
+            });
+            return false;
+          }
+          let firstUrl = this.$route.fullPath;
+
+          // 会涉及到同异步问题，所以需要多次判断
+          if (firstUrl.indexOf("/menuView/") == -1) {
+            url = this.$route.fullPath;
+          } else if (resData.rsource == "url") {
+            url = resData.ragentUrl;
+          } else if (this.VIEW_COMPONENTS[resData.rsource]) {
+            firstUrl = firstUrl.substring(0, firstUrl.indexOf("/menuView/"));
+            url = firstUrl + "/" + this.VIEW_COMPONENTS[resData.rsource].menu + "/" + this.resourceId;
+          } else {
+            let resourceKey = "";
+            this.QIANKUN_ACTIVE_RULES.forEach(item => {
+              if (resData.rsource.indexOf(item) > -1) {
+                resourceKey = item;
+              }
+              if (this.VIEW_COMPONENTS[resourceKey]) {
+                firstUrl = firstUrl.substring(0, firstUrl.indexOf("/menuView/"));
+                url = firstUrl + "/" + this.VIEW_COMPONENTS[resourceKey].menu + "/" + this.resourceId;
+              }
+            });
+          }
+        }
+        this.menuId && (this.menuResourceUrl[this.menuId] = url);
+        //执行跳转
+        if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
+          this.linkUrl = url;
+          this.isIfm = true;
+          // window.open(url);
+          return false;
+        } else if (url.indexOf(".jsp") > -1 || url.indexOf(".html") > -1) {
+          this.$message("暂无功能！");
+          return false;
+        }
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.routerPush(url);
+          })
+          // 执行跳转
+        })
+
+      });
+    },
+
+      /**
+       * 生成数据权限与操作权限
+       */
+      buildOptAndDataAuth(){
+          return new Promise((resolve, reject) => {
+              this.operateAuthArr = [];
+              this.dataPowerKeyArr = [];
+              let menuObj = window.menuIdToMenuObj[this.menuId];
+              this.RES_GLOBAL.getById(this.resourceId).then(resourceObj => {
+                  this.RES_GLOBAL.getUserOwnMenuOpt().then(datas => {
+                      let roleOptArr = [];
+                      (datas || []).forEach(item => {
+                          if (item.menuId === this.menuId) {
+                              roleOptArr.push(item);
+                          }
+                      });
+                      if(roleOptArr.length > 0){
+                          //遍历权限
+                          let optPowerArr = []; //操作权限
+                          let dataPowerArr = []; //数据权限
+                          roleOptArr.forEach(item =>{
+                              if(item.optPower){
+                                  optPowerArr = optPowerArr.concat(item.optPower.split(",") || []);
+                              }
+                              if (item.dataPower){
+                                  dataPowerArr = dataPowerArr.concat(item.dataPower.split(",") || []);
+                              }
+                          });
+                          //去重
+                          let optPowerSet = new Set(optPowerArr);
+                          optPowerArr = Array.from(optPowerSet);
+                          //去重
+                          let dataPowerSet = new Set(dataPowerArr);
+                          dataPowerArr = Array.from(dataPowerSet);
+                          let operatePermisList = ((menuObj || {}).operatePermis || '').split(","); //菜单操作权限
+                          (resourceObj.operatePermisList || []).forEach(item =>{
+                              // 菜单与角色权限同时存在时可以显示
+                              if((optPowerArr || []) .indexOf(item.id) > -1 && operatePermisList.indexOf(item.id) > -1){
+                                  this.operateAuthArr.push(item.powerCode); //操作权限
+                              }
+                          });
+                          let dataPermisList = ((menuObj || {}).dataPermis || '').split(",");//菜单数据权限
+                          (resourceObj.dataPermisList || []).forEach(item =>{ //数据权限
+                              if((dataPowerArr || []) .indexOf(item.id) > -1 && dataPermisList.indexOf(item.id) > -1){
+                                  this.dataPowerKeyArr.push(item.powerCode); //数据权限 arr
+                              }
+                          });
+                      }
+                      resolve();
+                  })
+              })
+          })
+      },
+
+    /**
+     * 请求跳转
+     */
+    routerPush(url, param) {
+        this.buildOptAndDataAuth().then(() => {
+// 获取完整的url
+            let getFullUrl = (url) => {
+                // 使用正则判断原有url中是否包含resourceId和menuId，如果有则替换，没有则追加
+                if (url.match(/resourceId=/)) {
+                    url = url.replace(/resourceId=[^&]*/, `resourceId=${this.resourceId || ''}`);
+                } else {
+                    url += `&resourceId=${this.resourceId || ''}`;
+                }
+
+                if (url.match(/menuId=/)) {
+                    url = url.replace(/menuId=[^&]*/, `menuId=${this.menuId || ''}`);
+                } else {
+                    url += `&menuId=${this.menuId || ''}`;
+                }
+
+                url = url.replace("?&", "?");
+                (url.indexOf("?") == -1) && (url = url.replace("&", "?"));
+
+                // 拼接操作权限
+                if(this.operateAuthArr.length > 0){
+                    url += "&spcpOptCode=" + (this.operateAuthArr || []).join(",");
+                }
+                // 拼接数据权限
+                if(this.dataPowerKeyArr.length > 0){
+                    url += "&spcpDataCode=" + (this.dataPowerKeyArr || []).join(",");
+                }
+
+                return url;
             }
-        },
-        created(){
-            this.initRouter();
-        },
-        watch: {
-          '$route.fullPath'() {
-            window.menuViewWatch = window.menuViewWatch || {};
-            if (window.menuViewWatch[this.$route.fullPath] && new Date().getTime() - window.menuViewWatch[this.$route.fullPath] < 10) {
-              return;
+            let sFullUrl = getFullUrl(url);
+
+            if (this.$route.fullPath === sFullUrl) {
+                return;
             }
-            window.menuViewWatch[this.$route.fullPath] = new Date().getTime();
-            // console.log("...oldFullPath...", this.oldFullPath);
-            // console.log("...fullPath...", this.$route.fullPath);
-            this.menuId = this.$route.query.menuId;
-            if (this.$route.params.resourceId && this.resourceId != this.$route.params.resourceId) {
-              this.resourceId = this.$route.params.resourceId;
+
+            // while循环获取调用replaceRealMenuUrl方法，避免死循环
+            let $parent = this.$parent;
+            let i = 0;
+
+            while ((!$parent.replaceRealMenuUrl) && ($parent != this.$root) && (++i < 10)) {
+                $parent = $parent.$parent;
             }
-            this.initRouter();
-          },
-        },
-        methods: {
-            initRouter() { //初始化跳转
-                this.linkUrl = '';
-                this.isIfm = false;
-                // 会涉及到同异步问题，所以需要多次判断
-                if (this.$route.fullPath.indexOf("/menuView/") == -1) {
-                    this.routerPush(this.$route.fullPath);
-                    return;
-                }
-                if (this.menuResourceUrl[this.menuId]) {
-                    if(this.menuResourceUrl[this.menuId].indexOf("http://") > -1 || this.menuResourceUrl[this.menuId].indexOf("https://") > -1||
-                    this.menuResourceUrl[this.menuId].indexOf(".jsp")>-1||this.menuResourceUrl[this.menuId].indexOf(".html")>-1){
-                        this.linkUrl = this.menuResourceUrl[this.menuId];
-                        this.isIfm = true;
-                        return false;
-                    }else{
-                        this.routerPush(this.menuResourceUrl[this.menuId]);
-                    }
-                    return;
-                }
+            $parent && $parent.replaceRealMenuUrl && $parent.replaceRealMenuUrl(sFullUrl);
 
-                this.RES_GLOBAL.getById(this.resourceId).then(resData => {
-                    let url = "";
-                    if (resData) {
-                        if(resData.rstatus == '0'){
-                            this.$message({
-                                message: "该资源已禁用，无法访问！",
-                                type: 'warning'
-                            });
-                            return false;
-                        }
-                        let firstUrl = this.$route.fullPath;
-
-                        // 会涉及到同异步问题，所以需要多次判断
-                        if (firstUrl.indexOf("/menuView/") == -1) {
-                            url = this.$route.fullPath;
-                        }else if (resData.rsource == "url") {
-                            url = resData.ragentUrl;
-                        } else if(this.VIEW_COMPONENTS[resData.rsource]){
-                            firstUrl = firstUrl.substring(0, firstUrl.indexOf("/menuView/"));
-                            url = firstUrl + "/" + this.VIEW_COMPONENTS[resData.rsource].menu + "/" + this.resourceId;
-                        } else {
-                          let resourceKey = "";
-                          this.QIANKUN_ACTIVE_RULES.forEach(item => {
-                            if (resData.rsource.indexOf(item) > -1) {
-                              resourceKey = item;
-                            }
-                            if (this.VIEW_COMPONENTS[resourceKey]) {
-                              firstUrl = firstUrl.substring(0, firstUrl.indexOf("/menuView/"));
-                              url = firstUrl + "/" + this.VIEW_COMPONENTS[resourceKey].menu + "/" + this.resourceId;
-                            }
-                          });
-                        }
-                    }
-                    this.menuId&&(this.menuResourceUrl[this.menuId] = url);
-                    //执行跳转
-                    if(url.indexOf("http://") > -1 || url.indexOf("https://") > -1){
-                        this.linkUrl = url;
-                        this.isIfm = true;
-                        // window.open(url);
-                        return false;
-                    }else if(url.indexOf(".jsp")>-1||url.indexOf(".html")>-1){
-                        this.$message("暂无功能！");
-                        return false;
-                    }
-
-                    this.$nextTick(() => {
-                      // 执行跳转
-                      this.routerPush(url);
-                    })
-
-                });
-            },
-
-            /**
-             * 请求跳转
-             */
-            routerPush(url,param) {
-                this.$router.push({
-                    path: url,
-                    query: {resourceId: this.resourceId,menuId:this.menuId}
-                });
-
-            },
+            this.$router.push({
+                path: sFullUrl
+            });
+        });
+    },
 
-        }
-    }
+  }
+}
 
 </script>
 

package/src/views/menuRouter/urlMenuRouter.vue

@@ -110,24 +110,21 @@
             },
           eachRouterSet(allRouterArr,urlArr,index){
             allRouterArr.forEach(item =>{
-              if(urlArr[index + 1]){
-                if(urlArr[index +1] == (item.name ? item.name : item.path)){
-                  //当前匹配
-                  //判断 urlArr是否存在下级
-                  if(index+2 >= urlArr.length){ //则当前地址为我需要的实际地址
-                    let componentString = item.component.toString();
-                    let arr = componentString.split("\"");
-                    this.activeUrl = arr[arr.length - 2] || '';
-                    this.activeIndex = item.component;
-                  }else if(item.children && item.children.length > 0) {
-                    //如果存在下级
-                    allRouterArr = item.children || [];
-                    index = index + 1;
-                    this.eachRouterSet(allRouterArr,urlArr,index);
-                  }
+              if(urlArr[index + 1] && urlArr[index +1] == (item.name ? item.name : item.path)){
+                //当前匹配
+                //判断 urlArr是否存在下级
+                if(index+2 >= urlArr.length){ //则当前地址为我需要的实际地址
+                  let componentString = item.component.toString();
+                  let arr = componentString.split("\"");
+                  this.activeUrl = arr[arr.length - 2] || '';
+                  this.activeIndex = item.component;
+                }else if(item.children && item.children.length > 0) {
+                  //如果存在下级
+                  allRouterArr = item.children || [];
+                  index = index + 1;
+                  this.eachRouterSet(allRouterArr,urlArr,index);
                 }
               }
-
             })
           },
             /**

package/src/views/org/entOrgTree.vue

@@ -580,10 +580,8 @@
                             if (currentData[elem]) {
                                 regionArr.push(currentData[elem]);
                             } else {
-                                if (!currentData["province"]) {
-                                    if(vm.cascadeOptions[0]){
+                                if (!currentData["province"] && vm.cascadeOptions[0]) {
                                         regionArr.push(vm.cascadeOptions[0].id);
-                                    }
                                 }
                                 break;
                             }