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

package.json

@@ -94,8 +94,8 @@
         "@wangeditor/editor-for-react": "^1.0.6",
         "@wisdom-cesium/cesium": "1.1.12",
         "@wisdom-cesium/krpano": "^1.0.29-60",
-        "@wisdom-map/arcgismap":"^2.0.97",
-        "@wisdom-map/basemap":"^2.0.4",
+        "@wisdom-map/arcgismap": "^2.0.97",
+        "@wisdom-map/basemap": "^2.0.4",
         "@wisdom-map/gis-component": "^1.0.46",
         "@wisdom-map/gis-utils": "^1.0.41",
         "@wisdom-map/pd-map": "^1.0.140",
@@ -131,7 +131,7 @@
         "jszip": "^3.10.1",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "6.11.09",
+        "panda-xform": "6.11.19",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",
@@ -165,7 +165,8 @@
         "styled-components": "4.2.0",
         "use-merge-value": "^1.0.2",
         "virtuallist-antd": "^0.8.0-beta.1",
-        "voca": "^1.4.0"
+        "voca": "^1.4.0",
+        "xlsx": "^0.18.5"
     },
     "devDependencies": {
         "@ant-design/icons": "^4.0.0",

src/pages/bsmanager/workOrder/autoCase/index.js

@@ -28,6 +28,7 @@ import {
   DeleteFlowAutoConfig,
   EnableDisableFlowAutoConfig,
   GetFlowAutoConfigDetail,
+  GetFlowCenterData
 } from '@/services/flow/flow';
 import {
   GetIISAgentConfig,
@@ -62,6 +63,7 @@ const AutoCase = props => {
   let flowConfigDetail = useRef(null);
   let showlogId = useRef(null);
   let planName = useRef(null)
+  let flowCenterData = useRef(null);
   const [refreshKey, setRefreshKey] = useState(0)
   let mode = useRef('');
   const statusObj = [<Tag color="default">已停用</Tag>, <Tag color="processing">已启用</Tag>];
@@ -141,6 +143,7 @@ const AutoCase = props => {
     {
       align: 'center',
       title: '操作',
+      fixed: 'right',
       render: (text, record, i) => {
         return (
           <Space size={'middle'} direction={'horizontal'}>
@@ -183,8 +186,20 @@ const AutoCase = props => {
 
   useEffect(()=>{
     getTableList()
+    getFlowCenterData()
   }, [])
 
+  const getFlowCenterData = async () => {
+    const { code, data, msg } = await GetFlowCenterData({ 
+      //userID: 1,
+      systemType: '业务系统',
+      isFilterOrderMode: 0,
+      isInternal: 0
+     }); 
+     if(code == 0){
+      flowCenterData.current = data;
+     }
+  }
 
   const getTableList = () => {
     GetIISAgentConfig({ agentName: '' }).then(res => {
@@ -352,7 +367,7 @@ const AutoCase = props => {
     }
     const res = await AddOrEditFlowAutoConfig(data);
     if (res.code === 0) {
-      message.success('新增成功!');
+      message.success('操作成功!');
       getData();
       setOpeneditor(false);
     } else {
@@ -365,8 +380,8 @@ const AutoCase = props => {
     <div className={style.content}>
       <div className={style.header}>
         <Space size={'middle'}>
-          <span>创建时间：</span>
-          <RangePicker showTime locale={locale} onChange={e => handleChange(e, 'date')} />
+          {/* <span>创建时间：</span>
+          <RangePicker showTime locale={locale} onChange={e => handleChange(e, 'date')} /> */}
           <span>方案状态：</span>
           <Radio.Group value={status} onChange={e => handleChange(e, 'status')}>
             <Radio.Button value={-1}>全部</Radio.Button>
@@ -422,6 +437,7 @@ const AutoCase = props => {
       {openEditor && <CaseModify
         visible={openEditor}
         flowConfigDetail={flowConfigDetail.current}
+        flowCenterData={flowCenterData.current}
         mode={mode.current}
         onClose={() => setOpeneditor(false)}
         onOk={onSubmit}

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/AddView.jsx

@@ -91,7 +91,7 @@ const AddView = props => {
   const getFormData = () => {
     console.log(msg, 'msgmsgmsgmsg');
 
-    if ((msg.WebPage === 'GisGatherProjectView' || msg.WebPage === 'InventoryMaterials' || msg.WebPage === 'RelatedOrder' || msg.WebPage === 'ReturnFeedbackView') && msg.WebParam) {
+    if ((msg.WebPage === 'GisGatherProjectView' || msg.WebPage === 'DataAuditingView' || msg.WebPage === 'AttributeErrorCorrectionView' || msg.WebPage === 'InventoryMaterials' || msg.WebPage === 'RelatedOrder' || msg.WebPage === 'ReturnFeedbackView') && msg.WebParam) {
       if (!Array.isArray(msg.WebParam)) {
         msg.WebParam = msg.WebParam?.split(',');
       }
@@ -107,7 +107,7 @@ const AddView = props => {
   const onFinish = () => {
     form.validateFields().then(validate => {
       if (validate) {
-        if ((validate.WebPage === 'GisGatherProjectView' || validate.WebPage === 'InventoryMaterials' || validate.WebPage === 'RelatedOrder' || validate.WebPage === 'ReturnFeedbackView') && validate.WebParam) {
+        if ((validate.WebPage === 'GisGatherProjectView' || msg.WebPage === 'DataAuditingView' || msg.WebPage === 'AttributeErrorCorrectionView' || validate.WebPage === 'InventoryMaterials' || validate.WebPage === 'RelatedOrder' || validate.WebPage === 'ReturnFeedbackView') && validate.WebParam) {
           validate.WebParam = validate.WebParam.toString();
         }
         let obj = {};

src/pages/log/loginLog/index.jsx

 import React, { useState, useEffect, useMemo } from 'react';
 import { DatePicker, Table, Row, Col, Button, notification, message, Spin } from 'antd';
-import { SwapRightOutlined, SyncOutlined } from '@ant-design/icons';
+import { SwapRightOutlined, SyncOutlined, ExportOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import 'moment/dist/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import ReactEcharts from 'echarts-for-react';
 import { post, PUBLISH_SERVICE } from '@/services/index';
 import styles from './index.less';
+import * as XLSX from "xlsx";
 const { RangePicker } = DatePicker;
 
 const LoginLog = () => {
@@ -108,6 +109,11 @@ const LoginLog = () => {
       key: 'IPTerritory',
       width: 250,
     },
+    {
+      title: '机构名称',
+      dataIndex: 'GroupName',
+      key: 'GroupName',
+    },
     {
       title: '用户名',
       dataIndex: 'ShowName',
@@ -212,6 +218,30 @@ const LoginLog = () => {
     setAllTime([moment().startOf('week'), moment(new Date(), 'YYYY-MM-DD HH:mm:ss')]);
     setFilteredValue([]);
   };
+
+  const handleExport = ()=>{
+    const souceData = data0.map(v=>{
+      let obj = {}
+       Object.keys(v).forEach(k=>{
+        const d = columns.find(x=> x.key === k)
+        if(d){
+          obj[`${d.title}`] =v[k] 
+        }
+      
+      })
+      return obj
+    })
+     // 2. 创建工作表
+     const worksheet = XLSX.utils.json_to_sheet(souceData);
+
+     // 3. 创建工作簿
+     const workbook = XLSX.utils.book_new();
+     XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
+ 
+     // 4. 生成 Excel 文件并下载
+     XLSX.writeFile(workbook, `导出数据_${new Date().toLocaleDateString()}.xlsx`);
+  }
+ 
   const onChangeInput = filters => {
     // console.log('filters', filters);
     setFilteredValue(filters.LoginName, filters.ShowName, filters.Client);
@@ -364,6 +394,17 @@ const LoginLog = () => {
             >
               重置
             </Button> */}
+            <Button
+              icon={<ExportOutlined className={styles.icon} />}
+              onClick={handleExport}
+              style={{
+                marginLeft: '25px',
+                verticalAlign: 'middle',
+                marginTop: '-3px',
+              }}
+            >
+              导出
+            </Button>
           </Col>
         </Row>
         <Spin spinning={loading} tip="loading">

src/services/flow/flow.js

@@ -147,6 +147,12 @@ export const GetFlowAutoConfigDetail = query => get(`${PUBLISH_SERVICE}/WorkFlow
 export const GetFlowAutoSchemeLogs = query => get(`${PUBLISH_SERVICE}/WorkFlow/GetFlowAutoSchemeLogs`, query);
 
 
+export const GetBizMetaData = query => post(`${PANDAWORKFLOW}/EventManage/GetBizMetaData`, query);
+
+
+export const GetFlowCenterData = query => get(`${PANDAWORKFLOW}/EventManage/GetFlowCenterData`, query);
+
+