From fe125c28731a9352720bf0ee7b863ad6fc624b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 22 May 2023 11:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/GPS/car/index.vue          |   2 +-
 ruoyi-ui/src/views/GPS/tyre/index.vue         |   2 +-
 .../carManagement/fleetManagement/index.vue   |   2 +-
 .../src/views/carManagement/info/index.vue    |   2 +-
 .../src/views/carManagement/type/index.vue    |   2 +-
 .../src/views/deviceManagement/info/index.vue |   2 +-
 .../src/views/feedback/feedback/index.vue     |   2 +-
 .../alarmSendingSettings/index.vue            |   2 +-
 .../alarmStatistics/index.vue                 |   2 +-
 .../carMonitoring/index.vue                   |  25 +-
 .../electronicFence/index.vue                 |   2 +-
 .../historicalRoute/index.vue                 |   2 +-
 .../vehicleMonitoring/index.vue               |   2 +-
 .../src/views/report/temppresspeed/index.vue  |   2 +-
 ruoyi-ui/src/views/system/menu/index.vue      | 532 ++++++++++--------
 .../src/views/tireManagement/info/index.vue   |  50 +-
 .../views/tireManagement/install/index.vue    |   2 +-
 .../views/tireManagement/lifecycle/index.vue  |   2 +-
 .../views/tireManagement/salesData/index.vue  |   2 +-
 19 files changed, 334 insertions(+), 305 deletions(-)

diff --git a/ruoyi-ui/src/views/GPS/car/index.vue b/ruoyi-ui/src/views/GPS/car/index.vue
index 61df508..2bc804d 100644
--- a/ruoyi-ui/src/views/GPS/car/index.vue
+++ b/ruoyi-ui/src/views/GPS/car/index.vue
@@ -112,7 +112,7 @@
   </div>
 </template>
 
-<script name="Test" setup>
+<script name="Car" setup>
 import { listTest} from "@/api/GPS/car";
 
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue
index 2d6bec8..32e3b51 100644
--- a/ruoyi-ui/src/views/GPS/tyre/index.vue
+++ b/ruoyi-ui/src/views/GPS/tyre/index.vue
@@ -74,7 +74,7 @@
   </div>
 </template>
 
-<script name="Test" setup>
+<script name="Tyre" setup>
 import {listTest, getChartData} from "@/api/GPS/tyre";
 import Temp from '@/views/dashboard/Temp'
 
diff --git a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
index 25cfba1..4fbcf88 100644
--- a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
+++ b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue
@@ -134,7 +134,7 @@
   </div>
 </template>
 
-<script name="CarQueue" setup>
+<script name="Carqueue" setup>
 import {
   addCarQueue,
   delCarQueue,
diff --git a/ruoyi-ui/src/views/carManagement/info/index.vue b/ruoyi-ui/src/views/carManagement/info/index.vue
index 0e76cd2..758df4b 100644
--- a/ruoyi-ui/src/views/carManagement/info/index.vue
+++ b/ruoyi-ui/src/views/carManagement/info/index.vue
@@ -273,7 +273,7 @@
   </div>
 </template>
 
-<script name="basetyre" setup>
+<script name="Info" setup>
 import {
   addBaseCar,
   delBaseCar,
diff --git a/ruoyi-ui/src/views/carManagement/type/index.vue b/ruoyi-ui/src/views/carManagement/type/index.vue
index b85e7b1..1c62c35 100644
--- a/ruoyi-ui/src/views/carManagement/type/index.vue
+++ b/ruoyi-ui/src/views/carManagement/type/index.vue
@@ -176,7 +176,7 @@
   </div>
 </template>
 
-<script name="basetyre" setup>
+<script name="Cartype" setup>
 import {addCartype, delCartype, getCartype, listCartype, updateCartype} from "@/api/carManagement/type";
 
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/deviceManagement/info/index.vue b/ruoyi-ui/src/views/deviceManagement/info/index.vue
index 7cc3371..a65eb67 100644
--- a/ruoyi-ui/src/views/deviceManagement/info/index.vue
+++ b/ruoyi-ui/src/views/deviceManagement/info/index.vue
@@ -173,7 +173,7 @@
   </div>
 </template>
 
-<script name="CarQueue" setup>
+<script name="Basedevice" setup>
 import {
   addBaseDevice,
   delBaseDevice,
diff --git a/ruoyi-ui/src/views/feedback/feedback/index.vue b/ruoyi-ui/src/views/feedback/feedback/index.vue
index 385e1b8..f3af309 100644
--- a/ruoyi-ui/src/views/feedback/feedback/index.vue
+++ b/ruoyi-ui/src/views/feedback/feedback/index.vue
@@ -40,7 +40,7 @@
   </div>
 </template>
 
-<script name="basetyre" setup>
+<script name="Feedback" setup>
 import {
   uploadImg
 } from "@/api/feedback/feedback";
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue
index a8e9e5f..3409f19 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue
@@ -45,7 +45,7 @@
 </template>
 
 
-<script name="Test" setup>
+<script name="AlarmSendingSettings" setup>
 import {listBaseCar, setAttributes, getInfoById} from "@/api/realTimeMonitoring/alarmSendingSettings";
 
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue
index cff5d79..39915f2 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue
@@ -94,7 +94,7 @@
   </div>
 </template>
 
-<script name="Test" setup>
+<script name="AlarmStatistics" setup>
 import {alarmList,alarmProcessing} from "@/api/realTimeMonitoring/alarmStatistics";
 
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
index 3cf85da..3ff154c 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue
@@ -42,11 +42,15 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature).toFixed(3) }}℃
+                {{
+                  parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature).toFixed(3)
+                }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
-                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure).toFixed(3) }}Pa
+                {{
+                  parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure).toFixed(3)
+                }}Pa
               </div>
               <!--              <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
               <!--                花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pattern }}-->
