feat:fix bugs

9 months ago · e47be27a6e
8 changed files with 70 additions and 24 deletions
--- a/api/app/lib/controllers/bigScreen/leader.js
+++ b/api/app/lib/controllers/bigScreen/leader.js
@ -212,8 +212,10 @@ async function devicesGuarantee(ctx) {
            // where: searchWhere,
            order: [["id", "desc"]],
            include: [{
+                required:true,
                model: models.PointDevice,
                include: {
+                    required:true,
                    model: models.Point,
                    where: { projectId: { $in: projectId.split(',') } }
                }
@ -332,8 +334,10 @@ async function getCenterData(ctx) {
            // where: searchWhere,
            order: [["id", "desc"]],
            include: [{
+                required:true,
                model: models.PointDevice,
                include: {
+                    required:true,
                    model: models.Point,
                    where: { projectId: { $in: projectId.split(',') } }
                }
--- a/web-screen/client/src/layout/components/header/index.js
+++ b/web-screen/client/src/layout/components/header/index.js
@ -38,14 +38,14 @@ const Header = props => {
        fontSize: '1.875rem',
        color: ' #FFFFFF',
        fontWeight: 600,
-        fontFamily: 'PangMenZhengDao',
+        fontFamily: ' PangMenZhengDaoBiaoTiTi',
        letterSpacing: '.5231rem',
        width:'39rem'
    }
    let headerTabStyle = {
        width: '4.375rem',
        height: '1.125rem',
-        fontFamily: 'PangMenZhengDao',
+        fontFamily: ' PangMenZhengDaoBiaoTiTi',
        fontSize: '1.125rem',
        color: '#CCE6FF',
        letterSpacing: '.0231rem'
--- a/web-screen/client/src/sections/bigScreen/components/error/style.less
+++ b/web-screen/client/src/sections/bigScreen/components/error/style.less
@ -12,7 +12,7 @@
        background-size: 100% 100%;
        height: 2.6875rem;
        width: 100%;
-        font-family: PangMenZhengDao;
+        font-family:  PangMenZhengDaoBiaoTiTi;
        font-size: 1.125rem;
        // color: #CCE6FF;
        letter-spacing: .0231rem;
@ -142,25 +142,52 @@
 .ant-table-thead > tr > th {  
    background-color: green;  
  }
-.ant-input-affix-wrapper{
+  
+// .ant-input-affix-wrapper{
+//     background-color: #00508D !important;
+//     >input{
+//         background-color: #00508D;
+//     }
+//   }
+body > div:nth-child(5) > div >div.ant-select-dropdown{
    background-color: #00508D !important;
-    >input{
-        background-color: #00508D;
-    }
 }
  #patrol-record{
-    .ant-select{
-    .ant-select-selector{
+     div.ant-table-wrapper > div > div > ul > li.ant-pagination-options > div >div.ant-select-selector{
        background-color: #00508D !important;
+        border-color: #00508D !important;
+
    }
+    > div:nth-child(1) > div > div>div.ant-select-selector{
+        background-color: #00508D !important;
+        border-color: #00508D !important;
+
+
    }
+ 
+//     .ant-select{
+//     .ant-select-selector{
+//         background-color: #00508D !important;
+//     }
+//   }
 }

-.ant-select-dropdown{
+// .ant-select-dropdown{
+//     background-color: #00508D !important;
+
+//   }
+  #patrol-record{
+     div:nth-child(1) > div > span{
+        background-color: #00508D !important;
+        border-color: #00508D !important;
+
+        >input{
            background-color: #00508D !important;
+            border-color: #00508D !important;

        }
-  #patrol-record{
+    }
+  
    .ant-table-wrapper{
        .ant-table-container{
            .ant-table-header{
@ -191,31 +218,46 @@
        background-color: transparent;
            background: transparent;
            color: #FFFFFF;
-            font-family: PangMenZhengDao;
+            font-family:  PangMenZhengDaoBiaoTiTi;
            font-size: 1.125rem;
            border-bottom:2px solid transparent;
    }
    .ant-table-cell-scrollbar:not([rowspan]){
        box-shadow: 0 1px 0 1px transparent;
    }
-    .ant-table-tbody > tr.ant-table-row:hover > td, .ant-table-tbody > tr > td.ant-table-cell-row-hover{
-        background-image: linear-gradient(360deg, #0080ff4d 0%, #0080ff33 58%, #0080ff4d 100%);
+    .ant-table-tbody > tr.ant-table-row:hover > td, .ant-table-tbody > tr :hover{
+        // background-image: linear-gradient(360deg, #0080ff4d 0%, #0080ff33 58%, #0080ff4d 100%);
+        background-color: #00508D;
+        // background-image: linear-gradient(180deg, #0080ff4d 0%, #0080ff33 58%, #0080ff4d 100%);
+
+        border-bottom:1px solid #0080ff;
+        border-top:1px solid #0080ff;
+
    }   

  }
  #patrol-record > div.ant-table-wrapper > div > div > div > div > div.ant-table-body > table > tbody > tr{
    background-color: #00508D
+    // background-image: linear-gradient(180deg, #0080ff4d 0%, #0080ff33 58%, #0080ff4d 100%);
+
  }

 #patrol-record {
    .ant-pagination-item-link{
        color:#fff ;
        background-color: #00508D;
+        border-color: #00508D !important;
+

    }
    .ant-pagination-item{
        color:#fff ;
        background-color: #00508D;
+        border-color: #00508D !important;
+
+    }
+   div.ant-table-wrapper > div > div > ul > li.ant-pagination-options > div > div.ant-select-selector > span.ant-select-selection-item{
+    color: #1890ff;
   }
 }

--- a/web-screen/client/src/sections/bigScreen/components/inspection/left.js
+++ b/web-screen/client/src/sections/bigScreen/components/inspection/left.js
@ -90,10 +90,8 @@ const Left = props => {
            })
            //计算比例
            Object.values(repairObject).forEach(item => {
-              console.log('item',item)
                repair.push(item.quests === 0 ? 0 : Number((item.done / item.quests * 100).toFixed(2)));
              });
-              console.log('x1111',repair,cRate)
              setRRate(repair)
          }
        }
@ -138,6 +136,7 @@ const Left = props => {
              }
            }
            if(data.length>10){
+              
                setRank(data.slice(0,10))
            }else{
                setRank(data)
@ -181,6 +180,7 @@ const Left = props => {
  }

  const topClick=(e)=>{
+    console.log('2222',e)
    switch (e) {
       case 'perBottom':
        const rs=rankCopy.sort((a,b)=>b.patrolRecordCount-a.patrolRecordCount)
--- a/web-screen/client/src/sections/bigScreen/components/leader/index.js
+++ b/web-screen/client/src/sections/bigScreen/components/leader/index.js
@ -17,7 +17,7 @@ const Leader = (props) => {
        fontSize:'1.2rem',
        fontStyle:'italic', 
        color:'#E5F1FF',
-        fontFamily: '思源黑体',
+        fontFamily: 'SourceHanSansCN-Regular',

    }
    const centerNumFontStyle={
--- a/web-screen/client/src/sections/bigScreen/components/leader/left.js
+++ b/web-screen/client/src/sections/bigScreen/components/leader/left.js
@ -21,7 +21,7 @@ const Left = props => {
  const [months, setMonths] = useState([])
  const [period, setPeriod] = useState('week')
  const [rank,setRank]=useState([])
-  const [state, setState] = useState(0)
+  const [state, setState] = useState(1)
  const [rankCopy,setRankCopy]=useState([])//用于排序（巡检次数）
  const { bigScreen } = actions
 //   const questFontColor = { color: '#8f7a49' } //有问题的颜色
--- a/web-screen/client/src/sections/bigScreen/components/run/style.less
+++ b/web-screen/client/src/sections/bigScreen/components/run/style.less
@ -21,7 +21,7 @@
 .title {
  //   width: 122px;
  height: 1.3125rem;
-  font-family: PangMenZhengDao;
+  font-family:  PangMenZhengDaoBiaoTiTi;
  font-size: 1.3125rem;
  color: #ffffff;
  // letter-spacing: 0.95px;
@ -201,7 +201,7 @@
  display: flex;
  padding-left: 3.375rem;
  line-height: 2.5rem;
-  font-family: PangMenZhengDao-Regular;
+  font-family: PangMenZhengDaoBiaoTiTi;
  font-weight: 400;
  font-size: 1rem;
  color: #FFFFFF;
--- a/web-screen/client/src/sections/bigScreen/components/style.less
+++ b/web-screen/client/src/sections/bigScreen/components/style.less
@ -34,7 +34,7 @@
 .title {
    //   width: 122px;
    height: 1.3125rem;
-    font-family: PangMenZhengDao;
+    font-family: PangMenZhengDaoBiaoTiTi;
    font-size: 1.3125rem;
    color: #ffffff;
    // letter-spacing: 0.95px;