mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mescc/zhp' (#79) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #79
This commit is contained in:
朱菊兰 2024-07-01 20:34:09 +08:00
commit 4332113e3b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/report/comprehensiveData.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-01 14:39:18 * @LastEditTime: 2024-07-01 14:43:42
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -326,6 +326,7 @@ export default {
} }
}, },
async getDataList() { async getDataList() {
console.log(this.listQuery.type);
if (this.listQuery.type == null) { if (this.listQuery.type == null) {
return this.$message('请选择时间维度') return this.$message('请选择时间维度')
} }

2
src/views/report/produceConversion.vue
View File

@ -247,7 +247,7 @@ export default {
yAxis: [ yAxis: [
{ {
type: "value", type: "value",
name: "单位/片", name: "单位/MW",
// min: function (value) {//取最小值向下取整为最小刻度 // min: function (value) {//取最小值向下取整为最小刻度
// return 0 // return 0
// }, // },