Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

web/client/src/sections/quanju/containers/footer/operation/left.js

@@ -39,9 +39,10 @@ const Left = (props) => {
     };
     const loop = (treeData) =>
         treeData.map((item) => {
-            const index = item.title.indexOf(searchValue);
+            // console.log(item,'===> item -----');
-            const beforeStr = item.title.substr(0, index);
+            const index = item.title != null && item.title.indexOf(searchValue);
-            const afterStr = item.title.substr(index + searchValue.length);
+            const beforeStr = item.title != null && item.title.substr(0, index);
+            const afterStr = item.title != null && item.title.substr(index + searchValue.length);
             const title =
                 index > -1 ? (
                     <span>
@@ -75,8 +76,12 @@ const Left = (props) => {
         let busTierList = []
         let busTierOpen = []
         let dataList = []
-        
+        let busTierNewList = []
-        busTier && busTier.data && busTier.data.forEach((e, index) => {
+        if (busTier && busTier.data && busTier.data.length > 0) {
+            busTierNewList.push(busTier && busTier.data && busTier.data[0])
+        }
+        if (busTierNewList.length > 0) {
+            busTierNewList.forEach((e, index) => {
                 if (index == 0) {
                     busTierOpen.push(e.name)
                 }
@@ -89,8 +94,14 @@ const Left = (props) => {
                             title: s.name,
                             children: s.child.map(i => {
                                 return {
-                                key: i.vehicleLicensePlateNumber,
+                                    key: i.name,
-                                title: i.vehicleLicensePlateNumber,
+                                    title: i.name,
+                                    children: i.child.map(x => {
+                                        return {
+                                            key: x.name,
+                                            title: x.name,
+                                        }
+                                    })
                                 }
                             })
                         }
@@ -98,24 +109,19 @@ const Left = (props) => {
                     })
                 })
             })
-        busTier && busTier.data && busTier.data.forEach(e => {
+            busTierNewList.forEach(e => {
-            dataList.push({
-                key: e.name,
-                title: e.name,
-            })
                 e.child.forEach(i => {
-                dataList.push({
-                    key: i.name,
-                    title: i.name,
-                })
                     i.child.forEach(s => {
+                        s.child.forEach(x => {
                             dataList.push({
-                        key: s.vehicleLicensePlateNumber,
+                                key: x.name,
-                        title: s.vehicleLicensePlateNumber,
+                                title: x.name
                             })
                         })
                     })
                 })
+            })
+        }
         setTreeData(busTierList)
         setExpandedKeys(busTierOpen)
         setTreeDataList(dataList)