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

src/components/exportTable/exportTable.vue

@@ -3,7 +3,7 @@
     <el-button ref="hwcell" size="small" type="primary" @click="exportExcel"  v-if="isShow">文件导出</el-button>
     <el-table :data="tableData" style="width: 100%" border>
       <el-table-column type="index" label="序号" width="60" />
-      <el-table-column prop="etcCardNumber" label="ETC卡号" width="190" />
+      <el-table-column prop="etcCardNumber" label="ETC卡号" width="145" />
       <el-table-column prop="licensePlateNumber" label="车牌号" width="100" />
       <el-table-column prop="consumptionType" label="消费类型" width="90" />
       <el-table-column prop="entranceTime" label="入口时间" width="110" />

src/views/shengbo/blacklistQuery/blacklistQuery.vue

@@ -1,12 +1,13 @@
 <template>
-  <div style="font-size: 13px; color: rgb(209, 65, 65); margin-left: 16px">
+  <div class="OBU-query content-warpper">
+    <div style="font-size: 10px; color: rgb(209, 65, 65);margin-left: 15px;">
     注：目前仅支持中国工商银行贵州省分行、中国工商银行股份有限公司贵州省分行、农业银行、部互联网发行、
     世纪恒通、工行微ETC、工总行直连模式三、贵州农信联社、贵州工行微ETC、世纪恒通GH查询下黑原因！
   </div>
   <div class="top">
     <!-- 输入框 -->
     <div class="topstyle">
-      <span style="margin-right: 10px; width: 40px">卡号</span>
+      <span style="width: 40px">卡号</span>
       <el-input v-model="formdata.ardNumber" placeholder="请输入卡号" style="width: 220px">
       </el-input>
     </div>
@@ -40,11 +41,11 @@
     <div class="topstyle">
       <el-button type="success" :icon="Search" @click="search">搜索</el-button>
       <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
-      <el-button type="primary" :icon="Plus" @click="addTo">添加</el-button>
+      <!-- <el-button type="primary" :icon="Plus" @click="addTo">添加</el-button> -->
     </div>
   </div>
   <!-- 弹窗 -->
-  <div>
+  <!-- <div>
     <el-dialog v-model="dialogFormVisible">
       <span class="as-gravity-center" style="font-size: 25px">卡黑名单-操作(下黑反白)</span>
 
@@ -80,18 +81,18 @@
         </span>
       </template>
     </el-dialog>
-  </div>
+  </div> -->
   <div style="padding-top: 12px">
     <el-table :data="tableData" border style="width: 100%">
       <el-table-column type="index" label="序号" width="60" />
-      <el-table-column prop="ardNumber" label="卡号" width="120" />
+      <el-table-column prop="ardNumber" label="卡号" width="110" />
       <el-table-column prop="blacklistType" label="黑名单类型" width="100" />
-      <el-table-column prop="effectiveTimeOfBlacklist" label="黑名单生效时间" width="170" />
+      <el-table-column prop="effectiveTimeOfBlacklist" label="黑名单生效时间" width="160" />
       <el-table-column prop="state" label="状态" width="60" />
       <el-table-column prop="blacklistAntiWhiteTime" label="黑名单反白时间" width="130" />
       <el-table-column prop="xiaheiOperatorNo" label="下黑操作工号" width="110" />
       <el-table-column prop="causeOfBlack" label="下黑原因" width="200" />
-      <el-table-column prop="antiWhiteOperatorNo" label="反白操作工号" width="130" />
+      <el-table-column prop="antiWhiteOperatorNo" label="反白操作工号" width="110" />
       <el-table-column prop="negativeeasons" label="反白原因" width="110" />
       <el-table-column label="操作" width="90">
         <el-button @click="dialogFormVisible1 = true" style="border-style: none">详情</el-button>
@@ -135,6 +136,7 @@
       </template>
     </el-dialog>
   </div>
+  </div>
   <!-- <div style="padding-top: 12px" class="as-gravity-center-end">
     <el-pagination :page-sizes="[10, 20, 30, 40]" layout="sizes, prev, pager, next" :total="1000" />
   </div> -->
