diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue index 71faa35..c9599bc 100644 --- a/src/views/Statistics/ReceptionOverview.vue +++ b/src/views/Statistics/ReceptionOverview.vue @@ -51,7 +51,7 @@ -->
筛选日期:
-
+
-->
-
+
{{ activeName == "3" ? "平均执行率" : "合计" }} @@ -509,8 +513,15 @@ : i + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF', - 'border': i + 1 == 1 ? '1px solid #FFCAC6' : i + 1 == 2 ? '1px solid #FFD6AA' : i + 1 == 3 ? '1px solid #FFEEAC' : 'none', - }" + border: + i + 1 == 1 + ? '1px solid #FFCAC6' + : i + 1 == 2 + ? '1px solid #FFD6AA' + : i + 1 == 3 + ? '1px solid #FFEEAC' + : 'none', + }" >{{ i + 1 }}
@@ -621,8 +632,15 @@ : i + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF', - 'border': i + 1 == 1 ? '1px solid #FFCAC6' : i + 1 == 2 ? '1px solid #FFD6AA' : i + 1 == 3 ? '1px solid #FFEEAC' : 'none', - }" + border: + i + 1 == 1 + ? '1px solid #FFCAC6' + : i + 1 == 2 + ? '1px solid #FFD6AA' + : i + 1 == 3 + ? '1px solid #FFEEAC' + : 'none', + }" >{{ i + 1 }}
@@ -983,7 +1001,7 @@ export default { params[0].name + "
" + params[0].marker + - "接待时常:" + + "接待时长:" + parseInt(m) + ":" + s @@ -1034,6 +1052,19 @@ export default { }, yAxis: { type: "value", + axisLabel: { + formatter: function (params) { + console.log(params) + switch (_this.activeName) { + case "1": + let s = params % 60; + let m = params / 60; + return parseInt(m); + default: + return params; + } + }, + }, }, series: [ { @@ -1073,7 +1104,6 @@ export default { }, ], }; - option && myChart.setOption(option); window.addEventListener("resize", () => { myChart.resize(); @@ -1772,8 +1802,8 @@ export default { text-indent: 20px; margin-top: 10px; color: #666666; - display: flex; - align-items: center; + display: flex; + align-items: center; } .text2 { @@ -1975,8 +2005,8 @@ export default { font-weight: 500; font-size: 16px; color: #333333; - display: flex; - align-items: center; + display: flex; + align-items: center; } .text2 { @@ -2008,8 +2038,8 @@ export default { font-weight: 500; font-size: 16px; color: #333333; - display: flex; - align-items: center; + display: flex; + align-items: center; } .text2 { @@ -2044,8 +2074,8 @@ export default { line-height: 16px; text-indent: 20px; margin-top: 20px; - display: flex; - align-items: center; + display: flex; + align-items: center; } .text2 { @@ -2166,8 +2196,8 @@ export default { background-size: 100%; margin-left: 6px; } -/deep/ .el-button--primary{ - background: #2671E2 !important; - border: 1px solid #2671E2 !important; +/deep/ .el-button--primary { + background: #2671e2 !important; + border: 1px solid #2671e2 !important; } diff --git a/vue.config.js b/vue.config.js index f8860e0..6b91abe 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,8 +8,8 @@ // const url = 'http://62.234.122.43:9999' //正式 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP // const url = 'http://192.168.31.89:9999' //sh -// const url = 'https://zanyong.hfju.com' // 正式域名 -const url = 'http://81.70.55.170:9999' // 新测试 +const url = 'https://zanyong.hfju.com' // 正式域名 +// const url = 'http://81.70.55.170:9999' // 新测试 // const url = 'http://82.156.35.22:9999' // 新正式ip const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']