From e5daf7251943b8428f33daf4b1359f795e7c0dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 5 May 2023 11:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/GPS/tyre/index.vue         | 22 +++++++++----------
 .../src/views/carManagement/info/index.vue    | 21 +++++++++++++++++-
 ruoyi-ui/vite.config.js                       |  4 ++--
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue
index 74ca6d1..8005c8f 100644
--- a/ruoyi-ui/src/views/GPS/tyre/index.vue
+++ b/ruoyi-ui/src/views/GPS/tyre/index.vue
@@ -47,7 +47,7 @@
     <el-table v-loading="loading" :data="postList" @row-click="rowClick">
       <el-table-column align="center" fixed type="selection" width="55"/>
       <el-table-column align="center" label="序号" prop="internationalization1"
-                       width="55" type='index'/>
+                       type='index' width="55"/>
       <el-table-column align="center" label="外胎号" prop="outerTireNumber"
       />
       <el-table-column align="center" label="传感器ID" prop="sensorid"
@@ -69,13 +69,13 @@
         @pagination="getList"
     />
     <el-dialog v-model="dialogTableVisible" @opened="dialogOpened">
-      <temp  ref="tempRef" width='900px'/>
+      <temp ref="tempRef" width='900px'/>
     </el-dialog>
   </div>
 </template>
 
 <script name="Test" setup>
-import {listTest,getChartData} from "@/api/GPS/tyre";
+import {listTest, getChartData} from "@/api/GPS/tyre";
 import Temp from '@/views/dashboard/Temp'
 
 import {useI18n} from 'vue-i18n';
@@ -115,9 +115,9 @@ const rowClick = (e) => {
   outerTireNumberNow.value = e.outerTireNumber
   dialogTableVisible.value = true
 }
-const dialogOpened = ()=>{
+const dialogOpened = () => {
   console.log(tempRef)
-  getChartData({outerTireNumber:outerTireNumberNow.value}).then(val=>{
+  getChartData({outerTireNumber: outerTireNumberNow.value}).then(val => {
     console.log(val)
     tempRef.value.setData(val.data);
   })
@@ -128,13 +128,13 @@ const dialogOpened = ()=>{
 function getList() {
   loading.value = true;
   let str = queryParams.value.outerTireNumber || ''
-  str = str.replace(',',' ')
-  str = str.replace('，',' ')
-  str = str.replace('、',' ')
+  str = str.replace(',', ' ')
+  str = str.replace('，', ' ')
+  str = str.replace('、', ' ')
   let dataRow = str.split(' ')
-  let data = dataRow?.filter(e=>!!e) || []
-  let params= {
-    outerTireNumbers:data?.toString(),
+  let data = dataRow?.filter(e => !!e) || []
+  let params = {
+    outerTireNumbers: data?.toString(),
     // params:{
     //   beginTime:dateRange.value?.[0],
     //   endTime:dateRange.value?.[1],
diff --git a/ruoyi-ui/src/views/carManagement/info/index.vue b/ruoyi-ui/src/views/carManagement/info/index.vue
index c7e8f20..7b03436 100644
--- a/ruoyi-ui/src/views/carManagement/info/index.vue
+++ b/ruoyi-ui/src/views/carManagement/info/index.vue
@@ -118,6 +118,14 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <pagination
+          v-show="total1 > 0"
+          v-model:limit="queryParams1.pageSize"
+          v-model:page="queryParams1.pageNum"
+          :total="total1"
+          @pagination="bindSearch"
+      />
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="bindOk">{{ t('option.ok') }}</el-button>
@@ -217,6 +225,7 @@ const single = ref(true);
 const multiple = ref(true);
 // 总条数
 const total = ref(0);
+const total1 = ref(0);
 // 模态框标题
 const title = ref("");
 // 要绑定的行信息
@@ -234,6 +243,11 @@ const queryParams = ref({
   pageSize: 10,
   carLicense: undefined,
 })
+// 搜索参数
+const queryParams1 = ref({
+  pageNum: 1,
+  pageSize: 10,
+})
 
 // 表单验证规则
 const rules = {
@@ -310,9 +324,10 @@ const bindHandleSelectionChange = (selection) => {
 
 // 搜索接收器
 const bindSearch = () => {
-  let params = {deviceId: bindInput.value}
+  let params = {deviceId: bindInput.value,...queryParams1.value}
   getBindList(params).then(response => {
     bindList.value = response.rows;
+    total1.value = response.total;
   })
 }
 // 绑定接收器确定
@@ -362,6 +377,10 @@ function handleUpdate(row) {
 function handleBang(row) {
   bangOpen.value = true;
   waitBind.value = row
+  queryParams1.value = {
+    pageNum: 1,
+    pageSize: 10,
+  }
   bindSearch()
 }
 
diff --git a/ruoyi-ui/vite.config.js b/ruoyi-ui/vite.config.js
index 2bf97ac..eca58c4 100644
--- a/ruoyi-ui/vite.config.js
+++ b/ruoyi-ui/vite.config.js
@@ -34,9 +34,9 @@ export default defineConfig(({mode, command}) => {
             // open: true,
             proxy: {
                 '/dev-api': {
-                    // target: 'https://ticptest.tercelo.com/dev-api',
+                    target: 'https://ticptest.tercelo.com/dev-api',
                     // target: 'http://47.94.93.46/dev-api',
-                    target: 'http://10.11.41.249:8080',
+                    // target: 'http://10.11.41.249:8080',
                     // target: 'http://localhost:8080',
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, '')