src/config/website.js

@@ -51,8 +51,8 @@ export default {
     reportUrl: 'https://nmwx.dahengsi.com:20001/ureport',
     //文件存储服务器地址，末尾必须/
     //ossServer: 'http://172.31.1.154:20002/oss/galaxy/',
-    //ossServer: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
-    ossServer: 'https://wx.dahengsi.com:44301/oss/galaxy/',
+    ossServer: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
+    //ossServer: 'https://wx.dahengsi.com:44301/oss/galaxy/',
     //文件预览服务器地址
     kkfileviewServer: 'http://localhost:8012',
     nm_post_code_sysadmin_id: '1562989286284906498',

src/views/wel/index.vue

@@ -1466,7 +1466,6 @@ export default {
         },
         getRtuStatusCountInfo() {
             getRtuStatusCountData().then((res) => {
-                //   console.log("status count " + JSON.stringify(res.data))
                 if (res.data.code === 200) {
                     let data = res.data.data;
 
@@ -1474,41 +1473,71 @@ export default {
                     this.rtuInfoCountPieOption.title.subtext = "测站总数量【" + data.rtus + "】";
 
                     //正常测站
-                    this.rtuInfoCountPieOption.series[0].data[0].value = data.rtus - data.warningRtus;
-                    let num = new Number((data.rtus - data.warningRtus) / data.rtus * 100);
-                    this.rtuInfoCountPieOption.series[0].data[0].percent = num.toFixed(2);
-                    // console.log("status count 1 " + this.rtuInfoCountPieOption.series[0].data[0].percent)
+                    if (data.rtus > 0 && (data.rtus - data.warningRtus) > 0) {
+                        this.rtuInfoCountPieOption.series[0].data[0].value = data.rtus - data.warningRtus;
+                        let num = new Number((data.rtus - data.warningRtus) / data.rtus * 100);
+                        this.rtuInfoCountPieOption.series[0].data[0].percent = num.toFixed(2);
+                    } else {
+                        this.rtuInfoCountPieOption.series[0].data[0].value = 0;
+                        this.rtuInfoCountPieOption.series[0].data[0].percent = 0;
+                    }
+
                     //离线
-                    this.rtuInfoCountPieOption.series[0].data[1].value = data.offlineRtus;
-                    let num2 = new Number(data.offlineRtus / data.rtus * 100);
-                    this.rtuInfoCountPieOption.series[0].data[1].percent = num2.toFixed(2);
-                    //  console.log("status count 2 " + this.rtuInfoCountPieOption.series[0].data[1].percent)
+                    if (data.rtus > 0 && data.offlineRtus > 0) {
+                        this.rtuInfoCountPieOption.series[0].data[1].value = data.offlineRtus;
+                        let num2 = new Number(data.offlineRtus / data.rtus * 100);
+                        this.rtuInfoCountPieOption.series[0].data[1].percent = num2.toFixed(2);
+                    } else {
+                        this.rtuInfoCountPieOption.series[0].data[1].value = 0;
+                        this.rtuInfoCountPieOption.series[0].data[1].percent = 0;
+                    }
+
                     //其他异常
-                    this.rtuInfoCountPieOption.series[0].data[2].value = data.warningRtus - data.offlineRtus;
-                    let num3 = new Number((data.warningRtus - data.offlineRtus) / data.rtus * 100);
-                    this.rtuInfoCountPieOption.series[0].data[2].percent = num3.toFixed(2);
-                    // console.log("status count 3 " + this.rtuInfoCountPieOption.series[0].data[2].percent)
+                    if (data.rtus > 0 && (data.warningRtus - data.offlineRtus) > 0) {
+                        this.rtuInfoCountPieOption.series[0].data[2].value = data.warningRtus - data.offlineRtus;
+                        let num3 = new Number((data.warningRtus - data.offlineRtus) / data.rtus * 100);
+                        this.rtuInfoCountPieOption.series[0].data[2].percent = num3.toFixed(2);
+                    } else {
+                        this.rtuInfoCountPieOption.series[0].data[2].value = 0;
+                        this.rtuInfoCountPieOption.series[0].data[2].percent = 0;
+                    }
+
                     this.rtuInfoCountPieMap.setOption(this.rtuInfoCountPieOption);
                 }
             });
         },
         getRtuUpCountInfo() {
             getRtuUpCountData().then((res) => {
-                //  console.log("up count " + JSON.stringify(res.data))
+
                 if (res.data.code === 200) {
                     let data = res.data.data;
                     this.rtuDataUpCountOption.series[0].data[2].value = data.rainRtuCount;
                     this.rtuDataUpCountOption.series[0].data[1].value = data.riverRtuCount;
                     this.rtuDataUpCountOption.series[0].data[0].value = data.groundRtuCount;
-                    let num = new Number(data.rainUpDataCount / data.rainRtuCount * 100);
-                    this.rtuDataUpCountOption.series[1].data[2].value = data.rainUpDataCount;
-                    this.rtuDataUpCountOption.series[1].data[2].percent = num.toFixed(1);
-                    num = new Number(data.riverUpDataCount / data.riverRtuCount * 100);
-                    this.rtuDataUpCountOption.series[1].data[1].value = data.riverUpDataCount;
-                    this.rtuDataUpCountOption.series[1].data[1].percent = num.toFixed(1);
-                    num = new Number(data.groundUpDataCount / data.groundRtuCount * 100);
-                    this.rtuDataUpCountOption.series[1].data[0].value = data.groundUpDataCount;
-                    this.rtuDataUpCountOption.series[1].data[0].percent = num.toFixed(1);
+                    if (data.rainRtuCount > 0 && data.rainUpDataCount) {
+                        let num = new Number(data.rainUpDataCount / data.rainRtuCount * 100);
+                        this.rtuDataUpCountOption.series[1].data[2].value = data.rainUpDataCount;
+                        this.rtuDataUpCountOption.series[1].data[2].percent = num.toFixed(1);
+                    } else {
+                        this.rtuDataUpCountOption.series[1].data[2].value = 0;
+                        this.rtuDataUpCountOption.series[1].data[2].percent = 0;
+                    }
+                    if (data.riverRtuCount > 0 && data.riverUpDataCount) {
+                        let num = new Number(data.riverUpDataCount / data.riverRtuCount * 100);
+                        this.rtuDataUpCountOption.series[1].data[1].value = data.riverUpDataCount;
+                        this.rtuDataUpCountOption.series[1].data[1].percent = num.toFixed(1);
+                    } else {
+                        this.rtuDataUpCountOption.series[1].data[1].value = 0;
+                        this.rtuDataUpCountOption.series[1].data[1].percent = 0;
+                    }
+                    if (data.groundRtuCount > 0 && data.groundUpDataCount) {
+                        let num = new Number(data.groundUpDataCount / data.groundRtuCount * 100);
+                        this.rtuDataUpCountOption.series[1].data[0].value = data.groundUpDataCount;
+                        this.rtuDataUpCountOption.series[1].data[0].percent = num.toFixed(1);
+                    } else {
+                        this.rtuDataUpCountOption.series[1].data[0].value = 0;
+                        this.rtuDataUpCountOption.series[1].data[0].percent = 0;
+                    }
                     this.rtuDataUpCountMap.setOption(this.rtuDataUpCountOption);
                 }
             });
@@ -1522,21 +1551,41 @@ export default {
                     //任务总数
                     this.checkOrderCountOption.series[0].data[4].value = data.orderCount;
                     //未确认
-                    this.checkOrderCountOption.series[0].data[3].value = data.unconfirmOrderCount;
-                    let num = new Number(data.unconfirmOrderCount / data.orderCount * 100);
-                    this.checkOrderCountOption.series[0].data[3].percent = num.toFixed(1);
+                    if (data.orderCount > 0 && data.unconfirmOrderCount > 0) {
+                        this.checkOrderCountOption.series[0].data[3].value = data.unconfirmOrderCount;
+                        let num = new Number(data.unconfirmOrderCount / data.orderCount * 100);
+                        this.checkOrderCountOption.series[0].data[3].percent = num.toFixed(1);
+                    } else {
+                        this.checkOrderCountOption.series[0].data[3].value = 0;
+                        this.checkOrderCountOption.series[0].data[3].percent = 0;
+                    }
                     //超时未确认
-                    this.checkOrderCountOption.series[0].data[2].value = data.delayComfireOrders;
-                    num = new Number(data.delayComfireOrders / data.orderCount * 100);
-                    this.checkOrderCountOption.series[0].data[2].percent = num.toFixed(1);
+                    if (data.orderCount > 0 && data.delayComfireOrders > 0) {
+                        this.checkOrderCountOption.series[0].data[2].value = data.delayComfireOrders;
+                        let num = new Number(data.delayComfireOrders / data.orderCount * 100);
+                        this.checkOrderCountOption.series[0].data[2].percent = num.toFixed(1);
+                    } else {
+                        this.checkOrderCountOption.series[0].data[2].value = 0;
+                        this.checkOrderCountOption.series[0].data[2].percent = 0;
+                    }
                     //处理中
-                    this.checkOrderCountOption.series[0].data[1].value = data.processCheckOrderCount;
-                    num = new Number(data.processCheckOrderCount / data.orderCount * 100);
-                    this.checkOrderCountOption.series[0].data[1].percent = num.toFixed(1);
+                    if (data.orderCount > 0 && data.processCheckOrderCount > 0) {
+                        this.checkOrderCountOption.series[0].data[1].value = data.processCheckOrderCount;
+                        let num = new Number(data.processCheckOrderCount / data.orderCount * 100);
+                        this.checkOrderCountOption.series[0].data[1].percent = num.toFixed(1);
+                    } else {
+                        this.checkOrderCountOption.series[0].data[1].value = 0;
+                        this.checkOrderCountOption.series[0].data[1].percent = 0;
+                    }
                     //已处理
-                    this.checkOrderCountOption.series[0].data[0].value = data.reportOrder;
-                    num = new Number(data.reportOrder / data.orderCount * 100);
-                    this.checkOrderCountOption.series[0].data[0].percent = num.toFixed(1);
+                    if (data.orderCount > 0 && data.reportOrder > 0) {
+                        this.checkOrderCountOption.series[0].data[0].value = data.reportOrder;
+                        let num = new Number(data.reportOrder / data.orderCount * 100);
+                        this.checkOrderCountOption.series[0].data[0].percent = num.toFixed(1);
+                    } else {
+                        this.checkOrderCountOption.series[0].data[0].value = 0;
+                        this.checkOrderCountOption.series[0].data[0].percent = 0;
+                    }
 
                     this.checkOrderMap.setOption(this.checkOrderCountOption);
                 }
@@ -1544,19 +1593,33 @@ export default {
         },
         getInspectionReportCountInfo() {
             getInspectionReportCountData().then((res) => {
-                //    console.log("InspectionReport count " + JSON.stringify(res.data))
                 if (res.data.code === 200) {
                     let data = res.data.data;
                     this.equipmentInspectionCountOption.series[0].data[3].value = data.equipmentInspectionCount;
-                    let num = new Number(data.equipmentInspectionBeforeRainReports / data.equipmentInspectionCount * 100);
-                    this.equipmentInspectionCountOption.series[0].data[2].value = data.equipmentInspectionBeforeRainReports;
-                    this.equipmentInspectionCountOption.series[0].data[2].percent = num.toFixed(1);
-                    num = new Number(data.equipmentInspectionRainFirstReports / data.equipmentInspectionCount * 100);
-                    this.equipmentInspectionCountOption.series[0].data[1].value = data.equipmentInspectionRainFirstReports;
-                    this.equipmentInspectionCountOption.series[0].data[1].percent = num.toFixed(1);
-                    num = new Number(data.equipmentInspectionRainSecondReports / data.equipmentInspectionCount * 100);
-                    this.equipmentInspectionCountOption.series[0].data[0].value = data.equipmentInspectionRainSecondReports;
-                    this.equipmentInspectionCountOption.series[0].data[0].percent = num.toFixed(1);
+                    if (data.equipmentInspectionCount > 0 && data.equipmentInspectionBeforeRainReports > 0) {
+                        let num = new Number(data.equipmentInspectionBeforeRainReports / data.equipmentInspectionCount * 100);
+                        this.equipmentInspectionCountOption.series[0].data[2].value = data.equipmentInspectionBeforeRainReports;
+                        this.equipmentInspectionCountOption.series[0].data[2].percent = num.toFixed(1);
+                    } else {
+                        this.equipmentInspectionCountOption.series[0].data[2].value = 0;
+                        this.equipmentInspectionCountOption.series[0].data[2].percent = 0;
+                    }
+                    if (data.equipmentInspectionCount > 0 && data.equipmentInspectionRainFirstReports > 0) {
+                        let num = new Number(data.equipmentInspectionRainFirstReports / data.equipmentInspectionCount * 100);
+                        this.equipmentInspectionCountOption.series[0].data[1].value = data.equipmentInspectionRainFirstReports;
+                        this.equipmentInspectionCountOption.series[0].data[1].percent = num.toFixed(1);
+                    } else {
+                        this.equipmentInspectionCountOption.series[0].data[1].value = 0;
+                        this.equipmentInspectionCountOption.series[0].data[1].percent = 0;
+                    }
+                    if (data.equipmentInspectionCount > 0 && data.equipmentInspectionRainSecondReports > 0) {
+                        let num = new Number(data.equipmentInspectionRainSecondReports / data.equipmentInspectionCount * 100);
+                        this.equipmentInspectionCountOption.series[0].data[0].value = data.equipmentInspectionRainSecondReports;
+                        this.equipmentInspectionCountOption.series[0].data[0].percent = num.toFixed(1);
+                    } else {
+                        this.equipmentInspectionCountOption.series[0].data[0].value = 0;
+                        this.equipmentInspectionCountOption.series[0].data[0].percent = 0;
+                    }
                     this.equipmentInspectionChartMap.setOption(this.equipmentInspectionCountOption);
                 }
             });
@@ -1583,7 +1646,6 @@ export default {
                         this.rtuWarnCountOption.series[0].data[6].percent = 0;
                     }
                     if (data.warnRtus > 0 && data.rainUpMissOut > 0) {
-
                         let num = new Number(data.rainUpMissOut / data.warnRtus * 100);
                         this.rtuWarnCountOption.series[0].data[5].value = data.rainUpMissOut;
                         this.rtuWarnCountOption.series[0].data[5].percent = num.toFixed(1);
@@ -1592,7 +1654,6 @@ export default {
                         this.rtuWarnCountOption.series[0].data[5].percent = 0;
                     }
                     if (data.warnRtus > 0 && data.riverUpMissOut > 0) {
-
                         let num = new Number(data.riverUpMissOut / data.warnRtus * 100);
                         this.rtuWarnCountOption.series[0].data[4].value = data.riverUpMissOut;
                         this.rtuWarnCountOption.series[0].data[4].percent = num.toFixed(1);
@@ -1624,7 +1685,7 @@ export default {
                         this.rtuWarnCountOption.series[0].data[1].value = 0;
                         this.rtuWarnCountOption.series[0].data[1].percent = 0;
                     }
-                    if (data.warnRtus > 0 && data.riverHourUpDelay > 0) {
+                    if (data.warnRtus > 0 && data.outlierValue > 0) {
                         let num = new Number(data.outlierValue / data.warnRtus * 100);
                         this.rtuWarnCountOption.series[0].data[0].value = data.outlierValue;
                         this.rtuWarnCountOption.series[0].data[0].percent = num.toFixed(1);