Commit 1f0d00c1 authored by 皮倩雯's avatar 皮倩雯

界面加载UI

parent 3ff3eeb3
Pipeline #33968 passed with stages
in 5 minutes 26 seconds
......@@ -66,7 +66,6 @@ const AddModal = props => {
if (obj.CreateMode === 0 || 1) {
obj.CreateMode = obj.CreateMode.toString()
}
if (checkedList2 != true) {
obj.Editable = false
} else {
......@@ -76,30 +75,18 @@ const AddModal = props => {
obj.Reportable = '均可'
obj.ReportFromMobile = '手持'
obj.ReportFromWeb = '前端'
// inputValue.Reportable = '均可'
// inputValue.ReportFromMobile = '手持'
// inputValue.ReportFromWeb = '前端'
} else if (checkedList3 === true) {
obj.Reportable = '前端'
obj.ReportFromMobile = ''
obj.ReportFromWeb = '前端'
// inputValue.Reportable = '前端'
// inputValue.ReportFromMobile = ''
// inputValue.ReportFromWeb = '前端'
obj.ReportFromWeb = '前端'
} else if (checkedList4 === true) {
obj.Reportable = '手持'
obj.ReportFromMobile = '手持'
obj.ReportFromWeb = ''
// inputValue.Reportable = '手持'
// inputValue.ReportFromMobile = '手持'
// inputValue.ReportFromWeb = ''
} else {
obj.Reportable = '否'
obj.ReportFromMobile = ''
obj.ReportFromWeb = ''
// inputValue.Reportable = ''
// inputValue.ReportFromMobile = ''
// inputValue.ReportFromWeb = ''
obj.ReportFromWeb = ''
}
console.log(type)
console.log(obj)
......@@ -119,7 +106,6 @@ const AddModal = props => {
})
}else{
let data = { ...obj, ...inputValue, Order: maxLength }
// let data = { ...obj, ...inputValue, Order: maxLength } : { ...obj, Order, ID: formObj.ID }
if (type == 'edit') {
CM_Event_EditEventTable({
...inputValue,
......@@ -137,8 +123,7 @@ const AddModal = props => {
ReportPage:obj.ReportPage,
DealPage:obj.DealPage,
RelatedEvents:obj.RelatedEvents,
InterfaceConfig:obj.InterfaceConfig,
InterfaceConfig:obj.InterfaceConfig,
})
.then(res => {
// setLoading(false);
......
......@@ -34,7 +34,6 @@ import ViewModal from './ViewModal'
const incident = () => {
const [treeLoading, setTreeLoading] = useState(false);
const [tableLoading, setTableLoading] = useState(false);
const [treeVisible, setTreeVisible] = useState(true); // 左边列表是否可见
const [treeData, setTreeData] = useState([]); // 事件表数据
const [tableData, setTableData] = useState([]); // 事件表
......@@ -259,7 +258,9 @@ const incident = () => {
]
useEffect(()=>{
setTreeLoading(true);
GetCM_Event_LoadEventTable().then(res =>{
setTreeLoading(false);
if(res.msg==='Ok'){
console.log(res.data)
// setMaxLength(res.data.root.length + 1)
......@@ -508,7 +509,6 @@ const incident = () => {
}}
columns={columns}
dataSource={tableData[pickItem]}
loading={tableLoading}
scroll={{ x: 'max-content', y: 'calc(100vh - 155px)' }}
pagination={{
showTotal: (total, range) =>
......
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