dedsudiyu пре 5 месеци
родитељ
комит
4fa86abb37

+ 2 - 2
src/api/safetyCheck/index.js

@@ -537,9 +537,9 @@ export function reportHazardItemsOneReportRefresh (query) {
   })
 }
 // 检查项统计-二级隐患数据刷新
-export function reportHazardReportTwoReportRefresh (query) {
+export function reportHazardItemsTwoReportRefresh (query) {
   return request({
-    url: '/report/hazardReport/twoReportRefresh',
+    url: '/report/hazardItems/twoReportRefresh',
     method: 'get',
     params: query
   })

+ 3 - 3
src/views/safetyCheck/collegeWorktable/annualHiddenDistribution.vue

@@ -138,12 +138,12 @@
         }else if(val.layerY>158&&val.layerY<200){
           this.suspensionTop = 170;
         }
-        this.$set(this,'suspensionLeft',43);
         this.$set(this,'suspensionType',false);
         this.$set(this,'suspensionText','');
       },
       mouseoverDv(row){
-        if(row.columnIndex == 1){
+        if(row.columnIndex != 0){
+          this.$set(this,'suspensionLeft',row.columnIndex==1?43:(row.columnIndex==2?137:(row.columnIndex==3?187:(row.columnIndex==4?245:(row.columnIndex==5?303:(row.columnIndex==6?361:(row.columnIndex==7?419:(row.columnIndex==8?477:43))))))));
           this.$set(this,'suspensionText',row.ceil);
           this.$set(this,'suspensionType',true);
         }else{
@@ -233,7 +233,7 @@
           color: rgba(70, 70, 70);
         }
         .position-suspension-null-left{
-          width:40px;
+          width:10px;
         }
         .position-suspension-null-right{
           flex:1;

+ 2 - 2
src/views/safetyCheck/components/inspectionItemsStatistics.vue

@@ -168,7 +168,7 @@
     securityCheckOptionList,
     securityCheckDangerTodayDangerList,
     reportHazardItemsOneReportRefresh,
-    reportHazardReportTwoReportRefresh,
+    reportHazardItemsTwoReportRefresh,
     reportHazardItemsThreeReportRefresh,
     reportHazardItemsOneReportPie,
     reportHazardItemsOneReportList,
@@ -520,7 +520,7 @@
                   this.getList();
                 });
               }else if(this.tabsIndex == 1){
-                reportHazardReportTwoReportRefresh().then(response => {
+                reportHazardItemsTwoReportRefresh().then(response => {
                   this.msgSuccess(response.message)
                   this.getList();
                 });

+ 3 - 3
src/views/safetyCheck/schoolWorktable/annualHiddenDistribution.vue

@@ -143,8 +143,8 @@
         this.$set(this,'suspensionText','');
       },
       mouseoverDv(row){
-        if(row.columnIndex == 1){
-          console.log('row.ceil',row.ceil)
+        if(row.columnIndex != 0){
+          this.$set(this,'suspensionLeft',row.columnIndex==1?43:(row.columnIndex==2?137:(row.columnIndex==3?187:(row.columnIndex==4?245:(row.columnIndex==5?303:(row.columnIndex==6?361:(row.columnIndex==7?419:(row.columnIndex==8?477:43))))))));
           this.$set(this,'suspensionText',row.ceil);
           this.$set(this,'suspensionType',true);
         }else{
@@ -234,7 +234,7 @@
           color: rgba(70, 70, 70);
         }
         .position-suspension-null-left{
-          width:40px;
+          width:10px;
         }
         .position-suspension-null-right{
           flex:1;