Merge branch 'VERSIONS-AnQuanJianCha' into leb-web-dev

src/views/basicsModules/ssoLogin.vue

@@ -65,15 +65,16 @@
           });
         }
       } else {
-        this.$alert('参数异常!', '提示', {
-          confirmButtonText: '确定',
-          callback: action => {
-            localStorage.removeItem('serviceType');
-            store.dispatch('LogOut').then(() => {
-              window.location.href = process.env.VUE_APP_OUT_URL;
-            })
-          }
-        });
+        // this.$alert('参数异常!', '提示', {
+        //   confirmButtonText: '确定',
+        //   callback: action => {
+        //     localStorage.removeItem('serviceType');
+        //     store.dispatch('LogOut').then(() => {
+        //       window.location.href = process.env.VUE_APP_OUT_URL;
+        //     })
+        //   }
+        // });
+        window.location.href = process.env.VUE_APP_OUT_URL;
       }
       localStorage.setItem('windowHref', window.location.href)
     },

src/views/safetyCheck/components/inspectionItemsStatistics.vue

@@ -352,7 +352,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //一级指标隐患分布 饼图/头部数据
-            reportHazardItemsOneReportPie(eChartsData).then(response => {
+            reportHazardItemsOneReportPie(obj).then(response => {
               let list = [];
               for(let i=0;i<response.data.pie.length;i++){
                 list.push({
@@ -375,7 +375,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //二级指标隐患分布 饼图/头部数据
-            reportHazardItemsTwoReportPie(eChartsData).then(response => {
+            reportHazardItemsTwoReportPie(obj).then(response => {
               this.$set(this,'formTitleData',response.data.topMsg);
             })
             this.$set(this.exportConfig,'api','/report/hazardItems/twoExport');
@@ -387,7 +387,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //三级指标隐患分布 饼图/头部数据
-            reportHazardItemsThreeReportPie(eChartsData).then(response => {
+            reportHazardItemsThreeReportPie(obj).then(response => {
               this.$set(this,'formTitleData',response.data.topMsg);
             })
             this.$set(this.exportConfig,'api','/report/hazardItems/threeExport');
@@ -402,7 +402,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //一级指标隐患分布 饼图/头部数据
-            reportHazardItemsOneReportPieCollege(eChartsData).then(response => {
+            reportHazardItemsOneReportPieCollege(obj).then(response => {
               let list = [];
               for(let i=0;i<response.data.pie.length;i++){
                 list.push({
@@ -425,7 +425,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //二级指标隐患分布 饼图/头部数据
-            reportHazardItemsTwoReportPieCollege(eChartsData).then(response => {
+            reportHazardItemsTwoReportPieCollege(obj).then(response => {
               this.$set(this,'formTitleData',response.data.topMsg);
             })
             this.$set(this.exportConfig,'api','/report/hazardItems/twoExportCollege');
@@ -437,7 +437,7 @@
               this.$set(this, 'total', response.data.total)
             })
             //三级指标隐患分布 饼图/头部数据
-            reportHazardItemsThreeReportPieCollege(eChartsData).then(response => {
+            reportHazardItemsThreeReportPieCollege(obj).then(response => {
               this.$set(this,'formTitleData',response.data.topMsg);
             })
             this.$set(this.exportConfig,'api','/report/hazardItems/threeExportCollege');