Explorar o código

备份

备份
Liao hai 1 ano
pai
achega
7126e26884

+ 21 - 0
src/api/article_liao.js

@@ -62,6 +62,27 @@ export default {
62
   optPerformanceAssessStat2page(params){
62
   optPerformanceAssessStat2page(params){
63
     return axios.get('/opt/performance/assess/stat2page', {params})
63
     return axios.get('/opt/performance/assess/stat2page', {params})
64
   },
64
   },
65
+  //获取欠费用户分页
66
+  optDefaultingSubscrlberPage(params){
67
+    return axios.get('/opt/defaulting/subscrlber/page', {params})
68
+  },
69
+  //添加推送消息
70
+  optMessageManagementPushAdd(params){
71
+    return axios.post('/opt/message/management/push/add', params)
72
+  },
73
+  //获取设备报警消息
74
+  optMessageManagementDevicePage(params){
75
+    return axios.get('/opt/message/management/device/page', {params})
76
+  },
77
+  //删除设备报警消息
78
+  optMessageManagementDeviceDelete(params){
79
+    return axios.post('/opt/message/management/device/delete', params)
80
+  },
81
+  //获取监控车辆消息
82
+  optMessageManagementVehiclePage(params){
83
+    return axios.get('/opt/message/management/vehicle/page', {params})
84
+  },
85
+
65
 
86
 
66
 
87
 
67
 
88
 

+ 4 - 2
src/config/index.js

@@ -4,11 +4,13 @@
4
 const Config = {
4
 const Config = {
5
   dev: {
5
   dev: {
6
 // BASE_API: 'https://172.16.36.211:8800', // http://172.16.36.211:8800
6
 // BASE_API: 'https://172.16.36.211:8800', // http://172.16.36.211:8800
7
-    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800
7
+    //BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800
8
+    BASE_API: 'http://192.168.0.81:16399/luohe2_ee/api'
8
   },
9
   },
9
   build: {
10
   build: {
10
 //服务地址及端口配置
11
 //服务地址及端口配置
11
-    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800,
12
+    //BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800,
13
+    BASE_API: 'http://192.168.0.81:16399/luohe2_ee/api'
12
   },
14
   },
13
   applicationName: '漯河停车管理系统',
15
   applicationName: '漯河停车管理系统',
14
 }
16
 }

+ 46 - 20
src/pages/index/components/defaulting_subscrlber.vue

@@ -7,13 +7,14 @@
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
7
         <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
8
           <el-row>
8
           <el-row>
9
             <el-col :span="6">
9
             <el-col :span="6">
10
-              <el-form-item label="会员ID:">
11
-                <el-input v-model="formInline.memberId" placeholder="请输入"></el-input>
12
-              </el-form-item>
13
-            </el-col>
14
-            <el-col :span="6">
15
-              <el-form-item label="停车场名称:">
16
-                <el-input v-model="formInline.parkName" placeholder="请输入"></el-input>
10
+              <el-form-item label="车场名称: ">
11
+                <el-select clearable v-model="formInline.parkId" placeholder="请选择">
12
+                  <el-option
13
+                    v-for="(item,index) in carParkingNameOptions"
14
+                    :key="index"
15
+                    :label="item.parkName"
16
+                    :value="item.id" />
17
+                </el-select>
17
               </el-form-item>
18
               </el-form-item>
18
             </el-col>
19
             </el-col>
19
             <el-col :span="6">
20
             <el-col :span="6">
@@ -45,6 +46,8 @@
45
 </template>
46
 </template>
46
 <script>
47
 <script>
47
 import api from "@/api/audit";
48
 import api from "@/api/audit";
49
+import api_l from "@/api/article_liao.js";
50
+import api_z from "@/api/article_z.js";
48
 
51
 
49
 
52
 
50
 export default {
53
 export default {
@@ -56,59 +59,82 @@ export default {
56
       formInline: {
59
       formInline: {
57
         memberId: '',
60
         memberId: '',
58
         parkName: '',
61
         parkName: '',
59
-        plateNo: ''
62
+        plateNo: '',
63
+        parkId:''
60
       },
64
       },
65
+      carParkingNameOptions: [],
61
       columns: [
66
       columns: [
62
         {
67
         {
63
           label: '停车场',
68
           label: '停车场',
64
           key: 'parkName'
69
           key: 'parkName'
65
         },
70
         },
66
         {
71
         {
67
-          label: '泊位号',
68
-          key: 'berthCode'
72
+          label: '车牌号',
73
+          key: 'plateNo'
74
+        },
75
+        {
76
+          label: '车牌颜色',
77
+          key: 'plateColor'
78
+        },
79
+        {
80
+          label: '手机号',
81
+          key: 'phoneNo'
69
         },
82
         },
70
         {
83
         {
71
-          label: '泊车状态',
72
-          key: 'berthIsorno'
84
+          label: '进场时间',
85
+          key: 'inTime'
73
         },
86
         },
74
         {
87
         {
75
-          label: '是否潮汐车位',
76
-          key: 'isTidalPark'
88
+          label: '出场时间',
89
+          key: 'outTime'
77
         },
90
         },
78
         {
91
         {
79
-          label: '是否充电泊位',
80
-          key: 'hasChargingPile'
92
+          label: '停车时长',
93
+          key: 'parkingDuration'
81
         },
94
         },
82
         {
95
         {
83
-          label: '是否共享泊位',
84
-          key: 'isSharePark'
96
+          label: '欠费金额',
97
+          key: 'arrearsAmount'
85
         },
98
         },
86
       ],
99
       ],
87
       tableData:[],
100
       tableData:[],
88
       total: 0,
101
       total: 0,
89
       pageSize: 5,
102
       pageSize: 5,
90
       pageNum: 1,
103
       pageNum: 1,
104
+      formLabelAlign:{
105
+
106
+      },
91
     }
107
     }
92
   },
108
   },
