wenbobowen 4 年之前
父節點
當前提交
51fef3cbde
共有 4 個文件被更改,包括 21 次插入3 次删除
  1. 9 1
      src/api/workSchedule.js
  2. 2 0
      src/apiConfig/api.js
  3. 3 1
      src/apiConfig/requestIP.js
  4. 7 1
      src/views/workbench/team/index.vue

+ 9 - 1
src/api/workSchedule.js

@@ -1,6 +1,6 @@
 // 个人工作台和团队工作台
 import request from '@/utils/request'
-import { TeamManagement } from '@/apiConfig/api'
+import { TeamManagement, teamWorkbenchUrl } from '@/apiConfig/api'
 
 // 获取用户团队列表
 export function queryTeamInfoList(data) {
@@ -278,3 +278,11 @@ export function settingGetCalendar() {
     method: 'get'
   })
 }
+
+// 获取用户信息
+export function getStaffByUsername(name) {
+  return request({
+    url: teamWorkbenchUrl + `/api/staff/getStaffByUsername?username=${name}`,
+    method: 'get'
+  })
+}

+ 2 - 0
src/apiConfig/api.js

@@ -17,6 +17,8 @@ export const vehicleUrl_online = 'http://10.190.9.230:9999' // 虚拟硬件 zhih
 
 export const projectManagementUrl = requestIp + '/project-management' //项目管理
 
+export const teamWorkbenchUrl = requestIp + '/ldip-server' // 团队工作台
+
 export const ldapServer = requestIp + '/ldap-server' //邮箱查询
 
 export const TeamManagement = projectManagementUrl // 团队配置 项目

+ 3 - 1
src/apiConfig/requestIP.js

@@ -13,9 +13,11 @@ if (location.host.indexOf('localhost') < 0) {
   logoutUrl = host + '/sso/logout?jumpto=' + location.href
   if (host.indexOf('zhihui-pre.intra.xiaojukeji.com') >= 0) {
     envTag = 'pre'
+    envUrl = 'http://zhihui-pre.intra.xiaojukeji.com/zhihui_env/'
+    toolsUrl = 'http://zhihui-pre.intra.xiaojukeji.com/tools/'
   } else if (host.indexOf('zhihui.xiaojukeji.com') >= 0) {
     envTag = 'online'
-    envUrl = 'http://zhihui-env.intra.xiaojukeji.com/#/env'
+    envUrl = 'http://zhihui.xiaojukeji.com/zhihui_env/'
     toolsUrl = 'http://zhihui.xiaojukeji.com/tools/'
   }
 }

+ 7 - 1
src/views/workbench/team/index.vue

@@ -206,7 +206,8 @@ import {
   getTeamBugSummary,
   getTeamBugDisDataBy,
   teamReminding,
-  settingQueryBizAndTeamInfo
+  settingQueryBizAndTeamInfo,
+  getStaffByUsername
 } from '@/api/workSchedule'
 import { getSeprateDayInfo, scheduleDelete } from '@/api/projectViewDetails'
 import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
@@ -343,11 +344,16 @@ export default {
   mounted() {
     this.queryTeamInfoList([-1])
     this.teamReminding()
+    this.getStaffByUsername()
   },
   methods: {
     setCascader() {
       this.$refs.cascader.$el.click()
     },
+    async getStaffByUsername() {
+      const res = await getStaffByUsername('qinzhipeng_v')
+      console.log(res, 'cdcdc')
+    },
     handleBizIdChange(val, option) {
       if (val.length > 0) {
         const one = val[0]