查询和接口有问题

查询和接口有问题

src/api/article_liao.js

@@ -10,5 +10,31 @@ export default {
   dashAccessDataAnalysisStat2(params){
     return axios.post('/dash/access/data/analysis/stat2', params)
   },
+  //获取交接班记录详情
+  optPersonnelManagementShiftDetail(params){
+    return axios.get('/opt/personnel/management/shift/detail', {params})
+  },
+  //获取交接班记录分页
+  optPersonnelManagementShiftPage(params){
+    return axios.get('/opt/personnel/management/shift/page', {params})
+  },
+  //编辑交接班记录
+  optPersonnelManagementShiftEdit(params){
+    return axios.post('/opt/personnel/management/shift/edit', params)
+  },
+  //删除交接班记录
+  optPersonnelManagementShiftDelete(params){
+    return axios.post('/opt/personnel/management/shift/delete', params)
+  },
+  //获取收费员信息分页
+  optPersonnelManagementBasicPage(params){
+    return axios.get('/opt/personnel/management/basic/page', {params})
+  },
+  //获取收费员信息分页
+  optPersonnelManagementBasicDetail(params){
+    return axios.get('/opt/personnel/management/basic/detail', {params})
+  },
+
+
 
 }

src/pages/index/components/personnel_management.vue

@@ -6,7 +6,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车场名称: ">
-                <el-input v-model="formInline1.carParkingName" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline1.carParkName" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.carParkName"
+                    :value="item.parkId" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -14,7 +20,7 @@
                 <el-button type="primary" class="query-btn" @click="onSubmit1">查询</el-button>
               </el-form-item>
               <el-form-item>
-                <el-button type="success" @click="handleAdd">添加车场</el-button>
+                <el-button type="success" @click="handleAdd">添加交接班记录</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -45,23 +51,47 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
-              <el-form-item label="车场名称">
-                <el-input v-model="formLabelAlign.carParkingName"></el-input>
+              <el-form-item label="车场名称: ">
+                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.carParkName"
+                    :value="item.parkId" />
+                </el-select>
               </el-form-item>
               <el-form-item label="收入统计">
-                <el-input v-model="formLabelAlign.incomeStatistics"></el-input>
+                <el-input v-model="formLabelAlign.incomeFee"></el-input>
               </el-form-item>
               <el-form-item label="停车量统计">
-                <el-input v-model="formLabelAlign.parkingStatistics"></el-input>
+                <el-input v-model="formLabelAlign.parkingNum"></el-input>
               </el-form-item>
               <el-form-item label="异常事件统计">
-                <el-input v-model="formLabelAlign.abnormalEvent"></el-input>
+                <el-input v-model="formLabelAlign.excptionEvent"></el-input>
               </el-form-item>
               <el-form-item label="设备情况">
-                <el-input v-model="formLabelAlign.equipmentCondition"></el-input>
+                <el-input v-model="formLabelAlign.deviceStatus"></el-input>
               </el-form-item>
               <el-form-item label="车辆情况">
-                <el-input v-model="formLabelAlign.vehicleCondition"></el-input>
+                <el-input v-model="formLabelAlign.vehicleStatus"></el-input>
+              </el-form-item>
+              <el-form-item label="交班人员: ">
+                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in peopleOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="接班人员: ">
+                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in peopleOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-form>
           </div>
@@ -109,7 +139,7 @@
           </el-pagination>
         </div>
         <el-dialog
-          :title="title2"
+          :title="title"
           :visible.sync="dialogVisible2"
           width="45%"
           custom-class="audit-dialog">
@@ -137,6 +167,8 @@
 </template>
 <script>
 import api from "@/api/audit.js";
+import api_l from "@/api/article_liao.js";
+import api_z from "@/api/article_z.js";
 import dictionary from "@/util/dictionary";
 
 export default {
@@ -147,35 +179,35 @@ export default {
       columns1: [
         {
           label: '车场名称',
-          key: 'carParkingName'
+          key: 'carParkName'
         },
         {
           label: '收入统计',
-          key: 'incomeStatistics'
+          key: 'incomeFee'
         },
         {
           label: '停车量统计',
-          key: 'parkingStatistics'
+          key: 'parkingNum'
         },
         {
           label: '异常事件统计',
-          key: 'abnormalEvent '
+          key: 'excptionEvent '
         },
         {
           label: '设备情况',
-          key: 'equipmentCondition'
+          key: 'deviceStatus'
         },
         {
           label: '车辆情况',
-          key: 'vehicleCondition'
+          key: 'vehicleStatus'
         },
         {
           label: '交班人',
-          key: 'handOver'
+          key: 'tollmanName '
         },
         {
           label: '接班人',
-          key: 'successor'
+          key: 'tollmanReceiveId'
         },
       ],
       tableData1: [{carParkingName: 'sasa'}],
@@ -184,17 +216,27 @@ export default {
       pageNum1: 1,
       formInline1: {
         carParkingName: '',
+        carParkName:'',
+        parkId:''
       },
       title: '',
       dialogVisible: false,
+      carParkingNameOptions: [],
+      peopleOptions:[],
       formLabelAlign: {
         id: '',
-        carParkingName: '',
-        incomeStatistics: '',
-        parkingStatistics: '',
-        abnormalEvent: '',
-        equipmentCondition: '',
-        vehicleCondition: '',
+        parkId: '',
+        tollmanFinishId: '',
+        tollmanReceiveId: '',
+        incomeFee: '',
+        parkingNum: '',
+        excptionEvent: '',
+        deviceStatus: '',
+        vehicleStatus: '',
+        carParkName: '',
+        tollmanName: '',
+        jiaobanrenyuan:'',
+        jiebanrenyuan:''
       },
       columns2: [
         {
@@ -232,25 +274,33 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
+    this.getTableData1()
     // this.getTableData2()
     // this.getTableData3()
     // this.getTableData4()
+    this.getCarParkingName()
+    this.getPeople()
   },
   watch: {},
   methods: {
     onSubmit1() {
-      this.pageNum1 = 1
-      this.getTableData1()
-    },
+      api_l.optPersonnelManagementShiftPage({parkId: this.formLabelAlign.parkId}).then(res => {
+        this.tableData1 = res.data.records
+      })
+      },
     handleAdd() {
       this.title = '添加'
-      this.formLabelAlign.carParkingName = ''
-      this.formLabelAlign.incomeStatistics = ''
-      this.formLabelAlign.parkingStatistics = ''
-      this.formLabelAlign.abnormalEvent = ''
-      this.formLabelAlign.equipmentCondition = ''
-      this.formLabelAlign.vehicleCondition = ''
+      this.formLabelAlign.carParkName = ''
+      this.formLabelAlign.parkId = ''
+      this.formLabelAlign.id = ''
+      this.formLabelAlign.tollmanFinishId = ''
+      this.formLabelAlign.tollmanReceiveId = ''
+      this.formLabelAlign.incomeFee = ''
+      this.formLabelAlign.parkingNum = ''
+      this.formLabelAlign.excptionEvent = ''
+      this.formLabelAlign.deviceStatus = ''
+      this.formLabelAlign.vehicleStatus = ''
+      this.formLabelAlign.tollmanName = ''
       this.dialogVisible = true
     },
     handleEdit(row) {
@@ -259,41 +309,38 @@ export default {
       this.dialogVisible = true
     },
     deleteRow(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_l.optPersonnelManagementShiftDelete({id: record.id}).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()
         }
       })
     },
+    //车场
+    getCarParkingName() {
+      api_z.querySelectParkListByPage().then(res => {
+        this.carParkingNameOptions=res.data
+      })
+    },
+    //人员
+    getPeople(){
+      api_l.optPersonnelManagementBasicDetail.then(res => {
+        this.peopleOptions = res.data
+      })
+    },
     handleConfirm() {
       if (this.title === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible = false
-            this.$message({
-              message: '修改成功!',
-              type: 'success'
-            })
-            this.getTableData1()
-          }
-        })
-      } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible = false
-            this.$message({
-              message: '添加成功!',
-              type: 'success'
-            })
-            this.getTableData1()
-          }
+        api_l.optPersonnelManagementShiftEdit({id:this.formLabelAlign.id,incomeFee: this.formLabelAlign.incomeFee, parkingNum: this.formLabelAlign.parkingNum, excptionEvent: this.formLabelAlign.excptionEvent, deviceStatus: this.formLabelAlign.deviceStatus, vehicleStatus: this.formLabelAlign.vehicleStatus}).then(res => {
+          this.getTableData1()
+          this.dialogVisible = false
         })
       }
     },
     onSubmit2() {
-      this.pageNum2 = 1
-      this.getTableData2()
+      api_l.optPersonnelManagementBasicPage({searchKey: this.formLabelAlign.ipAddr}).then(res => {
+
+      })
+
     },
     handleAdd2() {
       this.title2 = '添加'
@@ -318,26 +365,8 @@ export default {
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible2 = false
-            this.$message({
-              message: '修改成功!',
-              type: 'success'
-            })
-            this.getTableData2()
-          }
-        })
-      } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
-          if (res.code === 200) {
-            this.dialogVisible2 = false
-            this.$message({
-              message: '添加成功!',
-              type: 'success'
-            })
-            this.getTableData2()
-          }
+        api_l.optPersonnelManagementShiftEdit({carParkingName: this.formInline1.carParkingName}).then(res => {
+          this.tableData1 = res.data
         })
       }
     },
@@ -345,24 +374,14 @@ export default {
       this.getTableData1()
     },
     getTableData1() {
-      const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
-        this.total1 = res.data.total
+      api_l.optPersonnelManagementShiftPage({}).then(res => {
+        this.tableData1 = res.data.records
       })
     },
     handlePageChange2() {
       this.getTableData2()
     },
-    getTableData2() {
-      const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
-        this.total2 = res.data.total
-      })
-    },
-  }
-}
+}}
 </script>
 <style lang="scss" scoped>
 .body-wrapper {