93
   mounted() {
109
   mounted() {
94
     this.getTableData()
110
     this.getTableData()
111
+    this.getCarParkingName()
95
   },
112
   },
96
   watch: {},
113
   watch: {},
97
   methods: {
114
   methods: {
98
     onSubmit() {
115
     onSubmit() {
99
       this.pageNum = 1
116
       this.pageNum = 1
100
-      this.getTableData()
117
+      api_l.optDefaultingSubscrlberPage({plateNo:this.formInline.plateNo,parkLotId:this.formInline.parkId}).then(res => {
118
+        this.tableData = res.data.records
119
+        this.total = res.data.total
120
+      })
101
     },
121
     },
102
     handlePageChange() {
122
     handlePageChange() {
103
       this.getTableData()
123
       this.getTableData()
104
     },
124
     },
105
     getTableData() {
125
     getTableData() {
106
       const {pageNum, pageSize} = this
126
       const {pageNum, pageSize} = this
107
-      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
127
+      api_l.optDefaultingSubscrlberPage({}).then(res => {
108
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
128
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
109
         this.total = res.data.total
129
         this.total = res.data.total
110
       })
130
       })
111
     },
131
     },
132
+    //车场
133
+    getCarParkingName() {
134
+      api_z.querySelectParkListByPage().then(res => {
135
+        this.carParkingNameOptions=res.data
136
+      })
137
+    },
112
   }
138
   }
113
 }
139
 }
114
 </script>
140
 </script>

+ 35 - 26
src/pages/index/components/message_management.vue

@@ -74,7 +74,7 @@
74
           <el-row>
74
           <el-row>
75
             <el-col :span="8">
75
             <el-col :span="8">
76
               <el-form-item label="设备报警:">
76
               <el-form-item label="设备报警:">
77
-                <el-input v-model="formInline3.equipmentAlarm" placeholder="请输入"></el-input>
77
+                <el-input v-model="formInline3.alertInfo" placeholder="请输入"></el-input>
78
               </el-form-item>
78
               </el-form-item>
79
             </el-col>
79
             </el-col>
80
             <el-col :span="8">
80
             <el-col :span="8">
@@ -118,10 +118,10 @@
118
           <div class="form-div">
118
           <div class="form-div">
119
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign3">
119
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign3">
120
               <el-form-item label="设备报警">
120
               <el-form-item label="设备报警">
121
-                <el-input v-model="formLabelAlign3.equipmentAlarm"></el-input>
121
+                <el-input v-model="formLabelAlign3.alertInfo"></el-input>
122
               </el-form-item>
