From d08b504d080dba50253b9b1f9ee25eebdf2b084e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 11 May 2023 17:56:06 +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 | 58 +++++++++++++++------------
 ruoyi-ui/src/views/index.vue          |  2 +-
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue
index 8005c8f..b4825c7 100644
--- a/ruoyi-ui/src/views/GPS/tyre/index.vue
+++ b/ruoyi-ui/src/views/GPS/tyre/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索栏-->
-    <el-form v-show="showSearch" ref="queryRef" :inline="true" :label-width=" locale ? '90px':'140px'"
+    <el-form v-show="showSearch" ref="queryRef" :rules="rules" :inline="true" :label-width=" locale ? '90px':'140px'"
              :model="queryParams">
       <el-form-item label="外胎号" prop="outerTireNumber">
         <el-input
@@ -18,8 +18,8 @@
             end-placeholder="结束日期"
             range-separator="-"
             start-placeholder="开始日期"
-            type="daterange"
-            value-format="YYYY-MM-DD"
+            type="datetimerange"
+            value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item label=" ">
@@ -89,7 +89,7 @@ const {proxy} = getCurrentInstance();
 // 表格数据
 const postList = ref([]);
 // 表格加载状态开关标识
-const loading = ref(true);
+const loading = ref(false);
 // 搜索区域开关标识
 const showSearch = ref(true);
 // 总条数
@@ -100,6 +100,10 @@ const dialogTableVisible = ref(false)
 const tempRef = ref();
 const outerTireNumberNow = ref('')
 
+const rules = {
+  outerTireNumber: { required: true, message: '请输入外胎号', trigger: 'blur' },
+}
+
 // 搜索参数
 const queryParams = ref({
   pageNum: 1,
@@ -126,26 +130,30 @@ const dialogOpened = () => {
 
 /** 查询岗位列表 */
 function getList() {
-  loading.value = true;
-  let str = queryParams.value.outerTireNumber || ''
-  str = str.replace(',', ' ')
-  str = str.replace('，', ' ')
-  str = str.replace('、', ' ')
-  let dataRow = str.split(' ')
-  let data = dataRow?.filter(e => !!e) || []
-  let params = {
-    outerTireNumbers: data?.toString(),
-    // params:{
-    //   beginTime:dateRange.value?.[0],
-    //   endTime:dateRange.value?.[1],
-    // }
-  }
-  listTest(proxy.addDateRange(params, dateRange.value)).then(response => {
-    postList.value = response.rows;
-    total.value = response.total;
-  }).finally(() => {
-    loading.value = false;
-  });
+  proxy.$refs["queryRef"].validate(valid => {
+    if (valid) {
+      loading.value = true;
+      let str = queryParams.value.outerTireNumber || ''
+      str = str.replace(',', ' ')
+      str = str.replace('，', ' ')
+      str = str.replace('、', ' ')
+      let dataRow = str.split(' ')
+      let data = dataRow?.filter(e => !!e) || []
+      let params = {
+        outerTireNumbers: data?.toString(),
+        // params:{
+        //   beginTime:dateRange.value?.[0],
+        //   endTime:dateRange.value?.[1],
+        // }
+      }
+      listTest(proxy.addDateRange(params, dateRange.value)).then(response => {
+        postList.value = response.rows;
+        total.value = response.total;
+      }).finally(() => {
+        loading.value = false;
+      });
+    }
+  })
 }
 
 /** 搜索按钮操作 */
@@ -167,5 +175,5 @@ function handleExport() {
   }, `post_${new Date().getTime()}.xlsx`);
 }
 
-getList();
+// getList();
 </script>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index dd95f9a..a13ec01 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -609,7 +609,7 @@ export default {
       const userStore = useUserStore()
 
       const getWebsocket = () => {
-        let websocket = new WebSocket("https://ticptest.tercelo.com/dev-api/websocket/message/" + userStore.name)
+        let websocket = new WebSocket("ws://10.11.41.249:8080/websocket/message/" + userStore.name)
         websocket.onopen = function (event) {
           // console.log('onopen',event)
         };