修改业务配置和消息管理

src/api/article_liao.js

@@ -1,5 +1,6 @@
 // 文章
 import axios from "../util/ajax";
+import axios1 from "../util/ajax1";
 
 export default {
   //接入数据分析（柱状图）
@@ -78,9 +79,13 @@ export default {
   optMessageManagementPushAdd(params){
     return axios.post('/opt/message/management/push/add', params)
   },
-  // 消息管理——通知消息
+  // 消息管理——系统消息
+  systemInfoByPage(params) {
+    return axios1.post('/notification-center-server/message/queryMsgList', params)
+  },
+  // 消息管理——个人消息
   gjListByPage(params) {
-    return axios.get('/opt/message/management/notice/page', {params})
+    return axios1.post('/notification-center-server/message/queryMsgList', params)
   },
   //获取设备报警消息
   optMessageManagementDevicePage(params){

src/pages/index/components/message_management.vue

@@ -1,29 +1,45 @@
 <template>
   <div class="body-wrapper">
     <el-tabs v-model="activeName">
-      <el-tab-pane label="配置消息" name="配置消息">
-        <div class="form-div">
-          <el-form label-position="left" label-width="100px" :model="formLabelAlign">
-            <el-form-item label="标题：">
-              <el-input v-model="formLabelAlign.messageTitle"></el-input>
-            </el-form-item>
-            <el-form-item label="内容：">
-              <el-input type="textarea"
-                        :rows="4"
-                        v-model="formLabelAlign.messageArea"></el-input>
-            </el-form-item>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="handleConfirm">推送消息</el-button>
-          </span>
+      <el-tab-pane label="系统消息" name="系统消息">
+        <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="消息状态:">
+                <el-select clearable v-model="formInline1.read_status" placeholder="消息状态" popper-class="cur-select">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="已读" value="1"></el-option>
+                  <el-option label="未读" value="9"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-button type="primary" class="query-btn" @click="onSubmit1" icon="el-icon-search">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table border :row-class-name="rowClassName" :data="tableData1" v-loading="loading1">
+          <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
+          </el-table-column>
+        </el-table>
+        <div class="table-pagination">
+          <el-pagination layout="total, prev, pager, next, jumper" :total="total1" @current-change="handlePageChange1"
+            :current-page.sync="pageNum1" :page-size.sync="pageSize1">
+          </el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="通知消息" name="通知消息">
+      <el-tab-pane label="个人消息" name="个人消息">
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="报警信息:">
-                <el-input v-model="formInline2.alarmMessage" placeholder="请输入"></el-input>
+              <el-form-item label="消息状态:">
+                <el-select clearable v-model="formInline2.read_status" placeholder="消息状态" popper-class="cur-select">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="已读" value="1"></el-option>
+                  <el-option label="未读" value="9"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -36,24 +52,13 @@
         <el-table border :row-class-name="rowClassName" :data="tableData2" v-loading="loading2">
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
           </el-table-column>
-          <el-table-column
-            label="操作"
-            width="200">
-            <div slot-scope="scope">
-              <el-button @click="handleDetail2(scope.row)" type="primary" size="mini">查看详情</el-button>
-            </div>
-          </el-table-column>
         </el-table>
         <div class="table-pagination">
           <el-pagination layout="total, prev, pager, next, jumper" :total="total2" @current-change="handlePageChange2"
-                         :current-page.sync="pageNum2" :page-size.sync="pageSize2">
+            :current-page.sync="pageNum2" :page-size.sync="pageSize2">
           </el-pagination>
         </div>
-        <el-dialog
-          :title="title2"
-          :visible.sync="dialogVisible2"
-          width="45%"
-          custom-class="audit-dialog">
+        <el-dialog :title="title2" :visible.sync="dialogVisible2" width="45%" custom-class="audit-dialog">
           <div class="form-div">
             <el-form disabled label-position="left" label-width="110px" :model="formLabelAlign2">
               <el-form-item label="报警信息">
@@ -87,16 +92,12 @@
         <el-table border :row-class-name="rowClassName" :data="tableData3" v-loading="loading3">
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
           </el-table-column>
-          <el-table-column
-            label="详情"
-            width="200">
+          <el-table-column label="详情" width="200">
             <div slot-scope="scope">
               <el-button @click="handleDetail3(scope.row)" type="primary" size="mini">查看详情</el-button>
             </div>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            width="200">
+          <el-table-column label="操作" width="200">
             <template slot-scope="scope" style="display: inline-block">
               <el-popconfirm title="确定删除吗？" @confirm="deleteRow3(scope.row)">
                 <el-button type="danger" slot="reference">删除</el-button>
@@ -106,15 +107,11 @@
         </el-table>
         <div class="table-pagination">
           <el-pagination layout="total, prev, pager, next, jumper" :total="total3" @current-change="handlePageChange3"
-                         :current-page.sync="pageNum3" :page-size.sync="pageSize3">
+            :current-page.sync="pageNum3" :page-size.sync="pageSize3">
           </el-pagination>
         </div>
 
-        <el-dialog
-          :title="title3"
-          :visible.sync="dialogVisible3"
-          width="45%"
-          custom-class="audit-dialog">
+        <el-dialog :title="title3" :visible.sync="dialogVisible3" width="45%" custom-class="audit-dialog">
           <div class="form-div">
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign3">
               <el-form-item label="设备报警">
@@ -150,9 +147,7 @@
         <el-table border :row-class-name="rowClassName" :data="tableData4" v-loading="loading4">
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
           </el-table-column>
-          <el-table-column
-            label="操作"
-            width="200">
+          <el-table-column label="操作" width="200">
             <div slot-scope="scope">
               <el-button @click="handleDetail4(scope.row)" type="primary" size="mini">查看详情</el-button>
             </div>
@@ -160,15 +155,11 @@
         </el-table>
         <div class="table-pagination">
           <el-pagination layout="total, prev, pager, next, jumper" :total="total4" @current-change="handlePageChange4"
-                         :current-page.sync="pageNum4" :page-size.sync="pageSize4">
+            :current-page.sync="pageNum4" :page-size.sync="pageSize4">
           </el-pagination>
         </div>
 
-        <el-dialog
-          :title="title4"
-          :visible.sync="dialogVisible4"
-          width="45%"
-          custom-class="audit-dialog">
+        <el-dialog :title="title4" :visible.sync="dialogVisible4" width="45%" custom-class="audit-dialog">
           <div class="form-div">
             <el-form disabled label-position="left" label-width="100px" :model="formLabelAlign4">
               <el-form-item label="设备报警">
@@ -178,9 +169,7 @@
                 <el-input v-model="formLabelAlign4.deviceId"></el-input>
               </el-form-item>
               <el-form-item label="报警时间">
-                <el-date-picker
-                  v-model="formLabelAlign4.createTime"
-                  type="date">
+                <el-date-picker v-model="formLabelAlign4.createTime" type="date">
                 </el-date-picker>
               </el-form-item>
             </el-form>
@@ -198,15 +187,37 @@ export default {
   components: {},
   data() {
     return {
+      loading1: false,
       loading2: false,
       loading3: false,
       loading4: false,
-      activeName: '配置消息',
+      activeName: '系统消息',
       formLabelAlign: {
         id: '',
         messageTitle: '',
         messageArea: '',
       },
+      columns1: [
+        {
+          label: '报警信息',
+          key: 'alarmMessage'
+        },
+        {
+          label: '车牌号',
+          key: 'plateNo'
+        },
+        {
+          label: '报警时间',
+          key: 'alarmTime'
+        },
+      ],
+      tableData1: [],
+      total1: 0,
+      pageSize1: 10,
+      pageNum1: 1,
+      formInline1: {
+        read_status: '',
+      },
       columns2: [
         {
           label: '报警信息',
@@ -226,7 +237,7 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        alarmMessage: '',
+        read_status: '',
       },
       title2: '',
       dialogVisible2: false,
@@ -262,7 +273,7 @@ export default {
       formLabelAlign3: {
         id: '',
         readFlag: '',
-        alertInfo:'',
+        alertInfo: '',
 
       },
       columns4: [
@@ -287,7 +298,7 @@ export default {
           key: 'createTime'
         },
       ],
-      tableData4: [{equipmentAlarm: 'sasa1111',alarmTime:'2023'}],
+      tableData4: [{ equipmentAlarm: 'sasa1111', alarmTime: '2023' }],
       total4: 0,
       pageSize4: 10,
       pageNum4: 1,
@@ -318,14 +329,14 @@ export default {
       return rowIndex % 2 === 0 ? 'even-row' : 'odd-row';
     },
     handleConfirm() {
-      api_l.optMessageManagementPushAdd({msgTitle: this.formLabelAlign.msgTitle,msgContent:this.formLabelAlign.messageArea}).then(res => {
+      api_l.optMessageManagementPushAdd({ msgTitle: this.formLabelAlign.msgTitle, msgContent: this.formLabelAlign.messageArea }).then(res => {
         if (res.code === 200) {
           this.$message({
             message: '添加成功!',
             type: 'success'
           })
-          this.formLabelAlign.messageTitle=''
-          this.formLabelAlign.messageArea=''
+          this.formLabelAlign.messageTitle = ''
+          this.formLabelAlign.messageArea = ''
         }
       })
     },
@@ -334,20 +345,20 @@ export default {
       this.getTableData2()
     },
     handleDetail2(row) {
-      this.formLabelAlign2 = {...row}
+      this.formLabelAlign2 = { ...row }
       this.dialogVisible2 = true
     },
     handleDetail3(row) {
-      this.formLabelAlign3 = {...row}
+      this.formLabelAlign3 = { ...row }
       this.dialogVisible3 = true
     },
     handleDetail4(row) {
-      this.formLabelAlign4 = {...row}
+      this.formLabelAlign4 = { ...row }
       this.dialogVisible4 = true
     },
     onSubmit3() {
       this.pageNum3 = 1
-      api_l.optMessageManagementDevicePage({searchKey: this.formLabelAlign3.equipmentAlarm}).then(res => {
+      api_l.optMessageManagementDevicePage({ searchKey: this.formLabelAlign3.equipmentAlarm }).then(res => {
         this.tableData3 = res.data.records
       })
 
@@ -363,20 +374,20 @@ export default {
 
     handleEdit3(row) {
       this.title3 = '修改'
-      this.formLabelAlign3 = {...row}
+      this.formLabelAlign3 = { ...row }
       this.dialogVisible3 = true
     },
     deleteRow3(record) {
-      api_l.optMessageManagementDeviceDelete([{id: record.id}]).then(res => {
+      api_l.optMessageManagementDeviceDelete([{ id: record.id }]).then(res => {
         if (res.code === 200) {
-          this.$message({type: 'success', message: '删除成功!'})
+          this.$message({ type: 'success', message: '删除成功!' })
           this.getTableData3()
         }
       })
     },
     handleConfirm3() {
       if (this.title3 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
+        api.addWhiteIp({ ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id }).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -387,7 +398,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
+        api.addWhiteIp({ ipAddr: this.formLabelAlign3.ipAddr }).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -414,20 +425,20 @@ export default {
 
     handleEdit4(row) {
       this.title4 = '修改'
-      this.formLabelAlign4 = {...row}
+      this.formLabelAlign4 = { ...row }
       this.dialogVisible4 = true
     },
     deleteRow4(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api.deleteWhiteIp({ id: record.id }).then(res => {
         if (res.code === 200) {
-          this.$message({type: 'success', message: '删除成功!'})
+          this.$message({ type: 'success', message: '删除成功!' })
           this.getTableData4()
         }
       })
     },
     handleConfirm4() {
       if (this.title4 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr, id: this.formLabelAlign4.id}).then(res => {
+        api.addWhiteIp({ ipAddr: this.formLabelAlign4.ipAddr, id: this.formLabelAlign4.id }).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -438,7 +449,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr}).then(res => {
+        api.addWhiteIp({ ipAddr: this.formLabelAlign4.ipAddr }).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -450,15 +461,27 @@ export default {
         })
       }
     },
+    handlePageChange1() {
+      this.getTableData1()
+    },
+    getTableData1() {
+      this.loading2 = true
+      const { pageNum1, pageSize1 } = this
+      api_l.systemInfoByPage({ cur_page: pageNum1, page_size: pageSize1, ...this.formInline1, push_type: '1' }).then(res => {
+        this.tableData1 = res.data.data || []
+        this.total1 = res.data.total_count
+        this.loading1 = false
+      })
+    },
     handlePageChange2() {
       this.getTableData2()
     },
     getTableData2() {
       this.loading2 = true
-      const {pageNum2, pageSize2} = this
-      api_l.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
-        this.total2 = res.data.total
+      const { pageNum2, pageSize2 } = this
+      api_l.gjListByPage({ cur_page: pageNum2, page_size: pageSize2, ...this.formInline2, push_type: '2' }).then(res => {
+        this.tableData2 = res.data.data || []
+        this.total2 = res.data.total_count
         this.loading2 = false
       })
     },
@@ -467,8 +490,8 @@ export default {
     },
     getTableData3() {
       this.loading3 = true
-      const {pageNum3, pageSize3} = this
-      api_l.optMessageManagementDevicePage({current: pageNum3, size: pageSize3}).then(res => {
+      const { pageNum3, pageSize3 } = this
+      api_l.optMessageManagementDevicePage({ current: pageNum3, size: pageSize3 }).then(res => {
         this.tableData3 = res.data.records
         this.total3 = res.data.total
         this.loading3 = false
@@ -479,8 +502,8 @@ export default {
     },
     getTableData4() {
       this.loading4 = true
-      const {pageNum4, pageSize4} = this
-      api_l.optMessageManagementVehiclePage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
+      const { pageNum4, pageSize4 } = this
+      api_l.optMessageManagementVehiclePage({ current: pageNum4, size: pageSize4, ...this.formInline4 }).then(res => {
         this.tableData4 = res.data.records
         this.total4 = res.data.total
         this.loading4 = false

src/pages/index/components/service_configuration.vue

@@ -133,12 +133,23 @@
               <el-form-item label="节假日名称">
                 <el-input v-model="formLabelAlign2.holidayName"></el-input>
               </el-form-item>
-              <el-form-item label="基础停车费(元/小时)">
+              <el-form-item label="节假日时间">
+                <el-date-picker
+                  v-model="formLabelAlign2.time"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间">
+                </el-date-picker>
+              </el-form-item>
+              <!-- <el-form-item label="基础停车费(元/小时)">
                 <el-input v-model="formLabelAlign2.pakingFee"></el-input>
               </el-form-item>
               <el-form-item label="超时费(元/小时)">
                 <el-input v-model="formLabelAlign2.overtimeFee"></el-input>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
           </div>
           <span slot="footer" class="dialog-footer">
@@ -206,12 +217,12 @@
               <el-form-item label="商圈名称">
                 <el-input v-model="formLabelAlign3.districtName	"></el-input>
               </el-form-item>
-              <el-form-item label="基础停车费(元/小时)">
+              <!-- <el-form-item label="基础停车费(元/小时)">
                 <el-input v-model="formLabelAlign3.pakingFee"></el-input>
               </el-form-item>
               <el-form-item label="超时费(元/小时)">
                 <el-input v-model="formLabelAlign3.overtimeFee"></el-input>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
           </div>
           <span slot="footer" class="dialog-footer">
@@ -301,6 +312,7 @@
 import dictionary from "@/util/dictionary";
 import api_z from "@/api/article_z.js";
 import options from '@/util/options'
+import moment from 'moment';
 
 export default {
   components: {},
@@ -366,15 +378,23 @@ export default {
           key: 'holidayName'
         },
         {
-          label: '基础停车费(元/小时)',
-          key: 'pakingFee'
+          label: '开始时间',
+          key: 'startTime'
         },
         {
-          label: '超时费(元/小时)',
-          key: 'overtimeFee'
-        },
+          label: '结束时间',
+          key: 'endTime'
+        }
+        // {
+        //   label: '基础停车费(元/小时)',
+        //   key: 'pakingFee'
+        // },
+        // {
+        //   label: '超时费(元/小时)',
+        //   key: 'overtimeFee'
+        // },
       ],
-      tableData2: [{regionName: 'sasa1'}],
+      tableData2: [],
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
@@ -391,6 +411,7 @@ export default {
         holidayName:'',
         pakingFee: '',
         overtimeFee: '',
+        time: []
       },
       columns3: [
         {
@@ -405,14 +426,14 @@ export default {
           label: '商圈名称',
           key: 'districtName'
         },
-        {
-          label: '基础停车费(元/小时)',
-          key: 'pakingFee'
-        },
-        {
-          label: '超时费(元/小时)',
-          key: 'overtimeFee'
-        },
+        // {
+        //   label: '基础停车费(元/小时)',
+        //   key: 'pakingFee'
+        // },
+        // {
+        //   label: '超时费(元/小时)',
+        //   key: 'overtimeFee'
+        // },
       ],
       tableData3: [{carParkingName: 'sasa111'}],
       total3: 0,
@@ -539,7 +560,7 @@ export default {
 
     handleEdit2(row) {
       this.title2 = '修改'
-      this.formLabelAlign2 = {...row}
+      this.formLabelAlign2 = {...row, time: [row.startTime, row.endTime]}
       this.dialogVisible2 = true
     },
     deleteRow2(record) {
@@ -552,7 +573,13 @@ export default {
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api_z.editServiceConfigurationHoliday({...this.formLabelAlign2, regionName: this.areaCodeMap[this.formLabelAlign2.regionCode]}).then(res => {
+        let params = {...this.formLabelAlign2}
+        if (params.time && params.time.length > 0) {
+          params.startTime = params.time[0].substring(0, 10) + ' 00:00:00'
+          params.endTime = params.time[1].substring(0, 10) + ' 23:59:59'
+        }
+        delete params.time
+        api_z.editServiceConfigurationHoliday({...params, regionName: this.areaCodeMap[this.formLabelAlign2.regionCode]}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -690,7 +717,7 @@ export default {
       this.loading2 = true
       const {pageNum2, pageSize2} = this
       api_z.queryServiceConfigurationHolidayByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
+        this.tableData2 = res.data.records.map(item => ({...item, startTime: item.startTime ? moment(item.startTime).format('YYYY-MM-DD') : '--', endTime: item.endTime ? moment(item.endTime).format('YYYY-MM-DD') : '--'})) || []
         this.total2 = res.data.total
         this.loading2 = false
       })