apply-clients 3.4.79 → 3.4.81

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/applyAndroid.js +54 -55
  3. package/src/components/android/AppTakePic.vue +31 -34
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.79",
3
+ "version": "3.4.81",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/applyAndroid.js CHANGED
@@ -1,55 +1,54 @@
1
- import Vue from 'vue'
2
- import { all } from 'vue-client'
3
- Vue.config.silent = true
4
- import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
5
- import ApplyLoadParams from './stores/ApplyLoadParams'
6
- /** ****************服务插件*********************/
7
-
8
- export default function (filiale) {
9
- Vue.use(ApplyGetSaleParam)
10
- Vue.use(ApplyLoadParams)
11
- /** ***************************报建模块*********************************/
12
- // 报建 总入口
13
- Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
14
- Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
15
- Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
16
- Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
17
- Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
18
- Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
19
-
20
- Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
21
- Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
22
- Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
23
- Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
24
-
25
- Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
26
-
27
- Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
28
- Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
29
- Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
30
- Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
31
- // 选择用户信息
32
- Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
33
- // 选择报建项目
34
- Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
35
- Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
36
-
37
- // 区域 地址下拉框联动组件
38
- Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
39
- Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
40
- Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
41
- Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
42
- // 地图组件
43
- Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
44
- // 扫描二维码
45
- Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
46
- Vue.component('app-ignition-ventilation', (resolve) => { require(['./components/android/ignition/VentilationIgnition'], resolve) })
47
- Vue.component('app-ignition-handle', (resolve) => { require(['./components/android/ignition/VentilationIgnitionHandle'], resolve) })
48
- // 特殊目录给这里加
49
- if (filiale) {
50
- let filialeComp = require(`./filiale/${filiale}/android`).specialComp
51
- for (let key in filialeComp) {
52
- Vue.component(key, filialeComp[key])
53
- }
54
- }
55
- }
1
+ import Vue from 'vue'
2
+ import { all } from 'vue-client'
3
+ Vue.config.silent = true
4
+ import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
5
+ import ApplyLoadParams from './stores/ApplyLoadParams'
6
+ /** ****************服务插件*********************/
7
+
8
+ export default function (filiale) {
9
+ Vue.use(ApplyGetSaleParam)
10
+ Vue.use(ApplyLoadParams)
11
+ /** ***************************报建模块*********************************/
12
+ // 报建 总入口
13
+ Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
14
+ Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
15
+ Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
16
+ Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
17
+ Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
18
+ Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
19
+
20
+ Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
21
+ Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
22
+ Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
23
+ Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
24
+
25
+ Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
26
+
27
+ Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
28
+ Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
29
+ Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
30
+ Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
31
+ // 选择用户信息
32
+ Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
33
+ // 选择报建项目
34
+ Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
35
+ Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
36
+ // 区域 地址下拉框联动组件
37
+ Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
38
+ Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
39
+ Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
40
+ Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
41
+ // 地图组件
42
+ Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
43
+ // 扫描二维码
44
+ Vue.component('app-qrcode-reader', (resolve) => { require(['./components/android/AreaSelect/AppQrcodeReader'], resolve) })
45
+ Vue.component('app-ignition-ventilation', (resolve) => { require(['./components/android/ignition/VentilationIgnition'], resolve) })
46
+ Vue.component('app-ignition-handle', (resolve) => { require(['./components/android/ignition/VentilationIgnitionHandle'], resolve) })
47
+ // 特殊目录给这里加
48
+ if (filiale) {
49
+ let filialeComp = require(`./filiale/${filiale}/android`).specialComp
50
+ for (let key in filialeComp) {
51
+ Vue.component(key, filialeComp[key])
52
+ }
53
+ }
54
+ }
package/src/components/android/AppTakePic.vue CHANGED
@@ -52,7 +52,7 @@ export default {
52
52
  condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
53
53
  }
54
54
  let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data: data}, {
55
- // let res = await http.load('POST', `rs/sql/apply_singleTable`, {data: data}, {
55
+ // let res = await http.load('POST', `rs/sql/apply_singleTable`, {data: data}, {
56
56
  warnMsg: null,
57
57
  resolveMsg: null
58
58
  })
@@ -71,26 +71,8 @@ export default {
71
71
  this.getFiles()
72
72
  })
73
73
  },
74
- takePic (title) {
75
- // 拍照成功回调
76
- HostApp.__callback__ = this.cameraCallBack
77
- HostApp.__this__ = this
78
- let fileName = guid() + '.jpg'
79
- // 打开相机
80
- HostApp._open_a_page({
81
- type: 'boomerang',
82
- page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
83
- param: {
84
- file: fileName,
85
- requestCode: 200,
86
- callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
87
- watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name // 水印
88
- }
89
- })
90
- },
91
74
  cameraCallBack (fileName, fileUrl) {
92
75
  console.log('-----------cameraCallBack-----------------')
93
-
94
76
  let data = {
95
77
  blodid: HostApp.__this__.blobid,
96
78
  type: HostApp.__this__.type,
@@ -100,20 +82,35 @@ export default {
100
82
  fileName: fileName,
101
83
  fileUrl: fileUrl
102
84
  }
103
-
104
85
  console.log('-----------bzLogic-----------------')
105
- HostApp.bzLogic({
86
+ let res=HostApp.bzLogic({
106
87
  'logic': 'appFileUpload',
107
88
  'data': data
108
89
  })
109
-
110
90
  console.log('----------------开始回调查询-------------------')
111
91
  HostApp.__this__.getFiles()
112
92
  console.log('----------------查询回调结束-------------------')
113
-
114
93
  HostApp.__callback__ = null
115
94
  HostApp.__this__ = null
116
- }
95
+ },
96
+ takePic (title) {
97
+ // 拍照成功回调
98
+ HostApp.__callback__ = this.cameraCallBack
99
+ HostApp.__this__ = this
100
+ let fileName = guid() + '.jpg'
101
+ // 打开相机
102
+ HostApp._open_a_page({
103
+ type: 'boomerang',
104
+ page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
105
+ param: {
106
+ file: fileName,
107
+ requestCode: 200,
108
+ callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
109
+ watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name // 水印
110
+ }
111
+ })
112
+ },
113
+
117
114
  },
118
115
  computed: {
119
116
  typeList () {
@@ -129,15 +126,15 @@ export default {
129
126
  </script>
130
127
 
131
128
  <style lang="less">
132
- .fileType {
133
- float: left;
134
- .select-style {
135
- background: #f8f8f8;
136
- border: 0px;
137
- }
138
- input {
139
- border-left: none;
140
- width: 100%;
141
- }
129
+ .fileType {
130
+ float: left;
131
+ .select-style {
132
+ background: #f8f8f8;
133
+ border: 0px;
142
134
  }
135
+ input {
136
+ border-left: none;
137
+ width: 100%;
138
+ }
139
+ }
143
140
  </style>