apply-clients 3.3.93 → 3.3.94-1

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.
@@ -1,165 +1,127 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- // var httpProxy = require('http-proxy')
6
- var app = express()
7
- var compiler = webpack(config)
8
- // var proxy = httpProxy.createProxyServer()
9
- // var ldap = 'http://121.36.79.201:8400'
10
- // var applyinstall = 'http://121.36.79.201:8400'
11
- var ldap = 'http://192.168.20.28:8400'
12
- var applyinstall = 'http://127.0.0.1:8080'
13
- // var ldap = 'http://192.168.20.28:8556'
14
- // var applyinstall = 'http://192.168.20.28:8556'
15
- var proxyTable = {
16
- '/wx': {
17
- target: ldap
18
- },
19
- '/ncc': {
20
- target: 'http://192.168.20.27:7890'
21
- },
22
- '/rs/sql/filemanage_getUserfies/n': {
23
- target: ldap
24
- },
25
- '/rs/sql/filemanage_getUserfies': {
26
- target: ldap
27
- },
28
- '/rs/entity/t_apply': {
29
- target: 'http://127.0.0.1:8080'
30
- },
31
- '/rs/logic/ApplyProductService': {
32
- target: 'http://127.0.0.1:8080'
33
- },
34
- '/rs/sql/checkuser': {
35
- target: 'http://127.0.0.1:8080'
36
- },
37
- '/rs/logic/exportfile': {
38
- target: ldap
39
- },
40
- '/rs/logic/getBatchOperaPro': {
41
- target: ldap
42
- },
43
- '/rs/sql/getApplyCharge': {
44
- target: 'http://127.0.0.1:8080'
45
- },
46
- '/rs/sql/getChargeAll': {
47
- target: 'http://127.0.0.1:8080'
48
- },
49
- '/rs/sql/supervisory': {
50
- target: 'http://127.0.0.1:8080'
51
- },
52
- '/rs/logic/updateApplyOrder': {
53
- target: ldap
54
- },
55
- // '/rs/sql/getAddresAndUserinfoAndUserfilesAmount': {
56
- // target: 'http://127.0.0.1:8080'
57
- // },
58
- // '/rs/sql/singleTable': {
59
- // target: 'http://127.0.0.1:8080'
60
- // },
61
- // '/rs/sql/countApplyUserinfo': {
62
- // target: 'http://127.0.0.1:8080'
63
- // },
64
- // '/rs/sql/getStockMaterial': {
65
- // target: 'http://127.0.0.1:8080'
66
- // },
67
- '/rs/logic/resAreaSelect': {
68
- target: 'http://127.0.0.1:8080'
69
- },
70
- // '/rs/logic/bjqCheck': {
71
- // target: 'http://127.0.0.1:8080'
72
- // },
73
- '/rs/logic/getSaleInitData': {
74
- target: ldap
75
- },
76
- '/rs/workflow': {
77
- target: applyinstall
78
- },
79
- '/rs/vue': {
80
- target: ldap
81
- },
82
- // 查找资源服务数据
83
- '/rs/search': {
84
- target: ldap
85
- },
86
- // 用户登录服务地址
87
- '/rs/user': {
88
- target: ldap
89
- },
90
- '/rs/logic/getInitData': {
91
- target: ldap
92
- },
93
- '/rs/logic/getLogin': {
94
- target: ldap
95
- },
96
- '/rs/file': { // 文件上传
97
- target: applyinstall
98
- },
99
- '/project': { // 文件回显
100
- target: applyinstall
101
- },
102
- '/rs': {
103
- target: applyinstall
104
- },
105
- '/ws': {
106
- target: applyinstall,
107
- ws: true // 代理webSocket
108
- }
109
- }
110
-
111
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
112
- publicPath: config.output.publicPath,
113
- stats: {
114
- colors: true,
115
- chunks: false
116
- }
117
- })
118
-
119
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
120
- // force page reload when html-webpack-plugin template changes
121
- compiler.plugin('compilation', function (compilation) {
122
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
123
- hotMiddleware.publish({action: 'reload'})
124
- cb()
125
- })
126
- })
127
-
128
- // proxy api requests
129
- Object.keys(proxyTable).forEach(function (context) {
130
- var options = proxyTable[context]
131
- if (typeof options === 'string') {
132
- options = {target: options}
133
- }
134
- app.use(proxyMiddleware(context, options))
135
- })
136
-
137
- // handle fallback for HTML5 history API
138
- app.use(require('connect-history-api-fallback')())
139
- // app.use(function (req, res, next) {
140
- // res.header('Access-Control-Allow-Origin', '*')
141
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
142
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
143
- // res.header('X-Powered-By', '3,2,1')
144
- // res.header('Access-Control-Allow-Credentials', 'true')
145
- // res.header('Content-Type', 'application/json;charset=utf-8')
146
- // next()
147
- // })
148
-
149
- // serve webpack bundle output
150
- app.use(devMiddleware)
151
-
152
- // enable hot-reload and state-preserving
153
- // compilation error display
154
- app.use(hotMiddleware)
155
-
156
- // serve pure static assets
157
- app.use('/static', express.static('./static'))
158
-
159
- module.exports = app.listen(8300, function (err) {
160
- if (err) {
161
- console.log(err)
162
- return
163
- }
164
- console.log('Listening at http://localhost:8300')
165
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ // var httpProxy = require('http-proxy')
6
+ var app = express()
7
+ var compiler = webpack(config)
8
+ // var proxy = httpProxy.createProxyServer()
9
+ // var ldap = 'http://121.36.79.201:8400'
10
+ // var applyinstall = 'http://121.36.79.201:8400'
11
+ var ldap = 'http://192.168.20.27:8555'
12
+ var applyinstall = 'http://192.168.20.27:8555'
13
+ var proxyTable = {
14
+ '/wx': {
15
+ target: ldap
16
+ },
17
+ '/rs/sql/filemanage_getUserfies/n': {
18
+ target: ldap
19
+ },
20
+ '/rs/sql/filemanage_getUserfies': {
21
+ target: ldap
22
+ },
23
+ '/rs/logic/saveInsInfo': {
24
+ target: ldap
25
+ },
26
+ '/rs/logic/exportfile': {
27
+ target: ldap
28
+ },
29
+ '/rs/logic/getBatchOperaPro': {
30
+ target: ldap
31
+ },
32
+ '/rs/logic/updateApplyOrder': {
33
+ target: ldap
34
+ },
35
+ '/rs/logic/getSaleInitData': {
36
+ target: ldap
37
+ },
38
+ '/rs/workflow': {
39
+ target: applyinstall
40
+ },
41
+ '/rs/vue': {
42
+ target: ldap
43
+ },
44
+ // 查找资源服务数据
45
+ '/rs/search': {
46
+ target: ldap
47
+ },
48
+ // 用户登录服务地址
49
+ '/rs/user': {
50
+ target: ldap
51
+ },
52
+ '/rs/logic/getInitData': {
53
+ target: ldap
54
+ },
55
+ '/rs/logic/getLogin': {
56
+ target: ldap
57
+ },
58
+ '/rs/file': { // 文件上传
59
+ target: applyinstall
60
+ },
61
+ '/project': { // 文件回显
62
+ target: applyinstall
63
+ },
64
+ '/rs': {
65
+ target: applyinstall
66
+ },
67
+ '/ws': {
68
+ target: applyinstall,
69
+ ws: true // 代理webSocket
70
+ }
71
+ }
72
+
73
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
74
+ publicPath: config.output.publicPath,
75
+ stats: {
76
+ colors: true,
77
+ chunks: false
78
+ }
79
+ })
80
+
81
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
82
+ // force page reload when html-webpack-plugin template changes
83
+ compiler.plugin('compilation', function (compilation) {
84
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
85
+ hotMiddleware.publish({action: 'reload'})
86
+ cb()
87
+ })
88
+ })
89
+
90
+ // proxy api requests
91
+ Object.keys(proxyTable).forEach(function (context) {
92
+ var options = proxyTable[context]
93
+ if (typeof options === 'string') {
94
+ options = {target: options}
95
+ }
96
+ app.use(proxyMiddleware(context, options))
97
+ })
98
+
99
+ // handle fallback for HTML5 history API
100
+ app.use(require('connect-history-api-fallback')())
101
+ // app.use(function (req, res, next) {
102
+ // res.header('Access-Control-Allow-Origin', '*')
103
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
104
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
105
+ // res.header('X-Powered-By', '3,2,1')
106
+ // res.header('Access-Control-Allow-Credentials', 'true')
107
+ // res.header('Content-Type', 'application/json;charset=utf-8')
108
+ // next()
109
+ // })
110
+
111
+ // serve webpack bundle output
112
+ app.use(devMiddleware)
113
+
114
+ // enable hot-reload and state-preserving
115
+ // compilation error display
116
+ app.use(hotMiddleware)
117
+
118
+ // serve pure static assets
119
+ app.use('/static', express.static('./static'))
120
+
121
+ module.exports = app.listen(8300, function (err) {
122
+ if (err) {
123
+ console.log(err)
124
+ return
125
+ }
126
+ console.log('Listening at http://localhost:8300')
127
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.3.93",
3
+ "version": "3.3.94-1",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/App.vue CHANGED
@@ -1,22 +1,20 @@
1
- <template>
2
- <div>
3
- <app-base class="bg">
4
- <div class='flex'>
5
- <article>
6
- <route :comp="{name: 'login'}"></route>
7
- <!-- <route :comp="{name: 'login-app'}"></route>-->
8
-
9
- </article>
10
- </div>
11
- </app-base>
12
- </div>
13
- </template>
14
-
15
- <script>
16
-
17
-
18
- export default {
19
-
20
-
21
- }
22
- </script>
1
+ <template>
2
+ <div>
3
+ <app-base class="bg">
4
+ <div class='flex'>
5
+ <article>
6
+ <route :comp="{name: 'login'}"></route>
7
+ </article>
8
+ </div>
9
+ </app-base>
10
+ </div>
11
+ </template>
12
+
13
+ <script>
14
+
15
+
16
+ export default {
17
+
18
+
19
+ }
20
+ </script>
@@ -180,16 +180,16 @@
180
180
  </div>
181
181
  </div>
182
182
  <!--区域地址联动-->
183
- <div>
184
- <app-res-area-select-group
185
- v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
186
- labelstyle = "control-label"
187
- @shiji-select = "getSelectShijiValue"
188
- @xian-select = "getSelectXianValue"
189
- @shequ-select = "getSelectShequValue"
190
- >
191
- </app-res-area-select-group>
192
- </div>
183
+ <!--<div>-->
184
+ <!-- <app-res-area-select-group-->
185
+ <!-- v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"-->
186
+ <!-- labelstyle = "control-label"-->
187
+ <!-- @shiji-select = "getSelectShijiValue"-->
188
+ <!-- @xian-select = "getSelectXianValue"-->
189
+ <!-- @shequ-select = "getSelectShequValue"-->
190
+ <!-- >-->
191
+ <!-- </app-res-area-select-group>-->
192
+ <!--</div>-->
193
193
  <div class="col-sm-12 col-xs-12" id="test11">
194
194
  <accordion one-at-a-time="true">
195
195
  <panel v-for="(i,item) in data.onetomany" :header="item.title" :is-open="false" type="primary">
@@ -203,6 +203,16 @@
203
203
 
204
204
  <!--自定义组件-->
205
205
  <slot>
206
+ <div>
207
+ <app-res-area-select-group
208
+ v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
209
+ labelstyle = "control-label"
210
+ @shiji-select = "getSelectShijiValue"
211
+ @xian-select = "getSelectXianValue"
212
+ @shequ-select = "getSelectShequValue"
213
+ >
214
+ </app-res-area-select-group>
215
+ </div>
206
216
  </slot>
207
217
 
208
218
  <!-- 按钮组 -->