fix: 细节优化

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-07 17:33:48
+ * @Last Modified time: 2023-11-08 17:15:55
  */
 
 @import url("../../themes/themes.less");
@@ -481,7 +481,7 @@
                 height: 80%;
                 color: #fff;
                 position: absolute;
-                right: 0%;
+                left: 48%;
                 top: 0.5em;
 
                 li {
@@ -490,6 +490,12 @@
                   font-size: 0.9em;
                 }
               }
+              @media (min-height: 900px) {
+                .name_ul{
+                  top:1.5em
+                }
+              }
+
 
               #echarts4,
               #echarts6_box {
@@ -497,17 +503,39 @@
                 height: 90%;
               }
 
+              #echarts4 {
+                width: 55%;
+              }
+
               #echarts6_box {
                 margin-top: -2em;
                 position: relative;
 
                 // background: url(../imgs/dataVimg/guanghuan.png) no-repeat left 43% / 102% 120%;
                 .guanghuan {
-                  width: 102%;
-                  height: 120%;
+                  width: 100%;
+                  /* height: 187px; */
                   position: absolute;
                   left: 0;
-                  top: -1em;
+                  top: 0;
+                }
+
+                @media (max-height: 768px) {
+                  .guanghuan {
+                    top: -10%;
+                  }
+                }
+
+                @media (min-height: 900px) {
+                  .guanghuan {
+                    top: -7%;
+                  }
+                }
+
+                @media (min-height: 1000px) {
+                  .guanghuan {
+                    top: 0%;
+                  }
                 }
 
                 #echarts6 {
@@ -540,7 +568,7 @@
             justify-content: center;
 
             #chartmain {
-              width: 80%;
+              width: 90%;
               height: 100%;
             }
 
@@ -838,7 +866,7 @@
         }
 
         .bottomContent3 {
-          height: 30%;
+          height: 23%;
           width: 100%;
           position: absolute;
           left: 0;
@@ -862,8 +890,8 @@
             }
 
             #echarts2 {
-              width: 80%;
-              height: 75%;
+              width: 95%;
+              height: 90%;
             }
           }
         }
@@ -873,6 +901,12 @@
           background: url(../imgs/dataVimg/toplineB.png) no-repeat 0 bottom / 100% 11%;
           height: 78%;
         }
+        @media (min-height: 900px) {
+          .center_li{
+            height: 60%;
+          }
+        }
+
 
         .right_li {
           background: url(../imgs/dataVimg/toplineV.png) no-repeat right top / 1px 100%;
@@ -1092,7 +1126,7 @@
   }
 
   #echarts8 {
-    width: 50%;
+    width: 53%;
     height: 80%;
     box-sizing: border-box;
     background: url(../imgs/dataVimg/toplineV.png) no-repeat 26% 50% / 1px 70%;
@@ -1117,7 +1151,7 @@
       display: block;
       position: absolute;
       color: rgba(205, 241, 255, 1);
-      left: 29%;
+      left: 37%;
       top: 1.2em;
       text-align: right;
     }

src/pages/jurisDiction/view.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm
  * @Date: 2023-11-07 14:21:24 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-08 09:57:24
+ * @Last Modified time: 2023-11-08 17:18:11
  */
 
 import React, { useState, useEffect, Component } from "react";
