manage-client-xy 3.1.92 → 3.1.94
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
CHANGED
|
@@ -11,13 +11,19 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var bendi = 'http://172.16.16.
|
|
15
|
-
,fuwu ='http://172.16.16.
|
|
14
|
+
var bendi = 'http://172.16.16.163:8399/'
|
|
15
|
+
,fuwu ='http://172.16.16.163:8399/'
|
|
16
16
|
// ,fuwu = 'http://172.16.16.163:8300/'
|
|
17
17
|
var proxyTable = {
|
|
18
18
|
|
|
19
|
-
'/rs/logic/exportfile': {
|
|
20
|
-
|
|
19
|
+
// '/rs/logic/exportfile': {
|
|
20
|
+
// target: 'http://127.0.0.1:9014/'
|
|
21
|
+
// },
|
|
22
|
+
'/rs/sql/GMHgasQuery': {
|
|
23
|
+
target: 'http://127.0.0.1:9019/'
|
|
24
|
+
},
|
|
25
|
+
'/rs/sql/GMHgasQuery/': {
|
|
26
|
+
target: 'http://127.0.0.1:9019/'
|
|
21
27
|
},
|
|
22
28
|
'/files': {
|
|
23
29
|
target: fuwu
|
package/package.json
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
:value.sync="model.startDate"
|
|
24
24
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
25
25
|
:show-reset-button="true"
|
|
26
|
-
condition="f_operate_date >= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
|
|
26
|
+
condition="tsb.f_operate_date >= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
|
|
27
27
|
</datepicker>
|
|
28
28
|
</div>
|
|
29
29
|
<div class="col-sm-2 form-group">
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
:value.sync="model.endDate"
|
|
34
34
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
35
35
|
:show-reset-button="true"
|
|
36
|
-
condition="f_operate_date <= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
|
|
36
|
+
condition="tsb.f_operate_date <= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
|
|
37
37
|
</datepicker>
|
|
38
38
|
</div>
|
|
39
39
|
<div class="span" style="float:right;">
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<v-select :value.sync="model.opType"
|
|
73
73
|
:search="false"
|
|
74
74
|
:options='$parent.$parent.opType' placeholder='请选择' v-model="model.opType"
|
|
75
|
-
condition="f_operat_type = '{}'"
|
|
75
|
+
condition="r.f_operat_type = '{}'"
|
|
76
76
|
close-on-select></v-select>
|
|
77
77
|
</div>
|
|
78
78
|
<div class="col-sm-2 form-group">
|
|
@@ -346,10 +346,11 @@ export default {
|
|
|
346
346
|
"f_meternumber": "表号",
|
|
347
347
|
"f_gas_person": "置换员",
|
|
348
348
|
"f_gas_date": "通气时间",
|
|
349
|
+
"f_gasproperties":"用气性质",
|
|
349
350
|
"f_total_gas": "累购气量",
|
|
350
351
|
"f_meter_brand": "气表品牌",
|
|
351
352
|
"isbgl": "是否有壁挂炉",
|
|
352
|
-
"f_operator": "
|
|
353
|
+
"f_operator": "开户人"
|
|
353
354
|
},
|
|
354
355
|
AreaGeneralQuery: {
|
|
355
356
|
"f_residential_area": "小区名称", "f_price_name": "气价名称",
|