岗亭操作和业务配置

src/api/article_z.js

@@ -402,4 +402,68 @@ export default {
   deleteParkingOutsideOperationSpecial(params) {
     return axios.post(`/opt/parking/outside/operation/special/delete`, params)
   },
+  // 岗亭操作——获取抬杆记录分页
+  queryParkingOutsideOperationLiftByPage(params) {
+    return axios.get(`/opt/parking/outside/operation/lift/page`, {params})
+  },
+  // 岗亭操作——添加抬杆记录
+  addParkingOutsideOperationLift(params) {
+    return axios.post(`/opt/parking/outside/operation/lift/add`, params)
+  },
+  // 岗亭操作——编辑抬杆记录
+  editParkingOutsideOperationLift(params) {
+    return axios.post(`/opt/parking/outside/operation/lift/edit`, params)
+  },
+  // 岗亭操作——删除抬杆记录
+  deleteParkingOutsideOperationLift(params) {
+    return axios.post(`/opt/parking/outside/operation/lift/delete`, params)
+  },
+  // 业务配置——获取业务参数配置分页
+  queryServiceConfigurationConfigByPage(params) {
+    return axios.get(`/opt/service/configuration/config/page`, {params})
+  },
+  // 岗亭操作——添加业务参数配置
+  addServiceConfigurationConfig(params) {
+    return axios.post(`/opt/service/configuration/config/add`, params)
+  },
+  // 岗亭操作——编辑业务参数配置
+  editServiceConfigurationConfig(params) {
+    return axios.post(`/opt/service/configuration/config/edit`, params)
+  },
+  // 岗亭操作——删除业务参数配置
+  deleteServiceConfigurationConfig(params) {
+    return axios.post(`/opt/service/configuration/config/delete`, params)
+  },
+  // 业务配置——获取节假日配置分页
+  queryServiceConfigurationHolidayByPage(params) {
+    return axios.get(`/opt/service/configuration/holiday/page`, {params})
+  },
+  // 岗亭操作——添加节假日配置
+  addServiceConfigurationHoliday(params) {
+    return axios.post(`/opt/service/configuration/holiday/add`, params)
+  },
+  // 岗亭操作——编辑节假日配置
+  editServiceConfigurationHoliday(params) {
+    return axios.post(`/opt/service/configuration/holiday/edit`, params)
+  },
+  // 岗亭操作——删除节假日配置
+  deleteServiceConfigurationHoliday(params) {
+    return axios.post(`/opt/service/configuration/holiday/delete`, params)
+  },
+  // 业务配置——获取热门商圈配置分页
+  queryServiceConfigurationDistrictByPage(params) {
+    return axios.get(`/opt/service/configuration/district/page`, {params})
+  },
+  // 岗亭操作——添加热门商圈配置
+  addServiceConfigurationDistrict(params) {
+    return axios.post(`/opt/service/configuration/district/add`, params)
+  },
+  // 岗亭操作——编辑热门商圈配置
+  editServiceConfigurationDistrict(params) {
+    return axios.post(`/opt/service/configuration/district/edit`, params)
+  },
+  // 岗亭操作——删除热门商圈配置
+  deleteServiceConfigurationDistrict(params) {
+    return axios.post(`/opt/service/configuration/district/delete`, params)
+  },
 }

src/pages/index/components/parking_outside_operation.vue

@@ -356,12 +356,24 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="收费员:">
-                <el-input v-model="formInline5.tollmanName" placeholder="请输入"></el-input>
+                <el-select clearable v-model="formInline5.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="抬杆类型:">
-                <el-input v-model="formInline5.liftingRodType" placeholder="请输入"></el-input>
+              <el-form-item label="车场名称:">
+                <el-select clearable v-model="formInline5.parkId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -401,24 +413,36 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="100px" :model="formLabelAlign5">
-              <el-form-item label="收费员">
-                <el-input v-model="formLabelAlign5.tollmanName"></el-input>
+              <el-form-item label="车场名称">
+                <el-select v-model="formLabelAlign5.parkId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in carParkingNameOptions"
+                    :key="index"
+                    :label="item.parkName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
-              <el-form-item label="抬杆类型">
-                <el-input v-model="formLabelAlign5.liftingRodType"></el-input>
+              <el-form-item label="收费员">
+                <el-select v-model="formLabelAlign5.tollmanId" placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in tollmanOptions"
+                    :key="index"
+                    :label="item.tollmanName"
+                    :value="item.id" />
+                </el-select>
               </el-form-item>
               <el-form-item label="抬杆时间">
                 <el-date-picker
