Skip to content

C
CivManage
Commit caac64e8 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

fix: '地图版本自定义行政区'

parent 1cd8ff3a
Pipeline #60533 passed with stages
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 210 additions and 174 deletions
          package.json
          View file @ caac64e8
          ...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
          "@esri/calcite-colors": "6.0.3", "@esri/calcite-colors": "6.0.3",
          "@wisdom-cesium/cesium": "^1.0.78", "@wisdom-cesium/cesium": "^1.0.78",
          "@wisdom-map/amap": "1.1.0-beta.38", "@wisdom-map/amap": "1.1.0-beta.38",
          "@wisdom-map/arcgismap": "1.4.0-50", "@wisdom-map/arcgismap": "1.4.0-51",
          "@wisdom-map/basemap": "1.1.0-10", "@wisdom-map/basemap": "1.1.0-11",
          "ace-builds": "^1.4.12", "ace-builds": "^1.4.12",
          "antd-img-crop": "^3.13.2", "antd-img-crop": "^3.13.2",
          "bizcharts": "^4.0.15", "bizcharts": "^4.0.15",
          ......
          src/pages/bsmanager/workOrder/incident/AddModal.jsx
          View file @ caac64e8
          ...@@ -46,7 +46,7 @@ import { ...@@ -46,7 +46,7 @@ import {
          GetCM_Event_QueryEventType, GetCM_Event_QueryEventType,
          CM_Event_AddEventTable, CM_Event_AddEventTable,
          } from '@/services/standingBook/api'; } from '@/services/standingBook/api';
          import { PlusOutlined, DownOutlined, InfoCircleOutlined, DeleteOutlined } from '@ant-design/icons'; import { PlusOutlined, DownOutlined, InfoCircleOutlined, DeleteOutlined, PictureOutlined } from '@ant-design/icons';
          import styles from './incident.less'; import styles from './incident.less';
          import ChangeAdd from './changeAdd'; import ChangeAdd from './changeAdd';
          import ChangeEdit from './changeEdit'; import ChangeEdit from './changeEdit';
          ...@@ -955,26 +955,36 @@ const AddModal = props => { ...@@ -955,26 +955,36 @@ const AddModal = props => {
          if (!name) { if (!name) {
          return '请传入对象属性'; return '请传入对象属性';
          } }
          //先获取一下这个数组中有多少个"name" //先获取一下这个数组中name的集合放进新数组
          let nameArr = []; let nameArr = [];
          for (let i in initialArr) { for (let i in initialArr) {
          if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) { if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
          nameArr.push(initialArr[i][`${name}`]); nameArr.push(initialArr[i][`${name}`]);
          } }
          } }
          console.log(nameArr);
          console.log(initialArr);
          //新建一个包含多个list的结果对象 //新建一个包含多个list的结果对象
          let tempObj = {}; let tempObj = {};
          let aa =[];
          // 根据不同的"name"生成多个数组 // 根据不同的"name"生成多个数组
          // eslint-disable-next-line guard-for-in // eslint-disable-next-line guard-for-in
          for (let k in nameArr) { for (let k in nameArr) {
          for (let j in initialArr) { for (let j in initialArr) {
          if (initialArr[j][`${name}`] == nameArr[k]) { if (initialArr[j][`${name}`] == nameArr[k]) {
          // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变 // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
          tempObj[nameArr[k]] = tempObj[nameArr[k]] || []; tempObj[nameArr[k]] = tempObj[nameArr[k]] || [];
          tempObj[nameArr[k]].push(initialArr[j]); if(initialArr[j].isDefaultField==false){
          tempObj[nameArr[k]].push(initialArr[j]);
          }else{
          aa.push(initialArr[j].fieldName);
          }
          } }
          } }
          } }
          console.log(aa);
          // tempObj.内置字段 = aa;
          for (let key in tempObj) { for (let key in tempObj) {
          let arr = []; let arr = [];
          tempObj[key].map(item => { tempObj[key].map(item => {
          ...@@ -982,6 +992,11 @@ const AddModal = props => { ...@@ -982,6 +992,11 @@ const AddModal = props => {
          arr.push(item.fieldName); arr.push(item.fieldName);
          }); });
          } }
          console.log(tempObj)
          if(aa.length>0){
          tempObj.内置字段 = [...aa];
          }
          console.log(tempObj);
          return tempObj; return tempObj;
          }; };
          ...@@ -1868,12 +1883,23 @@ const AddModal = props => { ...@@ -1868,12 +1883,23 @@ const AddModal = props => {
          style={{ style={{
          position: 'absolute', position: 'absolute',
          fontSize: '18px', fontSize: '18px',
          left: '44px', left: '24px',
          top: '45px', top: '45px',
          color: 'white', color: 'white',
          zIndex:'999' zIndex:'999'
          }} }}
          /> />
          <PictureOutlined
          onClick={pictruePreview}
          style={{
          position: 'absolute',
          fontSize: '18px',
          left: '54px',
          top: '45px',
          color: 'white',
          zIndex:'999'
          }}
          />
          </> </>
          ) : ( ) : (
          <></> <></>
          ...@@ -1884,18 +1910,19 @@ const AddModal = props => { ...@@ -1884,18 +1910,19 @@ const AddModal = props => {
          width="104px" width="104px"
          // height={100} // height={100}
          src="error" src="error"
          onClick={pictruePreview}
          fallback="data:image/png;base64,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" fallback="data:image/png;base64,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"
          /> />
          )} )}
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> {/* <Col span={12}>
          <Item> <Item>
          <Button type="primary" onClick={pictruePreview} style={{ marginTop: '33px' }}> <Button type="primary" onClick={pictruePreview} style={{ marginTop: '33px' }}>
          从图片库中选择 从图片库中选择
          </Button> </Button>
          </Item> </Item>
          </Col> </Col> */}
          </Row> </Row>
          </Form> </Form>
          {/* <ChangeAdd {/* <ChangeAdd
          ......
          src/pages/bsmanager/workOrder/incident/incident.less
          View file @ caac64e8
          ...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
          left: -9px; left: -9px;
          height: 104px; height: 104px;
          width: 104px; width: 104px;
          // background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
          border-radius: 2px; border-radius: 2px;
          z-index:1; z-index:1;
          } }
          ...@@ -307,3 +307,6 @@ ...@@ -307,3 +307,6 @@
          .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem { .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
          display: flex; display: flex;
          } }
          .ant-checkbox-wrapper ant-checkbox-group-item{
          color:red;
          }
          src/pages/platformCenter/gis/schemeConfig/TileConfig/AddProjectModal.jsx
          View file @ caac64e8
          ...@@ -239,65 +239,68 @@ const AddProjectModal = props => { ...@@ -239,65 +239,68 @@ const AddProjectModal = props => {
          <Form form={form} {...layout} onFinish={onFinish}> <Form form={form} {...layout} onFinish={onFinish}>
          {type === 'add' ? ( {type === 'add' ? (
          <> <>
          <Row> <Item label="底图级别" style={{ marginBottom: '0px' }}>
          <Col span={14}> <Row>
          <Item <Col span={7}>
          labelCol={{ span: 7 }} <Item
          label={ // label={
          <div> // <div>
          <Tooltip title="同一分级底图中的不同基础底图级别不能相同"> // {/* <Tooltip title="同一分级底图中的不同基础底图级别不能相同">
          <InfoCircleOutlined // <InfoCircleOutlined
          style={{ // style={{
          color: 'rgb(24, 144, 255)', // color: 'rgb(24, 144, 255)',
          marginLeft: '0px', // marginLeft: '0px',
          marginRight: '5px', // marginRight: '5px',
          }} // }}
          /> // />
          </Tooltip> // </Tooltip> */}
          <span>最小级别</span> // <span>最小级别</span>
          </div> // </div>
          } // }
          name="zoom" name="zoom"
          rules={[ rules={[
          { required: true, message: '请输入最小级别' }, { required: true, message: '请输入最小级别' },
          // { // {
          // validator: (rule, value) => { // validator: (rule, value) => {
          // const obj = form.getFieldsValue().zoom; // const obj = form.getFieldsValue().zoom;
          // console.log(obj); // console.log(obj);
          // if (arr.indexOf(obj) != -1) { // if (arr.indexOf(obj) != -1) {
          // console.log(111); // console.log(111);
          // return Promise.reject('已存在该级别的基础底图'); // return Promise.reject('已存在该级别的基础底图');
          // } // }
          // return Promise.resolve(); // return Promise.resolve();
          // }, // },
          // }, // },
          ]} ]}
          > >
          <InputNumber min={0} max={99} /> <InputNumber min={0} max={99} />
          </Item> </Item>
          </Col> </Col>
          <Col span={10}> <Col span={2}>
          <Item <div style={{ marginTop: '4px' }}>~</div>
          labelCol={{ span: 10 }} </Col>
          label="最大级别" <Col span={10}>
          name="maxzoom" <Item
          rules={[ // label="最大级别"
          { name="maxzoom"
          validator: (rule, value) => { rules={[
          const obj = form.getFieldsValue().zoom; {
          const objmax = form.getFieldsValue().maxzoom; validator: (rule, value) => {
          if (objmax < obj) { const obj = form.getFieldsValue().zoom;
          return Promise.reject('最大级别不能小于最小级别'); const objmax = form.getFieldsValue().maxzoom;
          } if (objmax < obj) {
          return Promise.resolve(); return Promise.reject('最大级别不能小于最小级别');
          }
          return Promise.resolve();
          },
          }, },
          }, ]}
          ]} >
          > <InputNumber min={0} max={99} />
          <InputNumber min={0} max={99} /> </Item>
          </Item> </Col>
          </Col> </Row>
          </Row> </Item>
          <Item <Item
          label="基础底图" label="基础底图"
          name="serverName" name="serverName"
          ...@@ -319,12 +322,14 @@ const AddProjectModal = props => { ...@@ -319,12 +322,14 @@ const AddProjectModal = props => {
          <Item <Item
          label="名称" label="名称"
          name="schemename" name="schemename"
          labelCol={{ span: 5 }}
          rules={[{ required: true, message: '请输入名称' }]} rules={[{ required: true, message: '请输入名称' }]}
          > >
          <Input placeholder="请输入名称" allowClear /> <Input placeholder="请输入名称" allowClear />
          </Item> </Item>
          <Item <Item
          label="默认基础底图" label="默认基础底图"
          labelCol={{ span: 5 }}
          name="baseMap" name="baseMap"
          rules={[{ required: true, message: '请选择基础底图' }]} rules={[{ required: true, message: '请选择基础底图' }]}
          > >
          ......
          src/pages/platformCenter/gis/schemeConfig/TileConfig/BaseMap.jsx
          View file @ caac64e8
          ...@@ -122,7 +122,7 @@ const BaseMap = props => { ...@@ -122,7 +122,7 @@ const BaseMap = props => {
          title={title} title={title}
          bodyStyle={{ width: '100%', minHeight: '100px' }} bodyStyle={{ width: '100%', minHeight: '100px' }}
          style={{ top: '150px' }} style={{ top: '150px' }}
          width="600px" width="500px"
          destroyOnClose destroyOnClose
          maskClosable={false} maskClosable={false}
          cancelText="取消" cancelText="取消"
          ...@@ -132,68 +132,69 @@ const BaseMap = props => { ...@@ -132,68 +132,69 @@ const BaseMap = props => {
          forceRender forceRender
          getContainer={false} getContainer={false}
          > >
          <Form form={form} {...layout} onFinish={onSubmit}> <Form form={form} onFinish={onSubmit}>
          <Row> <Item label="底图级别" style={{ marginTop: '20px' }} labelCol={{ span: 5 }}>
          <Col span={12}> <Row>
          <Item <Col span={8}>
          labelCol={{ span: 8 }} <Item
          label={ // label={
          <div> // <div>
          <Tooltip title="同一分级底图中的不同基础底图级别不能相同"> // <Tooltip title="同一分级底图中的不同基础底图级别不能相同">
          <InfoCircleOutlined // <InfoCircleOutlined
          style={{ // style={{
          color: 'rgb(24, 144, 255)', // color: 'rgb(24, 144, 255)',
          marginLeft: '0px', // marginLeft: '0px',
          marginRight: '5px', // marginRight: '5px',
          }} // }}
          /> // />
          </Tooltip> // </Tooltip>
          <span>最小级别</span> // <span>最小级别</span>
          </div> // </div>
          } // }
          style={{ marginTop: '20px' }}
          name="zoom" name="zoom"
          rules={[ rules={[
          { required: true, message: '请输入级别' }, { required: true, message: '请输入级别' },
          // { // {
          // validator: (rule, value) => { // validator: (rule, value) => {
          // const obj = form.getFieldsValue().zoom; // const obj = form.getFieldsValue().zoom;
          // console.log(obj); // console.log(obj);
          // if (arr.indexOf(obj) != -1) { // if (arr.indexOf(obj) != -1) {
          // console.log(111); // console.log(111);
          // return Promise.reject('已存在该级别的基础底图'); // return Promise.reject('已存在该级别的基础底图');
          // } // }
          // return Promise.resolve(); // return Promise.resolve();
          // }, // },
          // }, // },
          ]} ]}
          > >
          <InputNumber min={0} /> <InputNumber min={0} />
          </Item> </Item>
          </Col> </Col>
          <Col span={12}> <Col span={3}>
          <Item <div style={{ marginTop: '4px' }}>~</div>
          labelCol={{ span: 6 }} </Col>
          label="最大级别" <Col span={10}>
          name="maxzoom" <Item
          style={{ marginTop: '20px' }} name="maxzoom"
          rules={[ rules={[
          { {
          validator: (rule, value) => { validator: (rule, value) => {
          const obj = form.getFieldsValue().zoom; const obj = form.getFieldsValue().zoom;
          const objmax = form.getFieldsValue().maxzoom; const objmax = form.getFieldsValue().maxzoom;
          if (objmax < obj) { if (objmax < obj) {
          return Promise.reject('最大级别不能小于最小级别'); return Promise.reject('最大级别不能小于最小级别');
          } }
          return Promise.resolve(); return Promise.resolve();
          },
          }, },
          }, ]}
          ]} >
          > <InputNumber min={0} max={99} />
          <InputNumber min={0} max={99} /> </Item>
          </Item> </Col>
          </Col> </Row>
          </Row> </Item>
          </Form> </Form>
          </Modal> </Modal>
          ); );
          ......
          src/pages/platformCenter/gis/schemeConfig/VectorData/AddModal.jsx
          View file @ caac64e8
          ...@@ -196,7 +196,7 @@ const AddModal = props => { ...@@ -196,7 +196,7 @@ const AddModal = props => {
          {...props} {...props}
          onOk={() => onSubmit()} onOk={() => onSubmit()}
          confirmLoading={loading} confirmLoading={loading}
          forceRender={true} forceRender
          getContainer={false} getContainer={false}
          > >
          {visible && ( {visible && (
          ...@@ -243,15 +243,18 @@ const AddModal = props => { ...@@ -243,15 +243,18 @@ const AddModal = props => {
          rules={[{ required: true, message: '请选择工作空间名称' }]} rules={[{ required: true, message: '请选择工作空间名称' }]}
          > >
          <div className={styles.imgList}> <div className={styles.imgList}>
          <Select onChange={handleWorkspace} value={workSpace} style={{ width: '365px' }}> <Select
          onChange={handleWorkspace}
          value={workSpace}
          style={{ width: '365px' }}
          showSearch
          >
          {workList.length {workList.length
          ? workList.map((item, index) => { ? workList.map((item, index) => (
          return ( <Option key={index} value={item}>
          <Option key={index} value={item}> {item}
          {item} </Option>
          </Option> ))
          );
          })
          : ''} : ''}
          </Select> </Select>
          <Button <Button
          ......
          src/pages/platformCenter/gis/schemeConfig/projectMessage/AddModal.jsx
          View file @ caac64e8
          ...@@ -135,8 +135,8 @@ const AddModal = props => { ...@@ -135,8 +135,8 @@ const AddModal = props => {
          form.resetFields(); form.resetFields();
          let req1 = GetbaseMapschemeName(); let req1 = GetbaseMapschemeName();
          let req2 = GetVectorService(); let req2 = GetVectorService();
          let pipeArr = [], let pipeArr = [];
          baseMap = []; let baseMap = [];
          Promise.all([req1, req2]).then(res => { Promise.all([req1, req2]).then(res => {
          if (res[0].code == '0') { if (res[0].code == '0') {
          (res[0].data || []).map(item => { (res[0].data || []).map(item => {
          ...@@ -206,7 +206,7 @@ const AddModal = props => { ...@@ -206,7 +206,7 @@ const AddModal = props => {
          {...props} {...props}
          onOk={() => onSubmit()} onOk={() => onSubmit()}
          confirmLoading={loading} confirmLoading={loading}
          forceRender={true} forceRender
          getContainer={false} getContainer={false}
          > >
          {visible && ( {visible && (
          ...@@ -215,13 +215,11 @@ const AddModal = props => { ...@@ -215,13 +215,11 @@ const AddModal = props => {
          <Item label="分级底图" name="serverName"> <Item label="分级底图" name="serverName">
          <Select onChange={handleChange}> <Select onChange={handleChange}>
          {serviceList.length {serviceList.length
          ? serviceList.map((item, index) => { ? serviceList.map((item, index) => (
          return ( <Option key={index} value={item}>
          <Option key={index} value={item}> {item}
          {item} </Option>
          </Option> ))
          );
          })
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ...@@ -246,15 +244,13 @@ const AddModal = props => { ...@@ -246,15 +244,13 @@ const AddModal = props => {
          <Input placeholder="请输入方案名" allowClear /> <Input placeholder="请输入方案名" allowClear />
          </Item> </Item>
          <Item label="管网" name="servicename" placeholder="请选择管网"> <Item label="管网" name="servicename" placeholder="请选择管网">
          <Select onChange={handleService}> <Select onChange={handleService} showSearch>
          {pipeArr.length {pipeArr.length
          ? pipeArr.map((item, index) => { ? pipeArr.map((item, index) => (
          return ( <Option key={index} value={item}>
          <Option key={index} value={item}> {item}
          {item} </Option>
          </Option> ))
          );
          })
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ...@@ -278,13 +274,11 @@ const AddModal = props => { ...@@ -278,13 +274,11 @@ const AddModal = props => {
          > >
          <Select onChange={handleBaseMap}> <Select onChange={handleBaseMap}>
          {baseMap.length {baseMap.length
          ? baseMap.map((item, index) => { ? baseMap.map((item, index) => (
          return ( <Option key={index} value={item}>
          <Option key={index} value={item}> {item}
          {item} </Option>
          </Option> ))
          );
          })
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ...@@ -296,13 +290,11 @@ const AddModal = props => { ...@@ -296,13 +290,11 @@ const AddModal = props => {
          > >
          <Select onChange={handleBaseMap}> <Select onChange={handleBaseMap}>
          {keepData.length {keepData.length
          ? keepData.map((item, index) => { ? keepData.map((item, index) => (
          return ( <Option key={index} value={item}>
          <Option key={index} value={item}> {item}
          {item} </Option>
          </Option> ))
          );
          })
          : ''} : ''}
          </Select> </Select>
          </Item> </Item>
          ......
          src/pages/productCenter/webConfig/index.jsx
          View file @ caac64e8
          ...@@ -343,7 +343,7 @@ const WebConfigPage = props => { ...@@ -343,7 +343,7 @@ const WebConfigPage = props => {
          </strong> </strong>
          {tabPaneItem.existMapComponent < 9 && ( {tabPaneItem.existMapComponent < 9 && (
          <Button type="primary" onClick={() => SyncMap(tabPaneItem)}> <Button type="primary" onClick={() => SyncMap(tabPaneItem)}>
          同步地图组件 一键修复
          </Button> </Button>
          )} )}
          </div> </div>
          ......
          src/services/tablemanager/tablemanager.js
          View file @ caac64e8
          ...@@ -9,7 +9,8 @@ import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index'; ...@@ -9,7 +9,8 @@ import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
          // 检查表类型重分组 // 检查表类型重分组
          export const checkTableType = param => get(`${PUBLISH_SERVICE}/CaseManage/CheckTableType`, param); export const checkTableType = param => get(`${PUBLISH_SERVICE}/CaseManage/CheckTableType`, param);
          // 执行重分组表类型 // 执行重分组表类型
          export const regroupTableType = param => get(`${PUBLISH_SERVICE}/CaseManage/RegroupTableType`, param); export const regroupTableType = param =>
          get(`${PUBLISH_SERVICE}/CaseManage/RegroupTableType`, param);
          // 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);
          export const CM_Table_LoadTable = param => get(`${PUBLISH_SERVICE}/CaseManage/LoadTableV2`, param); export const CM_Table_LoadTable = param => get(`${PUBLISH_SERVICE}/CaseManage/LoadTableV2`, param);
          ...@@ -77,3 +78,7 @@ export const updateTablePost = param => post(`${PUBLISH_SERVICE}/CaseManage/Upda ...@@ -77,3 +78,7 @@ export const updateTablePost = param => post(`${PUBLISH_SERVICE}/CaseManage/Upda
          // 加载台账 // 加载台账
          export const LoadLedgers = query => export const LoadLedgers = query =>
          get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgers`, query); get(`${PUBLISH_SERVICE}/WorkOrderCenter/GetCM_Ledger_LoadLedgers`, query);
          // 获取各类表的的默认字段集合
          export const GetDefaultTableFields = query =>
          get(`${PUBLISH_SERVICE}/CaseManage/GetDefaultTableFields`, 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