备份

备份

src/api/article_liao.js

@@ -32,7 +32,31 @@ export default {
   },
   //获取收费员信息分页
   optPersonnelManagementBasicDetail(params){
-    return axios.get('/opt/personnel/management/basic/detail', {params})
+    return axios.get('/opt/personnel/management/basic/page', {params})
+  },
+  //编辑收费人员信息
+  optPersonnelManagementBasicEdit(params){
+    return axios.post('/opt/personnel/management/basic/edit', params)
+  },
+  //添加收费人员信息
+  optPersonnelManagementBasicAdd(params){
+    return axios.post('/opt/personnel/management/basic/add', params)
+  },
+  //删除收费人员信息
+  optPersonnelManagementBasicDelete(params){
+    return axios.post('/opt/personnel/management/basic/delete', params)
+  },
+  //收费员工作统计分页
+  optPerformanceassesspage(params){
+    return axios.get('/opt/performance/assess/page', {params})
+  },
+  //稽查员稽查工作统计
+  optPerformanceAssessStat1page(params){
+    return axios.get('/opt/performance/assess/stat1page', {params})
+  },
+  //收费人员被稽查统计
+  optPerformanceAssessStat2page(params){
+    return axios.get('/opt/performance/assess/stat2page', {params})
   },
 
 

src/pages/index/components/performance_assess.vue

@@ -30,8 +30,14 @@
         <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.inspector" placeholder="请输入"></el-input>
+              <el-form-item label="稽查员姓名: ">
+                <el-select clearable v-model="formInline2.id" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in peopleOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -86,6 +92,7 @@
 </template>
 <script>
 import api from "@/api/audit.js";
