manage-client 3.3.25 → 3.3.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/package.json +1 -1
  2. package/src/components/webmeter/DrillData/LostContactAnalysisList.vue +2 -1
  3. package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue +2 -2
  4. package/src/components/webmeter/recharge/RechargeList.vue +5 -3
  5. package/src/components/webmeter/report/ReportList.vue +6 -3
  6. package/src/components/webmeter/reportdata/ReportDataQuery.vue +5 -3
  7. package/src/filiale/wenxi/GasStatistics.vue +5 -3
  8. package/src/filiale/wenxi/WebHandQuery.vue +5 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.25",
3
+ "version": "3.3.26",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/webmeter/DrillData/LostContactAnalysisList.vue CHANGED
@@ -438,7 +438,7 @@
438
438
  dr.label = res.data[i].f_meter_brand
439
439
  dr.value = res.data[i].f_meter_brand
440
440
  //气表品牌
441
- self.WarningType.push(dr)
441
+ // self.WarningType.push(dr)
442
442
  } else if (groupname == 'f_meter_style') {
443
443
  self.Warningstyle= [
444
444
  {label: '全部', value: ''}
@@ -497,6 +497,7 @@
497
497
  }
498
498
 
499
499
  })
500
+ this.WarningType = [{label: '全部', value: ''}, ...arr]
500
501
 
501
502
  },
502
503
  search(args) {
package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue CHANGED
@@ -426,7 +426,7 @@
426
426
  dr.label = res.data[i].f_meter_brand
427
427
  dr.value = res.data[i].f_meter_brand
428
428
  //气表品牌
429
- self.WarningType.push(dr)
429
+ // self.WarningType.push(dr)
430
430
  } else if (groupname == 'f_meter_style') {
431
431
  self.Warningstyle= [
432
432
  {label: '全部', value: ''}
@@ -510,7 +510,7 @@
510
510
  }
511
511
 
512
512
  })
513
- this.meterbrands = [{label: '全部', value: ''}, ...arr]
513
+ this.WarningType = [{label: '全部', value: ''}, ...arr]
514
514
  },
515
515
  // 显示柱状图
516
516
  showEcharts() {
package/src/components/webmeter/recharge/RechargeList.vue CHANGED
@@ -221,9 +221,11 @@
221
221
  let brandArr = []
222
222
  this.$MagGetSaleParam.getGasbrand().forEach((item) => {
223
223
  let temp = {}
224
- temp.label = item.label
225
- temp.value = item.value.f_meter_brand
226
- brandArr.push(temp)
224
+ if(item.value.f_meter_type==='物联网表'){
225
+ temp.label = item.label
226
+ temp.value = item.value.f_meter_brand
227
+ brandArr.push(temp )
228
+ }
227
229
  })
228
230
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
229
231
  //初始化气表价格
package/src/components/webmeter/report/ReportList.vue CHANGED
@@ -270,9 +270,12 @@
270
270
  let brandArr = []
271
271
  this.$MagGetSaleParam.getGasbrand().forEach((item) => {
272
272
  let temp = {}
273
- temp.label = item.label
274
- temp.value = item.value.f_meter_brand
275
- brandArr.push(temp)
273
+ if(item.value.f_meter_type==='物联网表'){
274
+ temp.label = item.label
275
+ temp.value = item.value.f_meter_brand
276
+ brandArr.push(temp )
277
+ }
278
+
276
279
  })
277
280
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
278
281
  //初始化气表价格
package/src/components/webmeter/reportdata/ReportDataQuery.vue CHANGED
@@ -190,9 +190,11 @@
190
190
  let brandArr = []
191
191
  this.$MagGetSaleParam.getGasbrand().forEach((item) => {
192
192
  let temp = {}
193
- temp.label = item.label
194
- temp.value = item.value.f_meter_brand
195
- brandArr.push(temp)
193
+ if(item.value.f_meter_type==='物联网表'){
194
+ temp.label = item.label
195
+ temp.value = item.value.f_meter_brand
196
+ brandArr.push(temp )
197
+ }
196
198
  })
197
199
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
198
200
  //初始化气表价格
package/src/filiale/wenxi/GasStatistics.vue CHANGED
@@ -354,9 +354,11 @@
354
354
  let brandArr = []
355
355
  this.$MagGetSaleParam.getGasbrand().forEach((item) => {
356
356
  let temp = {}
357
- temp.label = item.label
358
- temp.value = item.value.f_meter_brand
359
- brandArr.push(temp)
357
+ if(item.value.f_meter_type==='物联网表'){
358
+ temp.label = item.label
359
+ temp.value = item.value.f_meter_brand
360
+ brandArr.push(temp )
361
+ }
360
362
  })
361
363
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
362
364
  //初始化气表价格
package/src/filiale/wenxi/WebHandQuery.vue CHANGED
@@ -315,9 +315,11 @@
315
315
  let brandArr = []
316
316
  this.$MagGetSaleParam.getGasbrand().forEach((item) => {
317
317
  let temp = {}
318
- temp.label = item.label
319
- temp.value = item.value.f_meter_brand
320
- brandArr.push(temp)
318
+ if(item.value.f_meter_type==='物联网表'){
319
+ temp.label = item.label
320
+ temp.value = item.value.f_meter_brand
321
+ brandArr.push(temp )
322
+ }
321
323
  })
322
324
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
323
325
  //初始化气表价格