Showing
11 changed files
with
39 additions
and
19 deletions
1 | <div> | 1 | <div> |
2 | <!-- 人员信息总汇--> | 2 | <!-- 人员信息总汇--> |
3 | - <project-ry/> | 3 | + <project-ry :docType="docType" |
4 | + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> | ||
4 | </div> | 5 | </div> |
5 | <div> | 6 | <div> |
6 | <!-- 项目评价总汇--> | 7 | <!-- 项目评价总汇--> |
7 | - <project-pj/> | 8 | + <project-pj :docType="docType" |
9 | + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> | ||
8 | </div> | 10 | </div> |
9 | <div> | 11 | <div> |
10 | <!-- 项目资料总汇--> | 12 | <!-- 项目资料总汇--> |
11 | - <project-zl/> | 13 | + <project-zl :docType="docType" |
14 | + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> | ||
12 | </div> | 15 | </div> |
13 | </div> | 16 | </div> |
@@ -20,6 +20,20 @@ export default { | @@ -20,6 +20,20 @@ export default { | ||
20 | } | 20 | } |
21 | } | 21 | } |
22 | }, | 22 | }, |
23 | + props:{ | ||
24 | + treeNode: { | ||
25 | + type: Object, | ||
26 | + default: {} | ||
27 | + }, | ||
28 | + parentNode: { | ||
29 | + type: Object, | ||
30 | + default: {} | ||
31 | + }, | ||
32 | + projectId: { | ||
33 | + type: String, | ||
34 | + default: '' | ||
35 | + } | ||
36 | + }, | ||
23 | setup() { | 37 | setup() { |
24 | let height = Vue.ref(window.innerHeight - 130); | 38 | let height = Vue.ref(window.innerHeight - 130); |
25 | const {proxy} = Vue.getCurrentInstance(); | 39 | const {proxy} = Vue.getCurrentInstance(); |
@@ -92,11 +92,14 @@ export default { | @@ -92,11 +92,14 @@ export default { | ||
92 | proxy.$http.post("/api-web/bOpsPerson/personCollect", { | 92 | proxy.$http.post("/api-web/bOpsPerson/personCollect", { |
93 | "page":1, | 93 | "page":1, |
94 | "limit":10, | 94 | "limit":10, |
95 | - "projectId": treeNode.map.nodeType.projectId | 95 | + "projectId": props.treeNode.map.nodeType.projectId |
96 | }, function (res) { | 96 | }, function (res) { |
97 | if (res && res.data) { | 97 | if (res && res.data) { |
98 | dataList.value = res.data | 98 | dataList.value = res.data |
99 | total.value = res.count; | 99 | total.value = res.count; |
100 | + } else { | ||
101 | + dataList.value = [] | ||
102 | + total.value = 0; | ||
100 | } | 103 | } |
101 | }); | 104 | }); |
102 | } | 105 | } |
@@ -179,7 +179,7 @@ export default { | @@ -179,7 +179,7 @@ export default { | ||
179 | clearInterval(this.timerId) | 179 | clearInterval(this.timerId) |
180 | } | 180 | } |
181 | let index = 12 | 181 | let index = 12 |
182 | - this.timerId = setInterval(() => { | 182 | + /*this.timerId = setInterval(() => { |
183 | this.startValue++ | 183 | this.startValue++ |
184 | this.endValue++ | 184 | this.endValue++ |
185 | // this.allData.polyline.data | 185 | // this.allData.polyline.data |
@@ -194,7 +194,7 @@ export default { | @@ -194,7 +194,7 @@ export default { | ||
194 | console.log(this.startValue) | 194 | console.log(this.startValue) |
195 | console.log(this.endValue) | 195 | console.log(this.endValue) |
196 | this.updateChart() | 196 | this.updateChart() |
197 | - }, 5000) | 197 | + }, 5000)*/ |
198 | } | 198 | } |
199 | } | 199 | } |
200 | } | 200 | } |
@@ -190,7 +190,7 @@ export default { | @@ -190,7 +190,7 @@ export default { | ||
190 | clearInterval(this.timerId) | 190 | clearInterval(this.timerId) |
191 | } | 191 | } |
192 | let index = 12 | 192 | let index = 12 |
193 | - this.timerId = setInterval(() => { | 193 | + /*this.timerId = setInterval(() => { |
194 | this.startValue++ | 194 | this.startValue++ |
195 | this.endValue++ | 195 | this.endValue++ |
196 | // this.allData.polyline.data | 196 | // this.allData.polyline.data |
@@ -205,7 +205,7 @@ export default { | @@ -205,7 +205,7 @@ export default { | ||
205 | console.log(this.startValue) | 205 | console.log(this.startValue) |
206 | console.log(this.endValue) | 206 | console.log(this.endValue) |
207 | this.updateChart() | 207 | this.updateChart() |
208 | - }, 5000) | 208 | + }, 5000)*/ |
209 | } | 209 | } |
210 | } | 210 | } |
211 | } | 211 | } |
@@ -188,7 +188,7 @@ export default { | @@ -188,7 +188,7 @@ export default { | ||
188 | clearInterval(this.timerId) | 188 | clearInterval(this.timerId) |
189 | } | 189 | } |
190 | let index = 12 | 190 | let index = 12 |
191 | - this.timerId = setInterval(() => { | 191 | + /*this.timerId = setInterval(() => { |
192 | this.startValue++ | 192 | this.startValue++ |
193 | this.endValue++ | 193 | this.endValue++ |
194 | if ((this.allData.polyline.data).length > 0) { | 194 | if ((this.allData.polyline.data).length > 0) { |
@@ -201,7 +201,7 @@ export default { | @@ -201,7 +201,7 @@ export default { | ||
201 | console.log(this.startValue) | 201 | console.log(this.startValue) |
202 | console.log(this.endValue) | 202 | console.log(this.endValue) |
203 | this.updateChart() | 203 | this.updateChart() |
204 | - }, 5000) | 204 | + }, 5000)*/ |
205 | } | 205 | } |
206 | } | 206 | } |
207 | } | 207 | } |
@@ -208,7 +208,7 @@ export default { | @@ -208,7 +208,7 @@ export default { | ||
208 | clearInterval(this.timerId) | 208 | clearInterval(this.timerId) |
209 | } | 209 | } |
210 | let index = 10 | 210 | let index = 10 |
211 | - this.timerId = setInterval(() => { | 211 | + /*this.timerId = setInterval(() => { |
212 | this.startValue++ | 212 | this.startValue++ |
213 | this.endValue++ | 213 | this.endValue++ |
214 | if (this.allData.polyline.data.data.length > 0) { | 214 | if (this.allData.polyline.data.data.length > 0) { |
@@ -219,7 +219,7 @@ export default { | @@ -219,7 +219,7 @@ export default { | ||
219 | this.endValue = 9 | 219 | this.endValue = 9 |
220 | } | 220 | } |
221 | this.updateChart() | 221 | this.updateChart() |
222 | - }, 5000) | 222 | + }, 5000)*/ |
223 | } | 223 | } |
224 | } | 224 | } |
225 | } | 225 | } |
@@ -187,7 +187,7 @@ export default { | @@ -187,7 +187,7 @@ export default { | ||
187 | clearInterval(this.timerId) | 187 | clearInterval(this.timerId) |
188 | } | 188 | } |
189 | let index = 12 | 189 | let index = 12 |
190 | - this.timerId = setInterval(() => { | 190 | + /*this.timerId = setInterval(() => { |
191 | this.startValue++ | 191 | this.startValue++ |
192 | this.endValue++ | 192 | this.endValue++ |
193 | if ((this.allData.polyline.data).length > 0) { | 193 | if ((this.allData.polyline.data).length > 0) { |
@@ -200,7 +200,7 @@ export default { | @@ -200,7 +200,7 @@ export default { | ||
200 | console.log(this.startValue) | 200 | console.log(this.startValue) |
201 | console.log(this.endValue) | 201 | console.log(this.endValue) |
202 | this.updateChart() | 202 | this.updateChart() |
203 | - }, 5000) | 203 | + }, 5000)*/ |
204 | } | 204 | } |
205 | } | 205 | } |
206 | } | 206 | } |
@@ -173,7 +173,7 @@ export default { | @@ -173,7 +173,7 @@ export default { | ||
173 | clearInterval(this.timerId) | 173 | clearInterval(this.timerId) |
174 | } | 174 | } |
175 | let index = 12 | 175 | let index = 12 |
176 | - this.timerId = setInterval(() => { | 176 | + /*this.timerId = setInterval(() => { |
177 | this.startValue++ | 177 | this.startValue++ |
178 | this.endValue++ | 178 | this.endValue++ |
179 | // this.allData.polyline.data | 179 | // this.allData.polyline.data |
@@ -188,7 +188,7 @@ export default { | @@ -188,7 +188,7 @@ export default { | ||
188 | console.log(this.startValue) | 188 | console.log(this.startValue) |
189 | console.log(this.endValue) | 189 | console.log(this.endValue) |
190 | this.updateChart() | 190 | this.updateChart() |
191 | - }, 5000) | 191 | + }, 5000)*/ |
192 | } | 192 | } |
193 | } | 193 | } |
194 | } | 194 | } |
@@ -146,7 +146,7 @@ export default { | @@ -146,7 +146,7 @@ export default { | ||
146 | clearInterval(this.timerId) | 146 | clearInterval(this.timerId) |
147 | } | 147 | } |
148 | let index = 30 | 148 | let index = 30 |
149 | - this.timerId = setInterval(() => { | 149 | + /*this.timerId = setInterval(() => { |
150 | this.startValue++ | 150 | this.startValue++ |
151 | this.endValue++ | 151 | this.endValue++ |
152 | // this.allData.polyline.data | 152 | // this.allData.polyline.data |
@@ -161,7 +161,7 @@ export default { | @@ -161,7 +161,7 @@ export default { | ||
161 | // console.log(this.startValue) | 161 | // console.log(this.startValue) |
162 | // console.log(this.endValue) | 162 | // console.log(this.endValue) |
163 | this.updateChart() | 163 | this.updateChart() |
164 | - }, 5000) | 164 | + }, 5000)*/ |
165 | } | 165 | } |
166 | } | 166 | } |
167 | } | 167 | } |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | <el-tree :data="dataSource" :default-expanded-keys="[1]" :props="defaultProps" > | 6 | <el-tree :data="dataSource" :default-expanded-keys="[1]" :props="defaultProps" > |
7 | <template #default="{ node, data }"> | 7 | <template #default="{ node, data }"> |
8 | <div style=" width: 100%;"> | 8 | <div style=" width: 100%;"> |
9 | - <div style="width: 100%;max-width: 100%;overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="handleNodeClick(data)" :title="node.label"> | 9 | + <div style="width: 85%;max-width: 85%;overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="handleNodeClick(data)" :title="node.label"> |
10 | {{node.label }} | 10 | {{node.label }} |
11 | </div> | 11 | </div> |
12 | </div> | 12 | </div> |
-
Please register or login to post a comment