Browse Source

fix:周报bug

guotianliang 3 years ago
parent
commit
09db680983

+ 1 - 1
src/views/ReportForm/weekReport/barChart.vue

@@ -103,7 +103,7 @@ export default {
                     color:"#2EA121",
                     avg:"",
                      param:[
-                         {name:"正常调节",color:"#2EA121",key:"feedbackNorSpaceNum"},
+                        //  {name:"正常调节",color:"#2EA121",key:"feedbackNorSpaceNum"},
                          {name:"无用户调节",color:"#ffffff",key:"feedbackNoSpaceNum",centerShow:true},
                          {name:"异常调节",color:"#F9908B",key:"feedbackAbnorSpaceNum"},
                     ]

+ 1 - 1
src/views/ReportForm/weekReport/chartLegend.vue

@@ -68,7 +68,7 @@ export default {
                 ],
                  'userAdjust':[
                     {name:"无用户调节",color:"#ffffff"},
-                    {name:"正常调节",color:"#2EA121"},
+                    // {name:"正常调节",color:"#2EA121"},
                     {name:"异常调节",color:"#F9908B"},
                     {name:""},
                 ],

+ 2 - 2
src/views/ReportForm/weekReport/envSurvey.vue

@@ -67,7 +67,7 @@
                     </div>
                     <ul class="content_lenged">
                         <li>无用户调节:{{surveyTable.weekFeedbackNoSpaceNum}}个</li>
-                        <li>正常调节:{{surveyTable.weekFeedbackNorSpaceNum}}个</li>
+                        <!-- <li>正常调节:{{surveyTable.weekFeedbackNorSpaceNum}}个</li> -->
                         <li>异常调节:{{surveyTable.weekFeedbackAbnorSpaceNum}}个</li>
                     </ul>
                 </div>
@@ -278,7 +278,7 @@ export default {
                     background: #2EA121;
                 }
             }
-            &>li:nth-child(3){
+            &>li:last-child{
                 &::before{
                     background: #F9908B;
                 }

+ 3 - 3
src/views/ReportForm/weekReport/reportDetail.vue

@@ -1099,13 +1099,13 @@ export default {
                 {name:"温度", id:'Tdb',weeknormalProprotion:'',weekAvg:'--',img:'happy',init:1,assess:'',weekcoldProprotion:'',weekhotProprotion:'',unit:'°C',assessHotTable:[
                     {name:'偏冷',min:-50},{name:"舒适",min:20},{name:"偏热",min:25}
                 ],assessColdTable:[
-                    {name:'偏冷',min:-50},{name:"舒适",min:24},{name:"偏热",min:27}
+                    {name:'偏冷',min:-50},{name:"舒适",min:20},{name:"偏热",min:25}
                 ]},
                 {name:"CO₂",id:"CO2",weeknormalProprotion:'',weekAvg:'',assess:'',img:'happy',init:0,unit:'ppm',assessTable:[
                     {name:"新鲜空气",min:400,type:"happy"},{name:"达标",min:800,type:"happy"},{name:"新风轻微不足",min:1000,type:"happy"},{name:"新风明显不足",min:1500,type:"hot"},{name:"新风严重不足",min:2000,type:"hot"}
                 ]},
                 {name:"甲醛",id:"HCHO",weeknormalProprotion:'',weekAvg:'',assess:'',img:'happy',init:2,unit:'mg/m3',assessTable:[
-                    {name:"符合国标",type:"happy"},{name:"超标",min:0.1,type:"hot"}
+                    {name:"符合国标",type:"happy",min:0},{name:"超标",min:0.1,type:"hot"}
                 ]},
                 {name:"相对湿度", id:"RH",weeknormalProprotion:'',weekAvg:'',init:0,img:'happy',assess:'',unit:'%',assessTable:[
                     {name:"干燥",type:"hot"},{name:"舒适",min:30,type:"happy"},{name:"湿润",min:70,type:"cold"}
@@ -1440,7 +1440,7 @@ export default {
                 item.min&&assessList.push(item.min)
             })
             assessList.sort((a,b)=>a-b);
-            let index = assessList.findIndex(item=>item ==Number(value.weekAvg)) || 1;
+            let index =  assessList.lastIndexOf(Number(value.weekAvg)) || 1;
 
             if(value.name=="温度"){
                 this.surveyTable[sgin].img = this.imgList[index-1];