Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

src/components/exportTable/exportTable.vue

@@ -56,7 +56,7 @@ export default {
     exportExcel() {
       //this.tableData1=this.tableData
       console.log(this.tableData,'==============');
-      if (!this.tableData1.length) {
+      if (!this.tableData.length) {
         this.$message.warning("暂无数据导出");
         return false;
       }
@@ -78,7 +78,7 @@ export default {
 
     //格式转换
     formatJson(filterVal) {
-      return this.tableData1.map(v =>
+      return this.tableData.map(v =>
         // obj = {
         //   name:'',
         //   age:''

src/views/shengbo/trafficFlow/trafficFlow.vue

@@ -47,7 +47,14 @@
       <exportTable ref="exportTS" :tableData="tableData1"></exportTable>
     </div>
     <div style="padding-top: 12px" class="as-gravity-center-end">
-      <!-- <el-pagination :page-sizes="pagesizes" :total="formData.total" :current-page="formData.pageNo" /> -->
+      <el-pagination 
+        layout="total,sizes,prev,pager,next,jumper"
+        :page-sizes="[7, 20, 30, 40]" 
+        v-model:total="formData.total"
+        v-model:current-page="formData.pageNo" 
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+       />
     </div>
   </div>
 </template>
@@ -56,15 +63,20 @@
 import { reactive, ref, toRaw, getCurrentInstance, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Calendar, Search, Refresh } from '@element-plus/icons-vue'
-import type { ElTable } from 'element-plus'
+import type { ElTable,ElPagination} from 'element-plus'
 import exportTable from '../../../components/exportTable/exportTable.vue'
 
 const { proxy }: any = getCurrentInstance()
-const pagesizes = ref(7)
+const handleSizeChange = (val: number) => {
+  console.log(`${val} items per page`)
+}
+const handleCurrentChange = (val: number) => {
+  console.log(`current page: ${val}`)
+}
 const formData = reactive({
-  pagesizes: '',//每页显示条数
-  total: '', //总条数
-  pageNo: '', //当前页
+  //pagesizes: '',//每页显示条数
+  total: 100, //总条数
+  pageNo: 1, //当前页
   etcCardNumber: '', //ETC卡号
   licensePlateNumber: '', //车牌号
   startDate: '', //开始日期
@@ -85,27 +97,14 @@ const tableData = reactive({
   postransactionalance: '', //交易后余额
 })
 
-//  json_fields: {
-//         "排查日期":'date',
-//         "整改隐患内容":'details',
-//         "整改措施":'measure',
-//         "整改时限":'timeLimit',
-//         "应急措施和预案":'plan',
-//         "整改责任人":'personInCharge',
-//         "填表人":'preparer',
-//         "整改资金":'fund',
-//         "整改完成情况":'complete',
-//         "备注":'remark',
-//       },
-
 //搜索
 function search() {
   if (formData.etcCardNumber != '') {
     proxy.$request
       .post('/uc/trafficrecord/query',{
-        cardId : formData.etcCardNumber,
-        vehiclePlate : formData.licensePlateNumber,
-        pageNo:1,
+        cardId: formData.etcCardNumber,
+        vehiclePlate: formData.licensePlateNumber,
+        pageNo: formData.pageNo,
       },
         {
           baseURL: 'http://10.52.0.172:10389/csms',
@@ -238,6 +237,216 @@ const tableData1 = [
     transactionAmount: '0.00',
     postransactionalance: '38.25',
   },
+  {
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },{
+    etcCardNumber: '52011328220200481698',
+    licensePlateNumber: '贵A710AE',
+    consumptionType: '省内流水',
+    entranceTime: '2019-12-27 20:14:02',
+    entryStationName: '贵阳西主线站',
+    exportTime: '2019-12-27 20:18:20',
+    exitStationName: '贵阳西主线站',
+    balanceBeforeTransaction: '38.25',
+    transactionAmount: '0.00',
+    postransactionalance: '38.25',
+  },
 ]
 </script>
 <style lang="scss" scoped>