-                  v-model="formLabelAlign5.liftingRodTime"
+                  v-model="formLabelAlign5.createTime"
                   type="date"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="抬杆车辆">
-                <el-input v-model="formLabelAlign5.liftingRodCar"></el-input>
+              <el-form-item label="抬杆类型">
+                <el-input v-model="formLabelAlign5.liftType"></el-input>
               </el-form-item>
-              <el-form-item label="应收费用">
-                <el-input v-model="formLabelAlign5.receivableFee"></el-input>
+              <el-form-item label="抬杆车辆">
+                <el-input v-model="formLabelAlign5.plateNo"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -592,19 +616,19 @@ export default {
         },
         {
           label: '抬杆类型',
-          key: 'liftingRodType'
+          key: 'liftType'
         },
         {
           label: '抬杆时间',
-          key: 'liftingRodTime'
+          key: 'createTime'
         },
         {
           label: '抬杆车辆',
-          key: 'liftingRodCar'
+          key: 'plateNo'
         },
         {
-          label: '应收费用',
-          key: 'receivableFee'
+          label: '车场名称',
+          key: 'carParkName'
         },
       ],
       tableData5: [{tollmanName: 'sasa1111'}],
@@ -613,17 +637,16 @@ export default {
       pageNum5: 1,
       formInline5: {
         tollmanId: '',
-        liftingRodType: '',
+        parkId: '',
       },
       title5: '',
       dialogVisible5: false,
       formLabelAlign5: {
         id: '',
         tollmanId: '',
-        liftingRodType: '',
-        liftingRodTime: '',
-        liftingRodCar: '',
-        receivableFee: '',
+        liftType: '',
+        plateNo: '',
+        parkId: '',
       },
     }
   },