@@ -31,7 +31,9 @@ class JrisDiction extends Component {
 
   componentWillMount() { 
     let searchInstance = queryToObj(); // url查询参数对象化
-    if(searchInstance?.token){
+    if(window.location.host.indexOf("localhost") > -1){
+      this.props.history.replace("/home/operation");
+    }else if(searchInstance?.token){
       this.getUrl(searchInstance?.token);
     }else{
       this.setState({ showMsg: true })
@@ -63,7 +65,7 @@ class JrisDiction extends Component {
         {
           showMsg && <div className="center">
             <img src={require("@assets/imgs/dataVImg/wuQuanXuan.png").default} alt="" />
-            <h1>您暂无权限访问</h1>
+            <h1>抱歉!您暂无权限访问</h1>
             <span>请联系管理员开通权限</span>
           </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-05 11:09:51
+ * @Last Modified time: 2023-11-08 16:43:21
  */
 
 
@@ -67,9 +67,9 @@ class BottomLineForSend extends Component {
           // formatter:'{c}' ,
         },
         grid: {
-          left: '0',
-          top: '5%',
-          right: '10%',
+          left: '8%',
+          top: '15%',
+          right: '8%',
           bottom: '10',
           containLabel: true
         },
@@ -90,9 +90,8 @@ class BottomLineForSend extends Component {
           boundaryGap: false,
           axisLabel: {
             textStyle: {
-              color: "rgba(255,255,255,.6)",
-              fontSize: 12,
-
+                color: '#7d7d7d',
+                fontSize: 12
             },
           },
           axisLine: {
@@ -128,13 +127,13 @@ class BottomLineForSend extends Component {
           axisLine: {
             lineStyle: {
               color: 'rgba(255,255,255,.1)'
-            }
+            },
           },
           axisLabel: {
             formatter: "{value} 吨",
             textStyle: {
-              color: "rgba(255,255,255,.6)",
-              fontSize: 14,
+              color: '#7d7d7d',
+              fontSize: 13
             },
           },
 

src/pages/tqcDataVHome/component/leftMenoyView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 库存金额
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-07 17:18:38
+ * @Last Modified time: 2023-11-08 15:41:54
  */
 
 
@@ -10,6 +10,7 @@ import React, { useState, useEffect, Component } from "react";
 import styles from "../style.less";
 import { useHistory, useLocation, withRouter } from "react-router-dom";
 import mod from '../mod';
+import { getArrMax } from "@utils/util";
 import {
   momeyService,
 } from "../api";
@@ -22,6 +23,7 @@ class LeftMenoyView extends Component {
     super(props, context);
     this.store = mod;
     this.state = {
+      max1:[],
       year:["碳酸锂","氧化纳",'金属锂',"氢氧化钠"],
       missionsIntensity_arr:[
         {value:0,name:"碳酸锂"},
@@ -132,14 +134,19 @@ class LeftMenoyView extends Component {
     await momeyService().then(({ data = [], resultCode }) => {
       
       if (+resultCode === 0) {
-        let year = [], missionsIntensity_arr = [];
+        let year = [], missionsIntensity_arr = [],max1=[],num=[];
         data.map((x, i) => {
+          num.push(x.indexValue)
           year.push(x.prodCatgory);
           data_style[i].value = x.indexValue;
           data_style[i].name = x.prodCatgory;
           missionsIntensity_arr.push(data_style[i])
         });
-        this.setState({ year, missionsIntensity_arr });
+        const max_1 = getArrMax(num);
+        for (let index = 0; index < data.length; index++) {
+          max1.unshift(max_1/0.7)
+        }
+        this.setState({ year, missionsIntensity_arr,max1 });
         this.setData();
         this.setData2();
       }
@@ -207,7 +214,7 @@ class LeftMenoyView extends Component {
               },
               textStyle: {
                 color: 'rgba(255,255,255,1)',
-                fontSize: '12',
+                fontSize: '10',
               }
             }
           },
@@ -240,7 +247,7 @@ class LeftMenoyView extends Component {
           type: 'bar',
           yAxisIndex: 1,
           barGap: '-100%',
-          data: [99.5, 99.5, 99.5, 99.5],
+          data: this.state.max1,
           barWidth: 15,
           itemStyle: {
             normal: {
@@ -295,7 +302,7 @@ class LeftMenoyView extends Component {
           if (index > 5) {
             index = 0;
           }
-        }, 2000);
+        }, 1800);
       }
       fun();
       setTimeout(function () {

src/pages/tqcDataVHome/component/moodSendView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 月度产量/发货量
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-05 11:09:21
+ * @Last Modified time: 2023-11-08 15:24:45
  */
 
 
@@ -58,6 +58,14 @@ class MoodSendView extends Component {
         dataShadow.push(yMax);
       }
       var option = {
+        grid: {
+          left: '2%',
+          top: '18%',
+          right: '0%',
+          bottom: '8%',
+          containLabel: true
+        },
+
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -65,9 +73,9 @@ class MoodSendView extends Component {
           },
           borderColor:"rgba(105, 255, 222, 0.5)",
           borderWidth:2,
-          padding:5,
+          padding:5, 
           textStyle:{
-            fontSize:12,
+            fontSize:10,
             color:"#ededed"
           },
           backgroundColor:"#0000008a"
@@ -122,7 +130,7 @@ class MoodSendView extends Component {
               interval: 0,
               textStyle: {
                 color: '#7d7d7d',
-                fontSize: 12
+                fontSize: 10
 
               },
             },

src/pages/tqcDataVHome/component/oneQualified.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 一次合格率
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-05 11:13:22
+ * @Last Modified time: 2023-11-08 16:45:11
  */
 
 
@@ -59,7 +59,7 @@ class BottomLineForSend extends Component {
           axisPointer: { type: 'shadow' },
           borderColor:"rgba(105, 255, 222, 0.5)",
           borderWidth:2,
-          padding:5,
+          padding:2,
           textStyle:{
             fontSize:12,
             color:"#ededed"
@@ -68,17 +68,18 @@ class BottomLineForSend extends Component {
           backgroundColor:"#0000008a"
         }, "grid": {
           "top": "20%",
-          "right": "15%",
+          "right": "5%",
           "bottom": "20",
-          "left": "15%",
+          "left": "7%",
         },
         legend: {
           data: ['目标一次及格率', '实际一次及格率'],
           right: 'center',
-          padding: [10, 0, 0, 15],
+          padding: [0, 0, 0, 5],
           top: 0,
           textStyle: {
-            color: "#fff"
+            color: "#fff",
+            fontSize:10,
           },
           itemWidth: 12,
           itemHeight: 5,
@@ -89,7 +90,7 @@ class BottomLineForSend extends Component {
             data: this.state.year,
             axisLine: { lineStyle: { color: "rgba(255,255,255,.1)" } },
             axisLabel: {
-              textStyle: { color: "rgba(255,255,255,.7)", fontSize: '12', },
+              textStyle: { color: "'#7d7d7d'", fontSize: '12', },
             },
             splitLine:{
               show:true,

src/pages/tqcDataVHome/component/rightBottomView.jsx

@@ -2,7 +2,7 @@
  * @Author: dayan_hjm 碳排放
  * @Date: 2023-10-23 09:32:12 
  * @Last Modified by: dayan_hjm
- * @Last Modified time: 2023-11-02 15:51:27
+ * @Last Modified time: 2023-11-08 16:05:47
  */
 
 
@@ -68,7 +68,7 @@ class RightBottomView extends Component {
       var option = {
 
         grid: {
-          left: '5%',
+          left: '3%',
           top: '15%',
           right: '5%',
           bottom: '0%',
@@ -81,7 +81,7 @@ class RightBottomView extends Component {
           axisTick: 'none',
           axisLine: 'none',
           axisLabel: {
-            padding:[0,25,0,0],
+            padding:[0,22,0,0],
             textStyle: {
               color: '#69FFDE',
               fontSize: '16',
@@ -125,27 +125,27 @@ class RightBottomView extends Component {
           label: {
             normal: {
               show: true,
-              position: 'insideBottomLeft',
+              position: 'insideLeft',
               formatter: function (param) {
                 return param.value;
               },
               textStyle: {
                 color: 'rgba(255,255,255,1)',
                 fontSize: '15',
-                padding:[5,0,0,5]
+                padding:[5,5,0,5]
               }
             }
           },
-          barWidth: 23,
+          barWidth: 24,
           itemStyle: {
             normal: {
               color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-                { offset: 0, color: 'rgba(255, 206, 0, 1)' },
-                { offset: 0.7, color: '#ffd01d94' },
-                { offset: 1, color: '#ffd01d94' },
+                { offset: 0, color: 'rgb(255 242 72)' },
+                { offset: 0.7, color: '#ffe06a99' },
+                { offset: 1, color: '#ffe06a99' },
               ]),
               barBorderRadius: 15,
-              borderColor: "rgba(255, 206, 0, 1)",
+              borderColor: "rgb(255 242 72)",
               borderWidth: 1
 
             },
@@ -157,7 +157,7 @@ class RightBottomView extends Component {
           yAxisIndex: 1,
           barGap: '-100%',
           data: this.state.max2,
-          barWidth: 23,
+          barWidth: 24,
           itemStyle: {
             normal: {
               color: '#ffffff24',
@@ -243,7 +243,7 @@ class RightBottomView extends Component {
               textStyle: {
                 color: 'rgba(255,255,255,1)',
                 fontSize: '15',
-                padding:[5,5,0,0]
+                padding:[5,5,0,5]
               }
             }
           },

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-11-08 09:56:35
+ * @Last Modified time: 2023-11-08 17:23:19
  */
 /*
  * @Author: dayan_hjm 
@@ -43,24 +43,18 @@ class Home extends Component {
       updateTime: '',
       changGif: false,
       plannedCompletionData: [
-        { name: '射洪', value: 78.1 },
-        { name: '广东', value: 12 },
-        { name: '珠海', value: 65 },
-        { name: '潮汕', value: 45 },
       ],
       plannedCompletionNum: 1,
       manHourData: [
-        { name: '射洪', value: 0.2 },
-        { name: '广东', value: 33 },
-        { name: '珠海', value: 65 },
-        { name: '潮汕', value: 65 },
       ],
       manHourNum: 1,
     };
     this.timer = null //定时器，用于检测同步状态
   }
   componentWillMount() {
-    this.getToken()
+    if(window.location.host.indexOf("localhost") == -1){
+      this.getToken()
+    }
   }
 
   async getToken() {
@@ -177,7 +171,7 @@ class Home extends Component {
             yearDecline = x.indexValue
           } else if (x.indexName == '产品库存') {
             yearSend = x.indexValue
-          } else if (x.indexName == '年度产量') {
+          } else if (x.indexName == '年度发货量') {
             productInventory = x.indexValue
           }
         });
@@ -208,13 +202,13 @@ class Home extends Component {
       //产量计划完成率
       var p1 = document.getElementById('plannedCompletionBox');
       const datas_ = plannedCompletionData[plannedCompletionNum - 1];
-      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_.value + '</span><span class="topMsg_number_2" style={{fontSize: "0.75em",color: "#fff"}}>%</span><p class="topMsg_number_p">' + datas_.name + '</p></div>';
+      var res = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_?.value.toFixed(2) + '</span><span class="topMsg_number_2" style={{fontSize: "0.75em",color: "#fff"}}>%</span><p class="topMsg_number_p">' + datas_.name + '</p></div>';
       p1.innerHTML = res;
 
       //百万工时损工率
       var p2 = document.getElementById('manHourBox');
       const datas_2 = manHourData[manHourNum - 1];
-      var res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2.value + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';
+      var res2 = '<div class="topMsg_box animate__animated animate__zoomIn"><span class="topMsg_number shu1">' + datas_2?.value.toFixed(2) + '</span><span class="topMsg_number_2">%</span><p class="topMsg_number_p">' + datas_2.name + '</p></div>';
       p2.innerHTML = res2;
 
       const num_ = plannedCompletionNum + 1 >= plannedCompletionData.length ? 1 : plannedCompletionNum + 1;
@@ -225,7 +219,7 @@ class Home extends Component {
 
   render() {
     const stores = this.store.state;
-    const { totalValue, yearDecline, yearSend, productInventory } = this.store.state;
+    let { totalValue, yearDecline, yearSend, productInventory } = this.store.state;
     let { changGif, updateTime, } = this.state;
     return (
       <div className={"home_box"}>
@@ -239,7 +233,7 @@ class Home extends Component {
 
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg">
-                <Tooltip placement="bottom" title={' ● 从1月至m-1月的产值累计，产值计算方式：销售单价*产量'}>
+                <Tooltip placement="bottom" title={' ● 从1月至m-1月的产值累计，产值计算方式：∑销售单价*产量'}>
                   <p className="topMsg_title">总产值</p>
                 </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"}>
@@ -250,7 +244,7 @@ class Home extends Component {
 
             <div class="center_box2 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
               <div className="center_box">
-                <Tooltip placement="bottom" title={' ● 即为 t-1天的库存金额，百分比即为产品库存金额占总体金额的百分比'}>
+                <Tooltip placement="bottom" title={' ● 即为 更新数据ETL日期当天的库存金额，百分比即为产品库存金额占总体金额的百分比'}>
                   <p className="topMsg_title" style={{ position: "relative", zIndex: 999999 }}>库存金额</p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -261,7 +255,7 @@ class Home extends Component {
 
             <div class="bottomContent2 animate__animated animate__fadeInDown animate__slower animate__delay-1s">
               <div className="bottomContent bigDivPd">
-                <Tooltip placement="bottom" title={' ● m-6至m月的产量和发货量的对比数据（含外加工）当月的数据计算至t-1天'}>
+                <Tooltip placement="bottom" title={' ● m-6至m月的产量和发货量的对比数据（含外加工）当月的数据计算至更新数据ETL日期当天'}>
                   <p className="topMsg_title">月度产量/发货量</p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -281,24 +275,24 @@ class Home extends Component {
                       <div className="right_li">
                         <span className="topMsg_number" class="shu1">{yearDecline}</span>
                         <p className="topMsg_line"></p>
-                        <Tooltip placement="bottom" title={' ● 即为从1/1至t-1天的产量之和（含外加工）'}>
+                        <Tooltip placement="bottom" title={' ● 即为从当年1月1日至更新数据ETL日期当天的产量之和（含外加工）'}>
                           <span className="topMsg_tip">年度产量/吨</span>
                         </Tooltip>
                       </div>
                     </div>
                     <div className="center_li">
                       <div className="right_li">
-                        <span className="topMsg_number" class="shu1">{yearSend}</span>
+                        <span className="topMsg_number" class="shu1">{productInventory}</span>
                         <p className="topMsg_line"></p>
-                        <Tooltip placement="bottom" title={' ● 即为从当年1/1至t-1天的发货量之和（含外加工）'}>
+                        <Tooltip placement="bottom" title={' ● 即为从当年1月1日至更新数据ETL日期当天的发货量之和（含外加工）'}>
                           <span className="topMsg_tip">年度发货量/吨</span>
                         </Tooltip>
                       </div>
                     </div>
                     <div className="center_li">
-                      <span className="topMsg_number" class="shu1">{productInventory}</span>
+                      <span className="topMsg_number" class="shu1">{yearSend}</span>
                       <p className="topMsg_line"></p>
-                      <Tooltip placement="bottom" title={' ● t-1天的产品库存数量（含外加工）'}>
+                      <Tooltip placement="bottom" title={' ● 更新数据ETL日期当天的产品库存数量（含外加工）'}>
                         <span className="topMsg_tip">产品库存/吨</span>
                       </Tooltip>
                     </div>
@@ -308,7 +302,7 @@ class Home extends Component {
             </div>
             <div class="bottomContent3 animate__animated animate__fadeInUp animate__slower">
               <div className="bottomContent">
-                <Tooltip placement="bottom" title={' ● t-31 至t-1 天的产量（含外加工）'}>
+                <Tooltip placement="bottom" title={' ● t-31 至更新数据ETL日期当天的日产量（含外加工）'}>
                   <p className="topMsg_title">近30天产量</p>
                 </Tooltip>
                 <div className="topMsg_content">
@@ -323,7 +317,7 @@ class Home extends Component {
           <div className="rightContent">
             <div class="topMsg2 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg bigDivPd">
-                <Tooltip placement="bottom" title={' ● 即为m-1月的百万工时损工率'}>
+                <Tooltip placement="bottom" title={' ● 即为1月至m-1月的百万工时损工率'}>
                   <p className="topMsg_title">百万工时损工率</p>
                 </Tooltip>
                 <div className={changGif ? "topMsg_content changBg_topMsg_content" : "topMsg_content"} id="manHourBox">
@@ -337,7 +331,7 @@ class Home extends Component {
 
             <div class="topMsg_22 animate__animated animate__fadeInDown animate__slower">
               <div className="topMsg_2">
-                <Tooltip placement="bottom" title={' ● m-6至m月\n近六个月的产品一次合格率和目标值合格率；\n当月的数据计算至t-1天'}>
+                <Tooltip placement="bottom" title={' ● m-6至m月近六个月的产品一次合格率和目标值合格率；当月的数据计算至更新数据ETL日期当天'}>
                   <p className="topMsg_title">一次合格率</p>
                 </Tooltip>
 
@@ -373,7 +367,7 @@ class Home extends Component {
             </div>
           </div>
           <div className="bottom_box">
-            <p style={{ color: "#6a818d" }}>
+            <p style={{ color: "#6a818d",lineHeight:'2px' }}>
               更新时间 : {updateTime}
             </p>
           </div>