fix():bug修改

src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx

@@ -240,10 +240,13 @@ function CarTypeAly() {
         });
         let tooltip = {
             formatter: (params) => {
+                let str = ''
+                params.map((item) => {
+                    str = str + ("<div style='display:inline-block;width:12px;height:12px;border-radius:10px;background:" + item.color + "'></div>" + item.seriesName + "：" + item.data + "(辆)<br/>")
+                })
                 return `<div class="tooltip-box">
                 ${params[0].axisValue}<br/>
-                ${params[0]?.data ? params[0]?.seriesName + ":" + params[0]?.data + "(辆)" : ''}<br/>
-                ${params[1]?.data ? params[1]?.seriesName + ":" + params[1]?.data + "(辆)" : ''}
+                ${str}
                 </div>`
             }
         }
@@ -347,6 +350,7 @@ function CarTypeAly() {
     };
     // 携带参数处理
     const getCheck = (v) => {
+        setTabKey('1');
         let postData = { ...formData };
         if (!loading) {
             postData = { ...holdData };
@@ -719,7 +723,7 @@ function CarTypeAly() {
                                     onChange={(key) => {
                                         setTabKey(key);
                                         //setPageInfo({ ...pageInfo, ...{ pn: 1 } });
-                                        key == 2 ? getData({ type: 'road', sort: 'asc', area_id: show }) : getData({ type: 'region', sort: 'asc', area_id: show })
+                                        key == 2 ? getData({ type: 'road', sort: 'desc', area_id: show }) : getData({ type: 'region', sort: 'desc', area_id: show })
 
                                     }}
                                     items={[

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@@ -588,6 +588,8 @@ function ParkingAlyDuration() {
     };
     // 携带参数处理
     const getCheck = (v) => {
+        setTabKey('1');
+        setTabCarKey('1');
         let postData = { ...formData, area_id: show, };
         if (!loading) {
             postData = { ...holdData };

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx

@@ -399,6 +399,7 @@ function ParkingAlyOverview() {
     };
     // 携带参数处理
     const getCheck = (v) => {
+        setTabKey('1');
         let postData = { ...formData };
         if (!loading) {
             postData = { ...holdData };

src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx

@@ -612,6 +612,25 @@ function MerchantConfiguration(props) {
       } else {
         return null;
       }
+    } else if (pt === 5) {
+      return [
+        // {
+        //   type: "title",
+        //   name: "title_1",
+        //   title: "特约商户配置",
+        // },
+        {
+          type: "select",
+          label: "ETC配置",
+          name: "etc_conf",
+          value: rowData?.etc_conf_name,
+          options: platformToAppData?.etc_conf || [],
+          disabled: actionState !== "add",
+          required: actionState !== "view",
+        },
+      ].map((item) => (
+        <FormItemList actionState={actionState} key={item.name} {...item} />
+      ));
     } else {
       return null;
     }