Commit f79efa29 authored by 邓超's avatar 邓超

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

# Conflicts: # src/services/tablemanager/tablemanager.js
parents 1123424f 5f3f16f2
Pipeline #54042 passed with stages
...@@ -27,6 +27,7 @@ import { ...@@ -27,6 +27,7 @@ import {
reloadTableFields, reloadTableFields,
removeFields, removeFields,
loadUnattachedTables, loadUnattachedTables,
LoadLedgers,
} from '@/services/tablemanager/tablemanager'; } from '@/services/tablemanager/tablemanager';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import FieldEditor from './fieldEditor'; import FieldEditor from './fieldEditor';
...@@ -61,6 +62,7 @@ const AddModal = props => { ...@@ -61,6 +62,7 @@ const AddModal = props => {
const [deleteUserVisible, setDeleteUserVisible] = useState(false); // 批量删除 const [deleteUserVisible, setDeleteUserVisible] = useState(false); // 批量删除
const [checkStrictly, setCheckStrictly] = useState(false); const [checkStrictly, setCheckStrictly] = useState(false);
const [selectGroup, setSelectGroup] = useState([]); const [selectGroup, setSelectGroup] = useState([]);
const [keepStandingBook, setKeepStandingBook] = useState([]);
const editor = record => { const editor = record => {
console.log(record); console.log(record);
...@@ -300,6 +302,17 @@ const AddModal = props => { ...@@ -300,6 +302,17 @@ const AddModal = props => {
}, },
}, },
]; ];
useEffect(() => {
LoadLedgers().then(res => {
if (res.code === 0) {
let data = [];
res.data.root.map(i => {
data.push(i.name);
});
setKeepStandingBook(data);
}
});
}, []);
useEffect(() => { useEffect(() => {
console.log(props); console.log(props);
...@@ -724,6 +737,7 @@ const AddModal = props => { ...@@ -724,6 +737,7 @@ const AddModal = props => {
treeData={treeData} treeData={treeData}
keepTreeFirst={keepTreeFirst} keepTreeFirst={keepTreeFirst}
callBackSubmit={Submit} callBackSubmit={Submit}
keepStandingBook={keepStandingBook}
/> />
{visible && type === 'affiliateAdd' && ( {visible && type === 'affiliateAdd' && (
<AffiliateAdd <AffiliateAdd
......
...@@ -88,6 +88,7 @@ const ChangeAdd = props => { ...@@ -88,6 +88,7 @@ const ChangeAdd = props => {
console.log(indeterminate); console.log(indeterminate);
if (type == 'edit') { if (type == 'edit') {
if (isType != '' && isType === 'add') { if (isType != '' && isType === 'add') {
// 反馈名称
let checkArr = []; let checkArr = [];
console.log(newCheckedList); console.log(newCheckedList);
newCheckedList.map(checkItem => { newCheckedList.map(checkItem => {
...@@ -96,11 +97,12 @@ const ChangeAdd = props => { ...@@ -96,11 +97,12 @@ const ChangeAdd = props => {
} }
}); });
setCheckedList(checkArr); setCheckedList(checkArr);
setIndeterminate(!!newCheckedList.length && newCheckedList.length < filed.length); setIndeterminate(!!checkArr.length && checkArr.length < filed.length);
setCheckAll(newCheckedList.length === filed.length); setCheckAll(checkArr.length === filed.length);
let newArr = characterValue.length ? characterValue.split(',') : []; let newArr = characterValue.length ? characterValue.split(',') : [];
setSelectData(newArr); setSelectData(newArr);
} else if (isType === 'app') { } else if (isType === 'app') {
// 执行角色
let checkArr = []; let checkArr = [];
console.log(newCheckedList); console.log(newCheckedList);
newCheckedList.map(checkItem => { newCheckedList.map(checkItem => {
...@@ -109,26 +111,30 @@ const ChangeAdd = props => { ...@@ -109,26 +111,30 @@ const ChangeAdd = props => {
} }
}); });
setCheckedList(checkArr); setCheckedList(checkArr);
setIndeterminate(!!newCheckedList.length && newCheckedList.length < ff.length); setIndeterminate(!!checkArr.length && checkArr.length < ff.length);
setCheckAll(newCheckedList.length === ff.length); setCheckAll(checkArr.length === ff.length);
let newArr = characterValue.length ? characterValue.split(',') : []; let newArr = characterValue.length ? characterValue.split(',') : [];
setSelectData(newArr); setSelectData(newArr);
} }
} else { } else {
if (isType != '' && isType === 'add') { if (isType != '' && isType === 'add') {
// 反馈名称
let checkArr = []; let checkArr = [];
console.log(filed);
console.log(newCheckedList); console.log(newCheckedList);
newCheckedList.map(checkItem => { newCheckedList.map(checkItem => {
if (filed.includes(checkItem)) { if (filed.includes(checkItem)) {
checkArr.push(checkItem); checkArr.push(checkItem);
} }
}); });
console.log(checkArr);
setCheckedList(checkArr); setCheckedList(checkArr);
setIndeterminate(false); setIndeterminate(!!checkArr.length && checkArr.length < filed.length);
setCheckAll(false); setCheckAll(checkArr.length === filed.length);
let newArr = characterValue.length ? characterValue.split(',') : []; let newArr = characterValue.length ? characterValue.split(',') : [];
setSelectData(newArr); setSelectData(newArr);
} else if (isType === 'app') { } else if (isType === 'app') {
// 执行角色
let checkArr = []; let checkArr = [];
console.log(newCheckedList); console.log(newCheckedList);
newCheckedList.map(checkItem => { newCheckedList.map(checkItem => {
...@@ -137,8 +143,8 @@ const ChangeAdd = props => { ...@@ -137,8 +143,8 @@ const ChangeAdd = props => {
} }
}); });
setCheckedList(checkArr); setCheckedList(checkArr);
setIndeterminate(false); setIndeterminate(!!checkArr.length && checkArr.length < ff.length);
setCheckAll(false); setCheckAll(checkArr.length === ff.length);
let newArr = characterValue.length ? characterValue.split(',') : []; let newArr = characterValue.length ? characterValue.split(',') : [];
setSelectData(newArr); setSelectData(newArr);
} }
......
...@@ -20,6 +20,7 @@ const maintenance = () => { ...@@ -20,6 +20,7 @@ const maintenance = () => {
const [flag, setFlag] = useState(0); const [flag, setFlag] = useState(0);
const [sortVisible, setSortVisible] = useState(false); const [sortVisible, setSortVisible] = useState(false);
const [tableData, setTableData] = useState([]); const [tableData, setTableData] = useState([]);
const [keepTableData, setKeepTableData] = useState([]);
const columns = [ const columns = [
{ {
...@@ -47,7 +48,7 @@ const maintenance = () => { ...@@ -47,7 +48,7 @@ const maintenance = () => {
title: '业务类型', title: '业务类型',
dataIndex: 'businessType', dataIndex: 'businessType',
key: 'businessType', key: 'businessType',
// width: 100, width: 100,
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 100, maxWidth: 100,
...@@ -68,26 +69,17 @@ const maintenance = () => { ...@@ -68,26 +69,17 @@ const maintenance = () => {
title: '执行周期', title: '执行周期',
dataIndex: 'docycle', dataIndex: 'docycle',
key: 'docycle', key: 'docycle',
// width: 100, width: 100,
onCell: () => ({
style: {
maxWidth: 100,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
}, },
{ {
title: '台账名称', title: '台账名称',
dataIndex: 'accountName', dataIndex: 'accountName',
key: 'accountName', key: 'accountName',
// width: 100, width: 200,
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 100, maxWidth: 200,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
...@@ -105,10 +97,9 @@ const maintenance = () => { ...@@ -105,10 +97,9 @@ const maintenance = () => {
title: '反馈名称', title: '反馈名称',
dataIndex: 'feedbackName', dataIndex: 'feedbackName',
key: 'feedbackName', key: 'feedbackName',
width: 200,
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 200,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
...@@ -126,10 +117,10 @@ const maintenance = () => { ...@@ -126,10 +117,10 @@ const maintenance = () => {
title: '台账过滤条件', title: '台账过滤条件',
dataIndex: 'filterCondition', dataIndex: 'filterCondition',
key: 'filterCondition', key: 'filterCondition',
// width: 150, width: 150,
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 200, maxWidth: 150,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
...@@ -148,32 +139,22 @@ const maintenance = () => { ...@@ -148,32 +139,22 @@ const maintenance = () => {
dataIndex: 'isSubmit', dataIndex: 'isSubmit',
key: 'isSubmit', key: 'isSubmit',
width: 80, width: 80,
onCell: () => ({
style: {
maxWidth: 100,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
}, },
{ {
title: '执行角色', title: '执行角色',
dataIndex: 'doRole', dataIndex: 'doRole',
key: 'doRole', key: 'doRole',
width: 300, align: 'center',
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 350,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
cursor: 'pointer', cursor: 'pointer',
}, },
}), }),
align: 'center',
render: record => ( render: record => (
<Tooltip placement="topLeft" title={record}> <Tooltip placement="topLeft" title={record}>
{record} {record}
...@@ -185,32 +166,32 @@ const maintenance = () => { ...@@ -185,32 +166,32 @@ const maintenance = () => {
dataIndex: 'produceDays', dataIndex: 'produceDays',
key: 'produceDays', key: 'produceDays',
width: 80, width: 80,
align: 'center',
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 100, maxWidth: 80,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
cursor: 'pointer', cursor: 'pointer',
}, },
}), }),
align: 'center',
}, },
{ {
title: '在线任务量', title: '在线任务量',
dataIndex: 'onLines', dataIndex: 'onLines',
key: 'onLines', key: 'onLines',
width: 80, width: 80,
align: 'center',
onCell: () => ({ onCell: () => ({
style: { style: {
maxWidth: 100, maxWidth: 80,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
cursor: 'pointer', cursor: 'pointer',
}, },
}), }),
align: 'center',
render: record => ( render: record => (
<Tooltip placement="topLeft" title={record}> <Tooltip placement="topLeft" title={record}>
{record} {record}
...@@ -221,16 +202,7 @@ const maintenance = () => { ...@@ -221,16 +202,7 @@ const maintenance = () => {
title: '启停', title: '启停',
dataIndex: 'doNot', dataIndex: 'doNot',
key: 'doNot', key: 'doNot',
// width: 100, width: 80,
onCell: () => ({
style: {
maxWidth: 100,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
}, },
{ {
...@@ -265,6 +237,11 @@ const maintenance = () => { ...@@ -265,6 +237,11 @@ const maintenance = () => {
setTreeLoading(false); setTreeLoading(false);
if (res.msg === 'Ok') { if (res.msg === 'Ok') {
setTableData(res.data); setTableData(res.data);
let list = [];
res.data.map(i => {
list.push(i.businessName);
});
setKeepTableData(list);
} }
}); });
}, [flag]); }, [flag]);
...@@ -388,6 +365,7 @@ const maintenance = () => { ...@@ -388,6 +365,7 @@ const maintenance = () => {
onClose={() => setAddVisible(false)} onClose={() => setAddVisible(false)}
callBackSubmit={onSubmit} callBackSubmit={onSubmit}
formObj={formObj} formObj={formObj}
keepTableData={keepTableData}
placement="right" placement="right"
/> />
<SortModal <SortModal
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* @Description: * @Description:
* @Author: leizhe * @Author: leizhe
* @Date: 2022-04-06 11:38:46 * @Date: 2022-04-06 11:38:46
* @LastEditTime: 2022-05-23 10:49:46 * @LastEditTime: 2022-06-22 13:53:09
* @LastEditors: leizhe * @LastEditors: leizhe
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
...@@ -119,8 +119,8 @@ const DrawBoardManage = () => { ...@@ -119,8 +119,8 @@ const DrawBoardManage = () => {
const updateTrees = e => { const updateTrees = e => {
setTreeLoading(true); setTreeLoading(true);
typeList().then(res => { typeList().then(res => {
setTreeLoading(false);
if (res.code === 0) { if (res.code === 0) {
setTreeLoading(false);
if (e) { if (e) {
let aa = res.data.find(i => i.name === e); let aa = res.data.find(i => i.name === e);
setPickItem(aa); setPickItem(aa);
......
This diff is collapsed.
.getWay_container{ .getWay_container {
display: flex;
height: 100%;
width: 100%;
flex-direction: row;
justify-content: flex-start;
.operate_container {
display: flex; display: flex;
height: 100%; flex-direction: column;
justify-content: space-around;
.operate_item {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
height: 50px;
margin-left: 25px;
}
}
.head {
width: 100%; width: 100%;
flex-direction: row; display: flex;
justify-content: flex-start; justify-content: space-between;
.operate_container{ .head1 {
display: flex; display: flex;
flex-direction: column; align-items: center;
justify-content: space-around; }
width: 100%; }
height: 100%;
.operate_item{
display: flex;
flex-direction: row;
justify-content:flex-start;
align-items: center;
height: 50px;
margin-left:25px;
}
}
} }
.anticon svg { .anticon svg {
margin-top:-5px; margin-top: -5px;
} }
\ No newline at end of file
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
line-height: 1; line-height: 1;
} }
.ant-dropdown-menu-item>.anticon:first-child { .ant-dropdown-menu-item > .anticon:first-child {
vertical-align: 0.15em !important; vertical-align: 0.15em !important;
} }
.ant-table-tbody { .ant-table-tbody {
.ant-table-row:hover>td { .ant-table-row:hover > td {
background: #aed8fa !important; background: #aed8fa !important;
} }
} }
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
.ant-tree-treenode:hover { .ant-tree-treenode:hover {
.iconWraper1>span { .iconWraper1 > span {
margin-left: 12px; margin-left: 12px;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
...@@ -260,7 +260,6 @@ ...@@ -260,7 +260,6 @@
} }
.ant-card-body { .ant-card-body {
height: 100%; height: 100%;
} }
} }
...@@ -271,7 +270,7 @@ ...@@ -271,7 +270,7 @@
min-width: 600px; min-width: 600px;
} }
.siteCheckbox .ant-collapse-content>.ant-collapse-content-box { .siteCheckbox .ant-collapse-content > .ant-collapse-content-box {
padding: 16px 16px 0; padding: 16px 16px 0;
} }
...@@ -320,7 +319,7 @@ ...@@ -320,7 +319,7 @@
overflow: auto; overflow: auto;
} }
.sitePanel .ant-checkbox-wrapper+.ant-checkbox-wrapper { .sitePanel .ant-checkbox-wrapper + .ant-checkbox-wrapper {
margin: 0; margin: 0;
} }
...@@ -356,7 +355,8 @@ ...@@ -356,7 +355,8 @@
li { li {
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 170px; background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat
170px;
background-size: 20px; background-size: 20px;
background-position: center right; background-position: center right;
margin: 0 10px 10px 0; margin: 0 10px 10px 0;
...@@ -369,7 +369,8 @@ ...@@ -369,7 +369,8 @@
} }
} }
.siteline {} .siteline {
}
.siteBtn { .siteBtn {
width: 100%; width: 100%;
...@@ -389,7 +390,7 @@ ...@@ -389,7 +390,7 @@
.ant-checkbox-group .ant-checkbox-group-item { .ant-checkbox-group .ant-checkbox-group-item {
margin-right: 0px !important; margin-right: 0px !important;
min-width: 300px !important; width: 300px;
} }
.ant-tree-list-holder { .ant-tree-list-holder {
...@@ -440,4 +441,4 @@ ...@@ -440,4 +441,4 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
\ No newline at end of file
import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index'; /*
* @Description:
* @Author: leizhe
* @Date: 2022-01-13 17:26:14
* @LastEditTime: 2022-06-23 16:42:21
* @LastEditors: leizhe
*/
import { get, post, PUBLISH_SERVICE, CITY_SERVICE, PandaCore } from '@/services/index';
// 基础信息展示 // 基础信息展示
export const GetDataBaseConfig = param => export const GetDataBaseConfig = param =>
...@@ -32,6 +39,10 @@ export const ReloadNginx = param => get(`${PUBLISH_SERVICE}/HostManager/ReloadNg ...@@ -32,6 +39,10 @@ export const ReloadNginx = param => get(`${PUBLISH_SERVICE}/HostManager/ReloadNg
// 获取网关配置 // 获取网关配置
export const GetGateWay = param => get(`${PUBLISH_SERVICE}/HostManager/GetGateWay`, param); export const GetGateWay = param => get(`${PUBLISH_SERVICE}/HostManager/GetGateWay`, param);
export const UpdateGeteWay = param => get(`${PUBLISH_SERVICE}/HostManager/UpdateGeteWay`, param); export const UpdateGeteWay = param => get(`${PUBLISH_SERVICE}/HostManager/UpdateGeteWay`, param);
// 网关配置
export const GetReRoutes = param => get(`${PandaCore}/OcelotSettings/GetReRoutes`, param);
export const SaveRoutes = param => post(`/OcelotSettings/SaveRoutes`, param);
export const DelRoutes = param => get(`/OcelotSettings/DelRoutes`, param);
// 代理服务老接口 // 代理服务老接口
export const GetNginxConfigInfoOLD = param => export const GetNginxConfigInfoOLD = param =>
......
...@@ -7,6 +7,7 @@ const PUBLISH_SERVICE = '/PandaOMS/OMS'; ...@@ -7,6 +7,7 @@ const PUBLISH_SERVICE = '/PandaOMS/OMS';
const WebSERVICE = '/Publish/Web'; const WebSERVICE = '/Publish/Web';
const CoreSERVICE = '/PandaCore/GCK'; const CoreSERVICE = '/PandaCore/GCK';
const PANDA_GIS = '/PandaGIS/MapServer'; const PANDA_GIS = '/PandaGIS/MapServer';
const PandaCore = '/PandaCore/GateWay';
const get = async (url, params, options = {}) => const get = async (url, params, options = {}) =>
request({ request({
url, url,
...@@ -29,4 +30,14 @@ const postForm = async (url, params = {}, options = {}) => { ...@@ -29,4 +30,14 @@ const postForm = async (url, params = {}, options = {}) => {
return post(url, formData, options); return post(url, formData, options);
}; };
export { get, post, postForm, CITY_SERVICE, PUBLISH_SERVICE, WebSERVICE, CoreSERVICE, PANDA_GIS }; export {
get,
post,
postForm,
CITY_SERVICE,
PUBLISH_SERVICE,
WebSERVICE,
CoreSERVICE,
PANDA_GIS,
PandaCore,
};
/*
* @Description:
* @Author: leizhe
* @Date: 2022-01-13 17:26:14
* @LastEditTime: 2022-06-28 09:42:40
* @LastEditors: dengchao 754083046@qq.com
*/
import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index'; import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
// 1.获取所有已附加的表 // 1.获取所有已附加的表
export const CM_Table_LoadTable = param => get(`${PUBLISH_SERVICE}/CaseManage/LoadTable`, param); export const CM_Table_LoadTable = param => get(`${PUBLISH_SERVICE}/CaseManage/LoadTable`, param);
...@@ -61,3 +68,7 @@ export const ChangeOrder = data => post(`${PUBLISH_SERVICE}/CaseManage/ChangeOrd ...@@ -61,3 +68,7 @@ export const ChangeOrder = data => post(`${PUBLISH_SERVICE}/CaseManage/ChangeOrd
export const CreateTablePost = data => post(`${PUBLISH_SERVICE}/CaseManage/CreateTable`, data); export const CreateTablePost = data => post(`${PUBLISH_SERVICE}/CaseManage/CreateTable`, data);
// 修改表 // 修改表
export const updateTablePost = param => post(`${PUBLISH_SERVICE}/CaseManage/UpdateTable`, param); export const updateTablePost = param => post(`${PUBLISH_SERVICE}/CaseManage/UpdateTable`, param);
// 加载台账
export const LoadLedgers = query =>
get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgers`, query);
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