| @@ -240,7 +240,7 @@ | |||||
| color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", | color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", | ||||
| "#ea7ccc" | "#ea7ccc" | ||||
| ], | ], | ||||
| padding: [15, 10, 20, 15], | |||||
| padding: [25, 25, 25, 25], | |||||
| enableScroll: false, | enableScroll: false, | ||||
| legend: {}, | legend: {}, | ||||
| xAxis: { | xAxis: { | ||||
| @@ -267,10 +267,10 @@ | |||||
| this.getCompany() | this.getCompany() | ||||
| this.initPage() | this.initPage() | ||||
| }, | }, | ||||
| onPullDownRefresh() { | onPullDownRefresh() { | ||||
| this.initPage() | this.initPage() | ||||
| setTimeout(() => { | setTimeout(() => { | ||||
| uni.stopPullDownRefresh() | uni.stopPullDownRefresh() | ||||
| }, 2000) | }, 2000) | ||||
| @@ -420,7 +420,7 @@ | |||||
| color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", | color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", | ||||
| "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" | "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" | ||||
| ], | ], | ||||
| padding: [5, 5, 5, 5], | |||||
| padding: [20, 20, 20, 20], | |||||
| enableScroll: false, | enableScroll: false, | ||||
| extra: { | extra: { | ||||
| pie: { | pie: { | ||||
| @@ -431,8 +431,13 @@ | |||||
| border: false, | border: false, | ||||
| borderWidth: 3, | borderWidth: 3, | ||||
| borderColor: "#FFFFFF" | borderColor: "#FFFFFF" | ||||
| }, | |||||
| markLine: { | |||||
| labelOffsetX: 10, | |||||
| labelOffsetY: 10, | |||||
| } | } | ||||
| } | |||||
| }, | |||||
| } | } | ||||
| this.$forceUpdate() | this.$forceUpdate() | ||||
| } | } | ||||
| @@ -506,7 +511,7 @@ | |||||
| if (res) { | if (res) { | ||||
| this.companyList = res.map(item => { | this.companyList = res.map(item => { | ||||
| return { | return { | ||||
| id: item.id, | |||||
| id: item.orgCode, | |||||
| templateName: item.name | templateName: item.name | ||||
| } | } | ||||
| }) | }) | ||||