修改样式

src/components/ManagementPage/chartModule.js

@@ -125,7 +125,7 @@ const ChartModule = (props) => {
               ...option.series[item.type],
               name: item.name,
               data: item.data,
-              barWidth: dataList.length >= 4 ? 8 : 20,
+              // barWidth: dataList.length >= 4 ? 8 : 20,
             };
           });
         }
@@ -206,7 +206,7 @@ const defaultOption = {
     },
   },
   grid: {
-    bottom: 30,
+    bottom: 20,
     left: 70,
     right: 30,
   },
@@ -359,8 +359,8 @@ const defaultOption = {
       data: [120, 200, 150, 80, 70, 110, 130],
       name: '实际出水量',
       type: 'bar',
-      barGap: 0.2,
-      barWidth: 30,
+      // barGap: 0.2,
+      // barWidth: 30,
     },
     {
       data: [

src/global.less

@@ -147,6 +147,9 @@ input[type='reset'] {
   background: #ffffff;
   box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
 }
+.card-select {
+  border: 1px solid #66ccff;
+}
 .value-number {
   margin-bottom: 0.2rem;
   font-size: 0.8rem;

src/pages/Controller/components/AirConditioner.js

@@ -65,7 +65,7 @@ const Work = (props) => {
               key={item.id}
               onClick={() => onHandleSelect(item)}
               className={`card-box ${styles.item} ${
-                select == item.id ? styles.select : ''
+                select == item.id ? 'card-select' : ''
               }`}
             >
               <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>

src/pages/Controller/components/Light.js

@@ -65,7 +65,7 @@ const Work = (props) => {
               key={item.id}
               onClick={() => onHandleSelect(item)}
               className={`card-box ${styles.item} ${
-                select == item.id ? styles.select : ''
+                select == item.id ? 'card-select' : ''
               }`}
             >
               <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}

src/pages/Controller/index.less

@@ -36,7 +36,7 @@
   justify-content: space-between;
   font-family: Source Han Sans, Source Han Sans;
   color: #615d5d;
-  line-height: 34rem;
+  line-height: 0.34rem;
   letter-spacing: 0.04rem;
   box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
   .arr {

src/pages/EqSelfInspection/components/PatrolReportDetail.less

@@ -103,7 +103,7 @@
     font-size: 0.32rem;
     font-family: Source Han Sans, Source Han Sans;
     font-weight: 400;
-    color: #9b9797;
+    color: #3b3b3b;
     line-height: 1;
   }
 }

src/pages/MessageCenter/index.js

@@ -36,7 +36,10 @@ const MessageCenter = () => {
   };
 
   const handlerSeeClick = () => {
-    UnityAction.sendMsg('noti', tab == '1' ? 'gongKuang' : 'ziJian');
+    if (tab == '1') {
+      UnityAction.sendMsg('notiZiJian', item.ID);
+    } else {
+    }
   };
 
   const renderItem = (item) => {
@@ -45,11 +48,14 @@ const MessageCenter = () => {
       : '';
     return (
       <div className={`card-box ${styles.itemContent}`}>
-        <img className={styles.img} src={tab == '1' ? icon1 : icon2} />
-        <div>
-          <div className={styles.text}>{item.MsgBody}</div>
-          <div className={styles.time}>{time}</div>
+        <div className={styles.left}>
+          <img className={styles.img} src={tab == '1' ? icon1 : icon2} />
+          <div>
+            <div className={styles.text}>{item.MsgBody}</div>
+            <div className={styles.time}>{time}</div>
+          </div>
         </div>
+
         <div className={styles.right}>
           <div
             className={item?.ReadStatus ? styles.redPoint : styles.nonePoint}
@@ -57,7 +63,7 @@ const MessageCenter = () => {
           <Button
             className={styles.btn}
             type="primary"
-            onClick={handlerSeeClick}
+            onClick={() => handlerSeeClick(item)}
           >
             查看
           </Button>
@@ -73,20 +79,20 @@ const MessageCenter = () => {
         onChange={handleTabsChange}
         items={[
           {
-            label: `水厂工况`,
-            key: '1',
+            label: `系统自检`,
+            key: '2',
             children: (
-              <Spin spinning={loading}>
-                {data?.list?.map((item) => renderItem(item))}
+              <Spin spinning={loadingSelf}>
+                {dataSelf?.list?.map((item) => renderItem(item))}
               </Spin>
             ),
           },
           {
-            label: `系统自检`,
-            key: '2',
+            label: `水厂工况`,
+            key: '1',
             children: (
-              <Spin spinning={loadingSelf}>
-                {dataSelf?.list?.map((item) => renderItem(item))}
+              <Spin spinning={loading}>
+                {data?.list?.map((item) => renderItem(item))}
               </Spin>
             ),
           },

src/pages/MessageCenter/index.less

@@ -20,9 +20,14 @@
     }
   }
   .img {
+    margin-top: 0.06rem;
+    margin-right: 0.4rem;
     width: 0.42rem;
     height: 0.44rem;
   }
+  .left {
+    display: flex;
+  }
   .text {
     font-size: 0.38rem;
     color: #000000;

src/pages/Projects/index.less

@@ -109,7 +109,7 @@
   :global {
     .swiper-container {
       margin: auto;
-      width: 18.9rem;
+      width: 18.6rem;
     }
     .swiper-slide {
       width: auto;

src/pages/SafetyManagement/index.js

@@ -16,6 +16,7 @@ const videoIcon = require('@/assets/air-conditioner.png');
 const DeviceManager = () => {
   const { projectId } = useParams();
   const [tab, setTab] = useState(localStorage.safeTab || '1');
+  const [selected, setSelected] = useState();
 
   //门禁接口
   const { data, run, loading } = useRequest(
@@ -53,8 +54,22 @@ const DeviceManager = () => {
       UnityAction.sendMsg('camData', JSON.stringify(dataVList?.list));
   }, [data, dataVList]);
 
+  const onHandleSelect = (name) => {
+    setSelected(name);
+    UnityAction.sendMsg('safetyItem', name);
+  };
+
+  useEffect(() => {
+    UnityAction.addEventListener('safetyItem', (name) => {
+      setSelected(name);
+    });
+
+    return () => UnityAction.off('safetyItem');
+  }, []);
+
   const handleTabChange = (tab) => {
     setTab(tab);
+    setSelected(null);
     if (tab == '1') {
       runVideo();
       runVOnLine();
@@ -81,6 +96,8 @@ const DeviceManager = () => {
             key: '1',
             children: (
               <Video
+                selected={selected}
+                setSelected={onHandleSelect}
                 data={dataVList?.list}
                 dataOnline={dataVOnline}
                 loading={loadingVList}
@@ -93,6 +110,8 @@ const DeviceManager = () => {
             key: '2',
             children: (
               <Door
+                selected={selected}
+                setSelected={onHandleSelect}
                 data={data?.list}
                 dataOver={dataOver}
                 loading={loading || loadingOver}
@@ -106,6 +125,7 @@ const DeviceManager = () => {
   );
 };
 const Video = ({ data, dataOnline, loading }) => {
+  const [selected, setSelected] = useState();
   const renderRed = (item) => {
     return (
       <div className={styles.cardItem}>
@@ -147,7 +167,10 @@ const Video = ({ data, dataOnline, loading }) => {
             {data?.map((item, idx) => (
               <div
                 key={`video_${idx}`}
-                className={`card-box ${styles.listItem}`}
+                onClick={() => setSelected(idx)}
+                className={`card-box ${styles.listItem} ${
+                  selected == item.Name || selected == idx ? 'card-select' : ''
+                }`}
               >
                 {renderRed(item)}
               </div>
@@ -158,7 +181,14 @@ const Video = ({ data, dataOnline, loading }) => {
     </Spin>
   );
 };
-const Door = ({ data, dataOver, loading, projectId }) => {
+const Door = ({
+  data,
+  dataOver,
+  loading,
+  projectId,
+  selected,
+  setSelected,
+}) => {
   const navigate = useNavigate();
 
   const handleClick = () => {
@@ -222,7 +252,10 @@ const Door = ({ data, dataOver, loading, projectId }) => {
             {data?.map((item, idx) => (
               <div
                 key={`door_${idx}`}
-                className={`card-box ${styles.listItem}`}
+                onClick={() => setSelected(idx)}
+                className={`card-box ${styles.listItem} ${
+                  selected == item.name || selected == idx ? 'card-select' : ''
+                }`}
               >
                 {renderRed(item)}
               </div>

src/pages/SmartOps/Analysis.js

@@ -102,7 +102,6 @@ const Analysis = (props) => {
   const selectedItem = (e) => {
     setSelectedRowKeys(e);
     console.log(data);
-    // alert(e)
     const itemIndex = data?.findIndex((item) => item.type == tab);
     const item = data[itemIndex]?.data?.find((item) => item.DeviceCode == e);
     if (item) {

src/pages/SmartReport/index.less

@@ -168,6 +168,7 @@
     color: #3b3b3b;
     line-height: 0.92rem;
     letter-spacing: 0.07rem;
+    font-family: PangMenZhengDao-3, PangMenZhengDao-3;
   }
   .threeContent {
     margin: 0.62rem 0;