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

package.json

@@ -95,8 +95,8 @@
         "@wisdom-cesium/cesium": "1.1.12",
         "@wisdom-cesium/krpano": "^1.0.29-60",
         "@wisdom-map/amap":"^2.0.15",
-        "@wisdom-map/arcgismap":"^2.0.58",
-        "@wisdom-map/basemap":"^2.0.2",
+        "@wisdom-map/arcgismap":"^2.0.63",
+        "@wisdom-map/basemap":"^2.0.3",
         "@wisdom-utils/components": "0.1.337",
         "@wisdom-utils/utils": "0.1.377",
         "ace-builds": "^1.4.12",
@@ -129,7 +129,7 @@
         "jszip": "^3.10.1",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "6.9.25",
+        "panda-xform": "6.10.0",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",

src/pages/bsmanager/patrolMaintenance/maintenance/components/QRCodeDesign/index.js

@@ -121,7 +121,6 @@ const QRCodeDesign = (props, ref) => {
               }}
             >
               <QRCodeView
-                id={row.DeviceCode}
                 values={{
                   CorporateName: row.CorporateName || '熊猫水务',
                   Title: row.Title || '设备二维码',
@@ -229,7 +228,8 @@ const QRCodeDesign = (props, ref) => {
       allowTaint: false,
       useCORS: true,
       width: 610,
-      scale: 6,
+      height: 980,
+      scale: 1,
     })
     let a = document.createElement('a');
     a.setAttribute('href', can.toDataURL()); //toDataUrl：将canvas画布信息转化为base64格式图片
@@ -510,6 +510,29 @@ const QRCodeDesign = (props, ref) => {
           isBatch={false}
         />
       </Modal>
+      <div id={'QRCodeBoxs'} style={{ position: 'fixed', left: '-1200px', top: '-1200px', background: '#fff' }}>
+        {
+          dataSource.map(row => {
+            return (
+              <QRCodeView
+                id={row.DeviceCode}
+                values={{
+                  CorporateName: row.CorporateName || '熊猫水务',
+                  Title: row.Title || '设备二维码',
+                  IsSystemLogo: Boolean(row.IsSystemLogo) ? '系统LOGO' : '自定义LOGO',
+                  IsPandaLogo: Boolean(row.IsPandaLogo),
+                  LabelLogoUrl: row.LabelLogoUrl,
+                  DeviceName: row.DeviceName,
+                  DeviceCode: row.DeviceCode,
+                  AccountName: row.AccountName,
+                }}
+                isBatch={false}
+                style={{ width: '610px', height: '980px', margin: '0 auto' }}
+              />
+            )
+          })
+        }
+      </div>
     </Modal>
   )
 }

src/pages/bsmanager/workOrder/incident/AddModal/index.js