+import api_l from "@/api/article_liao.js";
 import dictionary from "@/util/dictionary";
 
 export default {
@@ -96,30 +103,31 @@ export default {
       columns1: [
         {
           label: '收费员',
-          key: 'tollCollector'
+          key: 'inspectionManName'
         },
         {
           label: '收费员收入',
-          key: ''
+          key: 'tollRevenue'
         },
         {
           label: '预收款',
-          key: ''
+          key: 'advancePayment'
         },
         {
           label: '欠费追缴金额',
-          key: ''
+          key: 'recoveryAmount'
         },
         {
           label: '录入次数',
-          key: ''
+          key: 'recordIn'
         },
         {
           label: '录出次数',
-          key: ''
+          key: 'recordOut'
         },
       ],
       tableData1: [],
+      peopleOptions:[],
       total1: 0,
       pageSize1: 10,
       pageNum1: 1,
@@ -129,15 +137,15 @@ export default {
       columns2: [
         {
           label: '稽查员',
-          key: 'inspector'
+          key: 'inspectionManName'
         },
         {
           label: '稽查次数',
-          key: ''
+          key: 'inspectionCount'
         },
         {
           label: '平均处理时间(/分钟)',
-          key: ''
+          key: 'perMinutes'
         },
       ],
       tableData2: [],
@@ -145,20 +153,25 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        inspector: ''
+        inspector: '',
+        inspectionmanId:'',
+        rollmanId:'',
+        inspectionManName:'',
+        inspectionCount:'',
+        perMinutes:''
       },
       columns3: [
         {
           label: '收费员',
-          key: 'tollCollector'
+          key: 'inspectionManName'
         },
         {
           label: '稽查员',
-          key: 'inspector'
+          key: 'tollManName'
         },
         {
           label: '被稽查次数',
-          key: ''
+          key: 'inspectionCount'
         },
       ],
       tableData3: [],
@@ -172,32 +185,44 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
+     this.getTableData1()
+     this.getTableData2()
+     this.getTableData3()
+     this.getPeopleName()
   },
   watch: {
   },
   methods: {
     onSubmit1() {
       this.pageNum1 = 1
-      this.getTableData1()
+      api_l.optPerformanceassesspage({rollmanId: this.formInline1.tollCollector}).then(res => {
+        this.tableData1 = res.data.records
+      })
     },
     onSubmit2() {
-      this.pageNum2 = 1
-      this.getTableData2()
+      const {pageNum2, pageSize2} = this
+      api_l.optPerformanceAssessStat1page({inspectionmanId:this.formInline2.inspectionmanId}).then(res => {
+        this.tableData2 = res.data.records
+        this.total2 = res.data.total
+      })
     },
     onSubmit3() {
-      this.pageNum3 = 1
-      this.getTableData3()
+      const {pageNum3, pageSize3} = this
+      api_l.optPerformanceAssessStat2page({inspectionmanId:this.formInline2.inspectionmanId,rollmanId:this.formInline2.rollmanId}).then(res => {
+        this.tableData2 = res.data.records
+        this.total2 = res.data.total
+      })
     },
     handlePageChange1() {
       this.getTableData1()
+    },
+    getPeopleName(){
+
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, tollCollector:this.formInline1.tollCollector}).then(res => {
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
+      api_l.optPerformanceassesspage({}).then(res => {
+        this.tableData1 = res.data.records
         this.total1 = res.data.total
       })
     },
@@ -206,8 +231,8 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, inspector:this.formInline2.inspector}).then(res => {
-        this.tableData2 = res.data.records || []
+      api_l.optPerformanceAssessStat1page({}).then(res => {
+        this.tableData2 = res.data.records
         this.total2 = res.data.total
       })
     },
@@ -216,8 +241,8 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, tollCollector:this.formInline3.tollCollector, inspector:this.formInline3.inspector}).then(res => {
-        this.tableData3 = res.data.records || []
+      api_l.optPerformanceAssessStat2page({}).then(res => {
+        this.tableData3 = res.data.records
         this.total3 = res.data.total
       })
     },

src/pages/index/components/personnel_management.vue

@@ -6,7 +6,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="车场名称: ">
-                <el-select clearable v-model="formInline1.carParkName" placeholder="请选择">
+                <el-select clearable v-model="formInline1.parkId" placeholder="请选择">
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
@@ -52,7 +52,7 @@
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
               <el-form-item label="车场名称: ">
-                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
+                <el-select clearable v-model="formLabelAlign.parkId" placeholder="请选择">
                   <el-option
                     v-for="(item,index) in carParkingNameOptions"
                     :key="index"
@@ -146,13 +146,17 @@
           <div class="form-div">
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
               <el-form-item label="收费员姓名">
-                <el-input v-model="formLabelAlign2.tollCollectorName"></el-input>
+                <el-input v-model="formLabelAlign2.tollmanName"></el-input>
               </el-form-item>
               <el-form-item label="出生日期">
-                <el-input v-model="formLabelAlign2.birthday"></el-input>
+                  <el-date-picker
+                    v-model="formLabelAlign2.birthDay"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                  </el-date-picker>
               </el-form-item>
               <el-form-item label="岗位权限">
-                <el-input v-model="formLabelAlign2.postAuthority"></el-input>
+                <el-input v-model="formLabelAlign2.positionPermission"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -210,7 +214,7 @@ export default {
           key: 'tollmanReceiveId'
         },
       ],
-      tableData1: [{carParkingName: 'sasa'}],
+      tableData1: [],
       total1: 0,
       pageSize1: 10,
       pageNum1: 1,
@@ -245,18 +249,18 @@ export default {
         },
         {
           label: '收费员姓名',
-          key: 'tollCollectorName'
+          key: 'tollmanName'
         },
         {
           label: '出生日期',
-          key: 'birthday'
+          key: 'birthDay'
         },
         {
           label: '岗位权限',
-          key: 'postAuthority'
+          key: 'positionPermission'
         },
       ],
