manage-client 3.2.43-aode → 3.2.44-aode
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.
- package/build/dev-server.js +5 -1
- package/build/webpack.base.conf.js +78 -76
- package/package.json +3 -2
- package/src/components/sale/config/exportConfig.js +260 -260
- package/src/components/sale/report/aode/YearByChargeTpye.vue +254 -220
- package/src/components/sale/report/aode/YearByUserType.vue +342 -307
- package/src/components/webmeter/DrillData/NewUserGasAll.vue +14 -6
- package/src/components/webmeter/DrillData/UserGasAll.vue +12 -9
- package/src/main.js +56 -56
|
@@ -39,12 +39,20 @@
|
|
|
39
39
|
<!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>-->
|
|
40
40
|
<!-- <button class="btn btn-success" @click="$parent.$parent.showEcharts()">显示图表</button>-->
|
|
41
41
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
42
|
-
<export-excel-plus :data="$parent.$parent.getCondition"
|
|
43
|
-
:defaultselect="$parent.$parent.selectfields"
|
|
44
|
-
:field="$parent.$parent.getfield"
|
|
45
|
-
:exportprogress="true" v-ref:exports
|
|
46
|
-
sqlurl="rs/logic/exportfileplus" sql-name="getNewUserGasAll" :template-name='$parent.$parent.getBean'
|
|
47
|
-
:choose-col="true"></export-excel-plus
|
|
42
|
+
<!-- <export-excel-plus :data="$parent.$parent.getCondition"-->
|
|
43
|
+
<!-- :defaultselect="$parent.$parent.selectfields"-->
|
|
44
|
+
<!-- :field="$parent.$parent.getfield"-->
|
|
45
|
+
<!-- :exportprogress="true" v-ref:exports-->
|
|
46
|
+
<!-- sqlurl="rs/logic/exportfileplus" sql-name="getNewUserGasAll" :template-name='$parent.$parent.getBean'-->
|
|
47
|
+
<!-- :choose-col="true"></export-excel-plus>-->
|
|
48
|
+
|
|
49
|
+
<easy-excel-export :data="$parent.$parent.getCondition"
|
|
50
|
+
:defaultselect="$parent.$parent.selectfields"
|
|
51
|
+
:field="$parent.$parent.getfield"
|
|
52
|
+
:exportprogress="true" v-ref:exports
|
|
53
|
+
sqlurl="rs/easyexcel/export" sql-name="getNewUserGasAll" :template-name="$parent.$parent.getBean"
|
|
54
|
+
:choose-col="true">
|
|
55
|
+
</easy-excel-export>
|
|
48
56
|
</div>
|
|
49
57
|
</div>
|
|
50
58
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
@@ -38,15 +38,16 @@
|
|
|
38
38
|
<button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
|
|
39
39
|
|
|
40
40
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
41
|
-
<
|
|
41
|
+
<easy-excel-export :data="$parent.$parent.getCondition"
|
|
42
42
|
:defaultselect="$parent.$parent.selectfields"
|
|
43
43
|
:field="$parent.$parent.getfield"
|
|
44
44
|
:exportprogress="true" v-ref:exports
|
|
45
|
-
|
|
46
|
-
:choose-col="true"
|
|
45
|
+
sqlurl="rs/easyexcel/export" sql-name="webmeter_getUserGasList" :template-name="$parent.$parent.getName"
|
|
46
|
+
:choose-col="true">
|
|
47
|
+
</easy-excel-export>
|
|
47
48
|
</div>
|
|
48
49
|
</div>
|
|
49
|
-
<div class="row"
|
|
50
|
+
<div class="row" >
|
|
50
51
|
|
|
51
52
|
<div class="col-sm-2 form-group">
|
|
52
53
|
<label class="font_normal_body">用气地址</label>
|
|
@@ -140,6 +141,7 @@
|
|
|
140
141
|
</div>
|
|
141
142
|
</div>
|
|
142
143
|
</div>
|
|
144
|
+
|
|
143
145
|
</criteria>
|
|
144
146
|
<data-grid :model="model" id="usergasall" partial='list' class="list_area table_sy" v-ref:grid>
|
|
145
147
|
<template partial='head'>
|
|
@@ -246,11 +248,10 @@
|
|
|
246
248
|
</div>
|
|
247
249
|
</div>
|
|
248
250
|
</div>
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
</div>
|
|
251
|
+
<!-- <div v-show="echarts">-->
|
|
252
|
+
<!-- <user-gas-echarts :condition="condition" :echarts="echarts" :enddate="endDate"-->
|
|
253
|
+
<!-- :groupname="groupname[0]" :startdate="startDate"></user-gas-echarts>-->
|
|
254
|
+
<!-- </div>-->
|
|
254
255
|
<!--汇总表显示模板-->
|
|
255
256
|
<div v-show="isActiveTotalForm" style="height:100%">
|
|
256
257
|
<!-- <user-gas-eform :condition="condition"></user-gas-eform>-->
|
|
@@ -311,6 +312,7 @@
|
|
|
311
312
|
}
|
|
312
313
|
},
|
|
313
314
|
ready() {
|
|
315
|
+
console.log(1223)
|
|
314
316
|
this.$refs.paged.$refs.cri.model.inputStartDate = Util.toStandardDateString() + ' 00:00:00'
|
|
315
317
|
this.$refs.paged.$refs.cri.model.inputEndDate = Util.toStandardDateString() + ' 23:59:59'
|
|
316
318
|
this.$refs.paged.$refs.cri.model.startHandDate = ''
|
|
@@ -342,6 +344,7 @@
|
|
|
342
344
|
},
|
|
343
345
|
// 查询开关
|
|
344
346
|
hidden() {
|
|
347
|
+
console.log('show'+ this.criteriaShow)
|
|
345
348
|
this.criteriaShow = !this.criteriaShow
|
|
346
349
|
},
|
|
347
350
|
SaveAsFile(str) {
|
package/src/main.js
CHANGED
|
@@ -1,56 +1,56 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import App from './App'
|
|
3
|
-
import { all } from 'vue-client'
|
|
4
|
-
import { system } from 'system-clients'
|
|
5
|
-
import { sale } from 'sale-client'
|
|
6
|
-
import saleManage from './saleManage'
|
|
7
|
-
import webmeterManage from './webmeterManage'
|
|
8
|
-
import reportManage from './reportManage'
|
|
9
|
-
import newmanage from './newmanage'
|
|
10
|
-
import ManageHome from './ManageHome'
|
|
11
|
-
import echarts from 'echarts'
|
|
12
|
-
import AMap from 'vue-amap';
|
|
13
|
-
|
|
14
|
-
Vue.config.silent = true
|
|
15
|
-
// Vue.mmType = 'AES'
|
|
16
|
-
|
|
17
|
-
Vue.use(AMap);
|
|
18
|
-
|
|
19
|
-
// 初始化vue-amap
|
|
20
|
-
AMap.initAMapApiLoader({
|
|
21
|
-
// 高德key
|
|
22
|
-
key: '3cec9ae8e2349207f7ac29279e3f4abe',
|
|
23
|
-
// 插件集合 （插件按需引入）
|
|
24
|
-
plugin: [
|
|
25
|
-
"AMap.Autocomplete", //输入提示插件
|
|
26
|
-
"AMap.PlaceSearch", //POI搜索插件
|
|
27
|
-
"AMap.Scale", //右下角缩略图插件 比例尺
|
|
28
|
-
"AMap.OverView", //地图鹰眼插件
|
|
29
|
-
"AMap.ToolBar", //地图工具条
|
|
30
|
-
"AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
|
|
31
|
-
"AMap.PolyEditor", //编辑 折线多，边形
|
|
32
|
-
"AMap.CircleEditor", //圆形编辑器插件
|
|
33
|
-
"AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
|
|
34
|
-
],
|
|
35
|
-
uiVersion: "1.0"
|
|
36
|
-
});
|
|
37
|
-
/** **************************通用组件******************************/
|
|
38
|
-
|
|
39
|
-
Vue.prototype.$echarts = echarts
|
|
40
|
-
all()
|
|
41
|
-
system(false)
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
newmanage()
|
|
47
|
-
reportManage()
|
|
48
|
-
require('./bootstrap/less/bootstrap.less');
|
|
49
|
-
require('./expandcss.less')
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
new Vue({
|
|
53
|
-
el: 'body',
|
|
54
|
-
components: { App }
|
|
55
|
-
})
|
|
56
|
-
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import App from './App'
|
|
3
|
+
import { all } from 'vue-client'
|
|
4
|
+
import { system } from 'system-clients'
|
|
5
|
+
import { sale } from 'sale-client'
|
|
6
|
+
import saleManage from './saleManage'
|
|
7
|
+
import webmeterManage from './webmeterManage'
|
|
8
|
+
import reportManage from './reportManage'
|
|
9
|
+
import newmanage from './newmanage'
|
|
10
|
+
import ManageHome from './ManageHome'
|
|
11
|
+
import echarts from 'echarts'
|
|
12
|
+
import AMap from 'vue-amap';
|
|
13
|
+
|
|
14
|
+
Vue.config.silent = true
|
|
15
|
+
// Vue.mmType = 'AES'
|
|
16
|
+
|
|
17
|
+
Vue.use(AMap);
|
|
18
|
+
|
|
19
|
+
// 初始化vue-amap
|
|
20
|
+
AMap.initAMapApiLoader({
|
|
21
|
+
// 高德key
|
|
22
|
+
key: '3cec9ae8e2349207f7ac29279e3f4abe',
|
|
23
|
+
// 插件集合 （插件按需引入）
|
|
24
|
+
plugin: [
|
|
25
|
+
"AMap.Autocomplete", //输入提示插件
|
|
26
|
+
"AMap.PlaceSearch", //POI搜索插件
|
|
27
|
+
"AMap.Scale", //右下角缩略图插件 比例尺
|
|
28
|
+
"AMap.OverView", //地图鹰眼插件
|
|
29
|
+
"AMap.ToolBar", //地图工具条
|
|
30
|
+
"AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
|
|
31
|
+
"AMap.PolyEditor", //编辑 折线多，边形
|
|
32
|
+
"AMap.CircleEditor", //圆形编辑器插件
|
|
33
|
+
"AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
|
|
34
|
+
],
|
|
35
|
+
uiVersion: "1.0"
|
|
36
|
+
});
|
|
37
|
+
/** **************************通用组件******************************/
|
|
38
|
+
|
|
39
|
+
Vue.prototype.$echarts = echarts
|
|
40
|
+
all()
|
|
41
|
+
system(false)
|
|
42
|
+
saleManage()
|
|
43
|
+
sale()
|
|
44
|
+
ManageHome()
|
|
45
|
+
webmeterManage()
|
|
46
|
+
newmanage()
|
|
47
|
+
reportManage()
|
|
48
|
+
require('./bootstrap/less/bootstrap.less');
|
|
49
|
+
require('./expandcss.less')
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
new Vue({
|
|
53
|
+
el: 'body',
|
|
54
|
+
components: { App }
|
|
55
|
+
})
|
|
56
|
+
|