apply-clients 7.1.36-yuchuan-42 → 7.1.36-yuchuan-43

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 (4) hide show
  1. package/build/dev-server.js +192 -172
  2. package/package.json +1 -1
  3. package/src/components/product/GongJianPush/ApplyPushDispose.vue +7 -6
  4. package/src/components/product/GongJianPush/ApplyPushList.vue +3 -0
package/build/dev-server.js CHANGED
@@ -1,172 +1,192 @@
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://193.168.1.64:8082'
12
- var ldap = 'http://193.168.1.6:8082'
13
- var applyinstall = 'http://61.134.61.238:8655'
14
- // var applyinstall = 'http://193.168.1.44:8600'
15
- // var fadada = 'http://127.0.0.1:8181'
16
- var fadada = 'http://61.134.61.238:8655'
17
-
18
- var proxyTable = {
19
- // ---------------------------
20
- '/rs/logic/pushShortUrlSms': {
21
- target: fadada
22
- },
23
- '/rs/logic/generateContract': {
24
- target: fadada
25
- },
26
- '/rs/logic/getAuthSubject': {
27
- target: fadada
28
- },
29
- '/rs/sql/getAuthSubjectList': {
30
- target: fadada
31
- },
32
- '/rs/logic/keyExtSign': {
33
- target: fadada
34
- },
35
- '/rs/logic/keyExtSignAuto': {
36
- target: fadada
37
- },
38
- // 重新发送实名认证短信
39
- '/rs/logic/anotherAuthSubject': {
40
- target: fadada
41
- },
42
- // ---------------------------
43
- '/rs/logic/getSaleInitData': {
44
- target: ldap
45
- },
46
- '/rs/logic/saveInstruct': {
47
- target: 'http://193.168.1.64:8082'
48
- },
49
- '/rs/logic/updateNetWorkValve': {
50
- target: 'http://193.168.1.64:8082'
51
- },
52
- '/rs/logic/uploadSave': {
53
- target: 'http://193.168.1.16:8003'
54
- },
55
- '/rs/workflow': {
56
- target: applyinstall
57
- },
58
- '/apply': {
59
- target: applyinstall
60
- },
61
- '/rs/vue': {
62
- target: ldap
63
- },
64
- // 查找资源服务数据
65
- '/rs/search': {
66
- target: ldap
67
- },
68
- // 发票组织数据
69
- '/rs/logic/bjEticketCharge': {
70
- target: 'http://193.168.1.6:8082'
71
- },
72
- // 开发票
73
- '/rs/logic/bjOpenEticket': {
74
- target: 'http://193.168.1.6:8082'
75
- },
76
- // 获取发票明细
77
- '/rs/logic/queryEticket': {
78
- target: 'http://193.168.1.44:8400'
79
- },
80
- // 创建小区
81
- '/rs/logic/address_updatearea': {
82
- target: ldap
83
- },
84
- '/rs/phone/send': {
85
- target: 'http://193.168.1.21:80'
86
- },
87
- // 用户登录服务地址
88
- '/rs/user': {
89
- target: ldap
90
- },
91
- '/rs/logic/getInitData': {
92
- target: ldap
93
- },
94
- '/rs/logic/getLogin': {
95
- target: ldap
96
- },
97
- '/rs/file': { // 文件上传
98
- target: applyinstall
99
- },
100
- '/project': { // 文件回显
101
- target: applyinstall
102
- },
103
- '/rs/apply': {
104
- target: applyinstall,
105
- pathRewrite: {
106
- '^/rs/apply': '/rs'
107
- }
108
- },
109
- '/rs': {
110
- target: applyinstall
111
- },
112
- '/ws': {
113
- target: applyinstall,
114
- ws: true // 代理webSocket
115
- }
116
- }
117
-
118
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
119
- publicPath: config.output.publicPath,
120
- stats: {
121
- colors: true,
122
- chunks: false
123
- }
124
- })
125
-
126
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
127
- // force page reload when html-webpack-plugin template changes
128
- compiler.plugin('compilation', function (compilation) {
129
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
130
- hotMiddleware.publish({action: 'reload'})
131
- cb()
132
- })
133
- })
134
-
135
- // proxy api requests
136
- Object.keys(proxyTable).forEach(function (context) {
137
- var options = proxyTable[context]
138
- if (typeof options === 'string') {
139
- options = {target: options}
140
- }
141
- app.use(proxyMiddleware(context, options))
142
- })
143
-
144
- // handle fallback for HTML5 history API
145
- app.use(require('connect-history-api-fallback')())
146
- // app.use(function (req, res, next) {
147
- // res.header('Access-Control-Allow-Origin', '*')
148
- // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
149
- // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
150
- // res.header('X-Powered-By', '3,2,1')
151
- // res.header('Access-Control-Allow-Credentials', 'true')
152
- // res.header('Content-Type', 'application/json;charset=utf-8')
153
- // next()
154
- // })
155
-
156
- // serve webpack bundle output
157
- app.use(devMiddleware)
158
-
159
- // enable hot-reload and state-preserving
160
- // compilation error display
161
- app.use(hotMiddleware)
162
-
163
- // serve pure static assets
164
- app.use('/static', express.static('./static'))
165
-
166
- module.exports = app.listen(8400, function (err) {
167
- if (err) {
168
- console.log(err)
169
- return
170
- }
171
- console.log('Listening at http://localhost:8400')
172
- })
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://193.168.1.5:8400'
10
+ // var applyinstall = 'http://121.36.79.201:8400'
11
+ // var ldap = 'http://193.168.1.64:8082'
12
+ var ldap = 'http://61.134.61.238:8655'
13
+ var applyinstall = 'http://61.134.61.238:8655'
14
+ // var applyinstall = 'http://193.168.1.5:8400'
15
+ // var fadada = 'http://193.168.1.5:8400'
16
+ var fadada = 'http://61.134.61.238:8655'
17
+ var proxyTable = {
18
+ '/baojianFile': {
19
+ target: fadada
20
+ },
21
+ '/testfiles': {
22
+ target: fadada
23
+ },
24
+ '/api/af-auth/login': {
25
+ target: fadada
26
+ },
27
+ '/rs/logic/getAllNode': {
28
+ target: fadada
29
+ },
30
+ '/android.html/rs': {
31
+ target: fadada,
32
+ pathRewrite: {
33
+ '^/android.html': ''
34
+ }
35
+ },
36
+ '/webapps/applyinstall/excel': {
37
+ target: fadada
38
+ },
39
+
40
+ '/rs/logic/pushShortUrlSms': {
41
+ target: fadada
42
+ },
43
+ '/rs/logic/generateContract': {
44
+ target: fadada
45
+ },
46
+ '/rs/logic/getAuthSubject': {
47
+ target: fadada
48
+ },
49
+ '/rs/sql/getAuthSubjectList': {
50
+ target: fadada
51
+ },
52
+ '/rs/logic/keyExtSign': {
53
+ target: fadada
54
+ },
55
+ '/rs/logic/keyExtSignAuto': {
56
+ target: fadada
57
+ },
58
+ // 重新发送实名认证短信
59
+ '/rs/logic/anotherAuthSubject': {
60
+ target: fadada
61
+ },
62
+ // ---------------------------
63
+ '/rs/logic/getSaleInitData': {
64
+ target: ldap
65
+ },
66
+ '/rs/logic/saveInstruct': {
67
+ target: 'http://193.168.1.64:8082'
68
+ },
69
+ '/rs/logic/updateNetWorkValve': {
70
+ target: 'http://193.168.1.64:8082'
71
+ },
72
+ '/rs/logic/uploadSave': {
73
+ target: 'http://193.168.1.16:8003'
74
+ },
75
+ '/rs/workflow': {
76
+ target: applyinstall
77
+ },
78
+ '/apply': {
79
+ target: applyinstall
80
+ },
81
+ '/rs/vue': {
82
+ target: ldap
83
+ },
84
+ // 查找资源服务数据
85
+ '/rs/search': {
86
+ target: ldap
87
+ },
88
+ // 发票组织数据
89
+ '/rs/logic/bjEticketCharge': {
90
+ target: 'http://193.168.1.6:8082'
91
+ },
92
+ // 开发票
93
+ '/rs/logic/bjOpenEticket': {
94
+ target: 'http://193.168.1.6:8082'
95
+ },
96
+ // 获取发票明细
97
+ '/rs/logic/queryEticket': {
98
+ target: 'http://193.168.1.44:8400'
99
+ },
100
+ // 创建小区
101
+ '/rs/logic/address_updatearea': {
102
+ target: ldap
103
+ },
104
+ '/rs/phone/send': {
105
+ target: 'http://193.168.1.21:80'
106
+ },
107
+ // 用户登录服务地址
108
+ '/rs/user': {
109
+ target: ldap
110
+ },
111
+ '/rs/logic/getInitData': {
112
+ target: ldap?ldap:applyinstall
113
+ },
114
+ '/rs/logic/getLogin': {
115
+ target: ldap
116
+ },
117
+ '/rs/file': { // 文件上传
118
+ target: applyinstall
119
+ },
120
+ '/project': { // 文件回显
121
+ target: applyinstall
122
+ },
123
+ '/rs/apply': {
124
+ target: applyinstall,
125
+ pathRewrite: {
126
+ '^/rs/apply': '/rs'
127
+ }
128
+ },
129
+ '/rs': {
130
+ target: applyinstall
131
+ },
132
+ // '/ws': {
133
+ // target: applyinstall,
134
+ // ws: true // 代理webSocket
135
+ // }
136
+ }
137
+
138
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
139
+ publicPath: config.output.publicPath,
140
+ stats: {
141
+ colors: true,
142
+ chunks: false
143
+ }
144
+ })
145
+
146
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
147
+ // force page reload when html-webpack-plugin template changes
148
+ compiler.plugin('compilation', function (compilation) {
149
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
150
+ hotMiddleware.publish({action: 'reload'})
151
+ cb()
152
+ })
153
+ })
154
+
155
+ // proxy api requests
156
+ Object.keys(proxyTable).forEach(function (context) {
157
+ var options = proxyTable[context]
158
+ if (typeof options === 'string') {
159
+ options = {target: options}
160
+ }
161
+ app.use(proxyMiddleware(context, options))
162
+ })
163
+
164
+ // handle fallback for HTML5 history API
165
+ app.use(require('connect-history-api-fallback')())
166
+ // app.use(function (req, res, next) {
167
+ // res.header('Access-Control-Allow-Origin', '*')
168
+ // res.header('Access-Control-Allow-Headers', 'X-Requested-With')
169
+ // res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
170
+ // res.header('X-Powered-By', '3,2,1')
171
+ // res.header('Access-Control-Allow-Credentials', 'true')
172
+ // res.header('Content-Type', 'application/json;charset=utf-8')
173
+ // next()
174
+ // })
175
+
176
+ // serve webpack bundle output
177
+ app.use(devMiddleware)
178
+
179
+ // enable hot-reload and state-preserving
180
+ // compilation error display
181
+ app.use(hotMiddleware)
182
+
183
+ // serve pure static assets
184
+ app.use('/static', express.static('./static'))
185
+
186
+ module.exports = app.listen(8400, function (err) {
187
+ if (err) {
188
+ console.log(err)
189
+ return
190
+ }
191
+ console.log('Listening at http://localhost:8400')
192
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "7.1.36-yuchuan-42",
3
+ "version": "7.1.36-yuchuan-43",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/GongJianPush/ApplyPushDispose.vue CHANGED
@@ -145,7 +145,7 @@
145
145
  <label class="font_normal_body">项目地址</label>
146
146
  <input type="text" v-model="model.f_project_address" style="width: 60%" class="input_search">
147
147
  </div>
148
- </div>
148
+ </div>
149
149
 
150
150
  <div class="row">
151
151
  <div class="col-sm-6" :class="[!model.f_land_acquisition_methods ? 'has-error' : '']">
@@ -236,7 +236,7 @@
236
236
  export default {
237
237
  title: '报警处置',
238
238
 
239
- data() {
239
+ data () {
240
240
  return {
241
241
  // [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
242
242
  landMethods: [...this.$appdata.getParam('土地获取方式') ? this.$appdata.getParam('土地获取方式') : []],
@@ -255,7 +255,7 @@ export default {
255
255
  }
256
256
  },
257
257
  methods: {
258
- isFormComplete() {
258
+ isFormComplete () {
259
259
  const model = this.model
260
260
  return (
261
261
  model.f_user_name && model.f_user_type && model.f_contact && model.f_phone && model.f_credentials &&
@@ -266,13 +266,14 @@ export default {
266
266
  model.f_national_standard_industry && model.f_open_date && model.f_success_date && model.f_construction_content
267
267
  )
268
268
  },
269
- cancel() {
269
+ cancel () {
270
270
  this.$dispatch('close')
271
271
  },
272
- addressValid(val) {
272
+ addressValid (val) {
273
+ console.log('model', this.model)
273
274
  console.log(val)
274
275
  },
275
- save(status) {
276
+ save (status) {
276
277
  this.model.f_state = status
277
278
  this.$resetpost('/third/rs/logic/gjPushData', {data: this.model}).then((res) => {
278
279
  console.log('this.model', this.model)
package/src/components/product/GongJianPush/ApplyPushList.vue CHANGED
@@ -104,6 +104,7 @@
104
104
  <th style="text-align:center"><nobr>客户名称</nobr></th>
105
105
  <th style="text-align:center"><nobr>电话</nobr></th>
106
106
  <th style="text-align:center"><nobr>地址</nobr></th>
107
+ <th style="text-align:center"><nobr>工程编号</nobr></th>
107
108
  <th style="text-align:center"><nobr>来源</nobr></th>
108
109
  <th style="text-align:center"><nobr>状态</nobr></th>
109
110
  <th style="text-align:center"><nobr>报建类型</nobr></th>
@@ -117,6 +118,7 @@
117
118
  <td style="text-align:center"><nobr>{{ row.f_user_name }}</nobr></td>
118
119
  <td style="text-align:center"><nobr>{{ row.f_phone }}</nobr></td>
119
120
  <td style="text-align:center"><nobr>{{ row.f_project_address }}</nobr></td>
121
+ <td style="text-align:center"><nobr>{{ row.f_apply_code }}</nobr></td>
120
122
  <td style="text-align:center"><nobr>{{ row.f_apply_source }}</nobr></td>
121
123
  <td style="text-align:center"><nobr>{{ row.f_process_state }}</nobr></td>
122
124
  <td style="text-align:center"><nobr>{{ row.f_apply_type }}</nobr></td>
@@ -171,6 +173,7 @@ export default {
171
173
  },
172
174
  idsearch () {
173
175
  this.$emit('add', '111')
176
+ this.search()
174
177
  },
175
178
  clearmsg () {
176
179
  this.$refs.paged.$refs.criteria.model = {}