vue2-client 1.2.100 → 1.2.103

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 (31) hide show
  1. package/.env +15 -15
  2. package/.eslintrc.js +82 -82
  3. package/CHANGELOG.md +249 -245
  4. package/package.json +92 -92
  5. package/src/base-client/all.js +66 -66
  6. package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue +113 -113
  7. package/src/base-client/components/common/CitySelect/CitySelect.vue +244 -244
  8. package/src/base-client/components/common/CitySelect/index.js +3 -3
  9. package/src/base-client/components/common/CitySelect/index.md +109 -109
  10. package/src/base-client/components/common/CreateQuery/CreateQuery.vue +547 -547
  11. package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue +778 -778
  12. package/src/base-client/components/common/CreateSimpleFormQuery/CreateSimpleFormQuery.vue +310 -310
  13. package/src/base-client/components/common/PersonSetting/PersonSetting.vue +210 -210
  14. package/src/base-client/components/common/PersonSetting/index.js +3 -3
  15. package/src/base-client/components/common/Upload/Upload.vue +157 -157
  16. package/src/base-client/components/common/Upload/index.js +3 -3
  17. package/src/base-client/components/common/XAddForm/XAddForm.vue +349 -349
  18. package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue +322 -322
  19. package/src/base-client/components/common/XForm/XForm.vue +268 -268
  20. package/src/base-client/components/common/XForm/XFormItem.vue +371 -371
  21. package/src/base-client/components/common/XFormTable/XFormTable.vue +507 -507
  22. package/src/base-client/components/iot/WebmeterAnalysisView/WebmeterAnalysisView.vue +960 -960
  23. package/src/config/CreateQueryConfig.js +307 -307
  24. package/src/layouts/header/HeaderNotice.vue +199 -164
  25. package/src/layouts/header/InstitutionDetail.vue +177 -177
  26. package/src/router/async/router.map.js +60 -60
  27. package/src/services/api/WebmeterAnalysisViewApi.js +24 -24
  28. package/src/services/api/common.js +58 -58
  29. package/src/services/api/manage.js +16 -16
  30. package/src/services/api/restTools.js +24 -24
  31. package/vue.config.js +163 -163
