Browse Source

接口联调

duwendi 1 year ago
parent
commit
febeee113e

+ 8 - 0
src/api/article_z.js

@@ -63,6 +63,14 @@ export default {
63 63
   queryChargePrice_Sfdjfx(params) {
64 64
     return axios.post(`/dash/charge/price/stat`, params)
65 65
   },
66
+  // 客户投诉监管——列表
67
+  khtsListByPage(params) {
68
+    return axios.get('/dash/customer/complaint/page',{params})
69
+  },
70
+  // 客户投诉监管_客诉登记
71
+  khtsSave(params) {
72
+    return axios.post(`/dash/customer/complaint/save`, params)
73
+  },
66 74
   //客户投诉监管_客诉分析
67 75
   queryCustomerComplaint_Ksfx(params) {
68 76
     return axios.post(`/dash/customer/complaint/stat`, params)

+ 4 - 7
src/api/audit.js

@@ -93,17 +93,14 @@ export default {
93 93
   serviceSave(params) {
94 94
     return axios.post('/dash/service/publish/save', params)
95 95
   },
96
-  // todo 公告功能
96
+  // 公告功能
97 97
   announcementListByPage(params) {
98 98
     return axios.get('/dash/announcement/function/page', {params})
99 99
   },
100
-  announcementPublic(params) {
101
-    return axios.post('/dash/announcement/function/publish', params)
102
-  },
103 100
   announcementSave(params) {
104 101
     return axios.post('/dash/announcement/function/save', params)
105 102
   },
106
-  // todo 消息中心
103
+  // 消息中心
107 104
   messageListByPage(params) {
108 105
     return axios.post('/dash/message/page', {params})
109 106
   },
@@ -111,7 +108,7 @@ export default {
111 108
   monitorListByPage(params) {
112 109
     return axios.get('/dash/service/monitor/page', {params})
113 110
   },
114
-  // todo 凭证管理
111
+  // 凭证管理
115 112
   pzglListByPage(params) {
116 113
     return axios.get('/dash/credential/management/function/page', {params})
117 114
   },
@@ -144,7 +141,7 @@ export default {
144 141
   fwdy(params) {
145 142
     return axios.post('/dash/service/call/function/call', params)
146 143
   },
147
-  // todo 操作日志功能
144
+  // 操作日志功能
148 145
   czrzListByPage(params) {
149 146
     return axios.get('/dash/operation/log/page', {params})
150 147
   },

+ 35 - 31
src/pages/index/components/announcement_function.vue

@@ -26,18 +26,21 @@
26 26
       width="50%"
27 27
       custom-class="audit-dialog">
28 28
       <div style="height: 100px" class="form-div">
29
-        <el-form label-position="left" label-width="80px" :model="formLabelAlign">
30
-          <el-form-item label="发布标题">
31
-            <el-input v-model="formLabelAlign.publicTitle"></el-input>
29
+        <el-form :disabled="title === '查看详情'" ref="formLabelAlign" label-position="left" label-width="80px" :model="formLabelAlign">
30
+          <el-form-item label="公告标题" required>
31
+            <el-input v-model="formLabelAlign.noticeTitle"></el-input>
32 32
           </el-form-item>
33
-          <el-form-item label="发布人">
34
-            <el-input v-model="formLabelAlign.publicPerson"></el-input>
33
+          <el-form-item label="公告正文" required>
34
+            <el-input v-model="formLabelAlign.noticeText"></el-input>
35
+          </el-form-item>
36
+          <el-form-item v-if="title === '查看详情'" label="发布人">
37
+            <el-input v-model="formLabelAlign.publishUser"></el-input>
35 38
           </el-form-item>
36 39
         </el-form>
37 40
       </div>
38 41
       <span slot="footer" class="dialog-footer">
39 42
             <el-button @click="dialogVisible = false">取 消</el-button>
40
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
43
+            <el-button type="primary" @click="handleConfirm('formLabelAlign')">确 定</el-button>
41 44
         </span>
42 45
     </el-dialog>
43 46
   </div>
@@ -51,16 +54,16 @@ export default {
51 54
     return {
52 55
       columns: [
53 56
         {
54
-          label: '发布标题',
55
-          key: 'publicTitle'
57
+          label: '公告标题',
58
+          key: 'noticeTitle'
56 59
         },
57 60
         {
58
-          label: '发布时间',
59
-          key: 'publicTime'
61
+          label: '公告日期',
62
+          key: 'publishDate'
60 63
         },
61 64
         {
62 65
           label: '发布人',
63
-          key: 'publicPerson'
66
+          key: 'publishUser'
64 67
         }
65 68
       ],
66 69
       tableData: [{"publicTitle":'预警提示',"publicTime":'2023-12-29 10:00:00',"publicPerson":'李玉'},
@@ -95,31 +98,32 @@ export default {
95 98
       this.formLabelAlign.publicPerson = ''
96 99
       this.dialogVisible = true
97 100
     },
98
-    handleConfirm() {
99
-      if (this.title === '发布公告') {
100
-        api.announcementPublic({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
101
-          if(res.code === 200) {
102
-            this.dialogVisible = false
103
-            this.$message({
104
-              message: '发布成功!',
105
-              type: 'success'
101
+    handleConfirm(formName) {
102
+      this.$refs[formName].validate((valid) => {
103
+        if (valid) {
104
+          if (this.title === '发布公告') {
105
+            api.announcementSave(this.formLabelAlign).then(res => {
106
+              if(res.code === 200) {
107
+                this.dialogVisible = false
108
+                this.$message({
109
+                  message: '发布成功!',
110
+                  type: 'success'
111
+                })
112
+                this.getTableData()
113
+              }
106 114
             })
107
-            this.getTableData()
115
+          } else {
116
+            this.dialogVisible = false;
108 117
           }
109
-        })
110
-      } else {
111
-        this.dialogVisible = false;
112
-      }
118
+        } else {
119
+          return false
120
+        }
121
+      })
113 122
     },
114 123
     getTableData() {
115 124
       const {pageNum, pageSize, searchWords} = this
116
-      api.applyList({pageNum, pageSize}).then(res => {
117
-        this.tableData = []
118
-        res.data.records.map((item, index) => {
119
-          const newItem = {...item}
120
-          newItem.applyTypeText = this.getApplyTypeText(item.applyType)
121
-          this.tableData.push(newItem)
122
-        })
125
+      api.announcementListByPage({current: pageNum, size: pageSize}).then(res => {
126
+        this.tableData = res.data.records || []
123 127
         this.total = res.data.total
124 128
       })
125 129
     },

+ 64 - 42
src/pages/index/components/credential_management_function.vue

@@ -4,15 +4,13 @@
4 4
       <el-row>
5 5
         <el-col :span="8">
6 6
           <el-form-item label="凭证名称">
7
-            <el-input v-model="formInline.credentialName" placeholder="请输入凭证"></el-input>
7
+            <el-input v-model="formInline.voucherName" placeholder="请输入凭证名称"></el-input>
8 8
           </el-form-item>
9 9
         </el-col>
10 10
         <el-col :span="8">
11 11
           <el-form-item>
12 12
             <el-button type="primary" @click="onSubmit">查询</el-button>
13
-            <el-form-item>
14
-              <el-button type="success" @click="handleAdd">添加凭证</el-button>
15
-            </el-form-item>
13
+            <el-button type="success" @click="handleAdd">添加凭证</el-button>
16 14
           </el-form-item>
17 15
         </el-col>
18 16
       </el-row>
@@ -27,11 +25,11 @@
27 25
       </el-table-column>
28 26
       <el-table-column
29 27
         label="操作"
30
-        width="100">
28
+        width="150">
31 29
         <template slot-scope="scope" style="display: inline-block">
32 30
           <el-button type="primary" @click="handleEdit(scope.row)" slot="reference">修改</el-button>
33 31
           <el-popconfirm title="确定删除吗?" @confirm="deleteRow(scope.row)">
34
-            <el-button type="danger" slot="reference">除</el-button>
32
+            <el-button type="danger" slot="reference">除</el-button>
35 33
           </el-popconfirm>
36 34
         </template>
37 35
       </el-table-column>
@@ -46,17 +44,25 @@
46 44
       :visible.sync="dialogVisible"
47 45
       width="60%"
48 46
       custom-class="audit-dialog">
49
-      <el-form  style="height: 100px" class="form-div" label-position="left" label-width="80px" :model="formLabelAlign">
50
-        <el-form-item label="凭证ID">
51
-          <el-input v-model="formLabelAlign.pzId"></el-input>
47
+      <el-form ref="formLabelAlign"  style="height: 100px" class="form-div" label-position="left" label-width="100px" :model="formLabelAlign">
48
+        <el-form-item label="凭证ID" required>
49
+          <el-input v-model="formLabelAlign.voucherId"></el-input>
52 50
         </el-form-item>
53
-        <el-form-item label="凭证名称">
54
-          <el-input v-model="formLabelAlign.pzName"></el-input>
51
+        <el-form-item label="凭证名称" required>
52
+          <el-input v-model="formLabelAlign.voucherName"></el-input>
53
+        </el-form-item>
54
+        <el-form-item label="凭证有效期" required>
55
+          <el-date-picker
56
+            v-model="formLabelAlign.voucherDate"
57
+            type="date"
58
+            value-format="yyyy-MM-dd HH:mm:ss"
59
+            placeholder="选择日期">
60
+          </el-date-picker>
55 61
         </el-form-item>
56 62
       </el-form>
57 63
       <span slot="footer" class="dialog-footer">
58 64
             <el-button @click="dialogVisible = false">取 消</el-button>
59
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
65
+            <el-button type="primary" @click="handleConfirm('formLabelAlign')">确 定</el-button>
60 66
         </span>
61 67
     </el-dialog>
62 68
   </div>
@@ -69,20 +75,20 @@ export default {
69 75
     data() {
70 76
       return {
71 77
         formInline: {
72
-          credentialName: ''
78
+          voucherName: ''
73 79
         },
74 80
         columns: [
75 81
           {
76 82
             label: '凭证ID',
77
-            key: 'resourceName'
83
+            key: 'voucherId'
78 84
           },
79 85
           {
80 86
             label: '凭证名称',
81
-            key: 'resourceType'
87
+            key: 'voucherName'
82 88
           },
83 89
           {
84 90
             label: '有效期',
85
-            key: 'applyTypeText'
91
+            key: 'voucherDate'
86 92
           }
87 93
         ],
88 94
         tableData: [],
@@ -92,8 +98,9 @@ export default {
92 98
         dialogVisible: false,
93 99
         title: '',
94 100
         formLabelAlign: {
95
-          pzId: '',
96
-          pzName: ''
101
+          voucherId: '',
102
+          voucherName: '',
103
+          voucherDate: '',
97 104
         }
98 105
       }
99 106
     },
@@ -103,6 +110,9 @@ export default {
103 110
     watch: {
104 111
     },
105 112
     methods: {
113
+      onSubmit () {
114
+        this.getTableData()
115
+      },
106 116
       indexMethod(index) {
107 117
         return this.pageSize * (this.pageNum - 1) + index + 1
108 118
       },
@@ -130,35 +140,43 @@ export default {
130 140
       handlePageChange() {
131 141
         this.getTableData()
132 142
       },
133
-      handleConfirm() {
134
-        if (this.title === '修改凭证') {
135
-          let params = {...formLabelAlign}
136
-          api.addPz().then(res => {
137
-            if(res.code === 200) {
138
-              this.dialogVisible = false
139
-              this.$message({
140
-                message: '修改成功!',
141
-                type: 'success'
143
+      handleConfirm(formName) {
144
+        this.$refs[formName].validate((valid) => {
145
+          if (valid) {
146
+            let params = {...this.formLabelAlign, voucherDate: this.formLabelAlign.voucherDate.substring(0, 10) + " 23:59:59"}
147
+            if (this.title === '修改凭证') {
148
+              api.addPz(params).then(res => {
149
+                if(res.code === 200) {
150
+                  this.dialogVisible = false
151
+                  this.$message({
152
+                    message: '修改成功!',
153
+                    type: 'success'
154
+                  })
155
+                  this.getTableData()
156
+                }
142 157
               })
143
-              this.getTableData()
144
-            }
145
-          })
146
-        } else {
147
-          api.addPz({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
148
-            if(res.code === 200) {
149
-              this.dialogVisible = false
150
-              this.$message({
151
-                message: '添加成功!',
152
-                type: 'success'
158
+            } else {
159
+              let params = {...this.formLabelAlign, voucherDate: this.formLabelAlign.voucherDate.substring(0, 10) + " 23:59:59"}
160
+              api.addPz(params).then(res => {
161
+                if(res.code === 200) {
162
+                  this.dialogVisible = false
163
+                  this.$message({
164
+                    message: '添加成功!',
165
+                    type: 'success'
166
+                  })
167
+                  this.getTableData()
168
+                }
153 169
               })
154
-              this.getTableData()
155 170
             }
156
-          })
157
-        }
171
+
172
+          } else {
173
+            return false;
174
+          }
175
+        });
158 176
       },
159 177
       getTableData() {
160 178
         const {pageNum, pageSize} = this
161
-        api.pzglListByPage({pageNum, pageSize, credentialName: this.formInline.credentialName}).then(res => {
179
+        api.pzglListByPage({current: pageNum, size: pageSize, voucherName: this.formInline.voucherName}).then(res => {
162 180
           this.tableData = res.data.records || []
163 181
           this.total = res.data.total
164 182
         })
@@ -233,9 +251,13 @@ export default {
233 251
   .form-div{
234 252
     /deep/ .el-input__inner{
235 253
       height: 35px;
236
-      width: 90%;
254
+      width: 100%;
237 255
       border: 1px solid #a6a5a5;
238 256
       color: #fff;
257
+      background: #2d3744;
258
+    }
259
+    /deep/ .el-input__icon {
260
+      line-height: 35px;
239 261
     }
240 262
   }
241 263
 }

+ 54 - 106
src/pages/index/components/customer_complaint.vue

@@ -6,21 +6,22 @@
6 6
     <br>
7 7
     <el-form class="form-wrapper" :inline="true" :model="formInline">
8 8
       <el-form-item label="投诉类型">
9
-        <el-select v-model="formInline.region0" placeholder="投诉类型" popper-class="cur-select">
9
+        <el-select v-model="formInline.comType" placeholder="投诉类型" popper-class="cur-select">
10
+          <el-option label="全部" value=""></el-option>
10 11
           <el-option label="经营服务类停车问题" value="经营服务类停车问题"></el-option>
11 12
           <el-option label="非法经营停车问题" value="非法经营停车问题"></el-option>
12 13
           <el-option label="不提供税票" value="不提供税票"></el-option>
13
-
14 14
         </el-select>
15 15
       </el-form-item>
16
-
17
-      <el-button class="btn_save" type="success" @click="handleAdd">客诉登记</el-button>
16
+      <el-form-item>
17
+        <el-button type="primary" @click="onSubmit">查询</el-button>
18
+        <el-button type="primary" @click="handleAdd">客诉登记</el-button>
19
+      </el-form-item>
18 20
     </el-form>
19 21
     <br>
20 22
     <br>
21 23
     <br>
22 24
     <br>
23
-
24 25
     <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
25 26
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
26 27
       </el-table-column>
@@ -35,13 +36,12 @@
35 36
       <div class="charts">
36 37
         <piechart
37 38
           class="model-pie-body"
38
-          :data="tableData2"
39 39
           :roseType="false"
40 40
           id="chart1"
41 41
           :radiusArr="['30%', '70%']"
42 42
           :colorArr="modelPieColor"
43 43
           :labelFormat="['{name|{b}}', '{sub|{@value}起 {d}%}', '{hr|}']"
44
-          :dataset="modelData.list"
44
+          :dataset="modelData"
45 45
           :encode="{ itemName: 'name', value: 'value' }"
46 46
         />
47 47
       </div>
@@ -52,52 +52,28 @@
52 52
       width="60%"
53 53
       height="600px"
54 54
       custom-class="audit-dialog">
55
-      <div style="width: 100%;height: 450px">
56
-      <el-form label-position="left" label-width="80px" :model="formLabelAlign" >
57
-        <div style="display: flex;justify-content: space-around;">
58
-        <el-form-item label="">
59
-          <el-select v-model="formInline.region1" placeholder="投诉类型" class="cur-select">
55
+      <el-form  class="form-div"  style="height: 120px"   ref="formLabelAlign" label-position="left" label-width="80px" :model="formLabelAlign" >
56
+        <el-form-item label="投诉类型" required>
57
+          <el-select v-model="formLabelAlign.comType" placeholder="投诉类型">
60 58
             <el-option label="经营服务类停车问题" value="经营服务类停车问题"></el-option>
61 59
             <el-option label="非法经营停车问题" value="非法经营停车问题"></el-option>
62 60
             <el-option label="不提供税票" value="不提供税票"></el-option>
63
-
64 61
           </el-select>
65 62
         </el-form-item>
66
-<<<<<<< Updated upstream
67
-<!--        <el-form-item label=":">-->
68
-<!--          <el-select v-model="formInline.region2" placeholder="路内停车场" class="cur-select">-->
69
-<!--            <el-option label="南街村景区-停车场" value="南街村景区-停车场"></el-option>-->
70
-<!--            <el-option label="漯河市中医院-地上停车场" value="漯河市中医院-地上停车场"></el-option>-->
71
-<!--          </el-select>-->
72
-<!--        </el-form-item>-->
73
-<!--        <el-form-item label=":">-->
74
-<!--          <el-select v-model="formInline.region3" placeholder="路外停车场" class="cur-select">-->
75
-<!--            <el-option label="市图书馆停车场" value="市图书馆停车场"></el-option>-->
76
-<!--            <el-option label="中山公园停车场" value="中山公园停车场"></el-option>-->
77
-<!--            <el-option label="市中心医院停车场" value="市中心医院停车场"></el-option>-->
78
-<!--            <el-option label="妇幼保健院停车场" value="妇幼保健院停车场"></el-option>-->
79
-<!--          </el-select>-->
80
-<!--        </el-form-item>-->
81
-=======
82
-
83
->>>>>>> Stashed changes
84
-        </div>
85
-
86
-        <el-input class="input-wrapper" v-model="searchWords" placeholder="客诉详情">
87
-        </el-input>
63
+        <el-form-item label="投诉内容" required>
64
+          <el-input v-model="formLabelAlign.comContent" placeholder="投诉内容"/>
65
+        </el-form-item>
88 66
       </el-form>
89
-      </div>
90 67
       <span slot="footer" class="dialog-footer">
91 68
             <el-button @click="dialogVisible = false">取 消</el-button>
92
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
69
+            <el-button type="primary" @click="handleConfirm('formLabelAlign')">确 定</el-button>
93 70
         </span>
94 71
     </el-dialog>
95 72
   </div>
96 73
 </template>
97 74
 <script>
98
-import api from "@/api/article_liao";
99 75
 import piechart from "@/components/pieChart";
100
-import api1 from "@/api/article_z";
76
+import api from "@/api/article_z";
101 77
 
102 78
 export default {
103 79
   components: {
@@ -106,10 +82,7 @@ export default {
106 82
   data() {
107 83
     return {
108 84
       formInline: {
109
-        region0: '',
110
-        region1: '',
111
-        region2: '',
112
-        region3: '',
85
+        comType: ''
113 86
       },
114 87
       options: [{
115 88
         value: '经营服务类停车问题',
@@ -140,29 +113,22 @@ export default {
140 113
         label: '中山公园停车场'
141 114
       }],
142 115
       columns: [
143
-        {
144
-          label: '姓名',
145
-          key: 'resourceName'
146
-        },
147 116
         {
148 117
           label: '投诉类型',
149
-          key: 'resourceType'
118
+          key: 'comType'
150 119
         },
151 120
         {
152
-          label: '投诉详情',
153
-          key: 'userName'
121
+          label: '所属停车场',
122
+          key: 'parkId'
154 123
         },
155 124
         {
156
-          label: '投诉时间',
157
-          key: 'userName'
125
+          label: '处理状态',
126
+          key: 'disposeState'
158 127
         }
159 128
       ],
160 129
       modelPieColor: ["#4382f6","#9078f8","#C1FFC1","#1E90FF"],
161
-      modelData: {
162
-        list: [{name: '服务态度', value: 100}, {name: '收费乱', value: 100},{name: '设备部灵敏', value: 100}, {name: '环境差', value: 100}]
163
-      },
130
+      modelData: [],
164 131
       tableData: [],
165
-      tableData2: [],
166 132
       total: 0,
167 133
       pageSize: 10,
168 134
       pageNum: 1,
@@ -179,16 +145,17 @@ export default {
179 145
   },
180 146
   mounted() {
181 147
     this.getTableData()
182
-    this.getTableData2()
183 148
     this.getModelDataData()
184 149
   },
185 150
   watch: {
186 151
   },
187 152
   methods: {
188
-
153
+    onSubmit() {
154
+      this.getTableData()
155
+    },
189 156
     getModelDataData(){
190
-      api1.queryCustomerComplaint_Ksfx().then(res=>{
191
-        this.modelData.list=res.data;
157
+      api.queryCustomerComplaint_Ksfx().then(res=>{
158
+        this.modelData = res.data;
192 159
       })
193 160
     },
194 161
     handlePageChange() {
@@ -196,60 +163,32 @@ export default {
196 163
     },
197 164
     handleAdd () {
198 165
       this.title = '客诉登记'
199
-      this.formLabelAlign.ipUrl = ''
200
-      this.dialogVisible = true
201
-    },
202
-    handleAudit(row) {
203
-      this.selRow = row
166
+      this.formLabelAlign = {}
204 167
       this.dialogVisible = true
205 168
     },
206
-    handleCancelApply(row) {
207
-      console.log('enter handle cancel apply')
208
-    },
209
-    handleConfirm() {
210
-      api.dashEmployeeQualificationExamine(formInline.region1).then(res => {
211
-        if(res.code === 200) {
212
-          this.dialogVisible = false
213
-          this.$message({
214
-            message: '修改成功!',
215
-            type: 'success'
169
+    handleConfirm(formName) {
170
+      this.$refs[formName].validate((valid) => {
171
+        if (valid) {
172
+          api.khtsSave(this.formLabelAlign).then(res => {
173
+            if(res.code === 200) {
174
+              this.dialogVisible = false
175
+              this.$message({
176
+                message: '添加成功!',
177
+                type: 'success'
178
+              })
179
+              this.getTableData()
180
+            }
216 181
           })
217 182
         }
218 183
       })
219 184
     },
220 185
     getTableData() {
221
-      const {pageNum, pageSize, searchWords} = this
222
-      api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
223
-        this.tableData = []
224
-        res.data.records.map((item, index) => {
225
-          const newItem = {...item}
226
-          newItem.applyTypeText = this.getApplyTypeText(item.applyType)
227
-          this.tableData.push(newItem)
228
-        })
186
+      const {pageNum, pageSize} = this
187
+      api.khtsListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
188
+        this.tableData = res.data.records || []
229 189
         this.total = res.data.total
230 190
       })
231 191
     },
232
-    getTableData2() {
233
-      api.applyList({}).then(res => {
234
-        this.tableData2 =  res.data.data
235
-        this.total2 = res.data.total
236
-      })
237
-    },
238
-    getApplyTypeText(val) {
239
-      if (!val){
240
-        return '未申请'
241
-      }
242
-      const textMap = {
243
-        1: '待审批',
244
-        2: '审批通过',
245
-        3: '审批驳回'
246
-      }
247
-      return textMap[val]
248
-    },
249
-    handleSearch() {
250
-      this.pageNum = 1
251
-      this.getTableData()
252
-    }
253 192
   }
254 193
 }
255 194
 </script>
@@ -356,8 +295,17 @@ export default {
356 295
   .label{
357 296
     text-align: right;
358 297
   }
359
-  /deep/ .el-input__inner{
360
-    background: white;
298
+  .form-div{
299
+    /deep/ .el-input__inner{
300
+      height: 35px;
301
+      width: 100%;
302
+      border: 1px solid #a6a5a5;
303
+      color: #fff;
304
+      background: #2d3744;
305
+    }
306
+    /deep/ .el-input__icon {
307
+      line-height: 35px;
308
+    }
361 309
   }
362 310
 }
363 311
 </style>

+ 8 - 10
src/pages/index/components/message.vue

@@ -23,15 +23,15 @@
23 23
       :visible.sync="dialogVisible"
24 24
       width="50%"
25 25
       custom-class="audit-dialog">
26
-      <el-form style="height: 120px" class="form-div" label-position="left" label-width="80px" :model="selRow">
26
+      <el-form disabled style="height: 120px" class="form-div" label-position="left" label-width="80px" :model="selRow">
27 27
         <el-form-item label="标题">
28
-          <el-input disabled v-model="selRow.title"/>
28
+          <el-input  v-model="selRow.messageTitle"/>
29 29
         </el-form-item>
30 30
         <el-form-item label="消息类型">
31
-          <el-input disabled v-model="selRow.messageType"/>
31
+          <el-input v-model="selRow.messageType"/>
32 32
         </el-form-item>
33 33
         <el-form-item label="发布时间">
34
-          <el-input disabled v-model="selRow.publicTime"/>
34
+          <el-input v-model="selRow.endPublishDate"/>
35 35
         </el-form-item>
36 36
       </el-form>
37 37
     </el-dialog>
@@ -47,7 +47,7 @@ export default {
47 47
       columns: [
48 48
         {
49 49
           label: '标题',
50
-          key: 'title'
50
+          key: 'messageTitle'
51 51
         },
52 52
         {
53 53
           label: '消息类型',
@@ -55,12 +55,10 @@ export default {
55 55
         },
56 56
         {
57 57
           label: '发布时间',
58
-          key: 'publicTime'
58
+          key: 'endPublishDate'
59 59
         },
60 60
       ],
61
-      tableData: [{"title": '系统升级', "messageType": '公告', "publicTime": '2023-12-29 10:00:00'},
62
-        {"title": '预警提示', "messageType": '系统通知', "publicTime": '2023-12-25 10:00:00'},
63
-        {"title": '故障提醒', "messageType": '系统通知', "publicTime": '2023-12-29 10:00:00'},],
61
+      tableData: [],
64 62
       total: 3,
65 63
       pageSize: 10,
66 64
       pageNum: 1,
@@ -82,7 +80,7 @@ export default {
82 80
     },
83 81
     getTableData() {
84 82
       const {pageNum, pageSize} = this
85
-      api.messageListByPage({pageNum, pageSize}).then(res => {
83
+      api.messageListByPage({current: pageNum, size: pageSize}).then(res => {
86 84
         this.tableData = res.data.records || []
87 85
         this.total = res.data.total
88 86
       })

+ 7 - 7
src/pages/index/components/operation_log.vue

@@ -4,7 +4,7 @@
4 4
       <el-row>
5 5
         <el-col :span="8">
6 6
           <el-form-item label="IP地址">
7
-            <el-input v-model="formInline.interfaceName" placeholder="请输入"></el-input>
7
+            <el-input v-model="formInline.ipAddress" placeholder="请输入"></el-input>
8 8
           </el-form-item>
9 9
         </el-col>
10 10
         <el-col :span="8">
@@ -99,7 +99,7 @@ export default {
99 99
       dialogVisible: false,
100 100
       logDetail: {},
101 101
       formInline: {
102
-        interfaceName: '',
102
+        ipAddress: '',
103 103
         time: ''
104 104
       }
105 105
     }
@@ -123,11 +123,11 @@ export default {
123 123
       })
124 124
     },
125 125
     getTableData() {
126
-      const {pageNum, pageSize, searchWords} = this
127
-      // api.czrzListByPage({pageNum, pageSize, interfaceName: this.formInline.interfaceName}).then(res => {
128
-      //   this.tableData = res.data.records
129
-      //   this.total = res.data.total
130
-      // })
126
+      const {pageNum, pageSize} = this
127
+      api.czrzListByPage({current: pageNum, size: pageSize, ipAddress: this.formInline.ipAddress}).then(res => {
128
+        this.tableData = res.data.records
129
+        this.total = res.data.total
130
+      })
131 131
     },
132 132
     onSubmit() {
133 133
       console.log(this.formInline, 'submit!');