Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4c068c65 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents 8aed46f3 a113c568
Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
148 index 148 index
149 ].label.split(":")[0]; 149 ].label.split(":")[0];
150 this.treedata[0].children[1].children[0].children[index].label = 150 this.treedata[0].children[1].children[0].children[index].label =
151 label + 151 label + ":" +
152 (qszts[item][0] || 0) + 152 (qszts[item][0] || 0) +
153 "，现:" + 153 "，现:" +
154 (qszts[item][1] || 0) + 154 (qszts[item][1] || 0) +
......
...@@ -165,8 +165,7 @@ export default { ...@@ -165,8 +165,7 @@ export default {
165 getQlname(bsm), 165 getQlname(bsm),
166 getDetail(bsm), 166 getDetail(bsm),
167 ]) 167 ])
168 .all([getDjbfm(bsm), getDjml(bsm), getZdjbxx(bsm), getQlname(bsm)]) 168 .then(([djbfm, djml, zdjbxx, qlname, detail]) => {
169 .then(([djbfm, djml, zdjbxx, qlname]) => {
170 let obj = { 169 let obj = {
171 djbfm: djbfm.result, 170 djbfm: djbfm.result,
172 djml: djml.result, 171 djml: djml.result,
......