122
               </el-form-item>
123
               <el-form-item label="状态">
123
               <el-form-item label="状态">
124
-                <el-input v-model="formLabelAlign3.type"></el-input>
124
+                <el-input v-model="formLabelAlign3.readFlag"></el-input>
125
               </el-form-item>
125
               </el-form-item>
126
             </el-form>
126
             </el-form>
127
           </div>
127
           </div>
@@ -172,14 +172,14 @@
172
           <div class="form-div">
172
           <div class="form-div">
173
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign4">
173
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign4">
174
               <el-form-item label="设备报警">
174
               <el-form-item label="设备报警">
175
-                <el-input v-model="formLabelAlign4.equipmentAlarm"></el-input>
175
+                <el-input v-model="formLabelAlign4.alertInfo"></el-input>
176
               </el-form-item>
176
               </el-form-item>
177
               <el-form-item label="设备ID">
177
               <el-form-item label="设备ID">
178
-                <el-input v-model="formLabelAlign4.equipmentID"></el-input>
178
+                <el-input v-model="formLabelAlign4.deviceId"></el-input>
179
               </el-form-item>
179
               </el-form-item>
180
               <el-form-item label="报警时间">
180
               <el-form-item label="报警时间">
181
                 <el-date-picker
181
                 <el-date-picker
182
-                  v-model="formLabelAlign4.alarmTime"
182
+                  v-model="formLabelAlign4.createTime"
183
                   type="date">
183
                   type="date">
184
                 </el-date-picker>
184
                 </el-date-picker>
185
               </el-form-item>
185
               </el-form-item>
@@ -192,6 +192,7 @@
192
 </template>
192
 </template>
193
 <script>
193
 <script>
194
 import api from "@/api/audit.js";
194
 import api from "@/api/audit.js";
195
+import api_l from "@/api/article_liao.js";
195
 
196
 
