fix: '地图方案权限配置关联站点优化'

src/components/RolePmSite/index.jsx

@@ -18,6 +18,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Modal, Checkbox, Tabs, Input, Button, Pagination, Empty, Tag, Divider, Radio } from 'antd';
 import { CM_Event_LoadDepartmentAndRoles } from '@/services/standingBook/api';
+import { GetMapLayerStationList } from '@/services/webConfig/api';
 
 import styles from './index.less';
 const CheckboxGroup = Checkbox.Group;
@@ -32,6 +33,8 @@ const RMSComponents = props => {
     chooseGroupName,
     dataType,
     isRadio,
+    mapSite,
+    gisType,
   } = props;
   const [checkedList, setCheckedList] = useState([]); // 选中复选框内容
   const [searchWord, setSearchWord] = useState(''); // 关键字
@@ -102,7 +105,7 @@ const RMSComponents = props => {
             setKeyValue('2');
             setKeepTabKey(2);
           }
-          getRoles(groupName, '', pageSize, 1, 0);
+
           let checkArr = [];
           // 角色
           let listdata = [];
@@ -178,6 +181,7 @@ const RMSComponents = props => {
           }
           setSaveCheckValue(checkArr);
           setCheckedList(checkArr);
+          getRoles(groupName, '', pageSize, 1, 0, checkArr);
         }
       });
     } else {
@@ -232,162 +236,349 @@ const RMSComponents = props => {
 
   // 搜索时获取数据
   const sreachRoles = (type, keywords, pageSizes, pageIndex) => {
-    CM_Event_LoadDepartmentAndRoles({
-      type,
-      keywords,
-      pageSize: pageSizes,
-      pageIndex,
-    }).then(res => {
-      if (res.msg === 'Ok') {
-        setOptionValue(groupArr(res.data, 'groupType'));
-        let aa = groupArr(res.data, 'groupType');
-        let list = [];
-        let data = '';
-        if (type == '角色') {
-          data = 0;
-        } else if (type == '部门') {
-          data = 1;
-        } else if (type == '站点') {
-          data = 2;
-        }
-        aa[type] &&
-          aa[type].map(i => {
-            if (checkedList[data].indexOf(i.value) != -1) {
-              list.push(i.value);
-            }
-          });
-        if (list.length === aa[type].length) {
-          if (type == '角色') {
-            setCheckAll(true);
-            setIndeterminate(false);
-          } else if (type == '部门') {
-            setCheckAll1(true);
-            setIndeterminate1(false);
-          } else if (type == '站点') {
-            setCheckAll2(true);
-            setIndeterminate2(false);
-          }
-        } else if (list.length < aa[type].length && list.length !== 0) {
-          if (type == '角色') {
-            setCheckAll(false);
-            setIndeterminate(true);
-          } else if (type == '部门') {
-            setCheckAll1(false);
-            setIndeterminate1(true);
-          } else if (type == '站点') {
-            setCheckAll2(false);
-            setIndeterminate2(true);
-          }
-        } else if (list.length === 0) {
+    if (!mapSite) {
+      CM_Event_LoadDepartmentAndRoles({
+        type,
+        keywords,
+        pageSize: pageSizes,
+        pageIndex,
+      }).then(res => {
+        if (res.msg === 'Ok') {
+          setOptionValue(groupArr(res.data, 'groupType'));
+          let aa = groupArr(res.data, 'groupType');
+          let list = [];
+          let data = '';
           if (type == '角色') {
-            setCheckAll(false);
-            setIndeterminate(false);
+            data = 0;
           } else if (type == '部门') {
-            setCheckAll1(false);
-            setIndeterminate1(false);
+            data = 1;
           } else if (type == '站点') {
-            setCheckAll2(false);
-            setIndeterminate2(false);
+            data = 2;
           }
-        }
-        setCurrentPage(1);
-        setTotal(res.data.count);
-        if (res.data.count == 0) {
-          setEmptyValue(1);
-        } else {
-          setEmptyValue(0);
-        }
-      }
-    });
-  };
-
-  const getRoles = (type, keywords, pageSizes, pageIndex, flag) => {
-    CM_Event_LoadDepartmentAndRoles({
-      type,
-      keywords,
-      pageSize: pageSizes,
-      pageIndex,
-    }).then(res => {
-      if (res.msg === 'Ok') {
-        setTotal(res.data.count);
-        setOptionValue(groupArr(res.data, 'groupType'));
-        let aa = groupArr(res.data, 'groupType');
-        let list = [];
-        let data = '';
-        if (type == '角色') {
-          data = 0;
-        } else if (type == '部门') {
-          data = 1;
-        } else if (type == '站点') {
-          data = 2;
-        }
-        // 首次进入调用
-        if (flag != undefined) {
-          let listId = [];
-          newCheckedList.map(checkItem => {
-            keepFiled.current[groupName].map(i => {
-              let canSave = dataType === 'name' ? i.label == checkItem : i.value == checkItem;
-              if (canSave) {
-                listId.push(i.value.toString());
-              }
-            });
-          });
           aa[type] &&
             aa[type].map(i => {
-              if (listId.indexOf(i.value) != -1) {
+              if (checkedList[data].indexOf(i.value) != -1) {
                 list.push(i.value);
               }
             });
-        } else {
-          aa[type] &&
-            aa[type].map(i => {
+          if (list.length === aa[type].length) {
+            if (type == '角色') {
+              setCheckAll(true);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(true);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(true);
+              setIndeterminate2(false);
+            }
+          } else if (list.length < aa[type].length && list.length !== 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(true);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(true);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(true);
+            }
+          } else if (list.length === 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(false);
+            }
+          }
+          setCurrentPage(1);
+          setTotal(res.data.count);
+          if (res.data.count == 0) {
+            setEmptyValue(1);
+          } else {
+            setEmptyValue(0);
+          }
+        }
+      });
+    } else {
+      GetMapLayerStationList({
+        keywords: keywords,
+      }).then(res => {
+        if (res.code === '0') {
+          let obj = {};
+          let arr = [];
+          res.data.list.forEach(i => {
+            let str = checkedList[2].indexOf(i.id.toString()) !== -1;
+            if (gisType === 'phone') {
+              arr.push({
+                label: i.name,
+                value: i.id.toString(),
+                disabled: str ? false : i.isPhone,
+              });
+            } else {
+              arr.push({
+                label: i.name,
+                value: i.id.toString(),
+                disabled: str ? false : i.isWeb,
+              });
+            }
+          });
+          obj.站点 = arr;
+          setOptionValue(obj);
+          let list = [];
+          let data = '';
+          if (type == '角色') {
+            data = 0;
+          } else if (type == '部门') {
+            data = 1;
+          } else if (type == '站点') {
+            data = 2;
+          }
+          obj[type] &&
+            obj[type].map(i => {
               if (checkedList[data].indexOf(i.value) != -1) {
                 list.push(i.value);
               }
             });
+          if (list.length === obj[type].length) {
+            if (type == '角色') {
+              setCheckAll(true);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(true);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(true);
+              setIndeterminate2(false);
+            }
+          } else if (list.length < obj[type].length && list.length !== 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(true);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(true);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(true);
+            }
+          } else if (list.length === 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(false);
+            }
+          }
+          if (res.data.count == 0) {
+            setEmptyValue(1);
+          } else {
+            setEmptyValue(0);
+          }
         }
+      });
+    }
+  };
 
-        if (list.length === aa[type].length) {
+  const getRoles = (type, keywords, pageSizes, pageIndex, flag, check) => {
+    if (!mapSite) {
+      CM_Event_LoadDepartmentAndRoles({
+        type,
+        keywords,
+        pageSize: pageSizes,
+        pageIndex,
+      }).then(res => {
+        if (res.msg === 'Ok') {
+          setTotal(res.data.count);
+          setOptionValue(groupArr(res.data, 'groupType'));
+          let aa = groupArr(res.data, 'groupType');
+          let list = [];
+          let data = '';
           if (type == '角色') {
-            setCheckAll(true);
-            setIndeterminate(false);
+            data = 0;
           } else if (type == '部门') {
-            setCheckAll1(true);
-            setIndeterminate1(false);
+            data = 1;
           } else if (type == '站点') {
-            setCheckAll2(true);
-            setIndeterminate2(false);
+            data = 2;
           }
-        } else if (list.length < aa[type].length && list.length !== 0) {
-          if (type == '角色') {
-            setCheckAll(false);
-            setIndeterminate(true);
-          } else if (type == '部门') {
-            setCheckAll1(false);
-            setIndeterminate1(true);
-          } else if (type == '站点') {
-            setCheckAll2(false);
-            setIndeterminate2(true);
+          // 首次进入调用
+          if (flag != undefined) {
+            let listId = [];
+            newCheckedList.map(checkItem => {
+              keepFiled.current[groupName].map(i => {
+                let canSave = dataType === 'name' ? i.label == checkItem : i.value == checkItem;
+                if (canSave) {
+                  listId.push(i.value.toString());
+                }
+              });
+            });
+            aa[type] &&
+              aa[type].map(i => {
+                if (listId.indexOf(i.value) != -1) {
+                  list.push(i.value);
+                }
+              });
+          } else {
+            aa[type] &&
+              aa[type].map(i => {
+                if (checkedList[data].indexOf(i.value) != -1) {
+                  list.push(i.value);
+                }
+              });
+          }
+
+          if (list.length === aa[type].length) {
+            if (type == '角色') {
+              setCheckAll(true);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(true);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(true);
+              setIndeterminate2(false);
+            }
+          } else if (list.length < aa[type].length && list.length !== 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(true);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(true);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(true);
+            }
+          } else if (list.length === 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(false);
+            }
+          }
+          if (res.data.count == 0) {
+            setEmptyValue(1);
+          } else {
+            setEmptyValue(0);
           }
-        } else if (list.length === 0) {
+        }
+      });
+    } else {
+      GetMapLayerStationList({
+        keywords: '',
+      }).then(res => {
+        if (res.code === '0') {
+          let obj = {};
+          let arr = [];
+          res.data.list.forEach(i => {
+            let newCheck = check ? check : checkedList;
+            let str = newCheck[2].indexOf(i.id.toString()) !== -1;
+            if (gisType === 'phone') {
+              arr.push({
+                label: i.name,
+                value: i.id.toString(),
+                disabled: str ? false : i.isPhone,
+              });
+            } else {
+              arr.push({
+                label: i.name,
+                value: i.id.toString(),
+                disabled: str ? false : i.isWeb,
+              });
+            }
+          });
+          obj.站点 = arr;
+          setOptionValue(obj);
+          let list = [];
+          let data = '';
           if (type == '角色') {
-            setCheckAll(false);
-            setIndeterminate(false);
+            data = 0;
           } else if (type == '部门') {
-            setCheckAll1(false);
-            setIndeterminate1(false);
+            data = 1;
           } else if (type == '站点') {
-            setCheckAll2(false);
-            setIndeterminate2(false);
+            data = 2;
+          }
+          // 首次进入调用
+          if (flag != undefined) {
+            let listId = [];
+            newCheckedList.map(checkItem => {
+              keepFiled.current[groupName].map(i => {
+                let canSave = dataType === 'name' ? i.label == checkItem : i.value == checkItem;
+                if (canSave) {
+                  listId.push(i.value.toString());
+                }
+              });
+            });
+            obj[type] &&
+              obj[type].map(i => {
+                if (listId.indexOf(i.value) != -1) {
+                  list.push(i.value);
+                }
+              });
+          } else {
+            obj[type] &&
+              obj[type].map(i => {
+                if (checkedList[data].indexOf(i.value) != -1) {
+                  list.push(i.value);
+                }
+              });
+          }
+
+          if (list.length === obj[type].length) {
+            if (type == '角色') {
+              setCheckAll(true);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(true);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(true);
+              setIndeterminate2(false);
+            }
+          } else if (list.length < obj[type].length && list.length !== 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(true);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(true);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(true);
+            }
+          } else if (list.length === 0) {
+            if (type == '角色') {
+              setCheckAll(false);
+              setIndeterminate(false);
+            } else if (type == '部门') {
+              setCheckAll1(false);
+              setIndeterminate1(false);
+            } else if (type == '站点') {
+              setCheckAll2(false);
+              setIndeterminate2(false);
+            }
+          }
+          if (res.data.count == 0) {
+            setEmptyValue(1);
+          } else {
+            setEmptyValue(0);
           }
         }
-        if (res.data.count == 0) {
-          setEmptyValue(1);
-        } else {
-          setEmptyValue(0);
-        }
-      }
-    });
+      });
+    }
   };
 
   const groupArr = (initialArr, name) => {
@@ -928,14 +1119,19 @@ const RMSComponents = props => {
                               </Radio.Group>
                             ) : (
                               <>
-                                <Checkbox
-                                  indeterminate={indeterminate2}
-                                  onChange={onCheckAllChange2}
-                                  checked={checkAll2}
-                                >
-                                  全选
-                                </Checkbox>
-                                <Divider />
+                                {!mapSite && (
+                                  <>
+                                    <Checkbox
+                                      indeterminate={indeterminate2}
+                                      onChange={onCheckAllChange2}
+                                      checked={checkAll2}
+                                    >
+                                      全选
+                                    </Checkbox>
+                                    <Divider />
+                                  </>
+                                )}
+
                                 <CheckboxGroup
                                   options={optionValue['站点']}
                                   value={checkedList[2]}
@@ -957,17 +1153,19 @@ const RMSComponents = props => {
             </div>
             {/* 分页 */}
             <div className={styles.footer}>
-              <Pagination
-                size="small"
-                total={total}
-                showSizeChanger
-                defaultPageSize={pageSize}
-                defaultCurrent={1}
-                pageSizeOptions={[10, 20, 45, 100]}
-                current={currentPage}
-                onChange={paginationChange}
-                style={{ marginBottom: '10px' }}
-              />
+              {!mapSite && (
+                <Pagination
+                  size="small"
+                  total={total}
+                  showSizeChanger
+                  defaultPageSize={pageSize}
+                  defaultCurrent={1}
+                  pageSizeOptions={[10, 20, 45, 100]}
+                  current={currentPage}
+                  onChange={paginationChange}
+                  style={{ marginBottom: '10px' }}
+                />
+              )}
             </div>
           </div>
           {/* 已选列表 */}

src/pages/platformCenter/gis/schemeConfig/solutionConfig/solutionConfig.jsx

@@ -35,6 +35,7 @@ const VectorData = props => {
   const [leafs, setLeafs] = useState([]);
   const [addVisible, setAddVisible] = useState(false);
   const [checkValue, setCheckValue] = useState([]);
+  const [gisType, setGisType] = useState('');
 
   const columns = [
     {
@@ -65,7 +66,10 @@ const VectorData = props => {
       render: record => (
         <Space size="middle">
           <UserAddOutlined
-            onClick={() => pickRole(record)}
+            onClick={() => {
+              pickRole(record);
+              setGisType('web');
+            }}
             style={{ fontSize: '18px', color: '#1890FF' }}
           />
         </Space>
@@ -124,7 +128,10 @@ const VectorData = props => {
       render: record => (
         <Space size="middle">
           <UserAddOutlined
-            onClick={() => pickRole(record)}
+            onClick={() => {
+              pickRole(record);
+              setGisType('phone');
+            }}
             style={{ fontSize: '18px', color: '#1890FF' }}
           />
         </Space>
@@ -779,6 +786,8 @@ const VectorData = props => {
         groupName="站点" // 打开组件展示的分组名，用来首次获取数据
         chooseGroupName={['站点']} // 可选分组名
         dataType="id"
+        mapSite={true}
+        gisType={gisType}
         // isRadio={true} // 站点单选
       />
       {/* <RoleModal

src/services/webConfig/api.js

@@ -349,3 +349,6 @@ export const SortSchemePost = param => post(`${PANDA_GIS}/MapLayer/SortSchemePos
 export const GetUserName = param => get(`${PUBLISH_SERVICE}/UserCenter/GetUserName`, param);
 
 export const ProductRepair = param => get(`${PUBLISH_SERVICE}/DBManager/ProductRepair`, param);
+
+export const GetMapLayerStationList = param =>
+  get(`${PANDA_GIS}/MapLayer/GetMapLayerStationList`, param);