Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

8 小时以前 b16c2f3fc117d8949b35c74b260e65d8816f711d

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 admin/.env.development

@@ -5,9 +5,9 @@

# VUE_APP_API_URL  = 'http://192.168.1.45:10010'

# VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://localhost:10010'

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'


 admin/src/components/common/CommonHeader.vue

@@ -166,19 +166,25 @@
    getHeaderNav (item,index) {
      this.setCurrentIndex(index)
      if(item.linkType === 0){
        console.log('setTopMenuCurrent')
        this.setTopMenuCurrent(item)
      }else{
        if (item.url && item.url === 'goHKAF' && item.params != null) {
          this.getHKAFHeaderNav(item.params)
          this.getHKAFHeaderNav(item.params, item.label)
        } else if (item.url && item.url.indexOf('http') === 0) {
          window.open(item.url, '_blank')
        }
      }
    },
    getHKAFHeaderNav (type) {
    getHKAFHeaderNav (type, label) {
      getAppHeaderNav(type).then(res => {
        window.open(res, '_blank')
        if (label === '安防中心') {
          let openWindow = window.open(res, '_blank')
          setTimeout(() => {
            openWindow.close()
          }, 7 * 1000)
        } else {
          window.open(res, '_blank')
        }
      })
    },
    handleTest () {

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -288,9 +288,9 @@
     * 3、能管中心：ngzx
     */
    public interface MenuPageId{
        String[] componentIds = new String[]{"Infovision iPark Platform","dfe","cems"};
        String afzx = "afzx";//安防中心
        String xkzx = "xkzx";//消控中心
        String[] componentIds = new String[]{"vms","fem","cems"};
        String afzx = "010100";//安防中心
        String xkzx = "000101";//消控中心
        String ngzx = "ngzx";//能管中心
        String jsc = "jsc";//物业后勤
        String kqgzt = "attendance_workstand";//考勤管理

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -1211,8 +1211,9 @@
        String componentId = HKConstants.MenuPageId.componentIds[0];
        String menuId = HKConstants.MenuPageId.afzx;
        if(Constants.equalsInteger(type,Constants.ONE)){
            componentId = HKConstants.MenuPageId.componentIds[1];
            menuId = HKConstants.MenuPageId.xkzx;
        }else  if(Constants.equalsInteger(type,Constants.TWO)){
        }/*else  if(Constants.equalsInteger(type,Constants.TWO)){
            menuId = HKConstants.MenuPageId.ngzx;
        }else  if(Constants.equalsInteger(type,Constants.THREE)){
            menuId = HKConstants.MenuPageId.jsc;
@@ -1227,10 +1228,11 @@
//            return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
        }else if(Constants.equalsInteger(type,7)){
            menuId = HKConstants.MenuPageId.hqzx;
        }
        }*/
        log.info("【海康获取工作台菜单免密登陆调整地址】================开始====menuId:"+menuId+"==token:"+token);
        try {
            ///xauthplus-plugin/thirdLogin?type=third&componentId=${componentId}&componentMenuId=${menuId}&token=${token}
            ///xauthplus-plugin/thirdLogin?type=third&componentld=vms&componentMenuld=010100
            String res = HKTools.getMenuUrl(componentId,menuId,token);
            return  res;
        }catch (Exception e){