提交 2849982d 编写于 作者: ibizdev's avatar ibizdev

chitanda 发布系统代码 [TrainSys,网页端]

上级 60917530
......@@ -245,6 +245,9 @@ export class Http {
if (data?.srfsessionid) {
delete data.srfsessionid;
}
if(data?.srfparentdemapname){
delete data.srfparentdemapname;
}
return data;
}
......
......@@ -335,8 +335,8 @@ export default class AppCustomTheme extends Vue {
private getVars(): any {
const select = this.defaultThemes.find((item: any) => item.codeName === this.selectTheme);
const vars = {
"@primary": select.color,
"@font-family": this.selectFont
// "@primary": select.color,
// "@font-family": this.selectFont
};
if (this.themeOptions && Object.keys(this.themeOptions).length > 0) {
Object.keys(this.themeOptions).forEach((key: string) => {
......
......@@ -19,6 +19,8 @@
var srfdcsystem = getUrlParam('srfdcsystem');
var state = getUrlParam('state');
var baseUrl = getUrlParam('baseUrl');
var redirectUrl = getUrlParam('redirect_uri');
var client_id = getUrlParam('client_id');
if (code && id && state) {
// 通过授权code请求后台
$.ajax({
......@@ -33,14 +35,31 @@
if (data) {
if (data.token) {
setCookie('ibzuaa-token', data.token, 7, true);
localStorage.setItem('ibzuaa-token',data.token);
}
if (data.user) {
var user = data.user;
setCookie('ibzuaa-user', JSON.stringify(data.user), 7, true);
setCookie("loginname", user.loginname, 7, false);
}
// 跳转首页
window.location.href = "../../";
if(redirectUrl && data.token){
$.ajax({
type: "get",
url: baseUrl + "/uaa/oauth/code" + "?client_id=" + client_id,
dataType: "json",
contentType: 'application/json',
headers: {
srfdcsystem: srfdcsystem,
'Authorization':`Bearer ${data.token}`
},
success: function (data) {
window.location.href = redirectUrl + '?code=' + data;
}
})
}else{
// 跳转首页
window.location.href = "../../";
}
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
......
......@@ -19,6 +19,8 @@
var srfdcsystem = getUrlParam('srfdcsystem');
var state = getUrlParam('state');
var baseUrl = getUrlParam('baseUrl');
var redirectUrl = getUrlParam('redirect_uri');
var client_id = getUrlParam('client_id');
if (code && id && state) {
// 通过授权code请求后台
$.ajax({
......@@ -33,14 +35,31 @@
if (data) {
if (data.token) {
setCookie('ibzuaa-token', data.token, 7, true);
localStorage.setItem('ibzuaa-token',data.token);
}
if (data.user) {
var user = data.user;
setCookie('ibzuaa-user', JSON.stringify(data.user), 7, true);
setCookie("loginname", user.loginname, 7, false);
}
// 跳转首页
window.location.href = "../../";
if(redirectUrl){
$.ajax({
type: "get",
url: baseUrl + "/uaa/oauth/code" + "?client_id=" + client_id,
dataType: "json",
contentType: 'application/json',
headers: {
srfdcsystem: srfdcsystem,
'Authorization':`Bearer ${data.token}`
},
success: function (data) {
window.location.href = redirectUrl + '?code=' + data;
}
})
}else{
// 跳转首页
window.location.href = "../../";
}
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
......
......@@ -126,7 +126,7 @@
display: flex;
> span{
font-size: 24px;
color: #fff;
color: #108cee;
}
}
.loading{
......@@ -141,7 +141,7 @@
height: 100%;
margin-right: 5px;
border-radius: 50%;
background: #fff;
background: #108cee;
-webkit-animation: load 1.04s ease infinite;
}
> span:last-child{
......
......@@ -31,49 +31,13 @@
<dependencies>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-cloud</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-redis</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-zookeeper</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-poi</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
<dependency>
<groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-liquibase</artifactId>
<version>${ibiz.cloud.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>ibizmvnrepository</id>
<name>ibizmvnrepository</name>
<url>http://172.16.240.220:8081/repository/public/</url>
<id>aliyunmaven</id>
<name>阿里云公共仓库</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
......
......@@ -756,12 +756,6 @@
"queryCodeExp" : "t1.`BXDID`",
"standardColumnName" : "`BXDID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_BXDID_EQ",
"name" : "N_BXDID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[BXDID][报销单标识]移动端默认",
......@@ -1163,21 +1157,6 @@
}, {
"name" : "BXDFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "报销单标识",
"name" : "N_BXDID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_BXDID_EQ"
},
"getPSDEField" : {
"name" : "BXDID",
"codeName" : "BXDId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "报销单名称",
"name" : "N_BXDNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -562,12 +562,6 @@
"queryCodeExp" : "t1.`BXDMXID`",
"standardColumnName" : "`BXDMXID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_BXDMXID_EQ",
"name" : "N_BXDMXID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[BXDMXID][报销单明细标识]",
......@@ -1567,21 +1561,6 @@
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "报销单明细标识",
"name" : "N_BXDMXID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_BXDMXID_EQ"
},
"getPSDEField" : {
"name" : "BXDMXID",
"codeName" : "BXDMXId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "报销单明细名称",
"name" : "N_BXDMXNAME_LIKE",
......
......@@ -953,12 +953,6 @@
"queryCodeExp" : "t1.`BOOKID`",
"standardColumnName" : "`BOOKID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_BOOKID_EQ",
"name" : "N_BOOKID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[BOOKID][书标识]移动端默认",
......@@ -3351,21 +3345,6 @@
}, {
"name" : "BookFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "书标识",
"name" : "N_BOOKID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_BOOKID_EQ"
},
"getPSDEField" : {
"name" : "BOOKID",
"codeName" : "BookId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "书名称",
"name" : "N_BOOKNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -585,12 +585,6 @@
"queryCodeExp" : "t1.`BOOKTYPEID`",
"standardColumnName" : "`BOOKTYPEID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_BOOKTYPEID_EQ",
"name" : "N_BOOKTYPEID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[BOOKTYPEID][书籍类别标识]移动端默认",
......@@ -1162,21 +1156,6 @@
}, {
"name" : "BookTypeFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "书籍类别标识",
"name" : "N_BOOKTYPEID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_BOOKTYPEID_EQ"
},
"getPSDEField" : {
"name" : "BOOKTYPEID",
"codeName" : "BookTypeId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "书籍类别名称",
"name" : "N_BOOKTYPENAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -604,12 +604,6 @@
"queryCodeExp" : "t1.`PRINTID`",
"standardColumnName" : "`PRINTID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_PRINTID_EQ",
"name" : "N_PRINTID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[PRINTID][PRINT标识]",
......@@ -1252,21 +1246,6 @@
}, {
"name" : "PRINTFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "PRINT标识",
"name" : "N_PRINTID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_PRINTID_EQ"
},
"getPSDEField" : {
"name" : "PRINTID",
"codeName" : "PRINTId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "PRINT名称",
"name" : "N_PRINTNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -509,12 +509,6 @@
"queryCodeExp" : "t1.`PHONEID`",
"standardColumnName" : "`PHONEID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_PHONEID_EQ",
"name" : "N_PHONEID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[PHONEID][手机标识]",
......@@ -1375,21 +1369,6 @@
}, {
"name" : "PhoneFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "手机标识",
"name" : "N_PHONEID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_PHONEID_EQ"
},
"getPSDEField" : {
"name" : "PHONEID",
"codeName" : "PhoneId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "手机名称",
"name" : "N_PHONENAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -299,12 +299,6 @@
"enableFront" : true
} ],
"getAllPSDEFields" : [ {
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_RAWMATERIALID_EQ",
"name" : "N_RAWMATERIALID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[RAWMATERIALID][原材料标识]",
......@@ -853,21 +847,6 @@
}, {
"name" : "RawMaterialFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "原材料标识",
"name" : "N_RAWMATERIALID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_RAWMATERIALID_EQ"
},
"getPSDEField" : {
"name" : "RAWMATERIALID",
"codeName" : "RawMaterialId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "原材料名称",
"name" : "N_RAWMATERIALNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -845,12 +845,6 @@
"queryCodeExp" : "t1.`REGINFOID`",
"standardColumnName" : "`REGINFOID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_REGINFOID_EQ",
"name" : "N_REGINFOID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[REGINFOID][学员登记信息标识]移动端默认",
......@@ -1858,21 +1852,6 @@
}, {
"name" : "ReginfoFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "学员登记信息标识",
"name" : "N_REGINFOID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_REGINFOID_EQ"
},
"getPSDEField" : {
"name" : "REGINFOID",
"codeName" : "ReginfoId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "学员登记信息名称",
"name" : "N_REGINFONAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -447,12 +447,6 @@
"queryCodeExp" : "t1.`REGINFOFID`",
"standardColumnName" : "`REGINFOFID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_REGINFOFID_EQ",
"name" : "N_REGINFOFID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[REGINFOFID][学员登记信息测试fzh标识]移动端默认",
......@@ -1612,21 +1606,6 @@
}, {
"name" : "ReginfofFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "学员登记信息测试fzh标识",
"name" : "N_REGINFOFID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_REGINFOFID_EQ"
},
"getPSDEField" : {
"name" : "REGINFOFID",
"codeName" : "ReginfofId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "学员登记信息测试fzh名称",
"name" : "N_REGINFOFNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -686,12 +686,6 @@
"queryCodeExp" : "t1.`STUDENTID`",
"standardColumnName" : "`STUDENTID`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_STUDENTID_EQ",
"name" : "N_STUDENTID_EQ",
"stdDataType" : 25,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[STUDENTID][学生标识]",
......@@ -1596,21 +1590,6 @@
}, {
"name" : "StudentFilterDTO",
"getPSDEFilterDTOFields" : [ {
"logicName" : "学生标识",
"name" : "N_STUDENTID_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_STUDENTID_EQ"
},
"getPSDEField" : {
"name" : "STUDENTID",
"codeName" : "StudentId"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "学生名称",
"name" : "N_STUDENTNAME_LIKE",
"getPSDEFSearchMode" : {
......
......@@ -1784,34 +1784,34 @@
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
"id" : "表格界面_编辑操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
"id" : "表格界面_行编辑开关操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作",
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "表格界面_编辑操作",
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
"id" : "ToggleRowEdit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : {
......@@ -2028,28 +2028,6 @@
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
......@@ -2077,6 +2055,28 @@
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
} ]
},
"width" : 100,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册