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

src/pages/Home/index.js

@@ -14,12 +14,30 @@ const HomePage = (props) => {
   const { data } = useRequest(queryConditionSnapshot, {
     defaultParams: [{ project_id: projectId }],
   });
-  // useEffect(() => {
-  //   localStorage.width = document.documentElement.getBoundingClientRect().width;
-  //   window.refreshpx();
-  // }, []);
+
+  const getPositionPst = (e) => {
+    const width = document.body.clientWidth;
+    const height = document.body.clientHeight;
+    const xPst = (e.clientX / width).toFixed(2);
+    const yPst = (e.clientY / height).toFixed(2);
+    return xPst + '-' + yPst;
+  };
+
+  const webMouseEvent = {
+    onMouseUp: (e) => {
+      UnityAction.sendMsg('PointerOut', getPositionPst(e));
+    },
+    onMouseDown: (e) => {
+      UnityAction.sendMsg('PointerIn', getPositionPst(e));
+    },
+  };
+
+  useEffect(() => {
+    localStorage.width = document.documentElement.getBoundingClientRect().width;
+    window.refreshRem();
+  }, []);
   return (
-    <div className={styles.content}>
+    <div className={styles.content} {...webMouseEvent}>
       <CenterContent data={data} />
       <LeftContent data={data} />
       <RightContent data={data} />

src/pages/Home/index.less

@@ -6,6 +6,7 @@
   width: 100%;
   padding-bottom: 40px;
   color: #3b3b3b;
+  user-select: none;
 }
 .left {
   text-align: center;

src/pages/Menu/index.less

@@ -8,7 +8,7 @@
   align-items: flex-end;
   background: url('@/assets/menu/right_bg.png') no-repeat center;
   background-size: 100% 100%;
-  border-radius: 0.74rem 0 0 0.74rem;
+  border-radius: 0.78rem 0 0 0.78rem;
   box-shadow: 0.03rem 0.49rem 1rem 0rem rgba(60, 93, 133, 0.72);
 }
 .menu {

src/pages/Projects/index.js

@@ -15,7 +15,7 @@ const Projects = () => {
       var list = [];
       res.data.forEach((item) => {
         // 使用水厂名替代项目名
-        item.List.forEach(item => item.Name = item.WaterName)
+        item.List.forEach((item) => (item.Name = item.WaterName));
         list = list.concat(item.List);
       });
       return list;

src/pages/Projects/index.less

@@ -1,6 +1,8 @@
 .main {
   width: 100%;
   height: 100vh;
+  padding-top: calc(100vh - 8.1rem);
+  // background-color: aqua;
   // background: url('@/assets/projects/bg.png') no-repeat center;
   // background-size: 100% 100%;
   // .titleCon {
@@ -35,7 +37,7 @@
 }
 .swiper {
   position: relative;
-  top: 30%;
+  bottom: 0;
   // margin-top: 2rem;
   .pic {
     width: 100%;

src/pages/SafetyManagement/index.js

@@ -62,6 +62,11 @@ const DeviceManager = () => {
   useEffect(() => {
     UnityAction.on('safetyItem', (name) => {
       setSelected(name);
+      const dom = document.getElementById(name);
+      if (dom) {
+        let v = document.getElementsByClassName('content-tab')[0];
+        v.scrollTop = dom.offsetTop - 6;
+      }
     });
 
     return () => UnityAction.off('safetyItem');
@@ -138,7 +143,7 @@ const Video = ({ data, dataOnline, loading, selected, setSelected }) => {
   return (
     <Spin spinning={loading}>
       <div className="content-tab">
-        <div className={styles.sparePart}>
+        <div id="scrollContent" className={styles.sparePart}>
           <div className={styles.titleContent}>
             <div className={styles.titleLeft}>
               <img className={styles.img} src={videoIcon} />
@@ -165,6 +170,7 @@ const Video = ({ data, dataOnline, loading, selected, setSelected }) => {
           <div className={styles.listContent}>
             {data?.map((item, idx) => (
               <div
+                id={item.Name}
                 key={`video_${idx}`}
                 onClick={() => setSelected(idx, item.Name)}
                 className={`card-box ${styles.listItem} ${

src/pages/SafetyManagement/index.less

@@ -121,14 +121,14 @@
       justify-content: space-between;
       padding: 0.28rem 0 0.32rem 0;
       .btn {
-        width: 1.57rem;
         height: 0.55rem;
-        background: rgba(222, 237, 255, 0.91);
+        background: #c4dcf9;
         border-radius: 0.06rem;
         padding: 0.08rem 0.26rem;
         font-size: 0.28rem;
         color: #329bfe;
         line-height: 0.38rem;
+        border: none;
       }
       .in {
         .point;

src/pages/Smart/ConditionDetection.js

@@ -51,15 +51,18 @@ const ConditionDetection = (props) => {
 
       <div className="content-title">
         <div className={styles.circle}>
-          <CircleScore big>
+          {/* <CircleScore big>
             <span className={styles.circleText}>{score}</span>
-          </CircleScore>
+          </CircleScore> */}
+          <div className={styles.circleBox}>
+            <span className={styles.circleText}>{score}</span>
+          </div>
           {/* <p>{desc}</p> */}
           <p>膜车间当前运行状态{grade}</p>
         </div>
         <div className={styles.content}>
           <Row gutter={16}>
-            <Col span={12} style={{ padding: "0.2rem" }}>
+            <Col span={12} style={{ padding: '0.2rem' }}>
               <div className={`${styles.card} card-box`}>
                 <h3>
                   实时工况 <span>{real.score}分</span>
@@ -83,7 +86,7 @@ const ConditionDetection = (props) => {
                 </ul>
               </div>
             </Col>
-            <Col span={12} style={{ padding: "0.2rem" }}>
+            <Col span={12} style={{ padding: '0.2rem' }}>
               <div className={`${styles.card2} card-box`}>
                 <h3>
                   目标工况 <span>{best.score}分</span>

src/pages/Smart/ConditionDetection.less

@@ -41,7 +41,18 @@
     margin-right: 0.12rem;
   }
 }
-
+.circleBox {
+  width: 1.94rem;
+  height: 1.94rem;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background: url('@/assets/home-circle.png') no-repeat center;
+  background-size: 100% 100%;
+  font-size: 0.34rem;
+  font-weight: bold;
+}
 .card2 {
   .card;
   i {