vue2-client 1.2.49 → 1.2.52

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 (62) hide show
  1. package/.env +15 -14
  2. package/.eslintrc.js +82 -82
  3. package/CHANGELOG.md +8 -0
  4. package/package.json +2 -1
  5. package/src/base-client/all.js +64 -61
  6. package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue +225 -0
  7. package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue +36 -29
  8. package/src/base-client/components/common/CitySelect/CitySelect.vue +244 -0
  9. package/src/base-client/components/common/CitySelect/index.js +3 -0
  10. package/src/base-client/components/common/CitySelect/index.md +109 -0
  11. package/src/base-client/components/common/CreateQuery/CreateQuery.vue +483 -1342
  12. package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue +770 -555
  13. package/src/base-client/components/common/Upload/Upload.vue +124 -124
  14. package/src/base-client/components/common/Upload/index.js +3 -3
  15. package/src/base-client/components/common/XAddForm/XAddForm.vue +38 -46
  16. package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue +316 -316
  17. package/src/base-client/components/common/XForm/XForm.vue +268 -275
  18. package/src/base-client/components/common/XForm/XFormItem.vue +348 -280
  19. package/src/base-client/components/common/XFormTable/XFormTable.vue +0 -2
  20. package/src/base-client/components/iot/CustomerDetailsView/index.md +1 -2
  21. package/src/base-client/components/iot/DeviceBrandDetailsView/DeviceBrandDetailsView.vue +1 -1
  22. package/src/base-client/components/iot/DeviceDetailsView/DeviceDetailsView.vue +2 -7
  23. package/src/base-client/components/iot/DeviceDetailsView/index.md +0 -2
  24. package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsException.vue +57 -57
  25. package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsMain.vue +240 -196
  26. package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsRead.vue +131 -131
  27. package/src/base-client/components/iot/DeviceTypeDetailsView/DeviceTypeDetailsView.vue +1 -5
  28. package/src/base-client/components/iot/InstructDetailsView/InstructDetailsView.vue +6 -14
  29. package/src/base-client/components/iot/InstructDetailsView/index.md +0 -2
  30. package/src/base-client/components/iot/LogDetailsView/LogDetailsView.vue +6 -13
  31. package/src/base-client/components/iot/LogDetailsView/index.md +0 -2
  32. package/src/base-client/components/iot/MeterDetailsView/MeterDetailsView.vue +17 -24
  33. package/src/base-client/components/iot/MeterDetailsView/index.md +0 -2
  34. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsCount.vue +0 -5
  35. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsException.vue +0 -5
  36. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsHandPlan.vue +0 -6
  37. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsInstruct.vue +0 -6
  38. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsMain.vue +1 -6
  39. package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsSellGas.vue +1 -6
  40. package/src/base-client/components/iot/WebmeterAnalysisView/WebmeterAnalysisView.vue +213 -288
  41. package/src/base-client/components/iot/WebmeterAnalysisView/index.md +0 -6
  42. package/src/base-client/components/ticket/TicketDetailsView/TicketDetailsView.vue +853 -853
  43. package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue +532 -532
  44. package/src/base-client/plugins/AppData.js +16 -1
  45. package/src/base-client/plugins/compatible/LoginServiceOA.js +19 -0
  46. package/src/config/CreateQueryConfig.js +298 -80
  47. package/src/config/default/setting.config.js +2 -2
  48. package/src/layouts/header/HeaderNotice.vue +96 -96
  49. package/src/layouts/tabs/TabsView.vue +0 -3
  50. package/src/pages/login/Login.vue +53 -22
  51. package/src/pages/resourceManage/orgListManage.vue +40 -40
  52. package/src/pages/system/ticket/submitTicketSuccess.vue +268 -268
  53. package/src/router/async/config.async.js +26 -26
  54. package/src/router/index.js +27 -27
  55. package/src/services/api/manage.js +16 -14
  56. package/src/services/api/restTools.js +24 -24
  57. package/src/theme/default/style.less +47 -47
  58. package/src/utils/map-utils.js +22 -11
  59. package/src/utils/request.js +198 -198
  60. package/src/utils/routerUtil.js +1 -10
  61. package/src/utils/util.js +222 -176
  62. package/vue.config.js +2 -2
