数据库初始化追加

src/pages/bsmanager/workOrder/incident/AddModal.jsx

@@ -476,7 +476,7 @@ const AddModal = props => {
   const [reportValue, setReportValue] = useState(); // 保存上报字段外部字段
   const [displayValue, setDisplayValue] = useState(); // 保存显示字段外部字段
   const [editableValue, setEditableValue] = useState(); // 保存编辑字段外部字段
-  const [transitValue, setTransitValue] = useState(); // 保存转单字段外部字段
+  const [displayColumns, setDisplayColumns] = useState(); // 保存显示列字段外部字段
   const [relatedEventValue, setRelatedEventValue] = useState(); // 保存关联字段外部字段
   const [groupName, setGroupName] = useState('角色');
   const [chooseGroupName, setChooseGroupName] = useState(['角色', '部门', '站点']);
@@ -563,8 +563,8 @@ const AddModal = props => {
             setFlag(0);
           }
           if (type == 'add') {
-            if (obj.TransitFields == undefined) {
-              obj.TransitFields = '';
+            if (obj.DisplayColumns == undefined) {
+              obj.DisplayColumns = '';
             }
             if (obj.Roles == undefined) {
               obj.Roles = '';
@@ -669,8 +669,8 @@ const AddModal = props => {
             } else {
               setEditableIsShow('none');
             }
-            setTransitValue(res.data.root.outTransitFields);
-            if (res.data.root.outTransitFields != 0) {
+            setDisplayColumns(res.data.root.outDisplayColumns);
+            if (res.data.root.outDisplayColumns != 0) {
               setTransitIsShow('inline');
             } else {
               setTransitIsShow('none');
@@ -882,11 +882,11 @@ const AddModal = props => {
       setEditableIsShow('none');
     }
   };
-  // 转单字段外部字段
+  // 显示列字段外部字段
   const ExternalTransitField = e => {
-    if (form.getFieldValue().TransitFields) {
+    if (form.getFieldValue().DisplayColumns) {
       let pp = formateArrDataA(e, 'group');
-      let ab = form.getFieldValue().TransitFields.split(',');
+      let ab = form.getFieldValue().DisplayColumns.split(',');
       let arr = Object.keys(pp);
       let b = [];
       let a = [];
@@ -904,7 +904,7 @@ const AddModal = props => {
           }
         }
       });
-      setTransitValue(a.length);
+      setDisplayColumns(a.length);
       if (a.length != 0) {
         setTransitIsShow('inline');
       } else {
@@ -1123,8 +1123,8 @@ const AddModal = props => {
         setEditableIsShow('none');
       }
     }
-    if (prop.pickItem == 'TransitFields') {
-      setTransitValue(prop.valueArr.length);
+    if (prop.pickItem == 'DisplayColumns') {
+      setDisplayColumns(prop.valueArr.length);
       if (prop.valueArr.length != 0) {
         setTransitIsShow('inline');
       } else {
@@ -1706,11 +1706,11 @@ const AddModal = props => {
               </div>
             </Item>
           </Col>
-          {/* <Col span={24}>
+          <Col span={24}>
             <Item
               label={
                 <div>
-                  <Tooltip title={`存在${transitValue}个外部字段`}>
+                  <Tooltip title={`存在${displayColumns}个外部字段`}>
                     <InfoCircleOutlined
                       style={{
                         color: 'red',
@@ -1719,25 +1719,25 @@ const AddModal = props => {
                       }}
                     />
                   </Tooltip>
-                  <span>转单字段</span>
+                  <span>显示列字段</span>
                 </div>
               }
-              name="TransitFields"
+              name="DisplayColumns"
               labelCol={{ span: 5 }}
             >
               <div style={{ display: 'flex' }}>
-                <Form.Item name="TransitFields" style={{ marginBottom: 0, width: '100%' }}>
-                  <Input placeholder="请选择转单字段" allowClear />
+                <Form.Item name="DisplayColumns" style={{ marginBottom: 0, width: '100%' }}>
+                  <Input placeholder="请选择显示列字段" allowClear />
                 </Form.Item>
                 <Button
                   type="dashed"
-                  onClick={() => pickFiled('TransitFields')}
+                  onClick={() => pickFiled('DisplayColumns')}
                   icon={<PlusOutlined style={{ marginTop: '5px' }} />}
                   style={{ marginLeft: '10px', width: '70px' }}
                 />
               </div>
             </Item>
-          </Col> */}
+          </Col>
           <Col span={24}>
             <Item label="事件权限" name="Roles" labelCol={{ span: 5 }}>
               <div style={{ display: 'flex' }}>

src/pages/database/databaseInitialization/AppendModal.jsx

 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */
 import React, { useEffect, useState } from 'react';
-import { Button, Space, notification, Modal, Popconfirm, Empty, Spin } from 'antd';
+import { Button, Space, notification, Modal, Popconfirm, Empty, Spin, Tooltip } from 'antd';
+import { BarcodeOutlined, UserOutlined, CalendarOutlined } from '@ant-design/icons';
 import styles from './DatabaseInitialization.less';
 import { GetLicenseDifference, InitEditDataBase, GetProductList } from '@/services/database/api';
 
 const AppendModal = props => {
-  const { callBackSubmit = () => {}, visible, onCancel, value } = props;
+  const { callBackSubmit = () => {}, visible, onCancel, value, keepHistroy } = props;
   const [data, setData] = useState([]);
   const [allLength, setAllLength] = useState('');
   const [flag, setFlag] = useState();
   const [loading, setLoading] = useState(false);
+  const [code, setCode] = useState('');
+  const [project, setProject] = useState('');
+  const [name, setName] = useState('');
+  const [number, setNumber] = useState('');
+  const [much, setMuch] = useState([]);
+  const [code1, setCode1] = useState('');
+  const [project1, setProject1] = useState('');
+  const [name1, setName1] = useState('');
+  const [number1, setNumber1] = useState('');
 
   useEffect(() => {
     if (visible) {
       getProduct();
       console.log(value);
+      console.log(keepHistroy);
+      let aa = [];
+      keepHistroy.map((i, j) => {
+        if (i.license != '已使用' && j != keepHistroy.length - 1) {
+          aa.push(i);
+        }
+      });
+      if (aa.length > 0) {
+        let a = [];
+        let b = [];
+        let c = [];
+        aa.map(k => {
+          a.push(k.license);
+          b.push(k.projectName);
+          c.push(`${k.applicantName}（${k.jobNumber}）`);
+        });
+        setCode1(a.toString());
+        setProject1(b.toString());
+        setName1(c.toString());
+      }
+      setMuch(aa);
+      setCode(keepHistroy[keepHistroy.length - 1].license);
+      setProject(keepHistroy[keepHistroy.length - 1].projectName);
+      setName(keepHistroy[keepHistroy.length - 1].applicantName);
+      setNumber(keepHistroy[keepHistroy.length - 1].jobNumber);
     } else {
       setData([]);
       setFlag();
@@ -99,7 +134,7 @@ const AppendModal = props => {
   return (
     <Modal
       title="产品追加"
-      width="800px"
+      width="1000px"
       visible={visible}
       onCancel={onCancel}
       destroyOnClose
@@ -134,11 +169,70 @@ const AppendModal = props => {
         ) : (
           <>
             {allLength > 0 && (
-              <div style={{ marginBottom: '26px' }}>
+              <div
+                style={{
+                  height: '50px',
+                  display: 'flex',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                  marginBottom: '15px',
+                }}
+              >
+                {much.length > 0 ? (
+                  <Tooltip title={code1}>
+                    <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                      <BarcodeOutlined style={{ color: 'rgb(227 168 96)', marginRight: '5px' }} />
+                      授权码：
+                      {code ? <>{code}</> : <span>--</span>}
+                      <span>...</span>
+                    </div>
+                  </Tooltip>
+                ) : (
+                  <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                    <BarcodeOutlined style={{ color: 'rgb(227 168 96)', marginRight: '5px' }} />
+                    授权码：
+                    {code ? <>{code}</> : <span>--</span>}
+                  </div>
+                )}
+                {much.length > 0 ? (
+                  <Tooltip title={project1}>
+                    <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                      <CalendarOutlined style={{ color: '#8466cb', marginRight: '5px' }} />
+                      项目名：{project ? <>{project}</> : '--'}
+                      <span>...</span>
+                    </div>
+                  </Tooltip>
+                ) : (
+                  <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                    <CalendarOutlined style={{ color: '#8466cb', marginRight: '5px' }} />
+                    项目名：{project ? <>{project}</> : '--'}
+                  </div>
+                )}
+                {much.length > 0 ? (
+                  <Tooltip title={name1}>
+                    <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                      <UserOutlined style={{ color: 'green', marginRight: '5px' }} />
+                      授权人：{name ? <>{name}</> : '-'}
+                      {number ? <>（{number}）</> : '-'}
+                      {much.length > 0 ? <span>...</span> : <></>}
+                    </div>
+                  </Tooltip>
+                ) : (
+                  <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                    <UserOutlined style={{ color: 'green', marginRight: '5px' }} />
+                    授权人：{name ? <>{name}</> : '-'}
+                    {number ? <>（{number}）</> : '-'}
+                  </div>
+                )}
+                <div style={{ display: 'inline-block', backgroundColor: 'aliceblue' }}>
+                  <div style={{ float: 'right' }}>
                     <strong>
-                  追加产品列表（共<span style={{ color: 'rgb(24 144 255)' }}>{allLength}</span>个）
+                      追加产品列表（共<span style={{ color: 'rgb(24 144 255)' }}>{allLength}</span>
+                      个）
                     </strong>
                   </div>
+                </div>
+              </div>
             )}
             {data &&
               Object.keys(data).map((i, j) => (

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

@@ -28,9 +28,9 @@ import {
 import { EnvironmentOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import { GetWebSiteConfig } from '@/services/gis/gis';
-import { SetServiceConfig } from '@/services/webConfig/api';
-import styles from './index.less';
+import { SetServiceConfig, GetSpriteSheet } from '@/services/webConfig/api';
 import { ContinuousLegend } from '@antv/g2/lib/dependents';
+import styles from './index.less';
 const { Option } = Select;
 const defaultMap = {
   basemaps: [
@@ -153,6 +153,9 @@ const Map = props => {
   const [color, setColor] = useState('');
 
   useEffect(() => {
+    // GetSpriteSheet().then(res => {
+    //   console.log(123);
+    // });
     GetWebSiteConfig({ client: 'sandbox' }).then(res => {
       let setttings = {};
       if (res.data.length === 0) {

src/services/webConfig/api.js

@@ -308,3 +308,5 @@ export const DragSingleWebsite = param =>
 
 export const UpdateSchemPipeNetwork = param =>
   get(`${PANDA_GIS}/MapLayer/UpdateSchemPipeNetwork`, param);
+
+export const GetSpriteSheet = param => get(`${PANDA_GIS}/MultiMedia/GetSpriteSheet`, param);