@@ -437,10 +437,12 @@ const AddModal = (props) => {
   const [reportIsShow, setReportIsShow] = useState('none'); // 上报字段外部字段是否显示
   const [displayIsShow, setDisplayIsShow] = useState('none'); // 显示字段外部字段是否显示
   const [transitIsShow, setTransitIsShow] = useState('none'); // 转单字段外部字段是否显示
+  const [copyIsShow, setCopyIsShow] = useState('none'); // 抄送字段外部字段是否显示
   const [summaryValue, setSummaryValue] = useState(); // 保存摘要字段外部字段
   const [reportValue, setReportValue] = useState(); // 保存上报字段外部字段
   const [displayValue, setDisplayValue] = useState(); // 保存显示字段外部字段
   const [displayColumns, setDisplayColumns] = useState(); // 保存显示列字段外部字段
+  const [copyValue, setCopyValue] = useState(); //保存抄送字段外部字段
   const [question, setQuestion] = useState({ outSearchFields: 0, outOrderByFieldConfig: 0 })
   const [keepFiled, setKeepFiled] = useState([]);
   const [imageUrl, setImageUrl] = useState();
@@ -595,6 +597,12 @@ const AddModal = (props) => {
             } else {
               setTransitIsShow('none');
             }
+            setCopyValue(res.data.root.outCopyField)
+            if (res.data.root.outCopyField != 0) {
+              setCopyIsShow('inline')
+            } else {
+              setCopyIsShow('none')
+            }
             setQuestion({
               outSearchFields,
               outOrderByFieldConfig
@@ -1556,6 +1564,38 @@ const AddModal = (props) => {
                   </div>
                 </Item>
               </Col>
+              <Col span={24}>
+                <Item
+                  label={
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                      <Tooltip title={`存在${copyValue}个外部字段`}>
+                        <InfoCircleOutlined
+                          style={{
+                            color: 'red',
+                            marginRight: '2px',
+                            display: copyIsShow,
+                          }}
+                        />
+                      </Tooltip>
+                      <span>抄送字段</span>
+                    </div>
+                  }
+                  name="CopyField"
+                  labelCol={{ span: 5 }}
+                >
+                  <div style={{ display: 'flex' }}>
+                    <Form.Item name="CopyField" style={{ marginBottom: 0, width: '100%' }}>
+                      <Input placeholder="请选择抄送字段" allowClear />
+                    </Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => pickFiled('CopyField')}
+                      icon={<PlusOutlined style={{ marginTop: '5px' }} />}
+                      style={{ marginLeft: '10px', width: '70px' }}
+                    />
+                  </div>
+                </Item>
+              </Col>
               <Col span={24}>
                 <Item
                   name="Reportable"

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx

@@ -372,7 +372,7 @@ const FlowChart = props => {
       ExtendPageList: [],
       FlowNodeBackfillConfigs: [],
       FlowTimerList: [],
-      TurnOnCc: 1,
+      TurnOnCc: 0,
       NodeAliasName: '',
       Handover: '移交选择人',
       TableName: '',
@@ -381,7 +381,7 @@ const FlowChart = props => {
       FeedbackName: '',
       Transferable: 0,
       EventsInformation: 0,
-      IsSendMessage: 1,
+      IsSendMessage: 0,
       IsSave: 0,
       AutoClose: '否',
       HalfwayClose: 0,

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx

@@ -172,16 +172,7 @@ const NodeModal = props => {
             </div>
           </div>
           <div
-            style={{
-              display:
-                activeConfig !== '高级配置' ||
-                  editMsg.NodeType === '20' ||
-                  editMsg.NodeType === '21' ||
-                  editMsg.NodeType === '22' ||
-                  editMsg.NodeType === '30'
-                  ? 'none'
-                  : 'block',
-            }}
+            style={{ display: activeConfig !== '高级配置' || ['20', '21', '22', '30'].includes(editMsg.NodeType) ? 'none' : 'block' }}
           >
             {/* 时限配置 */}
             <ConfigTimeLimit
@@ -271,12 +262,20 @@ const NodeModal = props => {
           </div>
           {/* 子流程配置 */}
           {editMsg.NodeType === '30' && (
-            <ConfigSubprocess
-              ref={refConfigSubprocess}
-              editMsg={editMsg}
-              flowID={flowID}
-              nodeChage={nodeChage}
-            />
+            <>
+              <ConfigSubprocess
+                ref={refConfigSubprocess}
+                editMsg={editMsg}
+                flowID={flowID}
+                nodeChage={nodeChage}
+              />
+              <ConfigAccount
+                ref={refConfigAccount}
+                nodeChage={nodeChage}
+                editMsg={editMsg}
+                flowID={flowID}
+              />
+            </>
           )}
           {/* 网关规则配置 */}
           <div

src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx

@@ -3,7 +3,7 @@
 /* eslint-disable no-case-declarations */
 /* eslint-disable import/no-duplicates */
 /* eslint-disable no-new */
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useMemo } from 'react';
 import { SketchPicker } from 'react-color';
 import {
   ArcGISMap,
@@ -18,6 +18,7 @@ import {
   SimpleFillSymbol,
   Graphic,
   EditAndDrawPanel,
+  Handles
 } from '@wisdom-map/arcgismap';
 import { checkInternalNetwork } from '@/utils/utils';
 import { getPipenetLayer } from '@wisdom-map/basemap';
@@ -200,6 +201,7 @@ const Map = props => {
   const [hide, setHide] = useState(false);
   const [hideChange, setHideChange] = useState(null);
   const [keepNameCustomPointExtent, setKeepNameCustomPointExtent] = useState(''); // 保存方案初始自定义区域
+  const mapHandles = useRef(new Handles())
 
   useEffect(() => {
     GetWebSiteConfig({ client: 'sandbox' })
@@ -495,14 +497,6 @@ const Map = props => {
       }
     });
     setMap(viewObject);
-    watchUtils.watch(viewObject, ['zoom'], newzoom => {
-      // 鼠标滚动隐藏管网图
-      viewObject.map.layers.find(layer => {
-        if (layer.layerType == 'PipenetLayer') {
-          layer.visible = false;
-        }
-      });
-    });
     mapInfo.current = viewObject;
     if (form.getFieldsValue().exportScheme == 'pandagis') {
       let data = mapInfo.current.map.layers.find(
@@ -521,6 +515,7 @@ const Map = props => {
           url: `/PandaGIS/MapServer/${aa}`,
           layerType: 'PipenetLayertest',
           title: aa,
+          customParameters : {}
         });
         viewObject.map.add(pandagis1);
       }
@@ -720,7 +715,14 @@ const Map = props => {
         setColorList(setttings.boundColor || '#86C8F8');
         setKeepColor(setttings.boundColor || '#86C8F8');
         setColor(setttings.backgroundColor || '#000000');
-        setRadio(setttings.exportScheme || 'pandagis');
+        if(radio == "arcgis" && setttings.exportScheme == "arcgis") {
+          setRadio()
+          setTimeout(() => {
+            setRadio("arcgis")
+          }, 50)
+        } else {
+          setRadio(setttings.exportScheme || 'pandagis');
+        }
         setRadio1(setttings.customFlag);
 
         mapRef.current.mapchange(obj);
@@ -760,6 +762,25 @@ const Map = props => {
     }, 0);
   };
 
+  useEffect(() => {
+    if(!map) return
+    const viewObject = map
+    if(mapHandles.current) {
+      mapHandles.current.removeAll()
+      mapHandles.current.add(watchUtils.watch(viewObject, ['zoom'], newzoom => {
+        // 鼠标滚动隐藏管网图
+        viewObject.map.layers.find(layer => {
+          if (layer.layerType == 'PipenetLayer') {
+            layer.visible = false;
+          }
+        });
+      }))
+    }
+    return () => {
+      mapHandles.current && mapHandles.current.removeAll()
+    }
+  }, [map])
+
   useEffect(() => {
     if (name && !hide) {
       setHideChange(false);
@@ -939,12 +960,13 @@ const Map = props => {
     });
   };
 
-  const pandagis = new MapImageLayer({
+  const pandagis = useMemo(() => new MapImageLayer({
     id: keep.id,
     url: `/PandaGIS/MapServer/${keep.id}`,
     layerType: 'PipenetLayertest',
     title: keep.id,
-  });
+    customParameters : {}
+  }), [keep])
 
   const onChange = e => {
     const { layer } = getPipenetLayer(mapInfo.current?.map);
@@ -1339,7 +1361,7 @@ const Map = props => {
             client="sandbox"
           />
         )}
-        {radio == 'arcgis' ? (
+        {radio == 'arcgis' && map &&  name && Schemename? (
           <PipenetStylesCenter
             schemeName={Schemename.schemename}
             mapServerName={name}