修改电子围栏

ruoyi-ui/src/views/GPS/car/index.vue

@@ -12,10 +12,10 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="接收机" prop="internationalization2">
+      <el-form-item label="收发器" prop="machineId">
         <el-input
-            v-model="queryParams.internationalization2"
-            :placeholder="t('common.pleaseEnter') + '接收机'"
+            v-model="queryParams.machineId"
+            :placeholder="t('common.pleaseEnter') + '收发器'"
             clearable
             style="width: 200px"
             @keyup.enter.native="handleQuery"
@@ -56,8 +56,8 @@
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column align="center" fixed type="selection" width="55"/>
       <el-table-column label="序号" align="center" type="index" width="50" />
-      <el-table-column label="GPS时间" align="center" prop="internationalization2"
-                       width="150"/>
+<!--      <el-table-column label="GPS时间" align="center" prop="internationalization2"-->
+<!--                       width="150"/>-->
       <el-table-column label="收发器ID" align="center" prop="machineId"
                        width="150"/>
       <el-table-column label="车牌号" align="center" prop="carLicense"
@@ -138,7 +138,7 @@ const queryParams = ref({
   pageNum: 1,
   pageSize: 10,
   carLicense: undefined,
-  internationalization2: undefined,
+  machineId: undefined,
   internationalization3: undefined,
 })
 

ruoyi-ui/src/views/report/temppresspeed/index.vue

@@ -26,18 +26,13 @@
       <el-form-item label=" ">
         <el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button>
         <el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
-        <el-form-item label="轮位" prop="outerTireNumber">
-          <el-input
-                  v-model="position"
-                  :disabled="true">
-          </el-input>
-        </el-form-item>
+
       </el-form-item>
 
     </el-form>
 
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <temp  />
+      <temp  ref="tempRef"/>
     </el-row>
     <el-row :gutter="32">
       <el-col :xs="24" :sm="24" :lg="8" @click="handleTyreMileage">
@@ -47,12 +42,12 @@
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <pie-chart />
+          <pie-chart ref="pieRef"/>
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <bar-chart />
+          <bar-chart ref="barRef"/>
         </div>
       </el-col>
     </el-row>
@@ -74,6 +69,10 @@
 const {proxy} = getCurrentInstance();
 // 搜索区域开关标识
 const showSearch = ref(true);
+const dateRange = ref([]);
+const tempRef = ref();
+const pieRef = ref();
+const barRef = ref()
 
 // 搜索参数
 const queryParams = ref({
@@ -97,17 +96,18 @@
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-    getTempdata(queryParams.value).then(response => {
-      console.log(response)
+  getTempdata(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    tempRef.value.setData(response.data);
+    pieRef.value.setData(response?.data?.WarnData);
+    barRef.value.setData(response?.data?.patternTextureList)
   }).finally(() => {
-      loading.value = false;
+    //loading.value = false;
   });
   //getList();
 }
 /** 搜索按钮操作 */
 function handleTyreMileage() {
 
-    // this.$tab.openPage("用户管理", "/system/user");
 }
 /** 重置按钮操作 */
 const resetQuery = () => {

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/, '')