Commit a76de6d8 authored by kangzhenfei's avatar kangzhenfei

更换 platform

parent 4670659f
...@@ -2,7 +2,8 @@ import Api from '@/plugins/request'; ...@@ -2,7 +2,8 @@ import Api from '@/plugins/request';
export default { export default {
getTable(data) { getTable(data) {
Api.get(`${systemUrl}/SysUser/GetAllSysUsers`) // Api.get(`${systemUrl}/SysUser/GetAllSysUsers`)
Api.get(`${system}/SysUser/GetAllSysUsers`)
.then(res => { .then(res => {
// {id:1,name:'张三',gender:'男',birthday:'1995-1-4',degree:'本科',title:'高级技工',jobNumber:'A0001',workLicense:'B0001',equipment:'E01',email:'abc@123.com',phone:'18000000222',department:'测试数控车1',jobName:'班组长',role:'班组长',account:'aaaaa',employeeNo:'C0001',modifyTime:'2019-8-8 10:10:10',status:1,remark:''} // {id:1,name:'张三',gender:'男',birthday:'1995-1-4',degree:'本科',title:'高级技工',jobNumber:'A0001',workLicense:'B0001',equipment:'E01',email:'abc@123.com',phone:'18000000222',department:'测试数控车1',jobName:'班组长',role:'班组长',account:'aaaaa',employeeNo:'C0001',modifyTime:'2019-8-8 10:10:10',status:1,remark:''}
let arrs = res.result.items; let arrs = res.result.items;
...@@ -43,7 +44,8 @@ export default { ...@@ -43,7 +44,8 @@ export default {
let model = { let model = {
Terms: terms Terms: terms
}; };
Api.get(`${systemUrl}/SysUser/GetSysUsers`, model) // Api.get(`${systemUrl}/SysUser/GetSysUsers`, model)
Api.get(`${system}/SysUser/GetSysUsers`, model)
.then(res => { .then(res => {
console.log(res); console.log(res);
let arrs = res.result.items; let arrs = res.result.items;
......
...@@ -320,7 +320,8 @@ export default { ...@@ -320,7 +320,8 @@ export default {
], ],
pageSize: 1 pageSize: 1
} }
this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => { // this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => {
this.$api.post(`${window.system}/config/list`, query).then((r) => {
if (r.success) { if (r.success) {
if (r.result.length == 1) { if (r.result.length == 1) {
this.userConfig = r.result[0] this.userConfig = r.result[0]
...@@ -335,7 +336,8 @@ export default { ...@@ -335,7 +336,8 @@ export default {
}) })
}, },
saveUserconfig() { saveUserconfig() {
let url = `${window.systemUrl}/config/update` // let url = `${window.systemUrl}/config/update`
let url = `${window.system}/config/update`
var content = [] var content = []
this.columnsCur.map((u) => { this.columnsCur.map((u) => {
content.push({ content.push({
...@@ -344,7 +346,8 @@ export default { ...@@ -344,7 +346,8 @@ export default {
}) })
}) })
if (!this.userConfig) { if (!this.userConfig) {
url = `${window.systemUrl}/config/create` // url = `${window.systemUrl}/config/create`
url = `${window.system}/config/create`
var data = { var data = {
page: window.location.pathname, page: window.location.pathname,
component: 'Grid', component: 'Grid',
......
...@@ -294,7 +294,8 @@ export default { ...@@ -294,7 +294,8 @@ export default {
], ],
pageSize: 1 pageSize: 1
} }
this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => { // this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => {
this.$api.post(`${window.system}/config/list`, query).then((r) => {
if (r.success) { if (r.success) {
if (r.result.length == 1) { if (r.result.length == 1) {
this.userConfig = r.result[0] this.userConfig = r.result[0]
...@@ -309,7 +310,8 @@ export default { ...@@ -309,7 +310,8 @@ export default {
}) })
}, },
saveUserconfig() { saveUserconfig() {
let url = `${window.systemUrl}/config/update` // let url = `${window.systemUrl}/config/update`
let url = `${window.system}/config/update`
var content = [] var content = []
this.columnsCur.map((u) => { this.columnsCur.map((u) => {
content.push({ content.push({
...@@ -318,7 +320,8 @@ export default { ...@@ -318,7 +320,8 @@ export default {
}) })
}) })
if (!this.userConfig) { if (!this.userConfig) {
url = `${window.systemUrl}/config/create` // url = `${window.systemUrl}/config/create`
url = `${window.system}/config/create`
var data = { var data = {
page: window.location.pathname, page: window.location.pathname,
component: 'Grid', component: 'Grid',
......
...@@ -72,9 +72,11 @@ export default { ...@@ -72,9 +72,11 @@ export default {
}, },
// 加载人员 // 加载人员
getselectuser(id) { getselectuser(id) {
let url = `${systemUrl}/user/getselectuser` // let url = `${systemUrl}/user/getselectuser`
let url = `${system}/account/getalluser`
this.$api this.$api
.post(url, { // .post(url, {
.get(url, {
// pageIndex: 1, // pageIndex: 1,
departmentId: id, departmentId: id,
type: this.type, type: this.type,
......
...@@ -10,8 +10,8 @@ let address=systemApi.dev; ...@@ -10,8 +10,8 @@ let address=systemApi.dev;
//let address=systemApi.local; //let address=systemApi.local;
window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理(基础数据) window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理(基础数据)
window.system =`http://${address}:10000/auth`;//多租户后台系统 // window.system =`http://${address}:10000/auth`;//多租户后台系统
// window.system =`http://${address}:10000/platform`;//多租户后台系统 window.system =`http://${address}:10000/platform`;//多租户后台系统 更换网关 platform
window.systemNew =`http://${address}:10000/platform`;//多租户后台系统-new 10130/platform/host/paged window.systemNew =`http://${address}:10000/platform`;//多租户后台系统-new 10130/platform/host/paged
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.designUrl = `http://${address}:10000/process`; // 工艺规程 window.designUrl = `http://${address}:10000/process`; // 工艺规程
......
...@@ -61,6 +61,7 @@ export const actions={ ...@@ -61,6 +61,7 @@ export const actions={
}, },
async loadDictionary({ commit }) { async loadDictionary({ commit }) {
let url = `${systemUrl}/Dictionary/GetAll` let url = `${systemUrl}/Dictionary/GetAll`
// let url = `${system}/Dictionary/GetAll`
let { result } = await Api.get(url); let { result } = await Api.get(url);
var map = new Map(); var map = new Map();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment