safecheck-client 3.0.35-15 → 3.0.35-17

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/android/PhoneUpUserinfo.vue +25 -6
  3. package/src/components/pc/SecurityCheckLedger.vue +113 -113
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "safecheck-client",
3
3
  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
4
- "version": "3.0.35-15",
4
+ "version": "3.0.35-17",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
package/src/components/android/PhoneUpUserinfo.vue CHANGED
@@ -641,7 +641,11 @@
641
641
  userinfoms.userfiles = []
642
642
  this.userinfo_old.meterinfo[0].devicesinfo = this.model
643
643
  userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
644
- new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
644
+ let url = 'rs/logic/filemanage_fileSave'
645
+ if(Vue.isv4){
646
+ url ='api/af-revenue/logic/openapi/filemanage_fileSave'
647
+ }
648
+ new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
645
649
  data: {
646
650
  userinfo: userinfoms,
647
651
  modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -657,7 +661,11 @@
657
661
  data.f_address = this.userinfo.addressinfo.f_address? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
658
662
  //
659
663
  data.f_operator = Vue.user.name
660
- new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
664
+ let url1 = 'rs/logic/address_updateuseraddress'
665
+ if(Vue.isv4){
666
+ url1 ='api/af-revenue/logic/openapi/address_updateuseraddress'
667
+ }
668
+ new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url1}`, {data: data}).then((res2) => {
661
669
  this.$showMessage("修改用户地址信息成功！")
662
670
  }).catch(error => {
663
671
  this.$showMessage("修改用户地址信息！")
@@ -708,7 +716,11 @@
708
716
  this.userinfo_old.meterinfo[0].devicesinfo = this.model
709
717
  userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
710
718
  //tag)
711
- new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
719
+ let url = 'rs/logic/filemanage_fileSave'
720
+ if(Vue.isv4){
721
+ url ='api/af-revenue/logic/openapi/filemanage_fileSave'
722
+ }
723
+ new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
712
724
  data: {
713
725
  userinfo: userinfoms,
714
726
  modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -1091,8 +1103,11 @@
1091
1103
  pcdlist.data.forEach((result) => {
1092
1104
  this.pcds.push({label: result.f_pcd, value: result})
1093
1105
  })
1094
- ////tag)
1095
- let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
1106
+ let url = 'rs/logic/filemanage_getFilesDetail'
1107
+ if(Vue.isv4){
1108
+ url ='api/af-revenue/logic/openapi/filemanage_getFilesDetail'
1109
+ }
1110
+ let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {
1096
1111
  //f_userinfo_code:'12381344',
1097
1112
  f_userinfo_id: this.f_userinfo_id
1098
1113
  }, {resolveMsg: null, rejectMsg: null})
@@ -1136,7 +1151,11 @@
1136
1151
  console.log(this.showBox)
1137
1152
  if (this.showBox) {
1138
1153
  // 获取调压箱
1139
- new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
1154
+ let url = 'rs/sql/adjustableboxQuery'
1155
+ if(Vue.isv4){
1156
+ url ='api/af-revenue/sql/adjustableboxQuery'
1157
+ }
1158
+ new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {data: {condition: '1 = 1'}}, {
1140
1159
  resolveMsg: null,
1141
1160
  rejectMsg: null
1142
1161
  }).then((res) => {
package/src/components/pc/SecurityCheckLedger.vue CHANGED
@@ -1,113 +1,113 @@
1
- <template>
2
- <div class="flex-row">
3
- <div class="basic-main">
4
- <criteria-paged :model="model" v-ref:paged>
5
- <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
6
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
- <div class="row">
8
- <div class="form-group col-sm-2" >
9
- <label class="font_normal_body">小区名称</label>
10
- <input type="text" class="input_search" v-model="model.f_residential_area"
11
- style="width: 60%" placeholder="小区名称" condition="ta.f_residential_area like '%{}%'">
12
- </div>
13
- <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
14
- <export-excel-safe :data="$parent.$parent.searchData"
15
- :field="$parent.$parent.excelHeaders"
16
- :choose-col="true"
17
- sqlurl="rs/logic/SafeExportExcel" sql-name="securityCheckLedger" template-name='安检台账'></export-excel-safe>
18
- <button class="button_spacing button_search" @click="search()">查询</button>
19
- </div>
20
- </div>
21
- </div>
22
- </criteria>
23
- <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
24
- <template partial='head'>
25
- <tr>
26
- <th>
27
- <nobr>小区名称</nobr>
28
- </th>
29
- <th>
30
- <nobr>小区用户数</nobr>
31
- </th>
32
- <th>
33
- <nobr>所属计划</nobr>
34
- </th>
35
- <th>
36
- <nobr>计划内用户数</nobr>
37
- </th>
38
- <th>
39
- <nobr>计划下发时间</nobr>
40
- </th>
41
- <th>
42
- <nobr>执行时间</nobr>
43
- </th>
44
- <th>
45
- <nobr>执行周期</nobr>
46
- </th>
47
- <th>
48
- <nobr>周期单位</nobr>
49
- </th>
50
- <th>
51
- <nobr>距离下周期时间（天）</nobr>
52
- </th>
53
- </tr>
54
- </template>
55
- <template partial='body'>
56
- <td style="text-align: center">{{row.f_residential_area}}</td>
57
- <td style="text-align: center">{{row.f_plan_name}}</td>
58
- <td style="text-align: center">{{row.area_num}}</td>
59
- <td style="text-align: center">{{row.plan_num}}</td>
60
- <td style="text-align: center">{{row.f_issue_time}}</td>
61
- <td style="text-align: center">{{row.first_check_date}}</td>
62
- <td style="text-align: center">{{row.zq_value}}</td>
63
- <td style="text-align: center">{{row.dw_value}}</td>
64
- <td style="text-align: center">{{row.difference_day}}</td>
65
- </template>
66
- </data-grid>
67
- </criteria-paged>
68
- </div>
69
- </div>
70
- </template>
71
-
72
- <script>
73
- import {PagedList} from 'vue-client'
74
-
75
- export default {
76
- title: '安检台账',
77
- data() {
78
- return {
79
- model: new PagedList('rs/sql/securityCheckLedger', 20),
80
- searchData: {
81
- condition: "1=1"
82
- },
83
- excelHeaders: {
84
- 'f_residential_area': '小区名称',
85
- 'f_plan_name': '小区用户数',
86
- 'area_num': '所属计划',
87
- 'plan_num': '计划内用户数',
88
- 'f_issue_time': '计划下发时间',
89
- 'first_check_date': '执行时间',
90
- 'zq_value': '执行周期',
91
- 'dw_value': '周期单位',
92
- 'difference_day': '距离下周期时间（天）'
93
- }
94
- }
95
- },
96
- methods: {
97
- selfSearch(args) {
98
- this.model.search(args.condition, args.model, args.condValue)
99
- }
100
- },
101
- ready() {
102
-
103
- },
104
- watch: {
105
- 'model.condition'(val) {
106
- if (val) {
107
- this.searchData.condition = val
108
- }
109
- }
110
- }
111
-
112
- }
113
- </script>
1
+ <template>
2
+ <div class="flex-row">
3
+ <div class="basic-main">
4
+ <criteria-paged :model="model" v-ref:paged>
5
+ <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="form-group col-sm-2" >
9
+ <label class="font_normal_body">小区名称</label>
10
+ <input type="text" class="input_search" v-model="model.f_residential_area"
11
+ style="width: 60%" placeholder="小区名称" condition="ta.f_residential_area like '%{}%'">
12
+ </div>
13
+ <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
14
+ <export-excel-safe :data="$parent.$parent.searchData"
15
+ :field="$parent.$parent.excelHeaders"
16
+ :choose-col="true"
17
+ sqlurl="rs/logic/SafeExportExcel" sql-name="securityCheckLedger" template-name='安检台账'></export-excel-safe>
18
+ <button class="button_spacing button_search" @click="search()">查询</button>
19
+ </div>
20
+ </div>
21
+ </div>
22
+ </criteria>
23
+ <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
24
+ <template partial='head'>
25
+ <tr>
26
+ <th>
27
+ <nobr>小区名称</nobr>
28
+ </th>
29
+ <th>
30
+ <nobr>小区用户数</nobr>
31
+ </th>
32
+ <th>
33
+ <nobr>所属计划</nobr>
34
+ </th>
35
+ <th>
36
+ <nobr>计划内用户数</nobr>
37
+ </th>
38
+ <th>
39
+ <nobr>计划下发时间</nobr>
40
+ </th>
41
+ <th>
42
+ <nobr>执行时间</nobr>
43
+ </th>
44
+ <th>
45
+ <nobr>执行周期</nobr>
46
+ </th>
47
+ <th>
48
+ <nobr>周期单位</nobr>
49
+ </th>
50
+ <th>
51
+ <nobr>距离下周期时间（天）</nobr>
52
+ </th>
53
+ </tr>
54
+ </template>
55
+ <template partial='body'>
56
+ <td style="text-align: center">{{row.f_residential_area}}</td>
57
+ <td style="text-align: center">{{row.area_num}}</td>
58
+ <td style="text-align: center">{{row.f_plan_name}}</td>
59
+ <td style="text-align: center">{{row.plan_num}}</td>
60
+ <td style="text-align: center">{{row.f_issue_time}}</td>
61
+ <td style="text-align: center">{{row.first_check_date}}</td>
62
+ <td style="text-align: center">{{row.zq_value}}</td>
63
+ <td style="text-align: center">{{row.dw_value}}</td>
64
+ <td style="text-align: center">{{row.difference_day}}</td>
65
+ </template>
66
+ </data-grid>
67
+ </criteria-paged>
68
+ </div>
69
+ </div>
70
+ </template>
71
+
72
+ <script>
73
+ import {PagedList} from 'vue-client'
74
+
75
+ export default {
76
+ title: '安检台账',
77
+ data() {
78
+ return {
79
+ model: new PagedList('rs/sql/securityCheckLedger', 20),
80
+ searchData: {
81
+ condition: "1=1"
82
+ },
83
+ excelHeaders: {
84
+ 'f_residential_area': '小区名称',
85
+ 'area_num': '小区用户数',
86
+ 'f_plan_name': '所属计划',
87
+ 'plan_num': '计划内用户数',
88
+ 'f_issue_time': '计划下发时间',
89
+ 'first_check_date': '执行时间',
90
+ 'zq_value': '执行周期',
91
+ 'dw_value': '周期单位',
92
+ 'difference_day': '距离下周期时间（天）'
93
+ }
94
+ }
95
+ },
96
+ methods: {
97
+ selfSearch(args) {
98
+ this.model.search(args.condition, args.model, args.condValue)
99
+ }
100
+ },
101
+ ready() {
102
+
103
+ },
104
+ watch: {
105
+ 'model.condition'(val) {
106
+ if (val) {
107
+ this.searchData.condition = val
108
+ }
109
+ }
110
+ }
111
+
112
+ }
113
+ </script>