Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
2c195217 by yangwei
Options

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

2 parents 4f698eef f69cea24
Inline Side-by-side
Showing 2 changed files with 119 additions and 119 deletions
...@@ -7,7 +7,7 @@ class data extends filter { ...@@ -7,7 +7,7 @@ class data extends filter {
7 return [ 7 return [
8 { 8 {
9 label: "行政区划", 9 label: "行政区划",
10 prop: "xzqh", 10 prop: "areaName",
11 width: '80' 11 width: '80'
12 }, 12 },
13 { 13 {
...@@ -20,12 +20,12 @@ class data extends filter { ...@@ -20,12 +20,12 @@ class data extends filter {
20 children: [ 20 children: [
21 { 21 {
22 label: '空项率', 22 label: '空项率',
23 prop: "xx", 23 prop: "yt",
24 }, 24 },
25 { 25 /*{
26 label: '分值', 26 label: '分值',
27 prop: "xx", 27 prop: "xx",
28 } 28 }*/
29 ] 29 ]
30 }, 30 },
31 { 31 {
...@@ -34,26 +34,12 @@ class data extends filter { ...@@ -34,26 +34,12 @@ class data extends filter {
34 children: [ 34 children: [
35 { 35 {
36 label: '空项率', 36 label: '空项率',
37 prop: "xx", 37 prop: "qlxz",
38 },
39 {
40 label: '分值',
41 prop: "xx",
42 }
43 ]
44 },
45 {
46 label: '权利设定方式',
47 prop: "",
48 children: [
49 {
50 label: '空项率',
51 prop: "xx",
52 }, 38 },
53 { 39 /*{
54 label: '分值', 40 label: '分值',
55 prop: "xx", 41 prop: "xx",
56 } 42 }*/
57 ] 43 ]
58 }, 44 },
59 { 45 {
...@@ -62,12 +48,12 @@ class data extends filter { ...@@ -62,12 +48,12 @@ class data extends filter {
62 children: [ 48 children: [
63 { 49 {
64 label: '空项率', 50 label: '空项率',
65 prop: "xx", 51 prop: "qlsdfs",
66 }, 52 },
67 { 53 /*{
68 label: '分值', 54 label: '分值',
69 prop: "xx", 55 prop: "xx",
70 } 56 }*/
71 ] 57 ]
72 }, 58 },
73 { 59 {
...@@ -76,12 +62,12 @@ class data extends filter { ...@@ -76,12 +62,12 @@ class data extends filter {
76 children: [ 62 children: [
77 { 63 {
78 label: '空项率', 64 label: '空项率',
79 prop: "xx", 65 prop: "gyjsydgyqk",
80 }, 66 },
81 { 67 /*{
82 label: '分值', 68 label: '分值',
83 prop: "xx", 69 prop: "xx",
84 } 70 }*/
85 ] 71 ]
86 }, 72 },
87 { 73 {
...@@ -90,12 +76,12 @@ class data extends filter { ...@@ -90,12 +76,12 @@ class data extends filter {
90 children: [ 76 children: [
91 { 77 {
92 label: '空项率', 78 label: '空项率',
93 prop: "xx", 79 prop: "dj",
94 }, 80 },
95 { 81 /*{
96 label: '分值', 82 label: '分值',
97 prop: "xx", 83 prop: "xx",
98 } 84 }*/
99 ] 85 ]
100 }, 86 },
101 { 87 {
...@@ -104,12 +90,12 @@ class data extends filter { ...@@ -104,12 +90,12 @@ class data extends filter {
104 children: [ 90 children: [
105 { 91 {
106 label: '空项率', 92 label: '空项率',
107 prop: "xx", 93 prop: "rjl",
108 }, 94 },
109 { 95 /*{
110 label: '分值', 96 label: '分值',
111 prop: "xx", 97 prop: "xx",
112 } 98 }*/
113 ] 99 ]
114 }, 100 },
115 ] 101 ]
...@@ -124,12 +110,12 @@ class data extends filter { ...@@ -124,12 +110,12 @@ class data extends filter {
124 children: [ 110 children: [
125 { 111 {
126 label: '空项率', 112 label: '空项率',
127 prop: "xx", 113 prop: "fwgyqk",
128 }, 114 },
129 { 115 /*{
130 label: '分值', 116 label: '分值',
131 prop: "xx", 117 prop: "xx",
132 } 118 }*/
133 ] 119 ]
134 }, 120 },
135 { 121 {
...@@ -138,12 +124,12 @@ class data extends filter { ...@@ -138,12 +124,12 @@ class data extends filter {
138 children: [ 124 children: [
139 { 125 {
140 label: '空项率', 126 label: '空项率',
141 prop: "xx", 127 prop: "fwxz",
142 }, 128 },
143 { 129 /*{
144 label: '分值', 130 label: '分值',
145 prop: "xx", 131 prop: "xx",
146 } 132 }*/
147 ] 133 ]
148 }, 134 },
149 { 135 {
...@@ -152,12 +138,12 @@ class data extends filter { ...@@ -152,12 +138,12 @@ class data extends filter {
152 children: [ 138 children: [
153 { 139 {
154 label: '空项率', 140 label: '空项率',
155 prop: "xx", 141 prop: "fwjg",
156 }, 142 },
157 { 143 /*{
158 label: '分值', 144 label: '分值',
159 prop: "xx", 145 prop: "xx",
160 } 146 }*/
161 ] 147 ]
162 }, 148 },
163 { 149 {
...@@ -166,12 +152,12 @@ class data extends filter { ...@@ -166,12 +152,12 @@ class data extends filter {
166 children: [ 152 children: [
167 { 153 {
168 label: '空项率', 154 label: '空项率',
169 prop: "xx", 155 prop: "jgsj",
170 }, 156 },
171 { 157 /*{
172 label: '分值', 158 label: '分值',
173 prop: "xx", 159 prop: "xx",
174 } 160 }*/
175 ] 161 ]
176 } 162 }
177 ] 163 ]
...@@ -185,13 +171,13 @@ class data extends filter { ...@@ -185,13 +171,13 @@ class data extends filter {
185 prop: "", 171 prop: "",
186 children: [ 172 children: [
187 { 173 {
188 prop: 'xxx', 174 prop: 'dyqx',
189 label: '空项率', 175 label: '空项率',
190 }, 176 },
191 { 177 /*{
192 prop: 'xxx',
193 label: '分值', 178 label: '分值',
194 } 179 prop: "xx",
180 }*/
195 ] 181 ]
196 } 182 }
197 ] 183 ]
...@@ -205,13 +191,13 @@ class data extends filter { ...@@ -205,13 +191,13 @@ class data extends filter {
205 prop: "", 191 prop: "",
206 children: [ 192 children: [
207 { 193 {
208 prop: 'xxx', 194 prop: 'zgzqse',
209 label: '空项率', 195 label: '空项率',
210 }, 196 },
211 { 197 /*{
212 prop: 'xxx',
213 label: '分值', 198 label: '分值',
214 } 199 prop: "xx",
200 }*/
215 ] 201 ]
216 } 202 }
217 ] 203 ]
...@@ -225,13 +211,13 @@ class data extends filter { ...@@ -225,13 +211,13 @@ class data extends filter {
225 prop: "", 211 prop: "",
226 children: [ 212 children: [
227 { 213 {
228 prop: 'xxx', 214 prop: 'ybzjzjwzl',
229 label: '空项率', 215 label: '空项率',
230 }, 216 },
231 { 217 /*{
232 prop: 'xxx',
233 label: '分值', 218 label: '分值',
234 } 219 prop: "xx",
220 }*/
235 ] 221 ]
236 }, 222 },
237 { 223 {
...@@ -239,13 +225,13 @@ class data extends filter { ...@@ -239,13 +225,13 @@ class data extends filter {
239 prop: "", 225 prop: "",
240 children: [ 226 children: [
241 { 227 {
242 prop: 'xxx', 228 prop: 'ybzjzjwdyfw',
243 label: '空项率', 229 label: '空项率',
244 }, 230 },
245 { 231 /*{
246 prop: 'xxx',
247 label: '分值', 232 label: '分值',
248 } 233 prop: "xx",
234 }*/
249 ] 235 ]
250 } 236 }
251 ] 237 ]
...@@ -259,13 +245,13 @@ class data extends filter { ...@@ -259,13 +245,13 @@ class data extends filter {
259 prop: "", 245 prop: "",
260 children: [ 246 children: [
261 { 247 {
262 prop: 'xxx', 248 prop: 'zgezjzjwzl',
263 label: '空项率', 249 label: '空项率',
264 }, 250 },
265 { 251 /*{
266 prop: 'xxx',
267 label: '分值', 252 label: '分值',
268 } 253 prop: "xx",
254 }*/
269 ] 255 ]
270 }, 256 },
271 { 257 {
...@@ -273,13 +259,13 @@ class data extends filter { ...@@ -273,13 +259,13 @@ class data extends filter {
273 prop: "", 259 prop: "",
274 children: [ 260 children: [
275 { 261 {
276 prop: 'xxx', 262 prop: 'zgezjzjwdyfw',
277 label: '空项率', 263 label: '空项率',
278 }, 264 },
279 { 265 /*{
280 prop: 'xxx',
281 label: '分值', 266 label: '分值',
282 } 267 prop: "xx",
268 }*/
283 ] 269 ]
284 } 270 }
285 ] 271 ]
...@@ -293,13 +279,13 @@ class data extends filter { ...@@ -293,13 +279,13 @@ class data extends filter {
293 prop: "", 279 prop: "",
294 children: [ 280 children: [
295 { 281 {
296 prop: 'xxx', 282 prop: 'dyzxyy',
297 label: '空项率', 283 label: '空项率',
298 }, 284 },
299 { 285 /*{
300 prop: 'xxx',
301 label: '分值', 286 label: '分值',
302 } 287 prop: "xx",
288 }*/
303 ] 289 ]
304 }, 290 },
305 { 291 {
...@@ -307,13 +293,13 @@ class data extends filter { ...@@ -307,13 +293,13 @@ class data extends filter {
307 prop: "", 293 prop: "",
308 children: [ 294 children: [
309 { 295 {
310 prop: 'xxx', 296 prop: 'zxsj',
311 label: '空项率', 297 label: '空项率',
312 }, 298 },
313 { 299 /*{
314 prop: 'xxx',
315 label: '分值', 300 label: '分值',
316 } 301 prop: "xx",
302 }*/
317 ] 303 ]
318 } 304 }
319 ] 305 ]
...@@ -327,13 +313,13 @@ class data extends filter { ...@@ -327,13 +313,13 @@ class data extends filter {
327 prop: "", 313 prop: "",
328 children: [ 314 children: [
329 { 315 {
330 prop: 'xxx', 316 prop: 'ywrzjzl',
331 label: '空项率', 317 label: '空项率',
332 }, 318 },
333 { 319 /*{
334 prop: 'xxx',
335 label: '分值', 320 label: '分值',
336 } 321 prop: "xx",
322 }*/
337 ] 323 ]
338 }, 324 },
339 { 325 {
...@@ -341,13 +327,13 @@ class data extends filter { ...@@ -341,13 +327,13 @@ class data extends filter {
341 prop: "", 327 prop: "",
342 children: [ 328 children: [
343 { 329 {
344 prop: 'xxx', 330 prop: 'ywrzjh',
345 label: '空项率', 331 label: '空项率',
346 }, 332 },
347 { 333 /*{
348 prop: 'xxx',
349 label: '分值', 334 label: '分值',
350 } 335 prop: "xx",
336 }*/
351 ] 337 ]
352 }, 338 },
353 { 339 {
...@@ -355,13 +341,13 @@ class data extends filter { ...@@ -355,13 +341,13 @@ class data extends filter {
355 prop: "", 341 prop: "",
356 children: [ 342 children: [
357 { 343 {
358 prop: 'xxx', 344 prop: 'ghyt',
359 label: '空项率', 345 label: '空项率',
360 }, 346 },
361 { 347 /*{
362 prop: 'xxx',
363 label: '分值', 348 label: '分值',
364 } 349 prop: "xx",
350 }*/
365 ] 351 ]
366 }, 352 },
367 { 353 {
...@@ -369,13 +355,13 @@ class data extends filter { ...@@ -369,13 +355,13 @@ class data extends filter {
369 prop: "", 355 prop: "",
370 children: [ 356 children: [
371 { 357 {
372 prop: 'xxx', 358 prop: 'ygdjfwxz',
373 label: '空项率', 359 label: '空项率',
374 }, 360 },
375 { 361 /*{
376 prop: 'xxx',
377 label: '分值', 362 label: '分值',
378 } 363 prop: "xx",
364 }*/
379 ] 365 ]
380 } 366 }
381 ] 367 ]
...@@ -389,13 +375,13 @@ class data extends filter { ...@@ -389,13 +375,13 @@ class data extends filter {
389 prop: "", 375 prop: "",
390 children: [ 376 children: [
391 { 377 {
392 prop: 'xxx', 378 prop: 'jfjg',
393 label: '空项率', 379 label: '空项率',
394 }, 380 },
395 { 381 /*{
396 prop: 'xxx',
397 label: '分值', 382 label: '分值',
398 } 383 prop: "xx",
384 }*/
399 ] 385 ]
400 }, 386 },
401 { 387 {
...@@ -403,13 +389,13 @@ class data extends filter { ...@@ -403,13 +389,13 @@ class data extends filter {
403 prop: "", 389 prop: "",
404 children: [ 390 children: [
405 { 391 {
406 prop: 'xxx', 392 prop: 'jfwj',
407 label: '空项率', 393 label: '空项率',
408 }, 394 },
409 { 395 /*{
410 prop: 'xxx',
411 label: '分值', 396 label: '分值',
412 } 397 prop: "xx",
398 }*/
413 ] 399 ]
414 }, 400 },
415 { 401 {
...@@ -417,13 +403,13 @@ class data extends filter { ...@@ -417,13 +403,13 @@ class data extends filter {
417 prop: "", 403 prop: "",
418 children: [ 404 children: [
419 { 405 {
420 prop: 'xxx', 406 prop: 'jfdjsj',
421 label: '空项率', 407 label: '空项率',
422 }, 408 },
423 { 409 /*{
424 prop: 'xxx',
425 label: '分值', 410 label: '分值',
426 } 411 prop: "xx",
412 }*/
427 ] 413 ]
428 }, 414 },
429 { 415 {
...@@ -431,13 +417,13 @@ class data extends filter { ...@@ -431,13 +417,13 @@ class data extends filter {
431 prop: "", 417 prop: "",
432 children: [ 418 children: [
433 { 419 {
434 prop: 'xxx', 420 prop: 'jfdbr',
435 label: '空项率', 421 label: '空项率',
436 }, 422 },
437 { 423 /*{
438 prop: 'xxx',
439 label: '分值', 424 label: '分值',
440 } 425 prop: "xx",
426 }*/
441 ] 427 ]
442 }, 428 },
443 { 429 {
...@@ -445,13 +431,13 @@ class data extends filter { ...@@ -445,13 +431,13 @@ class data extends filter {
445 prop: "", 431 prop: "",
446 children: [ 432 children: [
447 { 433 {
448 prop: 'xxx', 434 prop: 'jfywh',
449 label: '空项率', 435 label: '空项率',
450 }, 436 },
451 { 437 /*{
452 prop: 'xxx',
453 label: '分值', 438 label: '分值',
454 } 439 prop: "xx",
440 }*/
455 ] 441 ]
456 } 442 }
457 ] 443 ]
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-form-item> 25 <el-form-item>
26 <btn nativeType="cz" @click="handleResetForm">重置</btn> 26 <btn nativeType="cz" @click="handleResetForm">重置</btn>
27 <!-- 导出excel --> 27 <!-- 导出excel -->
28 <btn nativeType="cx" @click="handleSearch">查询</btn> 28 <btn nativeType="cx" @click="handleSearchSelf">查询</btn>
29 <btn nativeType="cx" @click="handlesetExport2Excel(downTitle)">导出</btn> 29 <btn nativeType="cx" @click="handlesetExport2Excel(downTitle)">导出</btn>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
...@@ -54,6 +54,8 @@ import tableMixin from "@/mixins/tableMixin.js"; ...@@ -54,6 +54,8 @@ import tableMixin from "@/mixins/tableMixin.js";
54 import downLbTable from '@/components/DownLbTable' 54 import downLbTable from '@/components/DownLbTable'
55 // 获取时间 55 // 获取时间
56 import { getCurrentDate, setExport2Excel } from "@/utils/tools"; 56 import { getCurrentDate, setExport2Excel } from "@/utils/tools";
57 import { nonNullSta } from "@/api/statistics.js";
58 import {getQlxxDictList} from "@/api/dict";
57 export default { 59 export default {
58 name: "jsbwcx", 60 name: "jsbwcx",
59 components: { 61 components: {
...@@ -105,8 +107,8 @@ export default { ...@@ -105,8 +107,8 @@ export default {
105 { 107 {
106 label: "序号", 108 label: "序号",
107 type: "index", 109 type: "index",
108 width: "50", 110 width: "50"
109 index: this.indexMethod, 111 // index: this.indexMethod,
110 } 112 }
111 ] 113 ]
112 .concat(data.columns()), 114 .concat(data.columns()),
...@@ -128,7 +130,9 @@ export default { ...@@ -128,7 +130,9 @@ export default {
128 this.generateFileName() 130 this.generateFileName()
129 }, 131 },
130 methods: { 132 methods: {
131 handleSearch () { }, 133 handleSearchSelf () {
134 this.featchDataSelf()
135 },
132 // 生成文件名 136 // 生成文件名
133 generateFileName () { 137 generateFileName () {
134 var reg = /(\d{4})\-(\d{2})\-(\d{2})/; 138 var reg = /(\d{4})\-(\d{2})\-(\d{2})/;
...@@ -138,17 +142,27 @@ export default { ...@@ -138,17 +142,27 @@ export default {
138 setExport2Excel(val) 142 setExport2Excel(val)
139 }, 143 },
140 // 初始化数据 144 // 初始化数据
141 featchData () { }, 145 featchDataSelf () {
146 if (!this.form.startTime || this.form.startTime === '' || !this.form.endTime || this.form.endTime === '') {
147 this.$message.warning("请选择一个时间段")
148 return
149 }
150 nonNullSta(this.form.startTime, this.form.endTime).then(res => {
151 let records = res.result
152 this.tableData.data = records ? records : []
153 })
154 },
142 // 重置 155 // 重置
143 resetForm () { 156 resetForm () {
144 this.$refs.ruleForm.resetFields(); 157 this.$refs.ruleForm.resetFields();
145 this.form.currentPage = 1 158 this.form.currentPage = 1
146 this.featchData(); 159 this.featchDataSelf();
147 }, 160 },
148 // 重置 161 // 重置
149 handleResetForm () { 162 handleResetForm () {
150 this.form.startTime = getCurrentDate() 163 this.form.startTime = getCurrentDate()
151 this.form.endTime = getCurrentDate('time') 164 this.form.endTime = getCurrentDate('time')
165 this.featchDataSelf()
152 } 166 }
153 } 167 }
154 } 168 }
......