bug fixed

src/api/article_liao.js

@@ -70,6 +70,10 @@ export default {
   optMessageManagementPushAdd(params){
     return axios.post('/opt/message/management/push/add', params)
   },
+  // 消息管理——通知消息
+  gjListByPage(params) {
+    return axios.get('/opt/message/management/notice/page', {params})
+  },
   //获取设备报警消息
   optMessageManagementDevicePage(params){
     return axios.get('/opt/message/management/device/page', {params})
@@ -82,8 +86,4 @@ export default {
   optMessageManagementVehiclePage(params){
     return axios.get('/opt/message/management/vehicle/page', {params})
   },
-
-
-
-
 }

src/pages/index/components/message_management.vue

@@ -218,7 +218,7 @@ export default {
           key: 'alarmTime'
         },
       ],
-      tableData2: [{alarmMessage: 'sasa1'}],
+      tableData2: [],
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
@@ -296,7 +296,7 @@ export default {
   },
   mounted() {
     // this.getTableData1()
-    // this.getTableData2()
+    this.getTableData2()
     this.getTableData3()
     this.getTableData4()
   },
@@ -440,7 +440,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api_l.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })

src/pages/index/components/pakking_lot.vue

@@ -11,7 +11,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkName" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkName" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="入场时间">
@@ -97,7 +97,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -143,7 +143,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="计费方式">
@@ -173,7 +173,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -220,7 +220,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="欠费期限(h)">
@@ -256,7 +256,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -303,7 +303,7 @@
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
                     :label="item.parkName"
-                    :value="item.parkId" />
+                    :value="item.id" />
                 </el-select>
               </el-form-item>
               <el-form-item label="标识通知">
@@ -381,7 +381,7 @@ export default {
       columns2: [
         {
           label: '车场名称',
-          key: 'parkLotId'
+          key: 'parkName'
         },
         {
           label: '计费方式',
@@ -415,7 +415,7 @@ export default {
       columns3: [
         {
           label: '停车场名称',
-          key: 'parkLotId'
+          key: 'parkName'
         },
         {
           label: '欠费期限(h)',
@@ -459,7 +459,7 @@ export default {
       columns4: [
         {
           label: '停车场名称',
-          key: 'parkLotId'
+          key: 'parkName'
         },
         {
           label: '标识通知',

src/pages/index/components/parking_order.vue

@@ -114,16 +114,16 @@ export default {
           key: 'orderNo'
         },
         {
-          label: '支付日期',
-          key: 'payTime'
+          label: '支付时间',
+          key: 'outTime'
         },
         {
           label: '支付金额',
           key: 'payAmount'
         },
         {
-          label: '泊位号',
-          key: 'parkingNo'
+          label: '停车场',
+          key: 'parkName'
         },
         {
           label: '车牌号',
@@ -183,7 +183,7 @@ export default {
         },
         {
           label: '所属停车场',
-          key: 'carParkName'
+          key: 'parkName'
         },
         {
           label: '预约时间',

src/pages/index/components/product_order.vue

@@ -127,7 +127,7 @@ export default {
         },
         {
           label: '支付状态',
-          key: 'payStatus'
+          key: 'orderStatus'
         },
       ],
       tableData1: [],
@@ -148,8 +148,8 @@ export default {
           key: 'plateNo'
         },
         {
-          label: '泊位号',
-          key: 'parkingNo'
+          label: '停车场',
+          key: 'parkName'
         },
         {
           label: '支付金额',
@@ -177,10 +177,10 @@ export default {
           label: '订单号',
           key: 'orderNo'
         },
-        {
-          label: '泊位号',
-          key: 'parkingNo'
-        },
+        // {
+        //   label: '泊位号',
+        //   key: 'parkingNo'
+        // },
         {
           label: '车牌号',
           key: 'plateNo'

static/mung-local-config.js

@@ -1,7 +1,7 @@
 window.mungConfig = {
   dev: {
-    //BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
-    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api'
+    BASE_API: "http://localhost:16399/luohe2_ee/api"
+    // BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api'
   },
   build: {
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"