@@ -634,7 +657,7 @@ export default {
     this.getTableData2()
     this.getTableData3()
     this.getTableData4()
-    // this.getTableData5()
+    this.getTableData5()
   },
   watch: {},
   methods: {
@@ -857,7 +880,7 @@ export default {
       this.dialogVisible5 = true
     },
     deleteRow5(record) {
-      api_z.deleteWhiteIp([{id: record.id}]).then(res => {
+      api_z.deleteParkingOutsideOperationLift([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData5()
@@ -866,7 +889,7 @@ export default {
     },
     handleConfirm5() {
       if (this.title5 === '修改') {
-        api_z.addWhiteIp({...this.formLabelAlign5}).then(res => {
+        api_z.editParkingOutsideOperationLift({...this.formLabelAlign5}).then(res => {
           if (res.code === 200) {
             this.dialogVisible5 = false
             this.$message({
@@ -877,7 +900,7 @@ export default {
           }
         })
       } else {
-        api_z.addWhiteIp({...this.formLabelAlign5}).then(res => {
+        api_z.addParkingOutsideOperationLift({...this.formLabelAlign5}).then(res => {
           if (res.code === 200) {
             this.dialogVisible5 = false
             this.$message({
@@ -934,7 +957,7 @@ export default {
     },
     getTableData5() {
       const {pageNum5, pageSize5} = this
-      api_z.tcjlListByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
+      api_z.queryParkingOutsideOperationLiftByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
         this.tableData5 = res.data.records || []
         this.total5 = res.data.total
       })

src/pages/index/components/service_configuration.vue

@@ -5,15 +5,15 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="所在区域:">
-                <el-input v-model="formInline1.localArea" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务类型:">
-                <el-input v-model="formInline1.businessType" placeholder="请输入"></el-input>
+              <el-form-item label="区域编码:">
+                <el-input v-model="formInline1.regionCode" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="业务类型:">-->
+<!--                <el-input v-model="formInline1.serviceType" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="8">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit1">查询</el-button>
@@ -50,17 +50,20 @@
           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.regionCode"></el-input>
+              </el-form-item>
               <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign.localArea"></el-input>
+                <el-input v-model="formLabelAlign.regionName"></el-input>
               </el-form-item>
               <el-form-item label="业务类型">
-                <el-input v-model="formLabelAlign.businessType"></el-input>
+                <el-input v-model="formLabelAlign.serviceType"></el-input>
               </el-form-item>
               <el-form-item label="内容">
-                <el-input v-model="formLabelAlign.content"></el-input>
+                <el-input v-model="formLabelAlign.configKey"></el-input>
               </el-form-item>
               <el-form-item label="参数配置">
-                <el-input v-model="formLabelAlign.parameterConfiguration"></el-input>
+                <el-input v-model="formLabelAlign.configValue"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -74,15 +77,15 @@
         <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.localArea" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="节假日名称:">
-                <el-input v-model="formInline2.holidayName" placeholder="请输入"></el-input>
+              <el-form-item label="区域编码:">
+                <el-input v-model="formInline2.regionCode" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="节假日名称:">-->
+<!--                <el-input v-model="formInline2.holidayName" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="8">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit2">查询</el-button>
@@ -119,14 +122,17 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="145px" :model="formLabelAlign2">
+              <el-form-item label="区域编码">
+                <el-input v-model="formLabelAlign2.regionCode"></el-input>
+              </el-form-item>
               <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign2.localArea"></el-input>
+                <el-input v-model="formLabelAlign2.regionName"></el-input>
               </el-form-item>
               <el-form-item label="节假日名称">
                 <el-input v-model="formLabelAlign2.holidayName"></el-input>
               </el-form-item>
               <el-form-item label="基础停车费(元/小时)">
-                <el-input v-model="formLabelAlign2.basicFee"></el-input>
+                <el-input v-model="formLabelAlign2.pakingFee"></el-input>
               </el-form-item>
               <el-form-item label="超时费(元/小时)">
                 <el-input v-model="formLabelAlign2.overtimeFee"></el-input>
@@ -143,15 +149,15 @@
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="所在区域:">
-                <el-input v-model="formInline3.localArea" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="商圈名称:">
-                <el-input v-model="formInline3.businessDistrictName" placeholder="请输入"></el-input>
+              <el-form-item label="区域编码:">
+                <el-input v-model="formInline3.regionCode" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="商圈名称:">-->
+<!--                <el-input v-model="formInline3.districtName	" placeholder="请输入"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="8">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit3">查询</el-button>
@@ -189,14 +195,17 @@
           custom-class="audit-dialog">
           <div class="form-div">
             <el-form label-position="left" label-width="145px" :model="formLabelAlign3">
+              <el-form-item label="区域编码">
+                <el-input v-model="formLabelAlign3.regionCode"></el-input>
+              </el-form-item>
               <el-form-item label="所在区域">
-                <el-input v-model="formLabelAlign3.localArea"></el-input>
+                <el-input v-model="formLabelAlign3.regionName"></el-input>
               </el-form-item>
               <el-form-item label="商圈名称">
-                <el-input v-model="formLabelAlign3.businessDistrictName"></el-input>
+                <el-input v-model="formLabelAlign3.districtName	"></el-input>
               </el-form-item>
               <el-form-item label="基础停车费(元/小时)">
-                <el-input v-model="formLabelAlign3.basicFee"></el-input>
+                <el-input v-model="formLabelAlign3.pakingFee"></el-input>
               </el-form-item>
               <el-form-item label="超时费(元/小时)">
                 <el-input v-model="formLabelAlign3.overtimeFee"></el-input>
@@ -289,6 +298,7 @@
 <script>
 import api from "@/api/audit.js";
 import dictionary from "@/util/dictionary";
+import api_z from "@/api/article_z.js";
 
 export default {
   components: {},
@@ -296,44 +306,53 @@ export default {
     return {
       activeName: '业务参数配置',
       columns1: [
+        {
+          label: '区域编码',
+          key: 'regionCode'
+        },
         {
           label: '所在区域',
-          key: 'localArea'
+          key: 'regionName'
         },
         {
           label: '业务类型',
-          key: 'businessType'
+          key: 'serviceType'
         },
         {
           label: '内容',
-          key: 'content'
+          key: 'configKey'
         },
         {
           label: '参数配置',
-          key: 'parameterConfiguration'
+          key: 'configValue'
         },
       ],
-      tableData1: [{localArea: 'sasa'}],
+      tableData1: [{regionName: 'sasa'}],
       total1: 0,
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        localArea: '',
-        businessType:'',
+        regionCode: '',
+        // serviceType:'',
       },
       title: '',
       dialogVisible: false,
       formLabelAlign: {
         id: '',
-        localArea: '',
-        businessType:'',
-        content: '',
-        parameterConfiguration: '',
+        regionCode: '',
+        regionName: '',
+        serviceType:'',
+        configKey: '',
+        configValue: '',
       },
       columns2: [
+        {
+          label: '区域编码',
+          key: 'regionCode'
+        },
         {
           label: '所在区域',
-          key: 'localArea'
+          key: 'regionName'
         },
         {
           label: '节假日名称',
@@ -341,42 +360,47 @@ export default {
         },
         {
           label: '基础停车费(元/小时)',
-          key: 'basicFee'
+          key: 'pakingFee'
         },
         {
           label: '超时费(元/小时)',
           key: 'overtimeFee'
         },
       ],
-      tableData2: [{localArea: 'sasa1'}],
+      tableData2: [{regionName: 'sasa1'}],
       total2: 0,
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        localArea: '',
+        regionCode: '',
         holidayName:'',
       },
       title2: '',
       dialogVisible2: false,
       formLabelAlign2: {
         id: '',
-        localArea: '',
+        regionCode: '',
+        regionName: '',
         holidayName:'',
-        basicFee: '',
+        pakingFee: '',
         overtimeFee: '',
       },
       columns3: [
+        {
+          label: '区域编码',
+          key: 'regionCode'
+        },
         {
           label: '所在区域',
-          key: 'localArea'
+          key: 'regionName'
         },
         {
           label: '商圈名称',
-          key: 'businessDistrictName'
+          key: 'districtName	'
         },
         {
           label: '基础停车费(元/小时)',
-          key: 'basicFee'
+          key: 'pakingFee'
         },
         {
           label: '超时费(元/小时)',
@@ -388,16 +412,16 @@ export default {
       pageSize3: 10,
       pageNum3: 1,
       formInline3: {
-        localArea: '',
-        businessDistrictName: ''
+        regionCode: '',
+        districtName	: ''
       },
       title3: '',
       dialogVisible3: false,
       formLabelAlign3: {
         id: '',
-        localArea: '',
-        businessDistrictName: '',
-        basicFee: '',
+        regionName: '',
+        districtName	: '',
+        pakingFee: '',
         overtimeFee: '',
       },
       columns4: [
@@ -438,9 +462,9 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
+    this.getTableData1()
+    this.getTableData2()
+    this.getTableData3()
     // this.getTableData4()
   },
   watch: {},
@@ -451,10 +475,7 @@ export default {
     },
     handleAdd() {
       this.title = '添加'
-      this.formLabelAlign.localArea = ''
-      this.formLabelAlign.businessType = ''
-      this.formLabelAlign.content = ''
-      this.formLabelAlign.parameterConfiguration = ''
+      this.formLabelAlign = {}
       this.dialogVisible = true
     },
     handleEdit(row) {
@@ -463,7 +484,7 @@ export default {
       this.dialogVisible = true
     },
     deleteRow(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteServiceConfigurationConfig([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()
@@ -472,7 +493,7 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+        api_z.editServiceConfigurationConfig({...this.formLabelAlign}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -483,7 +504,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+        api_z.addServiceConfigurationConfig({...this.formLabelAlign}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -501,10 +522,7 @@ export default {
     },
     handleAdd2() {
       this.title2 = '添加'
-      this.formLabelAlign2.localArea= ''
-      this.formLabelAlign2.holidayName= ''
-      this.formLabelAlign2.basicFee= ''
-      this.formLabelAlign2.overtimeFee = ''
+      this.formLabelAlign2 = {}
       this.dialogVisible2 = true
     },
 
@@ -514,7 +532,7 @@ export default {
       this.dialogVisible2 = true
     },
     deleteRow2(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteServiceConfigurationHoliday([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData2()
@@ -523,7 +541,7 @@ export default {
     },
     handleConfirm2() {
       if (this.title2 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
+        api_z.editServiceConfigurationHoliday({...this.formLabelAlign2}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -534,7 +552,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
+        api_z.addServiceConfigurationHoliday({...this.formLabelAlign2}).then(res => {
           if (res.code === 200) {
             this.dialogVisible2 = false
             this.$message({
@@ -552,10 +570,7 @@ export default {
     },
     handleAdd3() {
       this.title3 = '添加'
-      this.formLabelAlign3.localArea = ''
-      this.formLabelAlign3.businessDistrictName = ''
-      this.formLabelAlign3.basicFee = ''
-      this.formLabelAlign3.overtimeFee = ''
+      this.formLabelAlign3 = {}
       this.dialogVisible3 = true
     },
 
@@ -565,7 +580,7 @@ export default {
       this.dialogVisible3 = true
     },
     deleteRow3(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteServiceConfigurationDistrict([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData3()
@@ -574,7 +589,7 @@ export default {
     },
     handleConfirm3() {
       if (this.title3 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
+        api_z.editServiceConfigurationDistrict({...this.formLabelAlign3}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -585,7 +600,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
+        api_z.addServiceConfigurationDistrict({...this.formLabelAlign3}).then(res => {
           if (res.code === 200) {
             this.dialogVisible3 = false
             this.$message({
@@ -603,10 +618,7 @@ export default {
     },
     handleAdd4() {
       this.title4 = '添加'
-      this.formLabelAlign4.tollCollector= ''
-      this.formLabelAlign4.plateNo= ''
-      this.formLabelAlign4.releaseTime= ''
-      this.formLabelAlign4.releaseReason = ''
+      this.formLabelAlign4 = {}
       this.dialogVisible4 = true
     },
 
@@ -616,7 +628,7 @@ export default {
       this.dialogVisible4 = true
     },
     deleteRow4(record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api_z.deleteWhiteIp([{id: record.id}]).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData4()
@@ -625,7 +637,7 @@ export default {
     },
     handleConfirm4() {
       if (this.title4 === '修改') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr, id: this.formLabelAlign4.id}).then(res => {
+        api_z.addWhiteIp({...this.formLabelAlign4}).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -636,7 +648,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr}).then(res => {
+        api_z.addWhiteIp({...this.formLabelAlign4}).then(res => {
           if (res.code === 200) {
             this.dialogVisible4 = false
             this.$message({
@@ -653,8 +665,8 @@ export default {
     },
     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]}))
+      api_z.queryServiceConfigurationConfigByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+        this.tableData1 = res.data.records || []
         this.total1 = res.data.total
       })
     },
@@ -663,7 +675,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api_z.queryServiceConfigurationHolidayByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })
@@ -673,7 +685,7 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
+      api_z.queryServiceConfigurationDistrictByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
         this.tableData3 = res.data.records || []
         this.total3 = res.data.total
       })
@@ -683,7 +695,7 @@ export default {
     },
     getTableData4() {
       const {pageNum4, pageSize4} = this
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
+      api_z.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
         this.tableData4 = res.data.records || []
         this.total4 = res.data.total
       })