@@ -60,7 +64,9 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align: top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature).toFixed(3) }}℃
+                {{
+                  parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature).toFixed(3)
+                }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
@@ -80,7 +86,9 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature).toFixed(3) }}℃
+                {{
+                  parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature).toFixed(3)
+                }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
@@ -98,7 +106,9 @@
                  style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon1"/>
-                {{ parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature).toFixed(3) }}℃
+                {{
+                  parseFloat(tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature).toFixed(3)
+                }}℃
               </div>
               <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
                 <div class="icon2"/>
@@ -119,6 +129,7 @@
             @tab-click="resetQuery"
         >
           <el-tab-pane :label="t('web.VehiclesWithOnBoardEquipment')" name="有车载设备车辆">
+
             <el-form ref="queryRef" :inline="true" :model="queryParams"
                      label-width="60px" max-height="800">
               <el-form-item :label="t('web.licensePlateNumber')" prop="carLicense">
@@ -247,7 +258,7 @@
   </div>
 </template>
 
-<script setup>
+<script name="CarMonitoring1" setup>
 import {listBaseCar, getCarGpsList, getTyreList} from '@/api/realTimeMonitoring/carMonitoring'
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {useI18n} from "vue-i18n";
@@ -334,7 +345,7 @@ const getList = async () => {
 }
 
 