@@ -1,322 +1,322 @@
1
- <template>
2
- <div class="table-page-search-wrapper">
3
- <a-form-model
4
- v-if="loaded"
5
- ref="selectForm"
6
- :model="form"
7
- :rules="rules">
8
- <a-row :gutter="16">
9
- <x-form-item
10
- v-for="(item, index) in realJsonData"
11
- mode="新增/修改"
12
- :attr="item"
13
- :form="form"
14
- :key="index"
15
- :files="files"
16
- :images="images"
17
- :disabled="itemDisabled(item)"
18
- :selectsArray="SelectsArray"
19
- @selectsItemCheck="selectsItemCheck"
20
- :xl="12"
21
- :xxl="8"
22
- />
23
- </a-row>
24
- </a-form-model>
25
- </div>
26
- </template>
27
- <script>
28
- import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
29
- import { formatDate } from '@vue2-client/utils/util'
30
- import { mapState } from 'vuex'
31
- import { post } from '@vue2-client/services/api'
32
-
33
- export default {
34
- name: 'XAddNativeForm',
35
- components: {
36
- XFormItem
37
- },
38
- data () {
39
- return {
40
- // 内容加载是否完成
41
- loaded: false,
42
- // 表单Model
43
- form: undefined,
44
- // 修改有文件得表单时使用
45
- files: [],
46
- images: [],
47
- // 多层下拉框组 数据储存
48
- SelectsArray: {},
49
- // 多层下拉框组 各组数量
50
- SelectsNumber: {},
51
- // 校验
52
- rules: {},
53
- // 图标样式
54
- iconStyle: {
55
- position: 'relative',
56
- top: '1px'
57
- }
58
- }
59
- },
60
- computed: {
61
- // 过滤出用于新增/修改场景的表单项
62
- realJsonData: function () {
63
- return this.jsonData.filter(function (item) {
64
- return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
65
- })
66
- },
67
- // 过滤出用于静默新增场景的表单项
68
- silenceAddJsonData: function () {
69
- return this.jsonData.filter(function (item) {
70
- return item.addOrEdit === 'silenceAdd'
71
- })
72
- },
73
- // 过滤出版本号表单项
74
- versionJsonData: function () {
75
- return this.jsonData.filter(function (item) {
76
- return item.addOrEdit === 'version'
77
- })
78
- },
79
- ...mapState('account', { currUser: 'user' })
80
- },
81
- props: {
82
- jsonData: {
83
- type: Array,
84
- default: () => {
85
- return []
86
- }
87
- },
88
- // 业务类型
89
- businessType: {
90
- type: String,
91
- default: ''
92
- },
93
- // 修改操作前查询出的业务数据
94
- modifyModelData: {
95
- type: Object,
96
- default: () => {
97
- return {}
98
- }
99
- },
100
- // 新增或修改业务是否执行中
101
- loading: {
102
- type: Boolean,
103
- default: () => {
104
- return false
105
- }
106
- },
107
- // 固定新增表单
108
- fixedAddForm: {
109
- type: Object,
110
- default: () => {
111
- return {}
112
- }
113
- }
114
- },
115
- watch: {
116
- visible (rel) {
117
- if (rel) {
118
- this.formItemLoad()
119
- this.getSelectsArray()
120
- }
121
- }
122
- },
123
- mounted () {
124
- this.formItemLoad()
125
- this.getSelectsArray()
126
- },
127
- methods: {
128
- // 初始化级联框数据
129
- getSelectsArray () {
130
- const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
131
- const groupName = [...new Set(selectSate.map(item => item.group))]
132
- // 初始化数据组
133
- groupName.forEach(groupName => {
134
- this.SelectsArray[groupName] = []
135
- const SelectsItem = selectSate.filter(item => {
136
- if (item.groupIndex === 1) {
137
- if (item.keyName.substring(0, 6) === 'logic@') {
138
- // 请求logic
139
- post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
140
- this.SelectsArray[item.group][item.groupIndex] = res
141
- this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
142
- })
143
- } else {
144
- this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
145
- this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
146
- }
147
- }
148
- return item.group === groupName
149
- }
150
- )
151
- this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
152
- }
153
- )
154
- this.loaded = true
155
- },
156
- selectsItemCheck (callback, groupName, index, value) {
157
- const tem = { }
158
- const group = this.realJsonData.filter(item => item.addOrEdit && item.group && item.group === groupName)
159
- // 获取当前下拉框子下拉框的数据
160
- this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
161
- // 清空子下拉框的子们的数据
162
- for (let i = index; i < this.SelectsNumber[groupName]; i++) {
163
- tem[group[i].model] = undefined
164
- }
165
- this.form = Object.assign({}, this.form, tem)
166
- // 清空子下拉框的子们的数据源
167
- for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
168
- this.SelectsArray[groupName][i] = []
169
- }
170
- callback(this.SelectsArray)
171
- },
172
- formItemLoad () {
173
- const formData = Object.assign({}, this.fixedAddForm)
174
- for (let i = 0; i < this.realJsonData.length; i++) {
175
- const item = this.realJsonData[i]
176
- formData[item.model] = undefined
177
- // 处理表单校验情况
178
- if (item.rule) {
179
- this.rules[item.model] = []
180
- const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
181
- let trigger
182
- let message
183
- if (required) {
184
- switch (item.type) {
185
- case 'select':
186
- message = '请选择' + item.name
187
- trigger = 'change'
188
- break
189
- default:
190
- message = '请输入' + item.name
191
- trigger = 'blur'
192
- }
193
- this.rules[item.model].push({
194
- required: true,
195
- message: message,
196
- trigger: trigger
197
- })
198
- }
199
-
200
- switch (item.rule.type) {
201
- case 'number':
202
- case 'integer':
203
- case 'float':
204
- let defaultValue
205
- let message
206
- switch (item.rule.type) {
207
- case 'number':
208
- message = '数字'
209
- defaultValue = 0
210
- break
211
- case 'integer':
212
- message = '整数'
213
- defaultValue = 0
214
- break
215
- case 'float':
216
- message = '小数'
217
- defaultValue = 0.0
218
- break
219
- }
220
- this.rules[item.model].push({
221
- type: item.rule.type,
222
- message: item.name + '必须为' + message,
223
- transform: (value) => {
224
- if (value && value.length !== 0) {
225
- return Number(value)
226
- } else {
227
- return defaultValue
228
- }
229
- },
230
- trigger: 'blur'
231
- })
232
- break
233
- }
234
- }
235
- }
236
- this.form = formData
237
- if (this.modifyModelData.data) {
238
- this.files = this.modifyModelData.files
239
- this.images = this.modifyModelData.images
240
- if (Object.keys(this.modifyModelData.data).length > 0) {
241
- this.getModifyModelData()
242
- }
243
- }
244
- },
245
- itemDisabled (value) {
246
- return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
247
- (this.businessType === '修改' && value.addOrEdit === 'add')
248
- },
249
- itemDisabledPlus (group, index) {
250
- return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
251
- },
252
- resetForm () {
253
- this.$refs.selectForm.resetFields()
254
- },
255
- async onSubmit () {
256
- this.$refs.selectForm.validate(async valid => {
257
- for (const key of Object.keys(this.form)) {
258
- if (this.form[key] === null || this.form[key] === '') {
259
- this.form[key] = undefined
260
- }
261
- }
262
- const requestParameters = Object.assign({}, this.form)
263
- // 追加静默新增字段
264
- if (this.businessType === '新增') {
265
- for (const item of this.silenceAddJsonData) {
266
- switch (item.silencePurpose) {
267
- case 'createTime':
268
- requestParameters[item.model] = formatDate('now')
269
- break
270
- case 'operator':
271
- requestParameters[item.model] = this.currUser.name
272
- break
273
- case 'orgId':
274
- requestParameters[item.model] = this.currUser.orgid
275
- break
276
- }
277
- }
278
- // 通过请求追加静默新增:自定义字段
279
- for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
280
- requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
281
- }
282
- }
283
- const data = {
284
- valid: valid,
285
- form: requestParameters
286
- }
287
- this.$emit('onSubmit', data)
288
- })
289
- },
290
- async getSilenceSource (silenceSource, requestParameters) {
291
- const result = await post('/webmeterapi/' + silenceSource, requestParameters)
292
- return result
293
- },
294
- getModifyModelData () {
295
- for (let i = 0; i < this.realJsonData.length; i++) {
296
- if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
297
- // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
298
- // 新增修改表单每次提交时只会提交最新添加的文件
299
- continue
300
- }
301
- const item = this.realJsonData[i]
302
- if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
303
- this.form[item.model] = this.modifyModelData.data[item.model] + ''
304
- } else {
305
- this.form[item.model] = undefined
306
- }
307
- }
308
- // 追加版本号信息
309
- for (const item of this.versionJsonData) {
310
- if (!this.modifyModelData.data[item.model]) {
311
- this.form[item.model] = 0
312
- } else {
313
- this.form[item.model] = this.modifyModelData.data[item.model] + ''
314
- }
315
- }
316
- },
317
- onClose () {
318
- this.$emit('update:visible', false)
319
- }
320
- }
321
- }
322
- </script>
1
+ <template>
2
+ <div class="table-page-search-wrapper">
3
+ <a-form-model
4
+ v-if="loaded"
5
+ ref="selectForm"
6
+ :model="form"
7
+ :rules="rules">
8
+ <a-row :gutter="16">
9
+ <x-form-item
10
+ v-for="(item, index) in realJsonData"
11
+ mode="新增/修改"
12
+ :attr="item"
13
+ :form="form"
14
+ :key="index"
15
+ :files="files"
16
+ :images="images"
17
+ :disabled="itemDisabled(item)"
18
+ :selectsArray="SelectsArray"
19
+ @selectsItemCheck="selectsItemCheck"
20
+ :xl="12"
21
+ :xxl="8"
22
+ />
23
+ </a-row>
24
+ </a-form-model>
25
+ </div>
26
+ </template>
27
+ <script>
28
+ import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
29
+ import { formatDate } from '@vue2-client/utils/util'
30
+ import { mapState } from 'vuex'
31
+ import { post } from '@vue2-client/services/api'
32
+
33
+ export default {
34
+ name: 'XAddNativeForm',
35
+ components: {
36
+ XFormItem
37
+ },
38
+ data () {
39
+ return {
40
+ // 内容加载是否完成
41
+ loaded: false,
42
+ // 表单Model
43
+ form: undefined,
44
+ // 修改有文件得表单时使用
45
+ files: [],
46
+ images: [],
47
+ // 多层下拉框组 数据储存
48
+ SelectsArray: {},
49
+ // 多层下拉框组 各组数量
50
+ SelectsNumber: {},
51
+ // 校验
52
+ rules: {},
53
+ // 图标样式
54
+ iconStyle: {
55
+ position: 'relative',
56
+ top: '1px'
57
+ }
58
+ }
59
+ },
60
+ computed: {
61
+ // 过滤出用于新增/修改场景的表单项
62
+ realJsonData: function () {
63
+ return this.jsonData.filter(function (item) {
64
+ return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
65
+ })
66
+ },
67
+ // 过滤出用于静默新增场景的表单项
68
+ silenceAddJsonData: function () {
69
+ return this.jsonData.filter(function (item) {
70
+ return item.addOrEdit === 'silenceAdd'
71
+ })
72
+ },
73
+ // 过滤出版本号表单项
74
+ versionJsonData: function () {
75
+ return this.jsonData.filter(function (item) {
76
+ return item.addOrEdit === 'version'
77
+ })
78
+ },
79
+ ...mapState('account', { currUser: 'user' })
80
+ },
81
+ props: {
82
+ jsonData: {
83
+ type: Array,
84
+ default: () => {
85
+ return []
86
+ }
87
+ },
88
+ // 业务类型
89
+ businessType: {
90
+ type: String,
91
+ default: ''
92
+ },
93
+ // 修改操作前查询出的业务数据
94
+ modifyModelData: {
95
+ type: Object,
96
+ default: () => {
97
+ return {}
98
+ }
99
+ },
100
+ // 新增或修改业务是否执行中
101
+ loading: {
102
+ type: Boolean,
103
+ default: () => {
104
+ return false
105
+ }
106
+ },
107
+ // 固定新增表单
108
+ fixedAddForm: {
109
+ type: Object,
110
+ default: () => {
111
+ return {}
112
+ }
113
+ }
114
+ },
115
+ watch: {
116
+ visible (rel) {
117
+ if (rel) {
118
+ this.formItemLoad()
119
+ this.getSelectsArray()
120
+ }
121
+ }
122
+ },
123
+ mounted () {
124
+ this.formItemLoad()
125
+ this.getSelectsArray()
126
+ },
127
+ methods: {
128
+ // 初始化级联框数据
129
+ getSelectsArray () {
130
+ const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
131
+ const groupName = [...new Set(selectSate.map(item => item.group))]
132
+ // 初始化数据组
133
+ groupName.forEach(groupName => {
134
+ this.SelectsArray[groupName] = []
135
+ const SelectsItem = selectSate.filter(item => {
136
+ if (item.groupIndex === 1) {
137
+ if (item.keyName.substring(0, 6) === 'logic@') {
138
+ // 请求logic
139
+ post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
140
+ this.SelectsArray[item.group][item.groupIndex] = res
141
+ this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
142
+ })
143
+ } else {
144
+ this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
145
+ this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
146
+ }
147
+ }
148
+ return item.group === groupName
149
+ }
150
+ )
151
+ this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
152
+ }
153
+ )
154
+ this.loaded = true
155
+ },
156
+ selectsItemCheck (callback, groupName, index, value) {
157
+ const tem = { }
158
+ const group = this.realJsonData.filter(item => item.addOrEdit && item.group && item.group === groupName)
159
+ // 获取当前下拉框子下拉框的数据
160
+ this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
161
+ // 清空子下拉框的子们的数据
162
+ for (let i = index; i < this.SelectsNumber[groupName]; i++) {
163
+ tem[group[i].model] = undefined
164
+ }
165
+ this.form = Object.assign({}, this.form, tem)
166
+ // 清空子下拉框的子们的数据源
167
+ for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
168
+ this.SelectsArray[groupName][i] = []
169
+ }
170
+ callback(this.SelectsArray)
171
+ },
172
+ formItemLoad () {
173
+ const formData = Object.assign({}, this.fixedAddForm)
174
+ for (let i = 0; i < this.realJsonData.length; i++) {
175
+ const item = this.realJsonData[i]
176
+ formData[item.model] = undefined
177
+ // 处理表单校验情况
178
+ if (item.rule) {
179
+ this.rules[item.model] = []
180
+ const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
181
+ let trigger
182
+ let message
183
+ if (required) {
184
+ switch (item.type) {
185
+ case 'select':
186
+ message = '请选择' + item.name
187
+ trigger = 'change'
188
+ break
189
+ default:
190
+ message = '请输入' + item.name
191
+ trigger = 'blur'
192
+ }
193
+ this.rules[item.model].push({
194
+ required: true,
195
+ message: message,
196
+ trigger: trigger
197
+ })
198
+ }
199
+
200
+ switch (item.rule.type) {
201
+ case 'number':
202
+ case 'integer':
203
+ case 'float':
204
+ let defaultValue
205
+ let message
206
+ switch (item.rule.type) {
207
+ case 'number':
208
+ message = '数字'
209
+ defaultValue = 0
210
+ break
211
+ case 'integer':
212
+ message = '整数'
213
+ defaultValue = 0
214
+ break
215
+ case 'float':
216
+ message = '小数'
217
+ defaultValue = 0.0
218
+ break
219
+ }
220
+ this.rules[item.model].push({
221
+ type: item.rule.type,
222
+ message: item.name + '必须为' + message,
223
+ transform: (value) => {
224
+ if (value && value.length !== 0) {
225
+ return Number(value)
226
+ } else {
227
+ return defaultValue
228
+ }
229
+ },
230
+ trigger: 'blur'
231
+ })
232
+ break
233
+ }
234
+ }
235
+ }
236
+ this.form = formData
237
+ if (this.modifyModelData.data) {
238
+ this.files = this.modifyModelData.files
239
+ this.images = this.modifyModelData.images
240
+ if (Object.keys(this.modifyModelData.data).length > 0) {
241
+ this.getModifyModelData()
242
+ }
243
+ }
244
+ },
245
+ itemDisabled (value) {
246
+ return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
247
+ (this.businessType === '修改' && value.addOrEdit === 'add')
248
+ },
249
+ itemDisabledPlus (group, index) {
250
+ return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
251
+ },
252
+ resetForm () {
253
+ this.$refs.selectForm.resetFields()
254
+ },
255
+ async onSubmit () {
256
+ this.$refs.selectForm.validate(async valid => {
257
+ for (const key of Object.keys(this.form)) {
258
+ if (this.form[key] === null || this.form[key] === '') {
259
+ this.form[key] = undefined
260
+ }
261
+ }
262
+ const requestParameters = Object.assign({}, this.form)
263
+ // 追加静默新增字段
264
+ if (this.businessType === '新增') {
265
+ for (const item of this.silenceAddJsonData) {
266
+ switch (item.silencePurpose) {
267
+ case 'createTime':
268
+ requestParameters[item.model] = formatDate('now')
269
+ break
270
+ case 'operator':
271
+ requestParameters[item.model] = this.currUser.name
272
+ break
273
+ case 'orgId':
274
+ requestParameters[item.model] = this.currUser.orgid
275
+ break
276
+ }
277
+ }
278
+ // 通过请求追加静默新增:自定义字段
279
+ for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
280
+ requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
281
+ }
282
+ }
283
+ const data = {
284
+ valid: valid,
285
+ form: requestParameters
286
+ }
287
+ this.$emit('onSubmit', data)
288
+ })
289
+ },
290
+ async getSilenceSource (silenceSource, requestParameters) {
291
+ const result = await post('/webmeterapi/' + silenceSource, requestParameters)
292
+ return result
293
+ },
294
+ getModifyModelData () {
295
+ for (let i = 0; i < this.realJsonData.length; i++) {
296
+ if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
297
+ // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
298
+ // 新增修改表单每次提交时只会提交最新添加的文件
299
+ continue
300
+ }
301
+ const item = this.realJsonData[i]
302
+ if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
303
+ this.form[item.model] = this.modifyModelData.data[item.model] + ''
304
+ } else {
305
+ this.form[item.model] = undefined
306
+ }
307
+ }
308
+ // 追加版本号信息
309
+ for (const item of this.versionJsonData) {
310
+ if (!this.modifyModelData.data[item.model]) {
311
+ this.form[item.model] = 0
312
+ } else {
313
+ this.form[item.model] = this.modifyModelData.data[item.model] + ''
314
+ }
315
+ }
316
+ },
317
+ onClose () {
318
+ this.$emit('update:visible', false)
319
+ }
320
+ }
321
+ }
322
+ </script>