@@ -90,10 +90,6 @@ export default {
90
90
  STable
91
91
  },
92
92
  props: {
93
- selectOrgName: {
94
- type: String,
95
- required: true
96
- },
97
93
  userid: {
98
94
  type: String,
99
95
  required: true
@@ -105,8 +101,7 @@ export default {
105
101
  // 加载数据方法 必须为 Promise 对象
106
102
  loadSellGasData: parameter => {
107
103
  const queryParams = {
108
- userId: this.userid,
109
- orgName: this.selectOrgName
104
+ userId: this.userid
110
105
  }
111
106
  const requestParameters = Object.assign({}, parameter, queryParams)
112
107
  return this.getSimpleSellGas(requestParameters)
@@ -1,227 +1,219 @@
1
1
  <template>
2
- <a-drawer
3
- title="物联网综合分析"
4
- placement="right"
5
- :width="isMobile ? screenWidth : screenWidth * 0.85"
6
- :visible="visible"
7
- @close="onClose"
8
- >
9
- <a-page-header :title="selectOrgName +' - 物联网运行维护'">
10
- <div>
11
- <a-row :gutter="24">
12
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
13
- <x-card :loadState="instructSumLoadState" :retry="loadInstructSumCount">
14
- <chart-card title="总指令数" :total="instructSum | NumberFormat">
15
- <a-tooltip title="刷新" slot="action" :style="{ marginRight: '10px' }" @click="loadInstructSumCount()">
16
- <a-icon type="redo" />
17
- </a-tooltip>
18
- <a-tooltip title="生成的所有指令总数" slot="action">
19
- <a-icon type="info-circle-o" />
20
- </a-tooltip>
21
- <div>
22
- <trend :flag="instructYoW >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
23
- <span slot="term">同周比</span>
24
- {{ instructYoW + '%' }}
25
- </trend>
26
- <trend :flag="instructYoD >= 0 ? 'up' : 'down'">
27
- <span slot="term">日同比</span>
28
- {{ instructYoD + '%' }}
29
- </trend>
30
- </div>
31
- <template slot="footer">昨日新增 <span>{{ instructYesAdd | NumberFormat }}</span></template>
32
- </chart-card>
33
- </x-card>
34
- </a-col>
35
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
36
- <x-card :loadState="metereadSumLoadState" :retry="loadMetereadSumCount">
37
- <chart-card title="总抄表量" :total="metereadSum | NumberFormat">
38
- <a-tooltip title="刷新" slot="action" :style="{ marginRight: '10px' }" @click="loadMetereadSumCount()">
39
- <a-icon type="redo" />
40
- </a-tooltip>
41
- <a-tooltip title="生成的所有抄表(meteread)总数" slot="action">
42
- <a-icon type="info-circle-o" />
43
- </a-tooltip>
44
- <div>
45
- <mini-area :dataSource="metereadSumDataByWeek" :scale="metereadSumByWeekScale" />
46
- </div>
47
- <template slot="footer">昨日新增 <span> {{ metereadYesAdd | NumberFormat }}</span></template>
48
- </chart-card>
49
- </x-card>
50
- </a-col>
51
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
52
- <x-card :loadState="usingMeterSumLoadState" :retry="loadUsingMeterSumCount">
53
- <chart-card title="在用表具数" :total="usingMeterSum | NumberFormat">
54
- <a-tooltip title="刷新" slot="action" :style="{ marginRight: '10px' }" @click="loadUsingMeterSumCount()">
55
- <a-icon type="redo" />
56
- </a-tooltip>
57
- <a-tooltip title="开户成功的物联网表总数" slot="action">
58
- <a-icon type="info-circle-o" />
59
- </a-tooltip>
60
- <div>
61
- <mini-bar :dataSource="usingMeterSumDataByWeek" :scale="usingMeterSumByWeekScale" />
62
- </div>
63
- <template slot="footer">昨日新增 <span>{{ usingMeterYesAdd | NumberFormat }}</span></template>
64
- </chart-card>
65
- </x-card>
66
- </a-col>
67
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
68
- <x-card :loadState="instructRateOfSuccessLoadState" :retry="loadInstructRateOfSuccess">
69
- <chart-card title="指令下发成功率" :total="instructRateOfSuccessValue + '%'">
70
- <a-tooltip title="刷新" slot="action" :style="{ marginRight: '10px' }" @click="loadInstructRateOfSuccess()">
71
- <a-icon type="redo" />
72
- </a-tooltip>
73
- <a-tooltip title="执行成功和已发送状态的指令占所有指令的比例" slot="action">
74
- <a-icon type="info-circle-o" />
75
- </a-tooltip>
76
- <div>
77
- <mini-progress :color="instructRateOfColor" :target="90" :percentage="instructRateOfSuccessValue" height="8px" />
78
- </div>
79
- <template slot="footer">
80
- <trend :flag="instructRateOfSuccessYoW >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
81
- <span slot="term">同周比</span>
82
- {{ instructRateOfSuccessYoW + '%' }}
83
- </trend>
84
- <trend :flag="instructRateOfSuccessYoD >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
85
- <span slot="term">日同比</span>
86
- {{ instructRateOfSuccessYoD + '%' }}
87
- </trend>
88
- <span slot="term">昨日成功率</span>
89
- {{ yesterdayInstructRateOf + '%' }}
90
- </template>
91
- </chart-card>
92
- </x-card>
93
- </a-col>
94
- </a-row>
2
+ <a-page-header title="物联网运行维护">
3
+ <div>
4
+ <a-row :gutter="24">
5
+ <a-col :md="12" :sm="24" :style="{ marginBottom: '24px' }" :xl="6">
6
+ <x-card :loadState="instructSumLoadState" :retry="loadInstructSumCount">
7
+ <chart-card :total="instructSum | NumberFormat" title="总指令数">
8
+ <a-tooltip slot="action" :style="{ marginRight: '10px' }" title="刷新" @click="loadInstructSumCount()">
9
+ <a-icon type="redo" />
10
+ </a-tooltip>
11
+ <a-tooltip slot="action" title="生成的所有指令总数">
12
+ <a-icon type="info-circle-o" />
13
+ </a-tooltip>
14
+ <div>
15
+ <trend :flag="instructYoW >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
16
+ <span slot="term">同周比</span>
17
+ {{ instructYoW + '%' }}
18
+ </trend>
19
+ <trend :flag="instructYoD >= 0 ? 'up' : 'down'">
20
+ <span slot="term">日同比</span>
21
+ {{ instructYoD + '%' }}
22
+ </trend>
23
+ </div>
24
+ <template slot="footer">昨日新增 <span>{{ instructYesAdd | NumberFormat }}</span></template>
25
+ </chart-card>
26
+ </x-card>
27
+ </a-col>
28
+ <a-col :md="12" :sm="24" :style="{ marginBottom: '24px' }" :xl="6">
29
+ <x-card :loadState="metereadSumLoadState" :retry="loadMetereadSumCount">
30
+ <chart-card :total="metereadSum | NumberFormat" title="总抄表量">
31
+ <a-tooltip slot="action" :style="{ marginRight: '10px' }" title="刷新" @click="loadMetereadSumCount()">
32
+ <a-icon type="redo" />
33
+ </a-tooltip>
34
+ <a-tooltip slot="action" title="生成的所有抄表(meteread)总数">
35
+ <a-icon type="info-circle-o" />
36
+ </a-tooltip>
37
+ <div>
38
+ <mini-area :dataSource="metereadSumDataByWeek" :scale="metereadSumByWeekScale" />
39
+ </div>
40
+ <template slot="footer">昨日新增 <span> {{ metereadYesAdd | NumberFormat }}</span></template>
41
+ </chart-card>
42
+ </x-card>
43
+ </a-col>
44
+ <a-col :md="12" :sm="24" :style="{ marginBottom: '24px' }" :xl="6">
45
+ <x-card :loadState="usingMeterSumLoadState" :retry="loadUsingMeterSumCount">
46
+ <chart-card :total="usingMeterSum | NumberFormat" title="在用表具数">
47
+ <a-tooltip slot="action" :style="{ marginRight: '10px' }" title="刷新" @click="loadUsingMeterSumCount()">
48
+ <a-icon type="redo" />
49
+ </a-tooltip>
50
+ <a-tooltip slot="action" title="开户成功的物联网表总数">
51
+ <a-icon type="info-circle-o" />
52
+ </a-tooltip>
53
+ <div>
54
+ <mini-bar :dataSource="usingMeterSumDataByWeek" :scale="usingMeterSumByWeekScale" />
55
+ </div>
56
+ <template slot="footer">昨日新增 <span>{{ usingMeterYesAdd | NumberFormat }}</span></template>
57
+ </chart-card>
58
+ </x-card>
59
+ </a-col>
60
+ <a-col :md="12" :sm="24" :style="{ marginBottom: '24px' }" :xl="6">
61
+ <x-card :loadState="instructRateOfSuccessLoadState" :retry="loadInstructRateOfSuccess">
62
+ <chart-card :total="instructRateOfSuccessValue + '%'" title="指令下发成功率">
63
+ <a-tooltip slot="action" :style="{ marginRight: '10px' }" title="刷新" @click="loadInstructRateOfSuccess()">
64
+ <a-icon type="redo" />
65
+ </a-tooltip>
66
+ <a-tooltip slot="action" title="执行成功和已发送状态的指令占所有指令的比例">
67
+ <a-icon type="info-circle-o" />
68
+ </a-tooltip>
69
+ <div>
70
+ <mini-progress :color="instructRateOfColor" :percentage="instructRateOfSuccessValue" :target="90" height="8px" />
71
+ </div>
72
+ <template slot="footer">
73
+ <trend :flag="instructRateOfSuccessYoW >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
74
+ <span slot="term">同周比</span>
75
+ {{ instructRateOfSuccessYoW + '%' }}
76
+ </trend>
77
+ <trend :flag="instructRateOfSuccessYoD >= 0 ? 'up' : 'down'" style="margin-right: 16px;">
78
+ <span slot="term">日同比</span>
79
+ {{ instructRateOfSuccessYoD + '%' }}
80
+ </trend>
81
+ <span slot="term">昨日成功率</span>
82
+ {{ yesterdayInstructRateOf + '%' }}
83
+ </template>
84
+ </chart-card>
85
+ </x-card>
86
+ </a-col>
87
+ </a-row>
95
88
 
96
- <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
97
- <div class="salesCard">
98
- <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
99
- <div class="extra-wrapper" slot="tabBarExtraContent">
100
- <div class="extra-item">
101
- <a>今日</a>
102
- <a>本周</a>
103
- <a>本月</a>
104
- <a>本年</a>
105
- </div>
106
- <a-range-picker :style="{width: '256px'}" />
89
+ <a-card :body-style="{padding: '0'}" :bordered="false" :loading="loading">
90
+ <div class="salesCard">
91
+ <a-tabs :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}" default-active-key="1" size="large">
92
+ <div slot="tabBarExtraContent" class="extra-wrapper">
93
+ <div class="extra-item">
94
+ <a>今日</a>
95
+ <a>本周</a>
96
+ <a>本月</a>
97
+ <a>本年</a>
107
98
  </div>
108
- <a-tab-pane tab="抄表情况分析" key="1">
109
- <a-row :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
110
- <x-card :loadState="radarLoadState" :retry="loadGasView">
111
- <div style="padding: 0 0 0 20px;height: 370px" id="container" />
112
- </x-card>
113
- </a-row>
114
- </a-tab-pane>
115
- <a-tab-pane tab="访问量" key="2">
116
- <a-row>
117
- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
118
- <bar :data="barData2" title="销售额趋势" />
119
- </a-col>
120
- <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
121
- <rank-list title="门店销售排行榜" :list="rankList"/>
122
- </a-col>
123
- </a-row>
124
- </a-tab-pane>
125
- </a-tabs>
126
- </div>
127
- </a-card>
99
+ <a-range-picker :style="{width: '256px'}" />
100
+ </div>
101
+ <a-tab-pane key="1" tab="抄表情况分析">
102
+ <a-row :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
103
+ <x-card :loadState="radarLoadState" :retry="loadGasView">
104
+ <div id="container" style="padding: 0 0 0 20px;height: 370px" />
105
+ </x-card>
106
+ </a-row>
107
+ </a-tab-pane>
108
+ <a-tab-pane key="2" tab="访问量">
109
+ <a-row>
110
+ <a-col :lg="12" :md="12" :sm="24" :xl="16" :xs="24">
111
+ <bar :data="barData2" title="销售额趋势" />
112
+ </a-col>
113
+ <a-col :lg="12" :md="12" :sm="24" :xl="8" :xs="24">
114
+ <rank-list :list="rankList" title="门店销售排行榜"/>
115
+ </a-col>
116
+ </a-row>
117
+ </a-tab-pane>
118
+ </a-tabs>
119
+ </div>
120
+ </a-card>
128
121
 
129
- <div class="antd-pro-pages-dashboard-analysis-twoColLayout" :class="!isMobile && 'desktop'">
130
- <a-row :gutter="24" type="flex" :style="{ marginTop: '24px' }">
131
- <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
132
- <a-card :loading="loading" :bordered="false" title="用气情况排行" :style="{ height: '100%' }">
133
- <a-dropdown :trigger="['click']" placement="bottomLeft" slot="extra">
134
- <a class="ant-dropdown-link" href="#">
135
- <a-icon type="ellipsis" />
136
- </a>
137
- <a-menu slot="overlay">
138
- <a-menu-item>
139
- <a href="javascript:">操作一</a>
140
- </a-menu-item>
141
- <a-menu-item>
142
- <a href="javascript;">操作二</a>
143
- </a-menu-item>
144
- </a-menu>
145
- </a-dropdown>
146
- <a-row :gutter="68">
147
- <a-col :xs="24" :sm="12" :style="{ marginBottom: ' 24px'}">
148
- <number-info :total="21232.1" :sub-total="17.1">
149
- <span slot="subtitle">
150
- <span>当天总用气量</span>
151
- <a-tooltip title="指标说明" slot="action">
152
- <a-icon type="info-circle-o" :style="{ marginLeft: '8px' }" />
153
- </a-tooltip>
154
- </span>
155
- </number-info>
156
- <!-- miniChart -->
157
- <div>
158
- <mini-smooth-area :style="{ height: '45px' }" :dataSource="searchUserData" :scale="searchUserScale" />
159
- </div>
160
- </a-col>
161
- <a-col :xs="24" :sm="12" :style="{ marginBottom: ' 24px'}">
162
- <number-info :total="0.7" :sub-total="0.2" status="up">
163
- <span slot="subtitle">
164
- <span>人均用气量</span>
165
- <a-tooltip title="指标说明" slot="action">
166
- <a-icon type="info-circle-o" :style="{ marginLeft: '8px' }" />
167
- </a-tooltip>
168
- </span>
169
- </number-info>
170
- <!-- miniChart -->
171
- <div>
172
- <mini-smooth-area :style="{ height: '45px' }" :dataSource="searchUserData" :scale="searchUserScale" />
173
- </div>
174
- </a-col>
175
- </a-row>
176
- <div class="ant-table-wrapper">
177
- <a-table
178
- row-key="index"
179
- size="small"
180
- :columns="searchTableColumns"
181
- :dataSource="searchData"
182
- :pagination="{ pageSize: 5 }"
183
- >
184
- <span slot="range" slot-scope="text, record">
185
- <trend :flag="record.status === 0 ? 'up' : 'down'">
186
- {{ text }}%
187
- </trend>
122
+ <div :class="!isMobile && 'desktop'" class="antd-pro-pages-dashboard-analysis-twoColLayout">
123
+ <a-row :gutter="24" :style="{ marginTop: '24px' }" type="flex">
124
+ <a-col :lg="24" :md="24" :sm="24" :xl="12" :xs="24">
125
+ <a-card :bordered="false" :loading="loading" :style="{ height: '100%' }" title="用气情况排行">
126
+ <a-dropdown slot="extra" :trigger="['click']" placement="bottomLeft">
127
+ <a class="ant-dropdown-link" href="#">
128
+ <a-icon type="ellipsis" />
129
+ </a>
130
+ <a-menu slot="overlay">
131
+ <a-menu-item>
132
+ <a href="javascript:">操作一</a>
133
+ </a-menu-item>
134
+ <a-menu-item>
135
+ <a href="javascript;">操作二</a>
136
+ </a-menu-item>
137
+ </a-menu>
138
+ </a-dropdown>
139
+ <a-row :gutter="68">
140
+ <a-col :sm="12" :style="{ marginBottom: ' 24px'}" :xs="24">
141
+ <number-info :sub-total="17.1" :total="21232.1">
142
+ <span slot="subtitle">
143
+ <span>当天总用气量</span>
144
+ <a-tooltip slot="action" title="指标说明">
145
+ <a-icon :style="{ marginLeft: '8px' }" type="info-circle-o" />
146
+ </a-tooltip>
188
147
  </span>
189
- </a-table>
190
- </div>
191
- </a-card>
192
- </a-col>
193
- <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
194
- <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="指令类别占比" :style="{ height: '100%' }">
195
- <div slot="extra" style="height: inherit;">
196
- <div class="analysis-salesTypeRadio">
197
- <a-radio-group defaultValue="a">
198
- <a-radio-button value="a">本日</a-radio-button>
199
- <a-radio-button value="b">本周</a-radio-button>
200
- <a-radio-button value="c">本月</a-radio-button>
201
- </a-radio-group>
148
+ </number-info>
149
+ <!-- miniChart -->
150
+ <div>
151
+ <mini-smooth-area :dataSource="searchUserData" :scale="searchUserScale" :style="{ height: '45px' }" />
202
152
  </div>
203
- </div>
204
- <h4></h4>
205
- <div>
206
- <!-- style="width: calc(100% - 240px);" -->
153
+ </a-col>
154
+ <a-col :sm="12" :style="{ marginBottom: ' 24px'}" :xs="24">
155
+ <number-info :sub-total="0.2" :total="0.7" status="up">
156
+ <span slot="subtitle">
157
+ <span>人均用气量</span>
158
+ <a-tooltip slot="action" title="指标说明">
159
+ <a-icon :style="{ marginLeft: '8px' }" type="info-circle-o" />
160
+ </a-tooltip>
161
+ </span>
162
+ </number-info>
163
+ <!-- miniChart -->
207
164
  <div>
208
- <v-chart :force-fit="true" :height="405" :data="pieData" :scale="pieScale">
209
- <v-tooltip :showTitle="false" dataKey="item*percent" />
210
- <v-axis />
211
- <!-- position="right" :offsetX="-140" -->
212
- <v-legend dataKey="item"/>
213
- <v-pie position="percent" color="item" :vStyle="pieStyle" />
214
- <v-coord type="theta" :radius="0.75" :innerRadius="0.6" />
215
- </v-chart>
165
+ <mini-smooth-area :dataSource="searchUserData" :scale="searchUserScale" :style="{ height: '45px' }" />
216
166
  </div>
167
+ </a-col>
168
+ </a-row>
169
+ <div class="ant-table-wrapper">
170
+ <a-table
171
+ :columns="searchTableColumns"
172
+ :dataSource="searchData"
173
+ :pagination="{ pageSize: 5 }"
174
+ row-key="index"
175
+ size="small"
176
+ >
177
+ <span slot="range" slot-scope="text, record">
178
+ <trend :flag="record.status === 0 ? 'up' : 'down'">
179
+ {{ text }}%
180
+ </trend>
181
+ </span>
182
+ </a-table>
183
+ </div>
184
+ </a-card>
185
+ </a-col>
186
+ <a-col :lg="24" :md="24" :sm="24" :xl="12" :xs="24">
187
+ <a-card :bordered="false" :loading="loading" :style="{ height: '100%' }" class="antd-pro-pages-dashboard-analysis-salesCard" title="指令类别占比">
188
+ <div slot="extra" style="height: inherit;">
189
+ <div class="analysis-salesTypeRadio">
190
+ <a-radio-group defaultValue="a">
191
+ <a-radio-button value="a">本日</a-radio-button>
192
+ <a-radio-button value="b">本周</a-radio-button>
193
+ <a-radio-button value="c">本月</a-radio-button>
194
+ </a-radio-group>
217
195
  </div>
218
- </a-card>
219
- </a-col>
220
- </a-row>
221
- </div>
196
+ </div>
197
+ <h4></h4>
198
+ <div>
199
+ <!-- style="width: calc(100% - 240px);" -->
200
+ <div>
201
+ <v-chart :data="pieData" :force-fit="true" :height="405" :scale="pieScale">
202
+ <v-tooltip :showTitle="false" dataKey="item*percent" />
203
+ <v-axis />
204
+ <!-- position="right" :offsetX="-140" -->
205
+ <v-legend dataKey="item"/>
206
+ <v-pie :vStyle="pieStyle" color="item" position="percent" />
207
+ <v-coord :innerRadius="0.6" :radius="0.75" type="theta" />
208
+ </v-chart>
209
+ </div>
210
+ </div>
211
+ </a-card>
212
+ </a-col>
213
+ </a-row>
222
214
  </div>
223
- </a-page-header>
224
- </a-drawer>
215
+ </div>
216
+ </a-page-header>
225
217
  </template>
226
218
 
227
219
  <script>
@@ -472,38 +464,11 @@ export default {
472
464
  ...mapState('setting', ['isMobile'])
473
465
  },
474
466
  props: {
475
- selectOrgName: {
476
- type: String,
477
- required: true
478
- },
479
- webmeterUrl: {
480
- type: String,
481
- required: true
482
- },
483
- systemVersion: {
484
- type: String,
485
- required: true
486
- },
487
- dataSource: {
488
- type: String,
489
- required: true
490
- },
491
- visible: {
492
- type: Boolean,
493
- default: false
494
- }
495
467
  },
496
468
  methods: {
497
- onClose () {
498
- this.$emit('update:visible', false)
499
- },
500
469
  loadInstructSumCount () {
501
470
  this.instructSumLoadState = 'loading'
502
- return post(WebmeterAnalysisViewApi.instructSumCount, {
503
- webmeterUrl: this.webmeterUrl,
504
- systemVersion: this.systemVersion,
505
- dataSource: this.dataSource
506
- }).then(res => {
471
+ return post(WebmeterAnalysisViewApi.instructSumCount, {}).then(res => {
507
472
  this.instructSum = res.instructSum
508
473
  this.instructYoW = res.instructYoW
509
474
  this.instructYoD = res.instructYoD
@@ -517,17 +482,9 @@ export default {
517
482
  loadMetereadSumCount () {
518
483
  this.metereadSumDataByWeek = []
519
484
  this.metereadSumLoadState = 'loading'
520
- return post(WebmeterAnalysisViewApi.meteReadSumCount, {
521
- webmeterUrl: this.webmeterUrl,
522
- systemVersion: this.systemVersion,
523
- dataSource: this.dataSource
524
- }).then(res => {
485
+ return post(WebmeterAnalysisViewApi.meteReadSumCount, {}).then(res => {
525
486
  // 加载近一周抄表数图表
526
- post(WebmeterAnalysisViewApi.meteReadDataByWeek, {
527
- webmeterUrl: this.webmeterUrl,
528
- systemVersion: this.systemVersion,
529
- dataSource: this.dataSource
530
- }).then(res => {
487
+ post(WebmeterAnalysisViewApi.meteReadDataByWeek, {}).then(res => {
531
488
  for (let i = 0, len = res.length; i < len; i++) {
532
489
  this.metereadSumDataByWeek.push({
533
490
  x: res[i].date,
@@ -546,17 +503,9 @@ export default {
546
503
  loadUsingMeterSumCount () {
547
504
  this.usingMeterSumDataByWeek = []
548
505
  this.usingMeterSumLoadState = 'loading'
549
- return post(WebmeterAnalysisViewApi.usingMeterSumCount, {
550
- webmeterUrl: this.webmeterUrl,
551
- systemVersion: this.systemVersion,
552
- dataSource: this.dataSource
553
- }).then(res => {
506
+ return post(WebmeterAnalysisViewApi.usingMeterSumCount, {}).then(res => {
554
507
  // 加载近一周开户数图表
555
- post(WebmeterAnalysisViewApi.usingMeterDataByWeek, {
556
- webmeterUrl: this.webmeterUrl,
557
- systemVersion: this.systemVersion,
558
- dataSource: this.dataSource
559
- }).then(res => {
508
+ post(WebmeterAnalysisViewApi.usingMeterDataByWeek, {}).then(res => {
560
509
  for (let i = 0, len = res.length; i < len; i++) {
561
510
  this.usingMeterSumDataByWeek.push({
562
511
  x: res[i].date,
@@ -574,11 +523,7 @@ export default {
574
523
  },
575
524
  loadInstructRateOfSuccess () {
576
525
  this.instructRateOfSuccessLoadState = 'loading'
577
- return post(WebmeterAnalysisViewApi.instructRateOfSuccess, {
578
- webmeterUrl: this.webmeterUrl,
579
- systemVersion: this.systemVersion,
580
- dataSource: this.dataSource
581
- }).then(res => {
526
+ return post(WebmeterAnalysisViewApi.instructRateOfSuccess, {}).then(res => {
582
527
  this.instructRateOfSuccessValue = res.instructRateOfSuccessValue * 1.0
583
528
  if (this.instructRateOfSuccessValue < 70.0) {
584
529
  this.instructRateOfColor = 'rgb(242, 99, 123)'
@@ -607,11 +552,7 @@ export default {
607
552
  this.radarLoadState = 'loading'
608
553
  fetch('/webmeterapi/foreignaidHandMeterSumCountData', {
609
554
  method: 'POST',
610
- body: JSON.stringify({
611
- webmeterUrl: this.webmeterUrl,
612
- systemVersion: this.systemVersion,
613
- dataSource: this.dataSource
614
- })
555
+ body: JSON.stringify({})
615
556
  }).then((res) => res.json())
616
557
  .then((data) => {
617
558
  const linePlot = new Line('container', {
@@ -646,22 +587,6 @@ export default {
646
587
  this.radarLoadState = 'error'
647
588
  })
648
589
  }
649
- },
650
- watch: {
651
- 'visible' (val) {
652
- if (val) {
653
- // 加载指令数统计
654
- this.loadInstructSumCount()
655
- // 加载抄表量统计
656
- this.loadMetereadSumCount()
657
- // 加载在用表具量统计
658
- this.loadUsingMeterSumCount()
659
- // 加载指令成功率统计
660
- this.loadInstructRateOfSuccess()
661
- // 加载g2图表
662
- this.loadGasView()
663
- }
664
- }
665
590
  }
666
591
  }
667
592
  </script>
@@ -29,11 +29,6 @@ export default {
29
29
  ```html
30
30
  <webmeter-analysis-view
31
31
  :visible.sync="detailVisible"
32
- :select-org-name="selectOrgName"
33
- :webmeter-url="selectUrl"
34
- :system-version="selectSystemVersion"
35
- :data-source="selectDataSource"
36
- v-if="selectUrl"
37
32
  />
38
33
  ```
39
34
 
@@ -42,7 +37,6 @@ export default {
42
37
  | 参数 | 说明 | 类型 | 默认值 |
43
38
  |---------------|-----------|---------|-------|
44
39
  | visible | 是否显示 | Boolean | false |
45
- | selectOrgName | 燃气公司客户名 | String | null |
46
40
  | webmeterUrl | 物联网表服务名 | String | null |
47
41
  | systemVersion | 系统所属版本 | String | null |
48
42
  | dataSource | 系统所属数据库版本 | String | null |