添加搜索条件

ruoyi-ui/src/lang/zhCn.js

@@ -162,7 +162,12 @@ export default {
     mileage:'里程',
     ModifiedPatternDepth:'修改花纹深度',
     InstallationReplacement:'安装/更换',
-    UnloadingTire:'卸载轮胎'
+    UnloadingTire:'卸载轮胎',
+    specification:'规格',
+    serviceTime:'使用时间',
+    AllTimeHighTirePressure:'历史最高胎压',
+    EstimatedRemainingMileage:'预计剩余里程',
+    TheHighestFetalTemperatureEverRecorded:'历史最高胎温'
   },
   other: {
     tireInformationImport: '轮胎信息导入',

ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue

@@ -112,8 +112,9 @@ const handleQuery = () => {
   getTrack(proxy.addDateRange(queryParams.value, dateRange.value)).then(e => {
     text&&text.remove()
     let pathRow = e.data.map(val => [val.longitude, val.latitude])
-    convertFrom(pathRow,(result)=>{
-      let lnglats = result.map(e => [e.lng, e.lat]);
+    // convertFrom(pathRow,(result)=>{
+    //   let lnglats = result.map(e => [e.lng, e.lat]);
+    let lnglats = e.data.map(val => [val.longitude, val.latitude])
       console.log(lnglats)
       polyline = new AMap.Polyline({
         strokeColor: '#00BBFF', // 线颜色-深蓝色
@@ -129,7 +130,7 @@ const handleQuery = () => {
       })
       map.add(text);
       map.setFitView()
-    })
+    // })
     let grasp = new AMap.GraspRoad();
     // AMap.convertFrom(pathRow, 'gps', function (status, result) {
     //   if (result.info === 'ok') {

ruoyi-ui/src/views/tireManagement/lifecycle/index.vue

@@ -11,17 +11,17 @@
             </template>
           </el-input>
         </div>
-        <div>品牌：{{ tireInfo.brand }} 规格：{{ tireInfo.size }} 花纹：{{ tireInfo.pattern }}</div>
+        <div>{{ t('web.brand') }}：{{ tireInfo.brand }} {{ t('web.specification') }}：{{ tireInfo.size }} {{ t('web.pattern') }}：{{ tireInfo.pattern }}</div>
         <div>
-          <span class="yellow">使用时间&nbsp;&nbsp;</span>
+          <span class="yellow">{{ t('web.serviceTime') }}&nbsp;&nbsp;</span>
           <span>{{ tireInfo.userTime }}&nbsp;&nbsp;</span>
 <!--          <span class="yellow">最长连续报警时间&nbsp;&nbsp;</span>-->
 <!--          <span>{{ tireInfo.warringTime }}&nbsp;&nbsp;</span>-->
-          <span class="yellow">历史最高胎压&nbsp;&nbsp;</span>
+          <span class="yellow">{{ t('web.AllTimeHighTirePressure') }}&nbsp;&nbsp;</span>
           <span>{{ tireInfo.highPressHis }}&nbsp;&nbsp;</span>
         </div>
         <div>
-          <span class="yellow">预计剩余里程&nbsp;&nbsp;</span>
+          <span class="yellow">{{ t('web.EstimatedRemainingMileage') }}&nbsp;&nbsp;</span>
           <span>{{ tireInfo.surplusMileage }}km&nbsp;&nbsp;</span>
           <!--          <span class="yellow">最长连续工作时间&nbsp;&nbsp;</span>-->
           <!--          <span>{{ tireInfo.longestWorkTime }}&nbsp;&nbsp;</span>-->
@@ -81,7 +81,12 @@ import AMapLoader from '@amap/amap-jsapi-loader';
 import {getTyreLife,} from '@/api/tireManagement/lifecycle'
 import {parseTime} from "@/utils/ruoyi";
 import {Search} from '@element-plus/icons-vue'
+import {useI18n} from "vue-i18n";
+import Cookies from "js-cookie";
 
+const {t} = useI18n();
+
+const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
 const {proxy} = getCurrentInstance();
 const way = ref()
 const list = ref([])

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