fix: bug

src/assets/css/styleTemplate.less

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 茶百道主题样式
  * @Date: 2022-10-27 10:56:37 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-22 15:53:50
+ * @Last Modified time: 2023-12-19 15:15:14
  */
 
 @import url("../../themes/themes.less");
@@ -346,9 +346,13 @@
         z-index: 99;
         width: 2em;
         right: 0.8em;
-        top: 48%;
+        top: 46%;
         opacity: .5;
     }
+    .rightJ_png_L{
+      right: unset;
+      left: 0.8em;
+    }
 
     .video_box_hide {
       z-index: 12;
@@ -577,6 +581,7 @@
             justify-content: center;
 
             #chartmain {
+              min-width: 300px;
               width: 90%;
               height: 100%;
             }
@@ -621,6 +626,7 @@
           align-items: center;
 
           #echarts5 {
+            min-width: 400px;
             width: 100%;
             height: 80%;
           }
@@ -887,6 +893,7 @@
           width: 100%;
 
           .topMsg_content {
+            min-width: 400px;
             width: 100%;
             height: 100%;
             display: flex;
@@ -898,6 +905,7 @@
             }
 
             #echarts2 {
+              min-width: 600px;
               width: 95%;
               height: 90%;
               >div{

src/pages/frame/component/modelMsg/view.jsx

@@ -3,7 +3,7 @@
  * @Date: 2022-11-02 17:24:37 
  * @Last Modified by: dayan_hjm
  * @Last Modified time: 2023-09-06 17:33:24
- * @Last Modified time: 2023-10-16 18:40:10
+ * @Last Modified time: 2023-12-19 14:38:50
  */
 
 import React, { useEffect, useState, useRef, Component } from "react";
@@ -52,6 +52,8 @@ export default class extends Component {
     }
     this.pcLogin();
     this.props.history.listen((route, data) => {
+      // 大屏切换地址改名称
+      this.props.changeName(route["pathname"].indexOf("gvc") > -1 ? "产供销价值链" : "运营数据中心")
       this.setState({ showTips: false });
       let activeTree = utils.findNodeTree([...$store.sysMenu.norList, ...$store.sysMenu.menuList], route.pathname, "resourceUrl");
       //调取当前栏目的通知 

src/pages/frame/component/top/style.less

@@ -18,11 +18,20 @@
   :global {
     .allP_png {
       position: absolute;
-      right: 1em;
-      top: 2em;
+    right: 1em;
+    top: 2em;
+    opacity: 0.8;
+    width: 4em;
+    display: flex;
+    align-items: flex-start;
+    justify-content: right;
+    height: 3em;
+    cursor: pointer;
+    >img{
       border: 1px solid #ffffff7a;
       border-radius: 5px;
-      opacity: .8;
+
+    }
     }
 
     .logo {

src/pages/frame/component/top/view.jsx

@@ -588,44 +588,40 @@ export default observer(function (props) {
     //   }
     // });
   };
-  const name_arr = {
-    "#/home/gvc": "产供销价值链",
-    "#/home/operation": "运营数据中心",
-  }
-  window.lo
   return (
     <div class="top2 animate__animated animate__fadeInDown animate__delay-1s animate__slower">
       <div className={$store.app.styleCommon.theme == 'chaBaiDao' ? [styles.top + ' top'] : styles.top}>
         {/* 全屏按钮 */}
-        <Tooltip placement="bottom" title={ iptValue == 1 ? "全屏" : "退出全屏"}>
-          {
-            iptValue == 1 ? <img src={require("@assets/imgs/iconJpg/allP.png").default} alt="" style={{ width: "2em" }} className={"allP_png"} onClick={() => {
-              var element = document.documentElement;
-              if (element.requestFullscreen) {
-                element.requestFullscreen();
-              } else if (element.mozRequestFullScreen) {   // 兼容火狐
-                element.mozRequestFullScreen();
-              } else if (element.webkitRequestFullscreen) {    // 兼容谷歌
-                element.webkitRequestFullscreen();
-              } else if (element.msRequestFullscreen) {   // 兼容IE
-                element.msRequestFullscreen();
-              }
-              setIptValue(2)
-            }} /> : <img src={require("@assets/imgs/iconJpg/allP2.png").default} alt="" style={{ width: "2em" }} className={"allP_png"} onClick={() => {
-              var element = document.documentElement;
-              if(document.exitFullscreen) {
-                document.exitFullscreen();
-            } else if (document.mozCancelFullScreen) {
-                document.mozCancelFullScreen();
-            } else if (document.webkitCancelFullScreen) {
-                document.webkitCancelFullScreen();
-            } else if (document.msExitFullscreen) {
-                document.msExitFullscreen();
+        <Tooltip placement="bottom" title={iptValue == 1 ? "全屏" : "退出全屏"}>
+          <div className={"allP_png"}>
+            {
+              iptValue == 1 ? <img src={require("@assets/imgs/iconJpg/allP.png").default} alt="" style={{ width: "2em" }} onClick={() => {
+                var element = document.getElementById('app');
+                if (element.requestFullscreen) {
+                  element.requestFullscreen();
+                } else if (element.mozRequestFullScreen) {   // 兼容火狐
+                  element.mozRequestFullScreen();
+                } else if (element.webkitRequestFullscreen) {    // 兼容谷歌
+                  element.webkitRequestFullscreen();
+                } else if (element.msRequestFullscreen) {   // 兼容IE
+                  element.msRequestFullscreen();
+                }
+                setIptValue(2)
+              }} /> : <img src={require("@assets/imgs/iconJpg/allP2.png").default} alt="" style={{ width: "2em" }} onClick={() => {
+                var element = document.getElementById('app');
+                if (document.exitFullscreen) {
+                  document.exitFullscreen();
+                } else if (document.mozCancelFullScreen) {
+                  document.mozCancelFullScreen();
+                } else if (document.webkitCancelFullScreen) {
+                  document.webkitCancelFullScreen();
+                } else if (document.msExitFullscreen) {
+                  document.msExitFullscreen();
+                }
+                setIptValue(1)
+              }} />
             }
-              setIptValue(1)
-            }} />
-          }
-          
+          </div>
         </Tooltip>
 
         <div className="title_box">
@@ -634,7 +630,7 @@ export default observer(function (props) {
             width="17"
           />
           <span></span>
-          <h1>{name_arr[window.location.hash] || ''}</h1>
+          <h1>{props.names}</h1>
         </div>
         {/* {history.location.pathname === "/home/index" && (
           <>

src/pages/frame/view.jsx

@@ -146,9 +146,12 @@ export default observer(function Frame(props) {
   const history = useHistory();
   const [curKey, setKey] = useState("1");
   const moveBar = useRef();
-  const $search = useRef();
-  const leftMenu = useRef();
-  const [isMove, setisMove] = useState(false);
+  const [isMove,setisMove] = useState(false);
+  const name_arr = {
+    "#/home/gvc": "产供销价值链",
+    "#/home/operation": "运营数据中心",
+  }
+  const [titleName, setTitleName] = useState(name_arr[window.location.hash]);
 
   const { Search } = Input;
   let showIds = $store.app.showIds;
@@ -187,37 +190,6 @@ export default observer(function Frame(props) {
   const moveLeftMenu = () => {
     setisMove(true);
   };
-  const handleClick = (data) => {
-
-    let { key } = data;
-    let item = JSON.parse(key || "{}");
-    if (item.openType === "close") {
-      message.destroy();
-      return message.warning("该菜单暂未开放");
-    }
-    modelMsgs.isShow(item.resourceId, item.resourceName,item);
-    $store.app.setNavList({
-      name: item.resourceName,
-      path: item.resourceUrl,
-      type: item.resourceType,
-      openType: item.openType,
-      id: item.resourceId,
-    });
-
-    $store.app.setCurNav(item.resourceUrl);
-
-    sessionStorage.setItem("curNodeId", item.resourceId);
-    // sessionStorage.setItem("jumpType", item.props.type);
-
-    dealDiffSheetType(item).then((response) => {
-      if (response.type === "sys") {
-        history.push(response.link);
-      } else {
-        history.push(`/home/outer/${response.activeItem.resourceId}`);
-      }
-    });
-    saveMenu(item);
-  };
 
   /**打开 报表目录 */
   const openReportDire = (key) => {
@@ -260,181 +232,6 @@ export default observer(function Frame(props) {
     };
   }, [$store.app.refresh]);
 
-  function loopMenu(list) {
-    if(!$store.app.curNav){$store.app.curNav = ""}
-    return list.map((menu, index) => {
-      if (menu.resourceType !== "module_menu" && menu.resourceList.length > 0) {
-        return (
-          <SubMenu
-            key={`${menu.resourceId}Sub`}
-            title={menu.resourceName}
-            icon={iconObj[menu.resourceIcon]}
-            className={`normal_menu ${menu.resourceUrl === $store.app.curNav ||  $store.app.curNav.indexOf('/'+menu.resourceId) > -1 ? "click_active" : ""
-              }`}
-            onTitleClick={(val, domEvent) => {
-              let titleKey = val.key.slice(
-                0,
-                val.key.length - 3
-              ); /**侧边父级id */
-              let activeUrl = $store.app.activedUrl;
-              sessionStorage.setItem("resourceName", menu.resourceName);
-              if (
-                activeUrl.indexOf("/home/outer") > -1 ||
-                activeUrl === "/home/report" ||
-                activeUrl === "/home/write"
-              ) {
-                openReportDire(titleKey);
-              }
-            }}
-          // style={{ backgroundColor: "#031646" }}
-          >
-            {loopMenu(menu.resourceList)}
-          </SubMenu>
-        );
-      } else {
-        return (
-          <>
-            <Menu.Item
-              key={JSON.stringify(menu)}
-              icon={iconObj[menu.resourceIcon]}
-              className={`${menu.resourceUrl === $store.app.curNav ||  $store.app.curNav.indexOf('/'+menu.resourceId) > -1
-                  ? "click_active"
-                  : "normal_menu"
-                }`}
-            // style={{ backgroundColor: "#031646" }}
-            >
-              <span>
-                <span className="text_over" title={menu.resourceName}>
-                  {menu.resourceName}
-                </span>
-                {menu.resourceType.match(/fine_bi|dmpReport|report|yonghong/) && (
-                  <>
-                    {/* <span
-                      style={{ paddingLeft: 5 }}
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        getMenuDesc({
-                          resourceId: menu.resourceId,
-                        }).then(({ data, resultCode }) => {
-                          if (+resultCode === 0) {
-                            $store.app.setMetaData({
-                              data,
-                              visible: true,
-                            });
-                          }
-                        });
-                      }}
-                    >
-                      <InfoCircleOutlined />
-                    </span> */}
-
-                    <span
-                      className={menu.isCare ? "care_color" : "emptystar"}
-                      twotonecolor ="#FFBF00"
-                      style={{ paddingLeft: 5 }}
-                      onClick={(e) => {
-                        menu.isCare = !menu.isCare;
-                        $store.sysMenu.setSubmenuList(
-                          $store.sysMenu.submenuList
-                        );
-                        sessionStorage.setItem(
-                          "subMenuList",
-                          JSON.stringify($store.sysMenu.submenuList)
-                        );
-
-                        const config = {
-                          isCare: menu.isCare,
-                          resourceId: menu.resourceId,
-                        };
-                        careOrCancelResource(config).then(
-                          ({ data, resultCode }) => {
-                            if (+resultCode === 0) {
-                              message.success(
-                                menu.isCare ? "关注成功" : "取消关注成功"
-                              );
-                              //重新发送请求
-                              let subMenuList = JSON.parse(
-                                sessionStorage.getItem("subMenuList")
-                              );
-                              subMenuList.filter((item) => {
-                                if (item.resourceId === menu.resourceId) {
-                                }
-                              });
-                            }
-                          }
-                        );
-                        e.stopPropagation();
-                      }}
-                    >
-                      {menu.isCare ? <StarFilled /> : <StarOutlined />}
-                    </span>
-                  </>
-                )}
-              </span>
-            </Menu.Item>
-          </>
-        );
-      }
-    });
-  }
-
-  function loopMenu2(list) {
-    // console.log("showIds==", [...showIds]);
-    return list.map((menu, index) => {
-      if (showIds.indexOf(menu.resourceId) === -1) {
-        return null;
-      }
-      if (menu.resourceList.length > 0) {
-        return (
-          <SubMenu
-            key={`${menu.resourceId}Sub`}
-            title={menu.resourceName}
-            icon={iconObj[menu.resourceIcon]}
-            className={`normal_menu ${menu.resourceUrl === $store.app.curNav ? "click_active" : ""
-              }`}
-            onTitleClick={(val, domEvent) => {
-              let titleKey = val.key.slice(
-                0,
-                val.key.length - 3
-              ); /**侧边父级id */
-              let activeUrl = $store.app.activedUrl;
-              sessionStorage.setItem("resourceName", menu.resourceName);
-              if (
-                activeUrl.indexOf("/home/outer") > -1 ||
-                activeUrl === "/home/report" ||
-                activeUrl === "/home/write"
-              ) {
-                openReportDire(titleKey);
-              }
-            }}
-          // style={{ backgroundColor: "#031646" }}
-          >
-            {loopMenu2(menu.resourceList)}
-          </SubMenu>
-        );
-      } else {
-        return (
-          <>
-            <Menu.Item
-              key={JSON.stringify(menu)}
-              icon={iconObj[menu.resourceIcon]}
-              className={`${menu.resourceUrl === $store.app.curNav
-                  ? "click_active"
-                  : "normal_menu"
-                }`}
-            // style={{ backgroundColor: "#031646" }}
-            >
-              <span>
-                <span className="text_over" title={menu.resourceName}>
-                  {menu.resourceName}
-                </span>
-              </span>
-            </Menu.Item>
-          </>
-        );
-      }
-    });
-  }
   const onRef = (ref) => {
     setModelMsgs(ref);
   };
@@ -446,13 +243,15 @@ export default observer(function Frame(props) {
   };
   const onRef2 = (ref) => {
     setTipMsgs(ref);
-    console.log(tipMsgs,"tipMsgs")
+    console.log(tipMsgs, "tipMsgs")
   };
 
   return (
     <div className={styles.frame}>
-      <Top />
-      <ModelMsg onRef={onRef} getTips={getTips} cleatTips={cleatTips}/>
+      <Top names={titleName}/>
+      <ModelMsg onRef={onRef} getTips={getTips} cleatTips={cleatTips} changeName={(name) => {
+        setTitleName(name);
+      }} />
 
       {/* 断网或超时显示提示 */}
       {/* <div className="nowifi-tip">当前网络状态不佳</div> */}
@@ -475,7 +274,7 @@ export default observer(function Frame(props) {
         >
           <Navigator
             style={{
-              display:"none",
+              display: "none",
             }}
           />
           <TipMsg onRef={onRef2}></TipMsg>

src/pages/gvc/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm  产供销价值链
  * @Date: 2023-11-10 10:19:34 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-12-19 11:30:37
+ * @Last Modified time: 2023-12-19 15:27:45
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -384,16 +384,11 @@ class Gvc extends Component {
         {/* 右键切换大屏 */}
         <Tooltip placement="bottom" title={"数据运营中心"}>
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
-            if (document.exitFullscreen) {
-              document.exitFullscreen();
-            } else if (document.mozCancelFullScreen) {
-              document.mozCancelFullScreen();
-            } else if (document.webkitCancelFullScreen) {
-              document.webkitCancelFullScreen();
-            } else if (document.msExitFullscreen) {
-              document.msExitFullscreen();
-            }
-
+            this.props.history.replace("/home/operation");
+          }} />
+        </Tooltip>
+        <Tooltip placement="bottom" title={"数据运营中心"}>
+          <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
             this.props.history.replace("/home/operation");
           }} />
         </Tooltip>

src/pages/login/view.jsx

@@ -220,13 +220,13 @@ export default function () {
                 }}
                 prefix={
                   <div className="leftIcon">
-                    <img
+                    {/* <img
                       width={16}
                       src={
                         require("@assets/imgs/login/yonghu_icon.png").default
                       }
                       className="icon"
-                    />
+                    /> */}
                   </div>
                 }
               />
@@ -253,11 +253,11 @@ export default function () {
                 }}
                 prefix={
                   <div className="leftIcon">
-                    <img
+                    {/* <img
                       width={16}
                       src={require("@assets/imgs/login/mima_icon.png").default}
                       className="icon"
-                    />
+                    /> */}
                   </div>
                 }
               />

src/pages/tqcDataVHome/component/bottomLineForSend.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 近30天产量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-24 10:25:30
+ * @Last Modified time: 2023-12-19 15:18:50
  */
 
 

src/pages/tqcDataVHome/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 
  * @Date: 2023-10-25 10:32:44 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-12-19 11:32:14
+ * @Last Modified time: 2023-12-19 15:32:21
  */
 /*
  * @Author: dayan_hjm 
@@ -249,22 +249,19 @@ class Home extends Component {
         {/* 右键切换大屏 */}
         <Tooltip placement="bottom" title={"产供销价值链"}>
           <img src={require("@assets/imgs/iconJpg/rightJ.png").default} alt="" className={"rightJ_png"} onClick={() => {
-            if (document.exitFullscreen) {
-              document.exitFullscreen();
-            } else if (document.mozCancelFullScreen) {
-              document.mozCancelFullScreen();
-            } else if (document.webkitCancelFullScreen) {
-              document.webkitCancelFullScreen();
-            } else if (document.msExitFullscreen) {
-              document.msExitFullscreen();
-            }
             this.props.history.replace("/home/gvc");
           }} />
         </Tooltip>
+        <Tooltip placement="bottom" title={"产供销价值链"}>
+          <img src={require("@assets/imgs/iconJpg/rightJL.png").default} alt="" className={"rightJ_png rightJ_png_L"} onClick={() => {
+            this.props.history.replace("/home/gvc");
+          }} />
+        </Tooltip>
+
         {/* 视频播放器 */}
         <MapView></MapView>
         <div className={"video_box"}>
-          <video src={require("@assets/imgs/dataVImg/homeVideo2.mp4").default} autoplay="autoplay" loop="loop" class="video2 center_box2 animate__animated animate__fadeIn animate__delay-2s"></video>
+          <video src={require("@assets/imgs/dataVImg/homeVideo2.mp4").default} autoplay="autoplay" loop="loop" class="video2 center_box2 animate__animated animate__fadeIn animate__delay-1s"></video>
         </div>
         <div className={[styles.home + " home cbHome"]}>
           <div className="leftContent">
@@ -304,7 +301,7 @@ class Home extends Component {
               </div>
             </div>
 
-            <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
+            <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-2s">
               <div className="bottomContent bigDivPd">
                 <Tooltip placement="bottom" title={' ● 近六个月的产量和发货量的对比数据（含外加工），当月的数据计算至更新日期。'}>
                   <p className="topMsg_title">月度产量/发货量</p>
@@ -366,7 +363,7 @@ class Home extends Component {
                 </div>
               </div>
             </div>
-            <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower">
+            <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower animate__delay-1s">
               <div className="bottomContent">
                 <Tooltip placement="bottom" title={' ● 以更新日期为节点近30天的产量数据（含外加工）。'}>
                   <p className="topMsg_title">近30天产量</p>