-      tableData2: [{tollCollectorName: 'sasa1'}],
+      tableData2: [],
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
@@ -267,24 +271,23 @@ export default {
       dialogVisible2: false,
       formLabelAlign2: {
         id: '',
-        tollCollectorName: '',
-        birthday: '',
-        postAuthority: '',
+        parkId:'',
+        tollmanName: '',
+        birthDay: '',
+        positionPermission: '',
       },
     }
   },
   mounted() {
     this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
-    // this.getTableData4()
+    this.getTableData2()
     this.getCarParkingName()
     this.getPeople()
   },
   watch: {},
   methods: {
     onSubmit1() {
-      api_l.optPersonnelManagementShiftPage({parkId: this.formLabelAlign.parkId}).then(res => {
+      api_l.optPersonnelManagementShiftPage({parkId: this.formInline1.parkId}).then(res => {
         this.tableData1 = res.data.records
       })
       },
@@ -309,11 +312,8 @@ export default {
       this.dialogVisible = true
     },
     deleteRow(record) {
-      api_l.optPersonnelManagementShiftDelete({id: record.id}).then(res => {
-        if (res.code === 200) {
-          this.$message({type: 'success', message: '删除成功!'})
-          this.getTableData1()
-        }
+      api_l.optPersonnelManagementShiftDelete([{id: record.id}]).then(res => {
+        this.getTableData1()
       })
     },
     //车场
@@ -330,23 +330,25 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改') {
-        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 => {
+        api_l.optPersonnelManagementShiftEdit({id:this.formLabelAlign2.id,incomeFee: this.formLabelAlign2.incomeFee, parkingNum: this.formLabelAlign2.parkingNum, excptionEvent: this.formLabelAlign2.excptionEvent, deviceStatus: this.formLabelAlign2.deviceStatus, vehicleStatus: this.formLabelAlign2.vehicleStatus}).then(res => {
           this.getTableData1()
           this.dialogVisible = false
         })
       }
     },
     onSubmit2() {
-      api_l.optPersonnelManagementBasicPage({searchKey: this.formLabelAlign.ipAddr}).then(res => {
-
+      api_l.optPersonnelManagementBasicDetail({tollmanName: this.formInline2.tollCollectorName}).then(res => {
+        this.tableData2 = res.data.records
       })
 
     },
     handleAdd2() {
       this.title2 = '添加'
-      this.formLabelAlign2.tollCollectorName = ''
-      this.formLabelAlign2.birthday = ''
-      this.formLabelAlign2.postAuthority = ''
+      this.formLabelAlign2.id=''
+      this.formLabelAlign2.parkId=''
+      this.formLabelAlign2.tollmanName=''
+      this.formLabelAlign2.birthDay=''
+      this.formLabelAlign2.positionPermission=''
       this.dialogVisible2 = true
     },
 
@@ -356,28 +358,36 @@ export default {
       this.dialogVisible2 = true
     },
     deleteRow2(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
-        if (res.code === 200) {
-          this.$message({type: 'success', message: '删除成功!'})
-          this.getTableData2()
-        }
+      api_l.optPersonnelManagementBasicDelete([{id: record.id}]).then(res => {
+      this.getTableData2()
       })
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api_l.optPersonnelManagementShiftEdit({carParkingName: this.formInline1.carParkingName}).then(res => {
-          this.tableData1 = res.data
+        api_l.optPersonnelManagementShiftEdit({id: this.formLabelAlign2.id,parkId: this.formLabelAlign2.parkId,tollmanName: this.formLabelAlign2.tollmanName,birthDay: this.formLabelAlign2.birthDay,positionPermission: this.formLabelAlign2.positionPermission}).then(res => {
+          this.dialogVisible2 = false
+          this.getTableData2()
         })
+      }else if (this.title2 === '添加') {
+        api_l.optPersonnelManagementBasicAdd({parkId: this.formLabelAlign2.parkId,tollmanName: this.formLabelAlign2.tollmanName,birthDay: this.formLabelAlign2.birthDay,positionPermission: this.formLabelAlign2.positionPermission}).then(res => {
+          this.dialogVisible2 = false
+          this.getTableData2()
+      })
       }
     },
     handlePageChange1() {
       this.getTableData1()
     },
     getTableData1() {
-      api_l.optPersonnelManagementShiftPage({}).then(res => {
+      api_l.optPerformanceAssessStat1page({}).then(res => {
         this.tableData1 = res.data.records
       })
     },
+    getTableData2() {
+      api_l.optPersonnelManagementBasicDetail({}).then(res => {
+        this.tableData2 = res.data.records
+      })
+    },
     handlePageChange2() {
       this.getTableData2()
     },