@@ -165,9 +167,9 @@ const addtodata = reactive({
 //搜索
 function search() {
   proxy.$request
-    .post('api/user',{},
+    .post('/blacklistquery/queryBlackList',{},
       {
-        baseURL: 'http://192.168.101.123:8080',
+        baseURL: 'http://10.52.0.172:10389',
       }
     )
     .then((res: {}) => {
@@ -259,7 +261,7 @@ const tableData: User[] = [
   {
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
-    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    effectiveTimeOfBlacklist: '2020-12-19 3:41:04',
     state: '在黑',
     blacklistAntiWhiteTime: '',
     xiaheiOperatorNo: 'ETCGsyh002',
@@ -270,7 +272,7 @@ const tableData: User[] = [
   {
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
-    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    effectiveTimeOfBlacklist: '2020-12-19 3:41:04',
     state: '在黑',
     blacklistAntiWhiteTime: '',
     xiaheiOperatorNo: 'ETCGsyh002',
@@ -281,7 +283,7 @@ const tableData: User[] = [
   {
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
-    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    effectiveTimeOfBlacklist: '2020-12-19 3:41:04',
     state: '在黑',
     blacklistAntiWhiteTime: '',
     xiaheiOperatorNo: 'ETCGsyh002',
@@ -292,7 +294,7 @@ const tableData: User[] = [
   {
     ardNumber: '52011640230217310678',
     blacklistType: '账户透支',
-    effectiveTimeOfBlacklist: '2020-12-19T03:41:04',
+    effectiveTimeOfBlacklist: '2020-12-19 3:41:04',
     state: '在黑',
     blacklistAntiWhiteTime: '',
     xiaheiOperatorNo: 'ETCGsyh002',
@@ -322,12 +324,13 @@ const tableData: User[] = [
     antiWhiteOperatorNo: '',
     negativeeasons: '',
   },
+  
 ]
 </script>
 <style lang="scss" scoped>
 .top {
   display: flex;
-  margin-left: 10px;
+  //margin-left: 10px;
 }
 .topstyle {
   display: flex;

src/views/shengbo/trafficFlow/trafficFlow.vue

@@ -1,76 +1,63 @@
 <template>
-  <div class="top">
-    <!-- 输入框 -->
-    <div class="topstyle">
-      <el-input v-model="formData.etcCardNumber" placeholder="请输入ETC卡号" style="width: 200px">
-      </el-input>
-    </div>
-    <div class="topstyle">
-      <el-input
-        v-model="formData.licensePlateNumber"
-        placeholder="请输入车牌号"
-        style="width: 200px"
-      >
-      </el-input>
-    </div>
-    <!-- 日期框 -->
-    <div class="topstyle">
-      <el-date-picker
-        v-model="formData.startDate"
-        type="datetime"
-        placeholder="开始日期"
-        value-format="YYYY-MM-DD hh:mm:ss"
-      />
-      <!-- <span>-</span> -->
-      <!-- <el-button>至</el-button> -->
-      <el-date-picker
-        v-model="formData.endDate"
-        type="datetime"
-        placeholder="结束日期"
-        value-format="YYYY-MM-DD hh:mm:ss"
-        style="margin-left: 5px"
-      />
-    </div>
-    <!-- 按钮 -->
-    <div class="topstyle">
-      <el-button type="success" :icon="Search" @click="search">搜索</el-button>
-      <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
-      
-      <el-button type="primary" plain @click="exportCurrentPage">导出当前页</el-button>
+  <div class="OBU-query content-warpper">
+    <div class="top">
+      <!-- 输入框 -->
+      <div class="topstyle">
+        <el-input v-model="formData.etcCardNumber" placeholder="请输入ETC卡号" style="width: 200px">
+        </el-input>
+      </div>
+      <div class="topstyle">
+        <el-input
+          v-model="formData.licensePlateNumber"
+          placeholder="请输入车牌号"
+          style="width: 200px"
+        >
+        </el-input>
+      </div>
+      <!-- 日期框 -->
+      <div class="topstyle" style="width: 410px">
+        <el-date-picker
+          v-model="formData.startDate"
+          type="datetime"
+          placeholder="开始日期"
+          value-format="YYYY-MM-DD hh:mm:ss"
+        />
+        <!-- <span>-</span> -->
+        <!-- <el-button>至</el-button> -->
+        <el-date-picker
+          v-model="formData.endDate"
+          type="datetime"
+          placeholder="结束日期"
+          value-format="YYYY-MM-DD hh:mm:ss"
+          style="margin-left: 5px"
+        />
+      </div>
+      <!-- 按钮 -->
+      <div class="topstyle">
+        <el-button type="success" :icon="Search" @click="search">搜索</el-button>
+        <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
 
-      <el-button type="primary" plain @click="exportAll">导出所有</el-button>
+        <el-button type="primary" plain @click="exportCurrentPage">导出当前页</el-button>
+
+        <el-button type="primary" plain @click="exportAll">导出所有</el-button>
+      </div>
     </div>
-  </div>
 
-  <div style="padding-top: 12px">
-  <exportTable ref="exportTS"></exportTable>
-    <!-- <el-table :data="tableData1" style="width: 100%" border>
-      <el-table-column type="index" label="序号" width="60" />
-      <el-table-column prop="etcCardNumber" label="ETC卡号" width="190" />
-      <el-table-column prop="licensePlateNumber" label="车牌号" width="100" />
-      <el-table-column prop="consumptionType" label="消费类型" width="90" />
-      <el-table-column prop="entranceTime" label="入口时间" width="110" />
-      <el-table-column prop="entryStationName" label="入口站名" width="110" />
-      <el-table-column prop="exportTime" label="出口时间" width="110" />
-      <el-table-column prop="exitStationName" label="出口站名" width="110" />
-      <el-table-column prop="balanceBeforeTransaction" label="交易前余额（元）" width="140" />
-      <el-table-column prop="transactionAmount" label="交易金额（元）" width="125" />
-      <el-table-column prop="postransactionalance" label="交易后余额（元）" width="140" />
-    </el-table> -->
-  </div>
-  <div style="padding-top: 12px" class="as-gravity-center-end">
-    <el-pagination :page-sizes="[10, 20, 30, 40]" :total="1000" />
+    <div style="padding-top: 12px">
+      <exportTable ref="exportTS"></exportTable>
+    </div>
+    <div style="padding-top: 12px" class="as-gravity-center-end">
+      <el-pagination :page-sizes="[10, 20, 30, 40]" :total="1000" />
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, toRaw,getCurrentInstance, onMounted  } from 'vue'
+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 exportTable from'../../../components/exportTable/exportTable.vue'
-
-
+import exportTable from '../../../components/exportTable/exportTable.vue'
 
 const { proxy }: any = getCurrentInstance()
 const formData = reactive({
@@ -81,7 +68,7 @@ const formData = reactive({
 })
 const exportTS = ref()
 const tableData = reactive({
-  title: "xx公司表格",
+  title: 'xx公司表格',
   serialNumber: '', //序号
   etcCardNumber: '', //ETC卡号
   licensePlateNumber: '', //车牌号
@@ -110,23 +97,22 @@ const tableData = reactive({
 
 //搜索
 function search() {
-  if(formData.etcCardNumber !=''){
+  if (formData.etcCardNumber != '') {
     proxy.$request
-    .post('/uc/trafficrecord/query',{},
-      {
-        baseURL: 'http://localhost:8080',
-      }
-    )
-    .then((res: {}) => {
-      console.log(res)
-    })
-    .catch((err: {}) => {
-      console.log(err)
-    })
-  }else{
-    
+      .post('/uc/trafficrecord/query',{},
+        {
+          baseURL: 'http://10.52.0.172:10389',
+        }
+      )
+      .then((res: {}) => {
+        console.log(res)
+      })
+      .catch((err: {}) => {
+        console.log(err)
+      })
+  } else {
   }
-  
+
   console.log(toRaw(formData))
   console.log('发送搜索请求')
 }
@@ -138,14 +124,14 @@ function reset() {
   formData.endDate = ''
 }
 //导出当前页
-const exportCurrentPage=()=>{
+const exportCurrentPage = () => {
   exportTS.value.exportExcel()
   // childRef.value.exportExcel()
-   console.log('导出当前页的表格数据')
+  console.log('导出当前页的表格数据')
 }
 //导出所有
 function exportAll() {
-  proxy.$refs.exportTable.exportExcel();
+  proxy.$refs.exportTable.exportExcel()
   console.log('导出所有数据')
 }