-const setChildrenList =async (e) => {
+const setChildrenList = async (e) => {
   const {rows: list} = await listBaseCar({
     pageNum: 1,
     pageSize: 10,
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue
index 9488dc2..7c5faf6 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue
@@ -33,7 +33,7 @@
     <div id="container4"></div>
   </div>
 </template>
-<script setup>
+<script name="ElectronicFence" setup>
 import coordtransform from 'coordtransform'
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue
index 2e6dd3c..fb5258e 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue
@@ -31,7 +31,7 @@
     <div id="container3"></div>
   </div>
 </template>
-<script setup>
+<script name="HistoricalRoute" setup>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {getTrack} from "@/api/realTimeMonitoring/historicalRoute";
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue
index 2ba6e78..d6665e4 100644
--- a/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue
+++ b/ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue
@@ -5,7 +5,7 @@
   </div>
 </template>
 
-<script setup>
+<script name="VehicleMonitoring1" setup>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {getCarGpsList, listBasetyre, queryCardata} from '@/api/realTimeMonitoring/vehicleMonitoring'
 import {parseTime} from "@/utils/ruoyi";
diff --git a/ruoyi-ui/src/views/report/temppresspeed/index.vue b/ruoyi-ui/src/views/report/temppresspeed/index.vue
index f1c28ab..0889bc4 100644
--- a/ruoyi-ui/src/views/report/temppresspeed/index.vue
+++ b/ruoyi-ui/src/views/report/temppresspeed/index.vue
@@ -54,7 +54,7 @@
   </div>
 </template>
 
-<script setup name="basetyre">
+<script setup name="Temppresspeed">
 import {useI18n} from 'vue-i18n';
 import Cookies from "js-cookie";
 import Temp from '@/views/dashboard/Temp'
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 2d6dcac..4b67da9 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -1,291 +1,313 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="菜单名称" prop="menuName">
-            <el-input
-               v-model="queryParams.menuName"
-               placeholder="请输入菜单名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryRef" :inline="true" :model="queryParams">
+      <el-form-item label="菜单名称" prop="menuName">
+        <el-input
+            v-model="queryParams.menuName"
+            clearable
+            placeholder="请输入菜单名称"
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" clearable placeholder="菜单状态" style="width: 200px">
+          <el-option
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:menu:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="info"
-               plain
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['system:menu:add']"
+            icon="Plus"
+            plain
+            type="primary"
+            @click="handleAdd"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            icon="Sort"
+            plain
+            type="info"
+            @click="toggleExpandAll"
+        >展开/折叠
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-      <el-table
-         v-if="refreshTable"
-         v-loading="loading"
-         :data="menuList"
-         row-key="menuId"
-         :default-expand-all="isExpandAll"
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-         <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-         <el-table-column prop="icon" label="图标" align="center" width="100">
-            <template #default="scope">
-               <svg-icon :icon-class="scope.row.icon" />
-            </template>
-         </el-table-column>
-         <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-         <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="status" label="状态" width="80">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
+    <el-table
+        v-if="refreshTable"
+        v-loading="loading"
+        :data="menuList"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        row-key="menuId"
+    >
+      <el-table-column :show-overflow-tooltip="true" label="菜单名称" prop="menuName" width="160"></el-table-column>
+      <el-table-column align="center" label="图标" prop="icon" width="100">
+        <template #default="scope">
+          <svg-icon :icon-class="scope.row.icon"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" prop="orderNum" width="60"></el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="权限标识" prop="perms"></el-table-column>
+      <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component"></el-table-column>
+      <el-table-column label="状态" prop="status" width="80">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="创建时间" prop="createTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="210">
+        <template #default="scope">
+          <el-button v-hasPermi="['system:menu:edit']" icon="Edit" link type="primary" @click="handleUpdate(scope.row)">
+            修改
+          </el-button>
+          <el-button v-hasPermi="['system:menu:add']" icon="Plus" link type="primary" @click="handleAdd(scope.row)">新增
+          </el-button>
+          <el-button v-hasPermi="['system:menu:remove']" icon="Delete" link type="primary"
+                     @click="handleDelete(scope.row)">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <!-- 添加或修改菜单对话框 -->
-      <el-dialog :title="title" v-model="open" width="680px" append-to-body>
-         <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
-            <el-row>
-               <el-col :span="24">
-                  <el-form-item label="上级菜单">
-                     <el-tree-select
-                        v-model="form.parentId"
-                        :data="menuOptions"
-                        :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
-                        value-key="menuId"
-                        placeholder="选择上级菜单"
-                        check-strictly
-                        :render-after-expand="false"
-                     />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="菜单类型" prop="menuType">
-                     <el-radio-group v-model="form.menuType">
-                        <el-radio label="M">目录</el-radio>
-                        <el-radio label="C">菜单</el-radio>
-                        <el-radio label="F">按钮</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24" v-if="form.menuType != 'F'">
-                  <el-form-item label="菜单图标" prop="icon">
-                     <el-popover
-                        placement="bottom-start"
-                        :width="540"
-                        v-model:visible="showChooseIcon"
-                        trigger="click"
-                        @show="showSelectIcon"
-                     >
-                        <template #reference>
-                           <el-input ref="iconRef" v-model="form.icon" placeholder="点击选择图标" @input="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
-                              <template #prefix>
-                                 <svg-icon
-                                    v-if="form.icon"
-                                    :icon-class="form.icon"
-                                    class="el-input__icon"
-                                    style="height: 32px;width: 16px;"
-                                 />
-                                 <el-icon v-else style="height: 32px;width: 16px;"><search /></el-icon>
-                              </template>
-                           </el-input>
-                        </template>
-                        <icon-select ref="iconSelectRef" @selected="selected" />
-                     </el-popover>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="菜单名称" prop="menuName">
-                     <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item>
-                     <template #label>
+    <!-- 添加或修改菜单对话框 -->
+    <el-dialog v-model="open" :title="title" append-to-body width="680px">
+      <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="上级菜单">
+              <el-tree-select
+                  v-model="form.parentId"
+                  :data="menuOptions"
+                  :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
+                  :render-after-expand="false"
+                  check-strictly
+                  placeholder="选择上级菜单"
+                  value-key="menuId"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="菜单类型" prop="menuType">
+              <el-radio-group v-model="form.menuType">
+                <el-radio label="M">目录</el-radio>
+                <el-radio label="C">菜单</el-radio>
+                <el-radio label="F">按钮</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'F'" :span="24">
+            <el-form-item label="菜单图标" prop="icon">
+              <el-popover
+                  v-model:visible="showChooseIcon"
+                  :width="540"
+                  placement="bottom-start"
+                  trigger="click"
+                  @show="showSelectIcon"
+              >
+                <template #reference>
+                  <el-input ref="iconRef" v-model="form.icon" v-click-outside="hideSelectIcon" placeholder="点击选择图标"
+                            readonly @input="showSelectIcon">
+                    <template #prefix>
+                      <svg-icon
+                          v-if="form.icon"
+                          :icon-class="form.icon"
+                          class="el-input__icon"
+                          style="height: 32px;width: 16px;"
+                      />
+                      <el-icon v-else style="height: 32px;width: 16px;">
+                        <search/>
+                      </el-icon>
+                    </template>
+                  </el-input>
+                </template>
+                <icon-select ref="iconSelectRef" @selected="selected"/>
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="菜单名称" prop="menuName">
+              <el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" :min="0" controls-position="right"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'F'" :span="12">
+            <el-form-item>
+              <template #label>
                         <span>
                            <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>是否外链
                         </span>
-                     </template>
-                     <el-radio-group v-model="form.isFrame">
-                        <el-radio label="0">是</el-radio>
-                        <el-radio label="1">否</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item prop="path">
-                     <template #label>
+              </template>
+              <el-radio-group v-model="form.isFrame">
+                <el-radio label="0">是</el-radio>
+                <el-radio label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'F'" :span="12">
+            <el-form-item prop="path">
+              <template #label>
                         <span>
                            <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            路由地址
                         </span>
-                     </template>
-                     <el-input v-model="form.path" placeholder="请输入路由地址" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item prop="component">
-                     <template #label>
+              </template>
+              <el-input v-model="form.path" placeholder="请输入路由地址"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType == 'C'" :span="12">
+            <el-form-item prop="component">
+              <template #label>
                         <span>
                            <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            组件路径
                         </span>
-                     </template>
-                     <el-input v-model="form.component" placeholder="请输入组件路径" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'M'">
-                  <el-form-item>
-                     <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
-                     <template #label>
+              </template>
+              <el-input v-model="form.component" placeholder="请输入组件路径"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'M'" :span="12">
+            <el-form-item>
+              <el-input v-model="form.perms" maxlength="100" placeholder="请输入权限标识"/>
+              <template #label>
                         <span>
-                           <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                           <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
+                                       placement="top">
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            权限字符
                         </span>
-                     </template>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item>
-                     <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
-                     <template #label>
+              </template>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType == 'C'" :span="12">
+            <el-form-item>
+              <el-input v-model="form.query" maxlength="255" placeholder="请输入路由参数"/>
+              <template #label>
                         <span>
                            <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            路由参数
                         </span>
-                     </template>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item>
-                     <template #label>
+              </template>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType == 'C'" :span="12">
+            <el-form-item>
+              <template #label>
                         <span>
                            <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            是否缓存
                         </span>
-                     </template>
-                     <el-radio-group v-model="form.isCache">
-                        <el-radio label="0">缓存</el-radio>
-                        <el-radio label="1">不缓存</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item>
-                     <template #label>
+              </template>
+              <el-radio-group v-model="form.isCache">
+                <el-radio label="0">缓存</el-radio>
+                <el-radio label="1">不缓存</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'F'" :span="12">
+            <el-form-item>
+              <template #label>
                         <span>
                            <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            显示状态
                         </span>
-                     </template>
-                     <el-radio-group v-model="form.visible">
-                        <el-radio
-                           v-for="dict in sys_show_hide"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item>
-                     <template #label>
+              </template>
+              <el-radio-group v-model="form.visible">
+                <el-radio
+                    v-for="dict in sys_show_hide"
+                    :key="dict.value"
+                    :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.menuType != 'F'" :span="12">
+            <el-form-item>
+              <template #label>
                         <span>
                            <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                              <el-icon><question-filled /></el-icon>
+                              <el-icon><question-filled/></el-icon>
                            </el-tooltip>
                            菜单状态
                         </span>
-                     </template>
-                     <el-radio-group v-model="form.status">
-                        <el-radio
-                           v-for="dict in sys_normal_disable"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+              </template>
+              <el-radio-group v-model="form.status">
+                <el-radio
+                    v-for="dict in sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
-<script setup name="Menu">
-import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu";
+<script name="Menu" setup>
+import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/system/menu";
 import SvgIcon from "@/components/SvgIcon";
 import IconSelect from "@/components/IconSelect";
-import { ClickOutside as vClickOutside } from 'element-plus'
+import {ClickOutside as vClickOutside} from 'element-plus'
+
+
+
+import {useI18n} from 'vue-i18n';
+import Cookies from "js-cookie";
+import {getToken} from "@/utils/auth";
+const {t} = useI18n();
 
-const { proxy } = getCurrentInstance();
-const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
+const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
+
+const {proxy} = getCurrentInstance();
+const {sys_show_hide, sys_normal_disable} = proxy.useDict("sys_show_hide", "sys_normal_disable");
 
 const menuList = ref([]);
 const open = ref(false);
@@ -306,13 +328,13 @@ const data = reactive({
     visible: undefined
   },
   rules: {
-    menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
-    orderNum: [{ required: true, message: "菜单顺序不能为空", trigger: "blur" }],
-    path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }]
+    menuName: [{required: true, message: "菜单名称不能为空", trigger: "blur"}],
+    orderNum: [{required: true, message: "菜单顺序不能为空", trigger: "blur"}],
+    path: [{required: true, message: "路由地址不能为空", trigger: "blur"}]
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询菜单列表 */
 function getList() {
@@ -322,20 +344,23 @@ function getList() {
     loading.value = false;
   });
 }
+
 /** 查询菜单下拉树结构 */
 function getTreeselect() {
   menuOptions.value = [];
   listMenu().then(response => {
-    const menu = { menuId: 0, menuName: "主类目", children: [] };
+    const menu = {menuId: 0, menuName: "主类目", children: []};
     menu.children = proxy.handleTree(response.data, "menuId");
     menuOptions.value.push(menu);
   });
 }
+
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 表单重置 */
 function reset() {
   form.value = {
@@ -352,17 +377,20 @@ function reset() {
   };
   proxy.resetForm("menuRef");
 }
+
 /** 展示下拉图标 */
 function showSelectIcon() {
   console.log('blue')
   iconSelectRef.value.reset();
   showChooseIcon.value = true;
 }
+
 /** 选择图标 */
 function selected(name) {
   form.value.icon = name;
   showChooseIcon.value = false;
 }
+
 /** 图标外层点击隐藏下拉列表 */
 function hideSelectIcon(event) {
   var elem = event.relatedTarget || event.srcElement || event.target || event.currentTarget;
@@ -371,15 +399,18 @@ function hideSelectIcon(event) {
     showChooseIcon.value = false;
   }
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
   getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd(row) {
   reset();
@@ -392,6 +423,7 @@ function handleAdd(row) {
   open.value = true;
   title.value = "添加菜单";
 }
+
 /** 展开/折叠操作 */
 function toggleExpandAll() {
   refreshTable.value = false;
@@ -400,6 +432,7 @@ function toggleExpandAll() {
     refreshTable.value = true;
   });
 }
+
 /** 修改按钮操作 */
 async function handleUpdate(row) {
   reset();
@@ -410,6 +443,7 @@ async function handleUpdate(row) {
     title.value = "修改菜单";
   });
 }
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["menuRef"].validate(valid => {
@@ -430,14 +464,16 @@ function submitForm() {
     }
   });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {
+  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function () {
     return delMenu(row.menuId);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => {
+  });
 }
 
 getList();
diff --git a/ruoyi-ui/src/views/tireManagement/info/index.vue b/ruoyi-ui/src/views/tireManagement/info/index.vue
index 4345fa2..65e4156 100644
--- a/ruoyi-ui/src/views/tireManagement/info/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/info/index.vue
@@ -132,18 +132,20 @@
     <!--    表格主体-->
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column align="center" fixed type="selection" width="55"/>
-      <el-table-column align="center" :label="t('web.factory')" prop="tyreFactory" width="150"/>
-      <el-table-column align="center" :label="t('web.tireNumber')" prop="outerTireNumber" width="150"/>
-      <el-table-column align="center" :label="t('web.brand')" prop="brand" width="150"/>
-      <el-table-column align="center" :label="t('web.tireSpecificationModel')" prop="size" :width=" locale ? 150:200"/>
-      <el-table-column align="center" :label="t('web.pattern')" prop="pattern" width="150"/>
-      <el-table-column align="center" :label="t('web.currentlyInstalledVehicles')" prop="carLicense" :width=" locale ? 150:200"/>
-      <el-table-column align="center" :label="t('web.mountingWheelPosition')" prop="tyrePosition" :width=" locale ? 150:200"/>
-      <el-table-column align="center" :label="t('web.sensorNumber')" prop="sensorId" width="150"/>
-      <el-table-column align="center" :label="t('web.depthOfLatestPattern')" prop="currentTextureDepth" width="170"/>
-      <el-table-column align="center" :label="t('common.createTime')" prop="createTime" width="170"/>
-      <el-table-column align="center" :label="t('common.createBy')" prop="createName" width="170"/>
-      <el-table-column align="center" :label="t('web.usingEnterprise')" prop="companyCode" width="170"/>
+      <el-table-column :label="t('web.factory')" align="center" prop="tyreFactory" width="150"/>
+      <el-table-column :label="t('web.tireNumber')" align="center" prop="outerTireNumber" width="150"/>
+      <el-table-column :label="t('web.brand')" align="center" prop="brand" width="150"/>
+      <el-table-column :label="t('web.tireSpecificationModel')" :width=" locale ? 150:200" align="center" prop="size"/>
+      <el-table-column :label="t('web.pattern')" align="center" prop="pattern" width="150"/>
+      <el-table-column :label="t('web.currentlyInstalledVehicles')" :width=" locale ? 150:200" align="center"
+                       prop="carLicense"/>
+      <el-table-column :label="t('web.mountingWheelPosition')" :width=" locale ? 150:200" align="center"
+                       prop="tyrePosition"/>
+      <el-table-column :label="t('web.sensorNumber')" align="center" prop="sensorId" width="150"/>
+      <el-table-column :label="t('web.depthOfLatestPattern')" align="center" prop="currentTextureDepth" width="170"/>
+      <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="170"/>
+      <el-table-column :label="t('common.createBy')" align="center" prop="createName" width="170"/>
+      <el-table-column :label="t('web.usingEnterprise')" align="center" prop="companyCode" width="170"/>
       <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
                        width="160">
         <template #default="scope">
@@ -247,7 +249,7 @@
   </div>
 </template>
 
-<script name="basetyre" setup>
+<script name="Basetyre" setup>
 import {addBasetyre, delBasetyre, getBasetyre, listBasetyre, updateBasetyre} from "@/api/tireManagement/info";
 
 
@@ -262,26 +264,6 @@ const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
 const {proxy} = getCurrentInstance();
 const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 // 表格数据
 const postList = ref([]);
@@ -491,7 +473,7 @@ function submitFileForm() {
 
 /** 导入按钮操作 */
 function handleImport() {
-  upload.title = t('other.tireInformationImport') ;
+  upload.title = t('other.tireInformationImport');
   upload.open = true;
 };
 getList();
diff --git a/ruoyi-ui/src/views/tireManagement/install/index.vue b/ruoyi-ui/src/views/tireManagement/install/index.vue
index 8200887..ab93622 100644
--- a/ruoyi-ui/src/views/tireManagement/install/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/install/index.vue
@@ -119,7 +119,7 @@
   </div>
 </template>
 
-<script name="basetyre" setup>
+<script name="Install" setup>
 import {listCarQueue, setCarTyres, TyreInstall, getTyreInfo, TyreUnInstall,EditPatternTextureDepth} from "@/api/tireManagement/install";
 import {Search} from '@element-plus/icons-vue'
 import {useI18n} from 'vue-i18n';
diff --git a/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue b/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue
index 7deb2f4..e5cd9e4 100644
--- a/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/lifecycle/index.vue
@@ -76,7 +76,7 @@
   </div>
 </template>
 
-<script setup>
+<script name="Lifecycle" setup>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import {getTyreLife,} from '@/api/tireManagement/lifecycle'
 import {parseTime} from "@/utils/ruoyi";
diff --git a/ruoyi-ui/src/views/tireManagement/salesData/index.vue b/ruoyi-ui/src/views/tireManagement/salesData/index.vue
index eb0ffd8..bd2d012 100644
--- a/ruoyi-ui/src/views/tireManagement/salesData/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/salesData/index.vue
@@ -123,7 +123,7 @@
   </div>
 </template>
 
-<script setup name="basetyre">
+<script setup name="SalesData">
 import {listBasetyre} from "@/api/tireManagement/salesData";
 
 import {useI18n} from 'vue-i18n';