Forráskód Böngészése

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

ZhaoJun 1 éve
szülő
commit
c7177b6706

+ 8 - 0
src/global.js

@@ -0,0 +1,8 @@
+import { GetTokenFromUrl, storeToken } from '@/utils/utils';
+
+const token = GetTokenFromUrl();
+
+if (token) {
+  storeToken(token);
+  console.log(token);
+}

+ 2 - 2
src/pages/Smart/components/SimulateDetail.js

@@ -286,7 +286,7 @@ const DeviceList = (props) => {
       value={current?.device_code}
     >
       {data?.list.map((item) => (
-        <Option key={item.device_code}>{item.device_code}</Option>
+        <Select.Option key={item.device_code}>{item.device_code}</Select.Option>
       ))}
     </Select>
   );
@@ -714,7 +714,7 @@ const Optimization = ({ data }) => {
       </div>
       <div className={styles.title2}>调整内容</div>
       {Object.entries(data.optimization).map(([key, item]) => (
-        <div className={styles.content}>
+        <div key={key} className={styles.content}>
           【{NAME_MAP[key]}】{item.remark}
         </div>
       ))}

+ 1 - 0
src/pages/Smart/components/SimulatePie.js

@@ -19,6 +19,7 @@ const SimulatePie = (props) => {
     ],
     onSuccess(data) {
       console.log(data);
+      if (Object.keys(data).length == 0) return;
       let options = getOption(data);
 
       // chartRef.current.clear();