196
 export default {
197
 export default {
197
   components: {},
198
   components: {},
@@ -235,39 +236,44 @@ export default {
235
       columns3: [
236
       columns3: [
236
         {
237
         {
237
           label: '设备报警',
238
           label: '设备报警',
238
-          key: 'equipmentAlarm'
239
+          key: 'alertInfo'
240
+        },
241
+        {
242
+          label: '详情',
243
+          key: 'alertDetail'
239
         },
244
         },
240
         {
245
         {
241
           label: '状态',
246
           label: '状态',
242
-          key: 'type'
247
+          key: 'readFlag'
243
         },
248
         },
244
       ],
249
       ],
245
-      tableData3: [{equipmentAlarm: 'sasa111'}],
250
+      tableData3: [],
246
       total3: 0,
251
       total3: 0,
247
       pageSize3: 10,
252
       pageSize3: 10,
248
       pageNum3: 1,
253
       pageNum3: 1,
249
       formInline3: {
254
       formInline3: {
250
-        equipmentAlarm: '',
255
+        alertInfo: '',
251
       },
256
       },
252
       title3: '',
257
       title3: '',
253
       dialogVisible3: false,
258
       dialogVisible3: false,
254
       formLabelAlign3: {
259
       formLabelAlign3: {
255
         id: '',
260
         id: '',
256
-        equipmentAlarm: '',
257
-        type: '',
261
+        readFlag: '',
262
+        alertInfo:'',
263
+
258
       },
264
       },
259
       columns4: [
265
       columns4: [
260
         {
266
         {
261
           label: '设备报警',
267
           label: '设备报警',
262
-          key: 'equipmentAlarm'
268
+          key: 'alertInfo'
263
         },
269
         },
264
         {
270
         {
265
           label: '设备ID',
271
           label: '设备ID',
266
-          key: 'equipmentID'
272
+          key: 'deviceId'
267
         },
273
         },
268
         {
274
         {
269
           label: '报警时间',
275
           label: '报警时间',
270
-          key: 'alarmTime'
276
+          key: 'createTime'
271
         },
277
         },
272
       ],
278
       ],
273
       tableData4: [{equipmentAlarm: 'sasa1111',alarmTime:'2023'}],
279
       tableData4: [{equipmentAlarm: 'sasa1111',alarmTime:'2023'}],
@@ -275,8 +281,8 @@ export default {
275
       pageSize4: 10,
281
       pageSize4: 10,
276
       pageNum4: 1,
282
       pageNum4: 1,
277
       formInline4: {
283
       formInline4: {
278
-        equipmentAlarm: '',
279
-        equipmentID: '',
284
+        plateNo: '',
285
+        deviceId: '',
280
       },
286
       },
281
       title4: '',
287
       title4: '',
282
       dialogVisible4: false,
288
       dialogVisible4: false,
@@ -291,13 +297,13 @@ export default {
291
   mounted() {
297
   mounted() {
292
     // this.getTableData1()
298
     // this.getTableData1()
293
     // this.getTableData2()
299
     // this.getTableData2()
294
-    // this.getTableData3()
295
-    // this.getTableData4()
300
+    this.getTableData3()
301
+    this.getTableData4()
296
   },
302
   },
297
   watch: {},
303
   watch: {},
298
   methods: {
304
   methods: {
299
     handleConfirm() {
305
     handleConfirm() {
300
-      api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
306
+      api_l.optMessageManagementPushAdd({msgTitle: this.formLabelAlign.msgTitle,msgContent:this.formLabelAlign.messageArea}).then(res => {
301
         if (res.code === 200) {
307
         if (res.code === 200) {
302
           this.$message({
308
           this.$message({
303
             message: '添加成功!',
309
             message: '添加成功!',
@@ -326,7 +332,10 @@ export default {
326
     },
332
     },
327
     onSubmit3() {
333
     onSubmit3() {
328
       this.pageNum3 = 1
334
       this.pageNum3 = 1
329
-      this.getTableData3()
335
+      api_l.optMessageManagementDevicePage({searchKey: this.formLabelAlign3.equipmentAlarm}).then(res => {
336
+        this.tableData3 = res.data.records
337
+      })
338
+
330
     },
339
     },
331
     handleAdd3() {
340
     handleAdd3() {
332
       this.title3 = '添加'
341
       this.title3 = '添加'
@@ -343,7 +352,7 @@ export default {
343
       this.dialogVisible3 = true
352
       this.dialogVisible3 = true
344
     },
353
     },
345
     deleteRow3(record) {
354
     deleteRow3(record) {
346
-      api.deleteWhiteIp({id: record.id}).then(res => {
355
+      api_l.optMessageManagementDeviceDelete([{id: record.id}]).then(res => {
347
         if (res.code === 200) {
356
         if (res.code === 200) {
348
           this.$message({type: 'success', message: '删除成功!'})
357
           this.$message({type: 'success', message: '删除成功!'})
349
           this.getTableData3()
358
           this.getTableData3()
@@ -441,8 +450,8 @@ export default {
441
     },
450
     },
442
     getTableData3() {
451
     getTableData3() {
443
       const {pageNum3, pageSize3} = this
452
       const {pageNum3, pageSize3} = this
444
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
445
-        this.tableData3 = res.data.records || []
453
+      api_l.optMessageManagementDevicePage({current: pageNum3, size: pageSize3}).then(res => {
454
+        this.tableData3 = res.data.records
446
         this.total3 = res.data.total
455
         this.total3 = res.data.total
447
       })
456
       })
448
     },
457
     },
@@ -451,8 +460,8 @@ export default {
451
     },
460
     },
452
     getTableData4() {
461
     getTableData4() {
453
       const {pageNum4, pageSize4} = this
462
       const {pageNum4, pageSize4} = this
454
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
455
-        this.tableData4 = res.data.records || []
463
+      api_l.optMessageManagementVehiclePage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
464
+        this.tableData4 = res.data.records
456
         this.total4 = res.data.total
465
         this.total4 = res.data.total
457
       })
466
       })
458
     },
467
     },

+ 2 - 1
static/mung-local-config.js

@@ -1,6 +1,7 @@
1
 window.mungConfig = {
1
 window.mungConfig = {
2
   dev: {
2
   dev: {
3
-    BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
3
+    //BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
4
+    BASE_API: 'http://192.168.0.81:16399/luohe2_ee/api'
4
   },
5
   },
5
   build: {
6
   build: {
6
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
7
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"