diff --git a/public/Weboffice4Path.html b/public/Weboffice4Path.html
index b7319f6..1274525 100644
--- a/public/Weboffice4Path.html
+++ b/public/Weboffice4Path.html
@@ -50,8 +50,8 @@
.btnStyle02:hover {
background: #fff;
- color: #b30000;
- border: 1px solid #b30000;
+ color: #014F8F;
+ border: 1px solid #014F8F;
}
@@ -65,17 +65,18 @@
-
+
中国联通智慧供应链平台 |
+ style="position: absolute; left: 70px; font-size: 16px; font-weight: 600; display: inline-block;">111中远海运集团采购信息系统 |
招标采购中心
diff --git a/public/bidOpening/bidOpening.html b/public/bidOpening/bidOpening.html
index 7e4ebf4..26e564c 100644
--- a/public/bidOpening/bidOpening.html
+++ b/public/bidOpening/bidOpening.html
@@ -14,7 +14,7 @@
diff --git a/public/bidOpening/countDown.html b/public/bidOpening/countDown.html
index dc8ca3c..d7c4e46 100644
--- a/public/bidOpening/countDown.html
+++ b/public/bidOpening/countDown.html
@@ -14,7 +14,7 @@
diff --git a/public/officecontrol/ntko.20220624.js b/public/officecontrol/ntko.20220624.js
index 11d3d2c..5322fc1 100644
--- a/public/officecontrol/ntko.20220624.js
+++ b/public/officecontrol/ntko.20220624.js
@@ -6,7 +6,7 @@ function init(readonly, DocfileCode) {
ntko.Menubar = false;//隐藏窗体左上侧文件菜单
ntko.TitleBar = false;//隐藏窗体左上图标
$.ajax({
- url: "/api/doc/v1.0/files/queryReturn",
+ url: "/api/sys-manager-ebtp-project/v1.0/files/queryReturn",
type: "POST",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify([DocfileCode]),
@@ -20,11 +20,11 @@ function init(readonly, DocfileCode) {
if (result.success) {
if (result.data.length > 0) {
$.ajax({
- url: "/api/doc/api/data-service-document-center/outer/v1.0/files/getSecretKey?fileId=" + result.data[0].fileId,//获取密钥
+ url: "/api/sys-manager-ebtp-project/v1.0/files/getSecretKey?fileId=" + result.data[0].fileId,//获取密钥
type: "GET",
contentType: "application/json;charset=UTF-8",
success: function (response) {
- ntko.BeginOpenFromURL("/api/doc/api/data-service-document-center/outer/v1.0/files/getDownload?fileId=" + result.data[0].fileId + "&documentSecretKey=" + response.data);
+ ntko.BeginOpenFromURL("/api/sys-manager-ebtp-project/v1.0/files/getDownload?fileId=" + result.data[0].fileId + "&documentSecretKey=" + response.data);
}
})
} else {
@@ -51,12 +51,12 @@ function init(readonly, DocfileCode) {
//通用上传
function ntkoUpload(type, objectId, fileName) {
if (objectId !== null && objectId !== void 0 && objectId !== "") {
- var path = "/api/doc/v1.0/files/upload";
+ var path = "/api/sys-manager-ebtp-project/v1.0/files/upload";
var fileUploadName = "multipartFiles";
var params = "appCode=ebtp-cloud-frontend&objectId=" + objectId;
var msg
$.ajax({
- url: "/api/doc/v1.0/files/queryReturn",
+ url: "/api/sys-manager-ebtp-project/v1.0/files/queryReturn",
type: "POST",
async: false,
contentType: "application/json;charset=UTF-8",
@@ -67,7 +67,7 @@ function ntkoUpload(type, objectId, fileName) {
for (let i = 0; i < result.data.length; i++) {
const ele = result.data[i];
$.ajax({
- url: "/api/doc/v1.0/files/disk" + "?fileId=" + ele.fileId,
+ url: "/api/sys-manager-ebtp-project/v1.0/files/disk" + "?fileId=" + ele.fileId,
type: "POST",
dataType: "json",
})
@@ -91,7 +91,7 @@ function ntkoUpdateFile(objectId, fileName) {
if (objectId !== null && objectId !== void 0 && objectId !== "") {
var msg;
$.ajax({
- url: "/api/doc/v1.0/files/queryReturn",
+ url: "/api/sys-manager-ebtp-project/v1.0/files/queryReturn",
type: "POST",
async: false,
contentType: "application/json;charset=UTF-8",
@@ -100,7 +100,7 @@ function ntkoUpdateFile(objectId, fileName) {
if (result.success) {
if (result.data.length > 0) {
$.ajax({
- url: "/api/doc/v1.0/files/update",
+ url: "/api/sys-manager-ebtp-project/v1.0/files/update",
type: "POST",
async: false,
contentType: "application/json;charset=UTF-8",
diff --git a/public/webofficeComponent.html b/public/webofficeComponent.html
index 846f62f..8d1238b 100644
--- a/public/webofficeComponent.html
+++ b/public/webofficeComponent.html
@@ -50,9 +50,9 @@
}
.btnStyle01 {
- background: #b30000;
+ background: #014F8F;
color: #fff;
- border: 1px solid #b30000;
+ border: 1px solid #014F8F;
}
.btnStyle02 {
@@ -63,8 +63,8 @@
.btnStyle02:hover {
background: #fff;
- color: #b30000;
- border: 1px solid #b30000;
+ color: #014F8F;
+ border: 1px solid #014F8F;
}
@@ -98,16 +98,17 @@
-
+

-
中国联通智慧供应链平台 | 招标采购中心
+
中远海运集团采购信息系统 | 招标采购中心
diff --git a/public/webofficeIeComponent.html b/public/webofficeIeComponent.html
index 1e9a381..9e593d1 100644
--- a/public/webofficeIeComponent.html
+++ b/public/webofficeIeComponent.html
@@ -54,9 +54,9 @@
}
.btnStyle01 {
- background: #b30000;
+ background: #014F8F;
color: #fff;
- border: 1px solid #b30000;
+ border: 1px solid #014F8F;
}
.btnStyle02 {
@@ -67,8 +67,8 @@
.btnStyle02:hover {
background: #fff;
- color: #b30000;
- border: 1px solid #b30000;
+ color: #014F8F;
+ border: 1px solid #014F8F;
}
@@ -103,16 +103,17 @@
-
+

-
中国联通智慧供应链平台 | 招标采购中心
+
中远海运集团采购信息系统 | 招标采购中心
diff --git a/src/layouts/TopLayout.tsx b/src/layouts/TopLayout.tsx
index f9ffad6..93e0e42 100644
--- a/src/layouts/TopLayout.tsx
+++ b/src/layouts/TopLayout.tsx
@@ -45,7 +45,7 @@ const TopLayout: React.FC<{}> = (props) => {
-

中国联通智慧供应链平台 | 招标采购中心
+

中远海运集团采购信息系统 | 招标采购中心
- {moment().format("YYYY-MM-DD")}
diff --git a/src/pages/Auction/AuctionParticipateList/index.tsx b/src/pages/Auction/AuctionParticipateList/index.tsx
index 1be36da..ea6aa28 100644
--- a/src/pages/Auction/AuctionParticipateList/index.tsx
+++ b/src/pages/Auction/AuctionParticipateList/index.tsx
@@ -177,7 +177,7 @@ export default () => {
-

中国联通智慧供应链平台 | 招标采购中心
+

中远海运集团采购信息系统 | 招标采购中心
- {moment().format("YYYY-MM-DD")}
diff --git a/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx b/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx
index e045668..c00fd84 100644
--- a/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/structure/BiddingAnnoStructureForm.tsx
@@ -1097,7 +1097,7 @@ const BiddingAnnoStructureForm: React.FC<{}> = (props: any) => {
<>
-

中国联通智慧供应链平台 | 招标采购中心
+

中远海运集团采购信息系统 | 招标采购中心
- {moment().format("YYYY-MM-DD")}
diff --git a/src/pages/HighQualityOperation/Management/Manage/index.tsx b/src/pages/HighQualityOperation/Management/Manage/index.tsx
index 30a0b87..749d8b5 100644
--- a/src/pages/HighQualityOperation/Management/Manage/index.tsx
+++ b/src/pages/HighQualityOperation/Management/Manage/index.tsx
@@ -24,7 +24,7 @@ const Dashboard: React.FC<{}> = () => {
<>
-

中国联通智慧供应链平台 | 高质量运营行动
+

中远海运集团采购信息系统 | 高质量运营行动
- {moment().format("YYYY-MM-DD")}
diff --git a/src/pages/LoadingPage/index.tsx b/src/pages/LoadingPage/index.tsx
index 64a21e8..2c96c44 100644
--- a/src/pages/LoadingPage/index.tsx
+++ b/src/pages/LoadingPage/index.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from 'react';
import { message, Spin } from 'antd';
-import { history } from 'umi';
+import { history } from '@umijs/max';
import { cloudReloadToken, cooperReloadToken, fgetUserMsg, getDictionaries, getTokenByCode } from './service';
import { getTotalURLInformation, getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import { refreshTokenApi } from '@/services/login';
@@ -89,220 +89,47 @@ const Loading: React.FC<{}> = () => {
//获取用户信息
async function getUserData(token: string, url: string, extra: any, status: number) {
- const res = {
- "userId": "ex-wanghy623",
- "lastName": null,
- "firstName": null,
- "fullName": "曹鹏",
- "emailAddress": null,
- "loginName": "ex-wanghy623",
- "mobilePhone": null,
- "officePhone": null,
- "sex": null,
- "employeeCategory": null,
- "userType": "1",
- "dateOfBirth": null,
- "age": null,
- "employeeNumber": "1753782355",
- "nationalityId": null,
- "nationality": null,
- "nationalIdentifier": null,
- "supervisorId": null,
- "organizationId": "101152137",
- "organizationName": "河北通信工程招投标有限公司",
- "orgCategory": null,
- "deptId": "101152137",
- "deptName": "河北通信工程招投标有限公司",
- "roleIds": null,
- "bussiGroupId": null,
- "positionId": null,
- "currentRoleCode": "undefined",
- "province": null,
- "authorityList": [
- {
- "roleId": "000007",
- "roleName": "代理机构管理员",
- "roleCode": "ebtp-agency-admin",
- "roleScope": "EBTP",
- "authorities": [
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- null,
- "ebtp-agency-admin",
- null,
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
- null,
- "ebtp-agency-admin",
- null,
- null,
- null,
- null,
- "ebtp-agency-admin",
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
- "ebtp-agency-project-manager,ebtp-supplier",
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager"
- ]
- },
- {
- "roleId": "000009",
- "roleName": "代理机构业务经理",
- "roleCode": "ebtp-agency-project-manager",
- "roleScope": "EBTP",
- "authorities": [
- null,
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager",
- null,
- "ebtp-agency-project-manager",
- null,
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- null,
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager",
- null,
- null,
- "ebtp-agency-project-manager",
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
- null,
- null,
- "ebtp-agency-admin",
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager,ebtp-purchase",
- "ebtp-agency-project-manager,ebtp-purchase",
- "ebtp-agency-project-manager,ebtp-purchase",
- "ebtp-agency-project-manager,ebtp-purchase",
- "ebtp-agency-project-manager,ebtp-purchase",
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
- "ebtp-agency-project-manager,ebtp-supplier",
- "ebtp-agency-project-manager",
- "ebtp-agency-project-manager",
- null
- ]
- },
- {
- "roleId": "000006",
- "roleName": "供应商",
- "roleCode": "ebtp-supplier",
- "roleScope": "EBTP",
- "authorities": [
- "ebtp-supplier",
- "system:user:test",
- "ebtp-supplier",
- "system:user:test",
- "ebtp-agency-project-manager",
- "system:user:test",
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- "system:user:test",
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier,ebtp-agency-admin",
- "ebtp-agency-project-manager,ebtp-expert,ebtp-agency-admin",
- "system:user:test",
- "ebtp-supplier",
- null,
- "ebtp-supplier",
- "ebtp-supplier",
- "ebtp-supplier",
- "ebtp-supplier",
- "system:user:test",
- "ebtp-supplier",
- "ebtp-supplier",
- "ebtp-supplier",
- "ebtp-supplier",
- null,
- null,
- null,
- null,
- "ebtp-agency-project-manager,ebtp-expert,ebtp-supplier",
- "ebtp-agency-project-manager,ebtp-supplier",
- "ebtp-supplier",
- "system:user:test",
- "system:user:test",
- "system:user:test",
- "ebtp-agency-project-manager",
- "system:user:test"
- ]
+ fgetUserMsg(token).then(async res => {
+ if (res) {
+ if (res?.userType == null) {
+ error('401');
+ } else {
+ if (res?.authorityList == null || res?.authorityList?.length == 0) {
+ if (url == 'ExamineAndApprove/Announcement' ||
+ url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
+ url == 'ExamineAndApprove/Publicity' ||
+ url == 'ExamineAndApprove/InvitationLetter' ||
+ url == 'ExamineAndApprove/ExternalReference' ||
+ url == 'ExamineAndApprove/FailureAnnouncement') {
+ const newAuthority: any[] = []
+ debugger
+ newAuthority.push({
+ authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
+ roleCode: "ebtp-cosco-default",
+ roleId: "20004",
+ roleName: "普通用户",
+ roleScope: "EBTP"
+ })
+ res.authorityList = [...newAuthority];
+ await redirect(res, url, extra);
+ } else {
+ if (status == 0) {
+ // await refreshUserData(res?.userType, token, url, extra);
+ message.error("角色身份信息不存在").then(() => {
+ history.replace('/login');
+ });
+ } else {
+ error('401');
+ }
+ }
+ } else {
+ await redirect(res, url, extra);
+ }
}
- ]
- }
- if (res?.authorityList == null || res?.authorityList?.length == 0) {
- if (url == 'ExamineAndApprove/Announcement' ||
- url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
- url == 'ExamineAndApprove/Publicity' ||
- url == 'ExamineAndApprove/InvitationLetter' ||
- url == 'ExamineAndApprove/ExternalReference' ||
- url == 'ExamineAndApprove/FailureAnnouncement') {
- let newAuthority: any[] = []
- newAuthority.push({
- authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
- roleCode: "ebtp-unicom-default",
- roleId: "20004",
- roleName: "联通普通用户",
- roleScope: "EBTP"
- })
- res.authorityList = [...newAuthority];
- await redirect(res, url, extra);
+ } else {
+ message.error("登录信息有误,请重新登录")
}
- }else {
- await redirect(res, url, extra);
- }
- // await fgetUserMsg(token).then(async res => {
- // if (res) {
- // if (res?.userType == null) {
- // error('401');
- // } else {
- // if (res?.authorityList == null || res?.authorityList?.length == 0) {
- // if (url == 'ExamineAndApprove/Announcement' ||
- // url == 'ExamineAndApprove/ChangeTheAnnouncement' ||
- // url == 'ExamineAndApprove/Publicity' ||
- // url == 'ExamineAndApprove/InvitationLetter' ||
- // url == 'ExamineAndApprove/ExternalReference' ||
- // url == 'ExamineAndApprove/FailureAnnouncement') {
- // let newAuthority: any[] = []
- // newAuthority.push({
- // authorities: [null, "system:user:test", "system:user:test", "system:user:test", "system:user:test", null, null],
- // roleCode: "ebtp-unicom-default",
- // roleId: "20004",
- // roleName: "联通普通用户",
- // roleScope: "EBTP"
- // })
- // res.authorityList = [...newAuthority];
- // await redirect(res, url, extra);
- // } else {
- // if (status == 0) {
- // await refreshUserData(res?.userType, token, url, extra);
- // } else {
- // error('401');
- // }
- // }
- // } else {
- // await redirect(res, url, extra);
- // }
- // }
- // } else {
- // message.error("登录信息有误,请重新登录")
- // }
- // })
+ })
}
//通过code取token
async function getToken(code: string, data: any) {
diff --git a/src/pages/PartyMemberTopic/Management/Manage/index.tsx b/src/pages/PartyMemberTopic/Management/Manage/index.tsx
index 2a6803d..df489a3 100644
--- a/src/pages/PartyMemberTopic/Management/Manage/index.tsx
+++ b/src/pages/PartyMemberTopic/Management/Manage/index.tsx
@@ -24,7 +24,7 @@ const Dashboard: React.FC<{}> = () => {
<>
-

中国联通智慧供应链平台 | 党建攻坚
+

中远海运集团采购信息系统 | 党建攻坚
- {moment().format("YYYY-MM-DD")}
diff --git a/src/pages/SupplierRelation/index.tsx b/src/pages/SupplierRelation/index.tsx
index d061e26..f162d61 100644
--- a/src/pages/SupplierRelation/index.tsx
+++ b/src/pages/SupplierRelation/index.tsx
@@ -102,7 +102,7 @@ const SupplierRelation: React.FC<{}> = () => {
-

中国联通智慧供应链平台 | 招标采购中心
+

中远海运集团采购信息系统 | 招标采购中心
diff --git a/src/pages/userformal/login/index.tsx b/src/pages/userformal/login/index.tsx
index fa57c66..e300824 100644
--- a/src/pages/userformal/login/index.tsx
+++ b/src/pages/userformal/login/index.tsx
@@ -522,7 +522,7 @@ const Index: React.FC<{}> = () => {

-
中国联通智慧供应链平台 | 招标采购中心
+
中远海运集团采购信息系统 | 招标采购中心