Commit 86b709ca authored by zhengjianqing's avatar zhengjianqing

files

parent 3ce83e51
Pipeline #26030 failed with stages
in 36 seconds
......@@ -5,8 +5,8 @@ server {
#charset koi8-r;
access_log /var/log/nginx/host.access.log main;
location /idtAppServiceV6 {
proxy_pass https://dgoa.demo.idtzw.com.cn/idtAppServiceV6;
location {
proxy_pass https://dgoa.demo.idtzw.com.cn;
}
location /department {
proxy_pass http://121.37.200.66:8888/department;
......
......@@ -43,7 +43,7 @@
"style-loader": "^1.2.1"
},
"proxy": {
"/idtAppServiceV6": {
"": {
"target": "https://dgoa.demo.idtzw.com.cn",
"changeOrigin": true
},
......
......@@ -10,7 +10,7 @@ const Footer = (props) => {
const getData = () => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getWaitDealList',
url: '/oApp/getWaitDealList',
}).then(res => {
setBadge(res.total)
});
......
......@@ -32,7 +32,7 @@ const Backlog = (props) => {
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getWaitDealList',
url: '/oApp/getWaitDealList',
body: pageMap,
}).then(res => {
setStart(false);
......
......@@ -21,7 +21,7 @@ const AddressBook = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getDeptTree',
url: '/oApp/getDeptTree',
}).then(res => {
setStart(false);
setLoading(false);
......@@ -44,7 +44,7 @@ const AddressBook = (props) => {
const getUser = (DEPTID) => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getSearchAddressBook?deptId=${DEPTID}`,
url: `/oApp/getSearchAddressBook?deptId=${DEPTID}`,
}).then(res => {
const child = res.userList && res.userList.length > 0 ? res.userList : [];
const newData = [...data];
......
......@@ -15,7 +15,7 @@ const AddressBook = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getChildDeptList',
url: '/oApp/getChildDeptList',
}).then(res => {
setLoading(false);
setData(res)
......
......@@ -20,7 +20,7 @@ const NewPage = (props) => {
// console.log(HASUSER)
axiosRequest({
method: 'post',
url: HASUSER === 'true' ? `/idtAppServiceV6/oApp/getDeptUserList?deptId=${pId}` :`/idtAppServiceV6/oApp/getChildDeptList?pId=${pId}`,
url: HASUSER === 'true' ? `/oApp/getDeptUserList?deptId=${pId}` :`/oApp/getChildDeptList?pId=${pId}`,
}).then(res => {
setLoading(false);
setData(res)
......
......@@ -32,7 +32,7 @@ const Process = (props) => {
setFlowTbId(FLOWTBID);
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher`,
url: `/oApp/dispatcher`,
body: {
operateId: id,
formType: 'form',
......@@ -58,7 +58,7 @@ const Process = (props) => {
const getBasic = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getData`,
url: `/oApp/getData`,
body: {uuid, tableId, templateId}
}).then(res => {
setBasicLoading(true)
......@@ -76,7 +76,7 @@ const Process = (props) => {
const getFlow = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFlowList`,
url: `/oApp/getFlowList`,
body: {uuid, tableId}
}).then(res => {
setFlowLoading(true)
......@@ -89,7 +89,7 @@ const Process = (props) => {
const getAdjunct= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFiles`,
url: `/oApp/getFiles`,
body: {uuid, fieldName: 'fj', tableId}
}).then(res => {
setAdjunctLoading(true)
......@@ -100,7 +100,7 @@ const Process = (props) => {
const getButton= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/nextNodeList`,
url: `/oApp/nextNodeList`,
body: {curNodeId: nodeId}
}).then(res => {
const result = res ? res.map(item => ({button: item.name, target: item.special, nodetype: item.nodetype})) : []
......@@ -152,7 +152,7 @@ const Process = (props) => {
const developer = localStorage.getItem('developer');
downloadFile({
method: 'post',
url: `/idtAppServiceV6/oApp/downloadLargeFileForword`,
url: `/oApp/downloadLargeFileForword`,
body: {uuid, tableId, developer},
}).then(res => {
var downloadElement = document.createElement('a');
......@@ -185,7 +185,7 @@ const Process = (props) => {
const blyjSubmit = () => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/save`,
url: `/oApp/save`,
body: {
tableId,
dealInfo: JSON.stringify({BLYJ: blyj, flowTbId}),
......@@ -217,7 +217,7 @@ const Process = (props) => {
const end = () => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/application/interfaces/flow/saveWorkFlowModel.jsp`,
url: `/application/interfaces/flow/saveWorkFlowModel.jsp`,
body: {
flowNodeId: nodeId,
attachId: uuid,
......
......@@ -14,7 +14,7 @@ const SubmitDetail = (props) => {
setLoading(true)
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/application/interfaces/flow/getFlowJs.jsp?flowNodeId=${flowNodeId}&flowTbId=${flowTbId}`,
url: `/application/interfaces/flow/getFlowJs.jsp?flowNodeId=${flowNodeId}&flowTbId=${flowTbId}`,
}).then(res => {
if (res.tree && res.tree.length === 0) {
Toast.info('暂无下级办理人员, 请办结事件', 2, () => {
......@@ -48,7 +48,7 @@ const SubmitDetail = (props) => {
!result && Toast.fail('只可选择一名人员');
result && axiosRequest({
method: 'post',
url: `/idtAppServiceV6/application/interfaces/flow/saveWorkFlowModel.jsp`,
url: `/application/interfaces/flow/saveWorkFlowModel.jsp`,
body: {
flowNodeId,
attachId: uuid,
......
......@@ -32,7 +32,7 @@ const Process = (props) => {
setFlowTbId(FLOWTBID);
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/childDispatcher`,
url: `/oApp/childDispatcher`,
body: {
uuid,
templatePath: 'cgwpxx_list',
......@@ -58,7 +58,7 @@ const Process = (props) => {
const getBasic = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getData`,
url: `/oApp/getData`,
body: {uuid, tableId, templateId}
}).then(res => {
setBasicLoading(true)
......@@ -75,7 +75,7 @@ const Process = (props) => {
const getApplication = (uuid) => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getChildGridDataList`,
url: `/oApp/getChildGridDataList`,
body: {attachId: uuid, templatePath: 'cgwpxx_list'}
}).then(res => {
setBasicLoading(true);
......@@ -96,7 +96,7 @@ const Process = (props) => {
const getFlow = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFlowList`,
url: `/oApp/getFlowList`,
body: {uuid, tableId}
}).then(res => {
setFlowLoading(true)
......@@ -109,7 +109,7 @@ const Process = (props) => {
const getAdjunct= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFiles`,
url: `/oApp/getFiles`,
body: {uuid, fieldName: 'fj', tableId}
}).then(res => {
setAdjunctLoading(true)
......@@ -120,7 +120,7 @@ const Process = (props) => {
const getButton= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/nextNodeList`,
url: `/oApp/nextNodeList`,
body: {curNodeId: nodeId}
}).then(res => {
const result = res ? res.map(item => ({button: item.name, target: item.special, nodetype: item.nodetype})) : []
......@@ -211,7 +211,7 @@ const Process = (props) => {
const end = () => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/application/interfaces/flow/saveWorkFlowModel.jsp`,
url: `/application/interfaces/flow/saveWorkFlowModel.jsp`,
body: {
flowNodeId: nodeId,
attachId: uuid,
......
......@@ -30,7 +30,7 @@ const Process = (props) => {
setFlowTbId(FLOWTBID);
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher`,
url: `/oApp/dispatcher`,
body: {
operateId: id,
formType: 'form',
......@@ -54,7 +54,7 @@ const Process = (props) => {
const getBasic = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getData`,
url: `/oApp/getData`,
body: {uuid, tableId, templateId}
}).then(res => {
setBasicLoading(true)
......@@ -72,7 +72,7 @@ const Process = (props) => {
const getFlow = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFlowList`,
url: `/oApp/getFlowList`,
body: {uuid, tableId}
}).then(res => {
setFlowLoading(true)
......@@ -85,7 +85,7 @@ const Process = (props) => {
const getAdjunct= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFiles`,
url: `/oApp/getFiles`,
body: {uuid, fieldName: 'fj', tableId}
}).then(res => {
setAdjunctLoading(true)
......@@ -96,7 +96,7 @@ const Process = (props) => {
const getButton= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/nextNodeList`,
url: `/oApp/nextNodeList`,
body: {curNodeId: nodeId}
}).then(res => {
const result = res ? res.map(item => ({button: item.name, target: item.special, nodetype: item.nodetype})) : []
......@@ -186,7 +186,7 @@ const Process = (props) => {
const end = () => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/application/interfaces/flow/saveWorkFlowModel.jsp`,
url: `/application/interfaces/flow/saveWorkFlowModel.jsp`,
body: {
flowNodeId: nodeId,
attachId: uuid,
......
......@@ -14,7 +14,7 @@ const AddressBook = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/application/interfaces/getChry.jsp',
url: '/application/interfaces/getChry.jsp',
body: {attachId}
}).then(res => {
setLoading(false);
......
......@@ -12,7 +12,7 @@ const AddressBook = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getDeptTree',
url: '/oApp/getDeptTree',
}).then(res => {
setLoading(false);
setData(res)
......
......@@ -10,7 +10,7 @@ const Login = (props) => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/login?userName=2012012099&clientFlag=123456&password=1&loginType=mobile',
url: '/oApp/login?userName=2012012099&clientFlag=123456&password=1&loginType=mobile',
}).then(res => {
!res.errorMessage && props.history.push(`/bord/backlog`)
// setOperates(res.operate || []);
......
......@@ -25,7 +25,7 @@ const Notice = (props) => {
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getWaitDealList',
url: '/oApp/getWaitDealList',
body: pageMap,
}).then(res => {
setStart(false);
......
......@@ -26,7 +26,7 @@ const DateCalendar = (props) => {
const endtime = moment(dd).endOf('day').format("YYYY-MM-DD HH:mm:ss");
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/application/interfaces/getMyRcList.jsp',
url: '/application/interfaces/getMyRcList.jsp',
body: {starttime, endtime}
}).then(res => {
setLoading(false);
......@@ -47,7 +47,7 @@ const DateCalendar = (props) => {
values.endtime = moment(values.endtime).format("YYYY-MM-DD HH:mm:ss");
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/application/interfaces/addCalendar.jsp',
url: '/application/interfaces/addCalendar.jsp',
body: values,
}).then(res => {
Toast.success('添加成功');
......@@ -106,7 +106,7 @@ const DateCalendar = (props) => {
const endtime = moment(dd).endOf('month').format("YYYY-MM-DD HH:mm:ss");
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/application/interfaces/getMyRc.jsp',
url: '/application/interfaces/getMyRc.jsp',
body: {starttime, endtime},
}).then(res => {
const date = [];
......@@ -134,7 +134,7 @@ const DateCalendar = (props) => {
new Promise((resolve) => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/application/interfaces/deleteGRRC.jsp',
url: '/application/interfaces/deleteGRRC.jsp',
body: {uuid: dateInfo.UUID},
}).then(res => {
resolve();
......
......@@ -14,7 +14,7 @@ const Send = (props) => {
const {uuid} = props.match.params;
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/jspmail/mailGetMail',
url: '/jspmail/mailGetMail',
body: {uuid},
}).then(res => {
setLoading(false);
......
......@@ -27,7 +27,7 @@ const Send = (props) => {
if (!error) {
fileRequest({
method: 'post',
url: '/idtAppServiceV6/jspmail/sendMail',
url: '/jspmail/sendMail',
body: {jsonParam: JSON.stringify(jsonParam)},
payload: formData
}).then(res => {
......
......@@ -28,7 +28,7 @@ const Mail = (props) => {
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/jspmail/mailGetMailList',
url: '/jspmail/mailGetMailList',
body: pageMap,
}).then(res => {
setStart(false);
......
......@@ -16,7 +16,7 @@ const Send = (props) => {
upload.length > 0 && formData.append('file', upload[0].file);
fileRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/uploadPhoto',
url: '/oApp/uploadPhoto',
payload: formData
}).then(res => {
......@@ -34,7 +34,7 @@ const Send = (props) => {
uploadPng();
fileRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/changeUserInfo',
url: '/oApp/changeUserInfo',
body: {...values},
}).then(res => {
Toast.success('发送成功');
......
......@@ -19,6 +19,8 @@ const Work = (props) => {
new Promise((resolve => {
const query = queryString.parse(props.location.search);
const keys = Object.keys(query);
console.log('work query :>> ', query);
keys.length > 0 && query.token && localStorage.setItem('token', query.token);
resolve()
})).then(() => {
......@@ -43,7 +45,7 @@ const Work = (props) => {
// console.log([...a].join(','))
// axiosRequest({
// method: 'post',
// url: '/idtAppServiceV6/oApp/getAllOperate',
// url: '/oApp/getAllOperate',
// }).then(res => {
// setLoading(false);
//
......
......@@ -28,7 +28,7 @@ const Notice = (props) => {
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight);
tab && axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getGridDataList',
url: '/oApp/getGridDataList',
body: pageMap,
}).then(res => {
setStart(false);
......
......@@ -36,7 +36,7 @@ const Send = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/save',
url: '/oApp/save',
body: {
params: JSON.stringify(values),
dealInfo:JSON.stringify({flowTbId: submitData.flowTbId}),
......@@ -66,7 +66,7 @@ const Send = (props) => {
const getChildColumns = (uuid) => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/childDispatcher',
url: '/oApp/childDispatcher',
body: {
uuid,
returnJson: true,
......@@ -110,7 +110,7 @@ const Send = (props) => {
});
upload.length > 0 && fileRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/balanceUploadFileAdapt',
url: '/oApp/balanceUploadFileAdapt',
body: {
tableId: submitData.tableId,
ATTACH_ID: attachId,
......@@ -134,7 +134,7 @@ const Send = (props) => {
const menuIndex = menu.findIndex(item => item.text === name);
menuIndex > -1 && menu[menuIndex].children.length > 0 && axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher`,
url: `/oApp/dispatcher`,
body: {operateId: menu[menuIndex].children[0].id, formType: 'form'}
}).then(res => {
setLoading2(true)
......@@ -177,7 +177,7 @@ const Send = (props) => {
});
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/singleSave`,
url: `/oApp/singleSave`,
body: {
params: JSON.stringify(values),
tableId: submitData.tableId,
......@@ -208,7 +208,7 @@ const Send = (props) => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/delete`,
url: `/oApp/delete`,
body: {
uuids: JSON.stringify(ids),
tableId: submitData.tableId,
......
......@@ -31,7 +31,7 @@ const Send = (props) => {
values['会议地点'] = HYSDD;
!UUID && axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/save',
url: '/oApp/save',
body: {
params: JSON.stringify(values),
dealInfo:JSON.stringify({flowTbId: submitData.flowTbId}),
......@@ -92,7 +92,7 @@ const Send = (props) => {
});
upload.length > 0 && fileRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/balanceUploadFileAdapt',
url: '/oApp/balanceUploadFileAdapt',
body: {
tableId: submitData.tableId,
ATTACH_ID: attachId,
......@@ -116,7 +116,7 @@ const Send = (props) => {
const menuIndex = menu.findIndex(item => item.text === name);
menuIndex > -1 && menu[menuIndex].children.length > 0 && axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher`,
url: `/oApp/dispatcher`,
body: {operateId: menu[menuIndex].children[0].id, formType: 'form'}
}).then(res => {
setLoading2(true);
......
......@@ -23,7 +23,7 @@ const Send = (props) => {
const developer = localStorage.getItem('developer');
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/control/getGrid',
url: '/control/getGrid',
body: {
script: 'getMeetRoom',
replaceMap: JSON.stringify({developer}),
......
......@@ -40,7 +40,7 @@ const Send = (props) => {
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/save',
url: '/oApp/save',
body: {
params: JSON.stringify(values),
dealInfo:JSON.stringify({flowTbId: submitData.flowTbId}),
......@@ -107,7 +107,7 @@ const Send = (props) => {
});
upload.length > 0 && fileRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/balanceUploadFileAdapt',
url: '/oApp/balanceUploadFileAdapt',
body: {
tableId: submitData.tableId,
ATTACH_ID: attachId,
......@@ -134,7 +134,7 @@ const Send = (props) => {
menuIndex > -1 && menu[menuIndex].children.length > 0 && axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher`,
url: `/oApp/dispatcher`,
body: {operateId: menu[menuIndex].children[0].id, formType: 'form'}
}).then(res => {
setLoading2(true)
......@@ -217,7 +217,7 @@ const Send = (props) => {
// const checkTitle = () => {
// fileRequest({
// method: 'post',
// url: '/idtAppServiceV6/control/getList',
// url: '/control/getList',
// body: {
// script: 'oa_fwgl_jyFwwhbh',
// args: JSON.stringify([numberList[0], numberList[1]]),
......@@ -237,7 +237,7 @@ const Send = (props) => {
name.indexOf('发文') > -1 && result[0] && result[1] && axiosRequest({
method: 'post',
url: '/idtAppServiceV6/control/getMap',
url: '/control/getMap',
body: {
script: 'oa_fwgl_setFwwhbh',
args: JSON.stringify([result[1], result[0]]),
......
......@@ -16,7 +16,7 @@ const Send = (props) => {
useEffect(() => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/exclude/control/getList',
url: '/exclude/control/getList',
body: {
script: 'hysqTreeAll',
args: JSON.stringify(['47c2c4f9235aa97f01235aa97f7c0000']),
......@@ -48,7 +48,7 @@ const Send = (props) => {
});
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/saveChRyInfo.jsp',
url: '/saveChRyInfo.jsp',
body: {
ATTACH_ID: UUID,
paramsList: JSON.stringify(newData),
......
......@@ -31,8 +31,8 @@ const ReactRouter = () => {
return (
<Router>
<Switch>
<Route exact path="/" render={() => <Redirect to="/login" />} />
<Route path="/login" component={Login} />
<Route exact path="/" render={() => <Redirect to="/bord" />} />
{/* <Route path="/login" component={Login} /> */}
<Route path="/bord" render={ () =>
<CommonLayout>
<Route path="/bord/backlog" component={Backlog}/>
......
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