前台修改，后台车型车队接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.utils.http.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -139,4 +141,9 @@ public class SysMenuController extends BaseController
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }
+
+    public static void main(String[] args) {
+        HttpUtils.sendGet("http://api.fanyi.baidu.com/api/trans/vip/translate?q=apple&from=en&to=zh&appid=2015063000000001&salt=1435660288&sign=f89f9594663708c1605f3d736d01d2d4");
+    }
+
 }

ruoyi-admin/src/main/resources/i18n/messages.properties

@@ -3,7 +3,7 @@ not.null=*
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
 user.not.exists=用户不存在/密码错误
-user.password.not.match=password error
+user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
 user.password.delete=对不起，您的账号已被删除
@@ -35,3 +35,8 @@ no.update.permission=
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+
+##消息
+message.success=操作成功
+message.fail=操作失败
+message.query.success=查询成功

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -2,11 +2,11 @@
 not.null=* Must be filled in
 user.jcaptcha.error=Verification code error
 user.jcaptcha.expire=The verification code has expired
-user.not.exists=用户不存在/密码错误
-user.password.not.match=password error
-user.password.retry.limit.count=密码输入错误{0}次
+user.not.exists=User does not exist/password error
+user.password.not.match=User does not exist/password error
+user.password.retry.limit.count=Password input error{0}times
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
-user.password.delete=对不起，您的账号已被删除
+user.password.delete=Sorry, your account has been deleted
 user.blocked=用户已封禁，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功
@@ -18,11 +18,11 @@ user.password.not.valid=* 5-50
 
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
-user.login.success=登录成功
+user.login.success=Login succeeded
 user.register.success=注册成功
-user.notfound=请重新登录
+user.notfound=Please login again
 user.forcelogout=管理员强制退出，请重新登录
-user.unknown.error=未知错误，请重新登录
+user.unknown.error=Unknown error, please log in again
 
 ##文件上传消息
 upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
@@ -35,3 +35,8 @@ no.update.permission=
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+
+##ÏûÏ¢
+message.success=Operation succeeded
+message.fail=Operation failed
+message.query.success=Query was successful

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -35,3 +35,8 @@ no.update.permission=您没有修改数据的权限，请联系管理员添加
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+
+##消息
+message.success=操作成功
+message.fail=操作失败
+message.query.success=查询成功

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseCarController.java

@@ -2,6 +2,12 @@ package com.ruoyi.basetyre.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import com.ruoyi.basetyre.domain.BaseCarQueue;
+import com.ruoyi.basetyre.domain.BaseCarType;
+import com.ruoyi.basetyre.service.IBaseCarQueueService;
+import com.ruoyi.basetyre.service.IBaseCarTypeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,10 @@ public class BaseCarController extends BaseController
 {
     @Autowired
     private IBaseCarService baseCarService;
+    @Autowired
+    private IBaseCarQueueService baseCarQueueService;
+    @Autowired
+    private IBaseCarTypeService baseCarTypeService;
 
     /**
      * 查询车辆基础信息列表
@@ -75,7 +85,7 @@ public class BaseCarController extends BaseController
     @PreAuthorize("@ss.hasPermi('basecar:car:add')")
     @Log(title = "车辆基础信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BaseCar baseCar)
+    public AjaxResult add(@Valid @RequestBody BaseCar baseCar)
     {
         return toAjax(baseCarService.insertBaseCar(baseCar));
     }
@@ -101,4 +111,21 @@ public class BaseCarController extends BaseController
     {
         return toAjax(baseCarService.deleteBaseCarByIds(ids));
     }
+
+    /**
+     * 获取车队和车型接口
+     */
+    @GetMapping("/getCarQueueAndType")
+    public AjaxResult getCarQueue_Type(){
+        BaseCarQueue baseCarQueue=new BaseCarQueue();
+        BaseCarType  baseCarType = new BaseCarType();
+        baseCarQueue.setState((long) 0);
+        baseCarQueue.setState((long) 0);
+        List<BaseCarQueue> baseCarQueueList = baseCarQueueService.selectBaseCarQueueList(baseCarQueue);
+        List<BaseCarType> baseCarTypeList = baseCarTypeService.selectBaseCarTypeList(baseCarType);
+        AjaxResult ajaxResult = new AjaxResult();
+        ajaxResult.put("CarQueueList",baseCarQueueList);
+        ajaxResult.put("CarTypeList",baseCarTypeList);
+        return ajaxResult;
+    }
 }

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseCar.java

@@ -7,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 车辆基础信息对象 base_car
  * 
@@ -34,6 +36,7 @@ public class BaseCar extends BaseEntity
 
     /** 车牌号 */
     @Excel(name = "车牌号")
+    @NotBlank(message = "车牌号为空")
     private String carLicense;
 
     /** 内部牌号 */

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseCarQueueService.java

@@ -59,4 +59,5 @@ public interface IBaseCarQueueService
      * @return 结果
      */
     public int deleteBaseCarQueueById(String id);
+
 }

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseCarService.java

@@ -58,4 +58,12 @@ public interface IBaseCarService
      * @return 结果
      */
     public int deleteBaseCarById(String id);
+
+    /**
+     * 校验车牌号是否唯一
+     *
+     * @param baseCar 车辆信息
+     * @return 结果
+     */
+    public String checkCarLicenseUnique(BaseCar baseCar);
 }

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseCarQueueServiceImpl.java

@@ -1,9 +1,12 @@
 package com.ruoyi.basetyre.service.impl;
 
 import java.util.List;
+import java.util.UUID;
 
 import com.ruoyi.basetyre.domain.BaseCarQueue;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.basetyre.mapper.BaseCarQueueMapper;
@@ -55,6 +58,12 @@ public class BaseCarQueueServiceImpl implements IBaseCarQueueService
     public int insertBaseCarQueue(BaseCarQueue baseCarQueue)
     {
         baseCarQueue.setCreateTime(DateUtils.getNowDate());
+        baseCarQueue.setId(UUID.randomUUID().toString());
+        LoginUser loginUser= SecurityUtils.getLoginUser();
+        baseCarQueue.setCreateBy(loginUser.getUserId().toString());
+        baseCarQueue.setCreateName(loginUser.getUsername());
+        baseCarQueue.setModifyBy(loginUser.getUserId().toString());
+        baseCarQueue.setModifyTime(DateUtils.getNowDate());
         return baseCarQueueMapper.insertBaseCarQueue(baseCarQueue);
     }
 

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseCarServiceImpl.java

@@ -1,7 +1,11 @@
 package com.ruoyi.basetyre.service.impl;
 
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.basetyre.mapper.BaseCarMapper;
@@ -54,9 +58,17 @@ public class BaseCarServiceImpl implements IBaseCarService
     public int insertBaseCar(BaseCar baseCar)
     {
         baseCar.setCreateTime(DateUtils.getNowDate());
+        baseCar.setId(UUID.randomUUID().toString());
+        LoginUser loginUser=SecurityUtils.getLoginUser();
+        baseCar.setCreateBy(loginUser.getUserId().toString());
+        baseCar.setCreateName(loginUser.getUsername());
+        baseCar.setModifyBy(loginUser.getUserId().toString());
+        baseCar.setModifyTime(DateUtils.getNowDate());
         return baseCarMapper.insertBaseCar(baseCar);
+
     }
 
+
     /**
      * 修改车辆基础信息
      * 
@@ -92,4 +104,9 @@ public class BaseCarServiceImpl implements IBaseCarService
     {
         return baseCarMapper.deleteBaseCarById(id);
     }
+
+    @Override
+    public String checkCarLicenseUnique(BaseCar baseCar) {
+        return null;
+    }
 }

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseCarTypeServiceImpl.java

@@ -1,7 +1,11 @@
 package com.ruoyi.basetyre.service.impl;
 
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.basetyre.mapper.BaseCarTypeMapper;
@@ -54,6 +58,12 @@ public class BaseCarTypeServiceImpl implements IBaseCarTypeService
     public int insertBaseCarType(BaseCarType baseCarType)
     {
         baseCarType.setCreateTime(DateUtils.getNowDate());
+        baseCarType.setId(UUID.randomUUID().toString());
+        LoginUser loginUser= SecurityUtils.getLoginUser();
+        baseCarType.setCreateBy(loginUser.getUserId().toString());
+        baseCarType.setCreateName(loginUser.getUsername());
+        baseCarType.setModifyBy(loginUser.getUserId().toString());
+        baseCarType.setModifyTime(DateUtils.getNowDate());
         return baseCarTypeMapper.insertBaseCarType(baseCarType);
     }
 

ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseDeviceServiceImpl.java

@@ -1,7 +1,11 @@
 package com.ruoyi.basetyre.service.impl;
 
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.basetyre.mapper.BaseDeviceMapper;
@@ -54,6 +58,12 @@ public class BaseDeviceServiceImpl implements IBaseDeviceService
     public int insertBaseDevice(BaseDevice baseDevice)
     {
         baseDevice.setCreateTime(DateUtils.getNowDate());
+        baseDevice.setId(UUID.randomUUID().toString());
+        LoginUser loginUser= SecurityUtils.getLoginUser();
+        baseDevice.setCreateBy(loginUser.getUserId().toString());
+        baseDevice.setCreateName(loginUser.getUsername());
+        baseDevice.setModifyBy(loginUser.getUserId().toString());
+        baseDevice.setModifyTime(DateUtils.getNowDate());
         return baseDeviceMapper.insertBaseDevice(baseDevice);
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -3,6 +3,8 @@ package com.ruoyi.common.core.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
@@ -15,10 +17,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
 
 /**
@@ -84,7 +82,7 @@ public class BaseController
     {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setMsg("查询成功");
+        rspData.setMsg(MessageUtils.message("message.query.success"));
         rspData.setRows(list);
         rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain;
 
 import java.util.HashMap;
 import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -65,7 +66,7 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult success()
     {
-        return AjaxResult.success("操作成功");
+        return AjaxResult.success( MessageUtils.message("message.success"));
     }
 
     /**
@@ -75,7 +76,7 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult success(Object data)
     {
-        return AjaxResult.success("操作成功", data);
+        return AjaxResult.success(MessageUtils.message("message.success"), data);
     }
 
     /**
@@ -131,7 +132,7 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult error()
     {
-        return AjaxResult.error("操作失败");
+        return AjaxResult.error(MessageUtils.message("message.fail"));
     }
 
     /**

ruoyi-ui/src/api/basecar/car.js

@@ -42,3 +42,10 @@ export function delBaseCar(id) {
         method: 'delete'
     })
 }
+/** 获取车队、车型 */
+export function getCarQueueList() {
+    return request({
+        url: '/basecar/car/getCarQueueAndType',
+        method: 'get'
+    })
+}

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

@@ -3,33 +3,33 @@
     <!--    搜索栏-->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
              :label-width=" locale ? '110px':'170px'">
-      <el-form-item :label="t('baseCar.car.companyCode')" prop="companyCode">
-        <el-input
-            v-model="queryParams.companyCode"
-            :placeholder=" t('common.pleaseEnter') + t('baseCar.car.companyCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.carQueueId')" prop="carQueueId">
-        <el-input
-            v-model="queryParams.carQueueId"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.carTypeId')" prop="carTypeId">
-        <el-input
-            v-model="queryParams.carTypeId"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carTypeId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="t('baseCar.car.companyCode')" prop="companyCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.companyCode"-->
+<!--            :placeholder=" t('common.pleaseEnter') + t('baseCar.car.companyCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.carQueueId')" prop="carQueueId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carQueueId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.carTypeId')" prop="carTypeId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carTypeId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carTypeId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item :label="t('baseCar.car.carLicense')" prop="carLicense">
         <el-input
             v-model="queryParams.carLicense"
@@ -39,212 +39,212 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="t('baseCar.car.carLicenseIn')" prop="carLicenseIn">
-        <el-input
-            v-model="queryParams.carLicenseIn"
-            :placeholder="t('common.pleaseEnter') +t('baseCar.car.carLicenseIn')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.carLicenseParent')" prop="carLicenseParent">
-        <el-input
-            v-model="queryParams.carLicenseParent"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseParent')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.carIdParent')" prop="carIdParent">
-        <el-input
-            v-model="queryParams.carIdParent"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carIdParent')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.userId')" prop="userId">
-        <el-input
-            v-model="queryParams.userId"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.userId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.userName')" prop="userName">
-        <el-input
-            v-model="queryParams.userName"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.userName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.deviceId')" prop="deviceId">
-        <el-input
-            v-model="queryParams.deviceId"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.deviceId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.deviceBindTime')" prop="deviceBindTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.deviceBindTime"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.firstChangeDate')" prop="firstChangeDate">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.firstChangeDate"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.trailerNum')" prop="trailerNum">
-        <el-input
-            v-model="queryParams.trailerNum"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.trailerNum')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.isHandDevice')" prop="isHandDevice">
-        <el-input
-            v-model="queryParams.isHandDevice"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHandDevice')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.isHasDevice')" prop="isHasDevice">
-        <el-input
-            v-model="queryParams.isHasDevice"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHasDevice')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.longitude')" prop="longitude">
-        <el-input
-            v-model="queryParams.longitude"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.longitude')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.latitude')" prop="latitude">
-        <el-input
-            v-model="queryParams.latitude"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.latitude')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.car.tiresTotal')" prop="tiresTotal">
-        <el-input
-            v-model="queryParams.tiresTotal"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.car.tiresTotal')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.isRemove')" prop="isDelete">
-        <el-input
-            v-model="queryParams.isDelete"
-            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createTime')" prop="createTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.createTime"
-            :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorId')" prop="createId">
-        <el-input
-            v-model="queryParams.createId"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createBy')" prop="createBy">
-        <el-input
-            v-model="queryParams.createBy"
-            :placeholder="t('common.pleaseEnter') + t('common.createBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorName')" prop="createName">
-        <el-input
-            v-model="queryParams.createName"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editTime')" prop="modifyTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.modifyTime"
-            :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editID')" prop="modifyId">
-        <el-input
-            v-model="queryParams.modifyId"
-            :placeholder="t('common.pleaseEnter') + t('common.editID')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editBy')" prop="modifyBy">
-        <el-input
-            v-model="queryParams.modifyBy"
-            :placeholder="t('common.pleaseEnter') + t('common.editBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="t('baseCar.car.carLicenseIn')" prop="carLicenseIn">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carLicenseIn"-->
+<!--            :placeholder="t('common.pleaseEnter') +t('baseCar.car.carLicenseIn')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.carLicenseParent')" prop="carLicenseParent">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carLicenseParent"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseParent')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.carIdParent')" prop="carIdParent">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carIdParent"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.carIdParent')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.userId')" prop="userId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.userId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.userId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.userName')" prop="userName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.userName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.userName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.deviceId')" prop="deviceId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.deviceId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.deviceId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.deviceBindTime')" prop="deviceBindTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.deviceBindTime"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.firstChangeDate')" prop="firstChangeDate">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.firstChangeDate"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.trailerNum')" prop="trailerNum">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.trailerNum"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.trailerNum')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.isHandDevice')" prop="isHandDevice">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isHandDevice"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHandDevice')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.isHasDevice')" prop="isHasDevice">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isHasDevice"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHasDevice')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.longitude')" prop="longitude">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.longitude"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.longitude')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.latitude')" prop="latitude">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.latitude"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.latitude')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.car.tiresTotal')" prop="tiresTotal">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.tiresTotal"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.car.tiresTotal')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isDelete"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createTime')" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.createTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.createTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorId')" prop="createId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createBy')" prop="createBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.createBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorName')" prop="createName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.modifyTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editID')" prop="modifyId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editID')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editBy')" prop="modifyBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <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>
@@ -301,38 +301,44 @@
     <!--    表格主体-->
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column :label="t('baseCar.car.companyCode')" align="center" prop="companyCode" width="150"/>
-      <el-table-column :label="t('baseCar.car.carQueueId')" align="center" prop="carQueueId" width="150"/>
-      <el-table-column :label="t('baseCar.car.carTypeId')" align="center" prop="carTypeId" :width="locale ? 150:170"/>
+<!--      <el-table-column :label="t('baseCar.car.companyCode')" align="center" prop="companyCode" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.carQueueId')" align="center" prop="carQueueId" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.carTypeId')" align="center" prop="carTypeId" :width="locale ? 150:170"/>-->
       <el-table-column :label="t('baseCar.car.carLicense')" align="center" prop="carLicense" width="150"/>
-      <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn"
-                       :width="locale ? 150:170"/>
-      <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent"
-                       :width="locale ? 150:170"/>
-      <el-table-column :label="t('baseCar.car.carIdParent')" align="center" prop="carIdParent" width="150"/>
-      <el-table-column :label="t('baseCar.car.userId')" align="center" prop="userId" width="150"/>
-      <el-table-column :label="t('baseCar.car.userName')" align="center" prop="userName" width="150"/>
+      <el-table-column label="所属车队" align="center" prop="carLicense" width="150"/>
+      <el-table-column label="所属车型" align="center" prop="carLicense" width="150"/>
       <el-table-column :label="t('baseCar.car.deviceId')" align="center" prop="deviceId" width="150"/>
-      <el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime"
-                       :width="locale ? 150:170"/>
-      <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate"
-                       :width="locale ? 150:170"/>
-      <el-table-column :label="t('baseCar.car.trailerNum')" align="center" prop="trailerNum" width="150"/>
-      <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice"
-                       :width="locale ? 150:310"/>
-      <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice"
-                       :width="locale ? 150:260"/>
-      <el-table-column :label="t('baseCar.car.longitude')" align="center" prop="longitude" width="150"/>
-      <el-table-column :label="t('baseCar.car.latitude')" align="center" prop="latitude" width="150"/>
-      <el-table-column :label="t('baseCar.car.tiresTotal')" align="center" prop="tiresTotal" width="150"/>
-      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>
+      <el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime"/>
       <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
-      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>
       <el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
-      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>
-      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>
-      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>
-      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>
+<!--      <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn"-->
+<!--                       :width="locale ? 150:170"/>-->
+<!--      <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent"-->
+<!--                       :width="locale ? 150:170"/>-->
+<!--      <el-table-column :label="t('baseCar.car.carIdParent')" align="center" prop="carIdParent" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.userId')" align="center" prop="userId" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.userName')" align="center" prop="userName" width="150"/>-->
+
+
+<!--                       :width="locale ? 150:170"/>-->
+<!--      <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate"-->
+<!--                       :width="locale ? 150:170"/>-->
+<!--      <el-table-column :label="t('baseCar.car.trailerNum')" align="center" prop="trailerNum" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice"-->
+<!--                       :width="locale ? 150:310"/>-->
+<!--      <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice"-->
+<!--                       :width="locale ? 150:260"/>-->
+<!--      <el-table-column :label="t('baseCar.car.longitude')" align="center" prop="longitude" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.latitude')" align="center" prop="latitude" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.car.tiresTotal')" align="center" prop="tiresTotal" width="150"/>-->
+<!--      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
+
+<!--      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
+
+<!--      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>-->
+<!--      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>-->
+<!--      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
+<!--      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>-->
       <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
                        width="160">
         <template #default="scope">
@@ -350,6 +356,14 @@
               v-hasPermi="['basecar:car:remove']"
           >{{ t('option.remove') }}
           </el-button>
+<!--            <el-button-->
+<!--                    type="text"-->
+<!--                    icon="Delete"-->
+<!--                    @click="handleDelete(scope.row)"-->
+<!--                    v-hasPermi="['basecar:car:remove']"-->
+<!--            >绑定接收器-->
+<!--            </el-button>-->
+
         </template>
       </el-table-column>
     </el-table>
@@ -369,156 +383,180 @@
         <el-form-item prop="id" v-if="false">
           <el-input v-model="form.id"/>
         </el-form-item>
-        <el-form-item :label="t('baseCar.car.companyCode')" prop="companyCode">
-          <el-input
-              v-model="form.companyCode"
-              :placeholder=" t('common.pleaseEnter') + t('baseCar.car.companyCode')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carQueueId')" prop="carQueueId">
-          <el-input
-              v-model="form.carQueueId"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carTypeId')" prop="carTypeId">
-          <el-input
-              v-model="form.carTypeId"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carTypeId')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carLicense')" prop="carLicense">
-          <el-input
-              v-model="form.carLicense"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicense')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carLicenseIn')" prop="carLicenseIn">
-          <el-input
-              v-model="form.carLicenseIn"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseIn')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carLicenseParent')" prop="carLicenseParent">
-          <el-input
-              v-model="form.carLicenseParent"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseParent')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.carIdParent')" prop="carIdParent">
-          <el-input
-              v-model="form.carIdParent"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carIdParent')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.userId')" prop="userId">
-          <el-input
-              v-model="form.userId"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.userId')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.userName')" prop="userName">
-          <el-input
-              v-model="form.userName"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.userName')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.deviceId')" prop="deviceId">
-          <el-input
-              v-model="form.deviceId"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.deviceId')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.deviceBindTime')" prop="deviceBindTime">
-          <el-date-picker
-              clearable
-              v-model="form.deviceBindTime"
-              type="date"
-              format="YYYY/MM/DD"
-              value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')"
-          />
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.firstChangeDate')" prop="firstChangeDate">
-          <el-date-picker
-              clearable
-              v-model="form.firstChangeDate"
-              type="date"
-              format="YYYY/MM/DD"
-              value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')"
-          />
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.trailerNum')" prop="trailerNum">
-          <el-input
-              v-model="form.trailerNum"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.trailerNum')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.isHandDevice')" prop="isHandDevice">
-          <el-input
-              v-model="form.isHandDevice"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHandDevice')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.isHasDevice')" prop="isHasDevice">
-          <el-input
-              v-model="form.isHasDevice"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHasDevice')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.longitude')" prop="longitude">
-          <el-input
-              v-model="form.longitude"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.longitude')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.latitude')" prop="latitude">
-          <el-input
-              v-model="form.latitude"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.latitude')"/>
-        </el-form-item>
-        <el-form-item :label="t('baseCar.car.tiresTotal')" prop="tiresTotal">
-          <el-input
-              v-model="form.tiresTotal"
-              :placeholder="t('common.pleaseEnter') + t('baseCar.car.tiresTotal')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.isRemove')" prop="isDelete">
-          <el-input
-              v-model="form.isDelete"
-              :placeholder="t('common.pleaseEnter') + t('common.isRemove')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.createTime')" prop="createTime">
-          <el-date-picker
-              clearable
-              v-model="form.createTime"
-              type="date"
-              format="YYYY/MM/DD"
-              value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-          />
-        </el-form-item>
-        <el-form-item :label="t('common.creatorId')" prop="createId">
-          <el-input
-              v-model="form.createId"
-              :placeholder="t('common.pleaseEnter') + t('common.creatorId')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.createBy')" prop="createBy">
-          <el-input
-              v-model="form.createBy"
-              :placeholder="t('common.pleaseEnter') + t('common.createBy')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.creatorName')" prop="createName">
-          <el-input
-              v-model="form.createName"
-              :placeholder="t('common.pleaseEnter') + t('common.creatorName')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.editTime')" prop="modifyTime">
-          <el-date-picker
-              clearable
-              v-model="form.modifyTime"
-              type="date"
-              format="YYYY/MM/DD"
-              value-format="YYYY-MM-DD"
-              :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-          />
-        </el-form-item>
-        <el-form-item :label="t('common.editID')" prop="modifyId">
-          <el-input
-              v-model="form.modifyId"
-              :placeholder="t('common.pleaseEnter') + t('common.editID')"/>
-        </el-form-item>
-        <el-form-item :label="t('common.editBy')" prop="modifyBy">
-          <el-input
-              v-model="form.modifyBy"
-              :placeholder="t('common.pleaseEnter') + t('common.editBy')"/>
-        </el-form-item>
+          <el-form-item :label="t('baseCar.car.carLicense')" prop="carLicense">
+              <el-input
+                      v-model="form.carLicense"
+                      :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicense')"/>
+          </el-form-item>
+          <el-form-item label="所属车队" prop="carLicense">
+              <el-select
+                      v-model="queryParams.status"
+                      :placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"
+                      clearable
+                      style="width: 240px"
+              >
+                  <el-option
+                          v-for="dict in carQueue"
+                          :key="dict.id"
+                          :label="dict.label"
+                          :value="dict.title"
+                  />
+              </el-select>
+<!--              <el-input-->
+<!--                      v-model="form.carLicense"-->
+<!--                      :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicense')"/>-->
+          </el-form-item>
+          <el-form-item label="所属车型" prop="carLicense">
+              <el-input
+                      v-model="form.carLicense"
+                      :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicense')"/>
+          </el-form-item>
+<!--        <el-form-item :label="t('baseCar.car.companyCode')" prop="companyCode">-->
+<!--          <el-input-->
+<!--              v-model="form.companyCode"-->
+<!--              :placeholder=" t('common.pleaseEnter') + t('baseCar.car.companyCode')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.carQueueId')" prop="carQueueId">-->
+<!--          <el-input-->
+<!--              v-model="form.carQueueId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.carTypeId')" prop="carTypeId">-->
+<!--          <el-input-->
+<!--              v-model="form.carTypeId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carTypeId')"/>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item :label="t('baseCar.car.carLicenseIn')" prop="carLicenseIn">-->
+<!--          <el-input-->
+<!--              v-model="form.carLicenseIn"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseIn')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.carLicenseParent')" prop="carLicenseParent">-->
+<!--          <el-input-->
+<!--              v-model="form.carLicenseParent"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicenseParent')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.carIdParent')" prop="carIdParent">-->
+<!--          <el-input-->
+<!--              v-model="form.carIdParent"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.carIdParent')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.userId')" prop="userId">-->
+<!--          <el-input-->
+<!--              v-model="form.userId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.userId')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.userName')" prop="userName">-->
+<!--          <el-input-->
+<!--              v-model="form.userName"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.userName')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.deviceId')" prop="deviceId">-->
+<!--          <el-input-->
+<!--              v-model="form.deviceId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.deviceId')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.deviceBindTime')" prop="deviceBindTime">-->
+<!--          <el-date-picker-->
+<!--              clearable-->
+<!--              v-model="form.deviceBindTime"-->
+<!--              type="date"-->
+<!--              format="YYYY/MM/DD"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              :placeholder="t('common.PleaseSelect') + t('baseCar.car.deviceBindTime')"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.firstChangeDate')" prop="firstChangeDate">-->
+<!--          <el-date-picker-->
+<!--              clearable-->
+<!--              v-model="form.firstChangeDate"-->
+<!--              type="date"-->
+<!--              format="YYYY/MM/DD"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              :placeholder="t('common.PleaseSelect') + t('baseCar.car.firstChangeDate')"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.trailerNum')" prop="trailerNum">-->
+<!--          <el-input-->
+<!--              v-model="form.trailerNum"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.trailerNum')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.isHandDevice')" prop="isHandDevice">-->
+<!--          <el-input-->
+<!--              v-model="form.isHandDevice"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHandDevice')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.isHasDevice')" prop="isHasDevice">-->
+<!--          <el-input-->
+<!--              v-model="form.isHasDevice"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.isHasDevice')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.longitude')" prop="longitude">-->
+<!--          <el-input-->
+<!--              v-model="form.longitude"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.longitude')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.latitude')" prop="latitude">-->
+<!--          <el-input-->
+<!--              v-model="form.latitude"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.latitude')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('baseCar.car.tiresTotal')" prop="tiresTotal">-->
+<!--          <el-input-->
+<!--              v-model="form.tiresTotal"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('baseCar.car.tiresTotal')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
+<!--          <el-input-->
+<!--              v-model="form.isDelete"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.isRemove')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.createTime')" prop="createTime">-->
+<!--          <el-date-picker-->
+<!--              clearable-->
+<!--              v-model="form.createTime"-->
+<!--              type="date"-->
+<!--              format="YYYY/MM/DD"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              :placeholder="t('common.PleaseSelect') + t('common.createTime')"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.creatorId')" prop="createId">-->
+<!--          <el-input-->
+<!--              v-model="form.createId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.creatorId')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.createBy')" prop="createBy">-->
+<!--          <el-input-->
+<!--              v-model="form.createBy"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.createBy')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.creatorName')" prop="createName">-->
+<!--          <el-input-->
+<!--              v-model="form.createName"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.creatorName')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
+<!--          <el-date-picker-->
+<!--              clearable-->
+<!--              v-model="form.modifyTime"-->
+<!--              type="date"-->
+<!--              format="YYYY/MM/DD"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.editID')" prop="modifyId">-->
+<!--          <el-input-->
+<!--              v-model="form.modifyId"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.editID')"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="t('common.editBy')" prop="modifyBy">-->
+<!--          <el-input-->
+<!--              v-model="form.modifyBy"-->
+<!--              :placeholder="t('common.pleaseEnter') + t('common.editBy')"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -531,7 +569,7 @@
 </template>
 
 <script setup name="basetyre">
-import {addBaseCar, delBaseCar, getBaseCar, listBaseCar, updateBaseCar} from "@/api/basecar/car";
+import {addBaseCar, delBaseCar, getBaseCar, listBaseCar, updateBaseCar,getCarQueueList} from "@/api/basecar/car";
 
 import {useI18n} from 'vue-i18n';
 import Cookies from "js-cookie";
@@ -545,6 +583,9 @@ const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
 
 // 表格数据
 const postList = ref([]);
+//车队和车型信息
+const carQueue = ref([]);
+const carType = ref([]);
 // 模态框开关标识
 const open = ref(false);
 // 表格加载状态开关标识
@@ -644,6 +685,7 @@ function getList() {
   });
 }
 
+
 /** 取消按钮 */
 function cancel() {
   open.value = false;
@@ -708,6 +750,13 @@ function handleAdd() {
   reset();
   open.value = true;
   title.value = t('baseCar.car.addTitle');
+    getCarQueueList().then(response => {
+       console.log(response);
+       carQueue.value=response.CarQueueList;
+       carType.value=response.CarTypeList;
+    }).finally(() => {
+        loading.value = false;
+    });
 }
 
 /** 修改按钮操作 */

ruoyi-ui/src/views/basecar/carqueue/index.vue

@@ -3,145 +3,146 @@
     <!--    搜索栏-->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
              :label-width=" locale ? '90px':'140px'">
-      <el-form-item :label="t('baseCar.carQueue.tyreFacCode')" prop="tyreFacCode">
-        <el-input
-            v-model="queryParams.tyreFacCode"
-            :placeholder=" t('common.pleaseEnter') + t('baseCar.carQueue.tyreFacCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carQueue.companyCode')" prop="companyCode">
-        <el-input
-            v-model="queryParams.companyCode"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.companyCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carQueue.title')" prop="title">
-        <el-input
-            v-model="queryParams.title"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.title')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carQueue.state')" prop="state">
-        <el-input
-            v-model="queryParams.state"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.state')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carQueue.groupTotal')" prop="groupTotal">
-        <el-input
-            v-model="queryParams.groupTotal"
-            :placeholder="t('common.pleaseEnter') +t('baseCar.carQueue.groupTotal')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carQueue.carTotal')" prop="carTotal">
-        <el-input
-            v-model="queryParams.carTotal"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.carTotal')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.isRemove')" prop="isDelete">
-        <el-input
-            v-model="queryParams.isDelete"
-            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createTime')" prop="createTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.createTime"
-            :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorId')" prop="createId">
-        <el-input
-            v-model="queryParams.createId"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createBy')" prop="createBy">
-        <el-input
-            v-model="queryParams.createBy"
-            :placeholder="t('common.pleaseEnter') + t('common.createBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorName')" prop="createName">
-        <el-input
-            v-model="queryParams.createName"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editTime')" prop="modifyTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.modifyTime"
-            :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editID')" prop="modifyId">
-        <el-input
-            v-model="queryParams.modifyId"
-            :placeholder="t('common.pleaseEnter') + t('common.editID')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editBy')" prop="modifyBy">
-        <el-input
-            v-model="queryParams.modifyBy"
-            :placeholder="t('common.pleaseEnter') + t('common.editBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editName')" prop="modifyName">
-        <el-input
-            v-model="queryParams.modifyName"
-            :placeholder="t('common.pleaseEnter') + t('common.editName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-form-item :label="t('baseCar.carQueue.title')" prop="title">
+            <el-input
+                    v-model="queryParams.title"
+                    :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.title')"
+                    style="width: 200px"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+            />
+        </el-form-item>
+<!--      <el-form-item :label="t('baseCar.carQueue.tyreFacCode')" prop="tyreFacCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.tyreFacCode"-->
+<!--            :placeholder=" t('common.pleaseEnter') + t('baseCar.carQueue.tyreFacCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carQueue.companyCode')" prop="companyCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.companyCode"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.companyCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item :label="t('baseCar.carQueue.state')" prop="state">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.state"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.state')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carQueue.groupTotal')" prop="groupTotal">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.groupTotal"-->
+<!--            :placeholder="t('common.pleaseEnter') +t('baseCar.carQueue.groupTotal')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carQueue.carTotal')" prop="carTotal">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.carTotal"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carQueue.carTotal')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isDelete"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createTime')" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.createTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.createTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorId')" prop="createId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createBy')" prop="createBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.createBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorName')" prop="createName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.modifyTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editID')" prop="modifyId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editID')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editBy')" prop="modifyBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editName')" prop="modifyName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <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>
@@ -198,23 +199,23 @@
     <!--    表格主体-->
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column :label="t('baseCar.carQueue.tyreFacCode')" align="center" prop="tyreFacCode" width="150"/>
-      <el-table-column :label="t('baseCar.carQueue.companyCode')" align="center" prop="companyCode" width="150"/>
+<!--      <el-table-column :label="t('baseCar.carQueue.tyreFacCode')" align="center" prop="tyreFacCode" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.carQueue.companyCode')" align="center" prop="companyCode" width="150"/>-->
       <el-table-column :label="t('baseCar.carQueue.title')" align="center" prop="title" width="150"/>
       <el-table-column :label="t('baseCar.carQueue.state')" align="center" prop="state" width="150"/>
-      <el-table-column :label="t('baseCar.carQueue.groupTotal')" align="center" prop="groupTotal"
-                       width="150"/>
-      <el-table-column :label="t('baseCar.carQueue.carTotal')" align="center" prop="carTotal"
-                       width="150"/>
-      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>
+<!--      <el-table-column :label="t('baseCar.carQueue.groupTotal')" align="center" prop="groupTotal"-->
+<!--                       width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.carQueue.carTotal')" align="center" prop="carTotal"-->
+<!--                       width="150"/>-->
+<!--      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
       <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
-      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>
+<!--      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
       <el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
-      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>
-      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>
-      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>
-      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>
-      <el-table-column :label="t('common.editName')" align="center" prop="modifyName" width="150"/>
+<!--      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>-->
+<!--      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>-->
+<!--      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
+<!--      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>-->
+<!--      <el-table-column :label="t('common.editName')" align="center" prop="modifyName" width="150"/>-->
       <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
                        width="160">
         <template #default="scope">

ruoyi-ui/src/views/basecar/cartype/index.vue

@@ -3,163 +3,164 @@
     <!--    搜索栏-->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
              :label-width=" locale ? '100px':'140px'">
-      <el-form-item :label="t('baseCar.carType.tyreFacCode')" prop="tyreFacCode">
-        <el-input
-            v-model="queryParams.tyreFacCode"
-            :placeholder=" t('common.pleaseEnter') + t('baseCar.carType.companyCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.companyCode')" prop="companyCode">
-        <el-input
-            v-model="queryParams.companyCode"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.companyCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.code')" prop="code">
-        <el-input
-            v-model="queryParams.code"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.code')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.title')" prop="title">
-        <el-input
-            v-model="queryParams.title"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.title')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.state')" prop="state">
-        <el-input
-            v-model="queryParams.state"
-            :placeholder="t('common.pleaseEnter') +t('baseCar.carType.state')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.axleTotal')" prop="axleTotal">
-        <el-input
-            v-model="queryParams.axleTotal"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.axleTotal')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.tyreTotal')" prop="tyreTotal">
-        <el-input
-            v-model="queryParams.tyreTotal"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.tyreTotal')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.isRemove')" prop="isDelete">
-        <el-input
-            v-model="queryParams.isDelete"
-            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createTime')" prop="createTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.createTime"
-            :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorId')" prop="createId">
-        <el-input
-            v-model="queryParams.createId"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createBy')" prop="createBy">
-        <el-input
-            v-model="queryParams.createBy"
-            :placeholder="t('common.pleaseEnter') + t('common.createBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorName')" prop="createName">
-        <el-input
-            v-model="queryParams.createName"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editTime')" prop="modifyTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.modifyTime"
-            :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editID')" prop="modifyId">
-        <el-input
-            v-model="queryParams.modifyId"
-            :placeholder="t('common.pleaseEnter') + t('common.editID')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editBy')" prop="modifyBy">
-        <el-input
-            v-model="queryParams.modifyBy"
-            :placeholder="t('common.pleaseEnter') + t('common.editBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editName')" prop="modifyName">
-        <el-input
-            v-model="queryParams.modifyName"
-            :placeholder="t('common.pleaseEnter') + t('common.editName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseCar.carType.trailerNum')" prop="trailerNum">
-        <el-input
-            v-model="queryParams.trailerNum"
-            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.trailerNum')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-form-item :label="t('baseCar.carType.title')" prop="title">
+            <el-input
+                    v-model="queryParams.title"
+                    :placeholder="t('common.pleaseEnter') + t('baseCar.carType.title')"
+                    style="width: 200px"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+            />
+        </el-form-item>
+<!--      <el-form-item :label="t('baseCar.carType.tyreFacCode')" prop="tyreFacCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.tyreFacCode"-->
+<!--            :placeholder=" t('common.pleaseEnter') + t('baseCar.carType.companyCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carType.companyCode')" prop="companyCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.companyCode"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.companyCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carType.code')" prop="code">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.code"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.code')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      -->
+<!--      <el-form-item :label="t('baseCar.carType.state')" prop="state">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.state"-->
+<!--            :placeholder="t('common.pleaseEnter') +t('baseCar.carType.state')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carType.axleTotal')" prop="axleTotal">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.axleTotal"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.axleTotal')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carType.tyreTotal')" prop="tyreTotal">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.tyreTotal"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.tyreTotal')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isDelete"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createTime')" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.createTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.createTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorId')" prop="createId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createBy')" prop="createBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.createBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorName')" prop="createName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.modifyTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editID')" prop="modifyId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editID')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editBy')" prop="modifyBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editName')" prop="modifyName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseCar.carType.trailerNum')" prop="trailerNum">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.trailerNum"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseCar.carType.trailerNum')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <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>
@@ -215,26 +216,26 @@
 
     <!--    表格主体-->
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column :label="t('baseCar.carType.tyreFacCode')" align="center" prop="tyreFacCode" width="150"/>
-      <el-table-column :label="t('baseCar.carType.companyCode')" align="center" prop="companyCode" width="150"/>
-      <el-table-column :label="t('baseCar.carType.code')" align="center" prop="code" width="150"/>
+<!--      <el-table-column type="selection" width="55" align="center" fixed/>-->
+<!--      <el-table-column :label="t('baseCar.carType.tyreFacCode')" align="center" prop="tyreFacCode" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.carType.companyCode')" align="center" prop="companyCode" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.carType.code')" align="center" prop="code" width="150"/>-->
       <el-table-column :label="t('baseCar.carType.title')" align="center" prop="title" width="150"/>
       <el-table-column :label="t('baseCar.carType.state')" align="center" prop="state"
                        width="150"/>
       <el-table-column :label="t('baseCar.carType.axleTotal')" align="center" prop="axleTotal"
                        width="150"/>
-      <el-table-column :label="t('baseCar.carType.tyreTotal')" align="center" prop="tyreTotal" width="150"/>
-      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>
+<!--      <el-table-column :label="t('baseCar.carType.tyreTotal')" align="center" prop="tyreTotal" width="150"/>-->
+<!--      <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
       <el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
-      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>
+<!--      <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
       <el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
-      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>
-      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>
-      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>
-      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>
-      <el-table-column :label="t('common.editName')" align="center" prop="modifyName" width="150"/>
-      <el-table-column :label="t('baseCar.carType.trailerNum')" align="center" prop="trailerNum" width="150"/>
+<!--      <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>-->
+<!--      <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>-->
+<!--      <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
+<!--      <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>-->
+<!--      <el-table-column :label="t('common.editName')" align="center" prop="modifyName" width="150"/>-->
+<!--      <el-table-column :label="t('baseCar.carType.trailerNum')" align="center" prop="trailerNum" width="150"/>-->
       <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
                        width="160">
         <template #default="scope">

ruoyi-ui/src/views/basedevice/basedevice/index.vue

@@ -3,24 +3,24 @@
     <!--    搜索栏-->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
              :label-width=" locale ? '100px':'140px'">
-      <el-form-item :label="t('baseDevice.baseDevice.tyreFacCode')" prop="tyreFacCode">
-        <el-input
-            v-model="queryParams.tyreFacCode"
-            :placeholder=" t('common.pleaseEnter') + t('baseDevice.baseDevice.tyreFacCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('baseDevice.baseDevice.companyCode')" prop="companyCode">
-        <el-input
-            v-model="queryParams.companyCode"
-            :placeholder="t('common.pleaseEnter') + t('baseDevice.baseDevice.companyCode')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="t('baseDevice.baseDevice.tyreFacCode')" prop="tyreFacCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.tyreFacCode"-->
+<!--            :placeholder=" t('common.pleaseEnter') + t('baseDevice.baseDevice.tyreFacCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('baseDevice.baseDevice.companyCode')" prop="companyCode">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.companyCode"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('baseDevice.baseDevice.companyCode')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item :label="t('baseDevice.baseDevice.internetThingsNo')" prop="internetThingsNo">
         <el-input
             v-model="queryParams.internetThingsNo"
@@ -79,91 +79,91 @@
             value-format="YYYY-MM-DD"
         />
       </el-form-item>
-      <el-form-item :label="t('common.isRemove')" prop="isDelete">
-        <el-input
-            v-model="queryParams.isDelete"
-            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createTime')" prop="createTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.createTime"
-            :placeholder="t('common.PleaseSelect') + t('common.createTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorId')" prop="createId">
-        <el-input
-            v-model="queryParams.createId"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.createBy')" prop="createBy">
-        <el-input
-            v-model="queryParams.createBy"
-            :placeholder="t('common.pleaseEnter') + t('common.createBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.creatorName')" prop="createName">
-        <el-input
-            v-model="queryParams.createName"
-            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editTime')" prop="modifyTime">
-        <el-date-picker
-            clearable
-            style="width: 200px"
-            v-model="queryParams.modifyTime"
-            :placeholder="t('common.PleaseSelect') + t('common.editTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editID')" prop="modifyId">
-        <el-input
-            v-model="queryParams.modifyId"
-            :placeholder="t('common.pleaseEnter') + t('common.editID')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editBy')" prop="modifyBy">
-        <el-input
-            v-model="queryParams.modifyBy"
-            :placeholder="t('common.pleaseEnter') + t('common.editBy')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="t('common.editName')" prop="modifyName">
-        <el-input
-            v-model="queryParams.modifyName"
-            :placeholder="t('common.pleaseEnter') + t('common.editName')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.isDelete"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createTime')" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.createTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.createTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorId')" prop="createId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorId')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.createBy')" prop="createBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.createBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.creatorName')" prop="createName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.createName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
+<!--        <el-date-picker-->
+<!--            clearable-->
+<!--            style="width: 200px"-->
+<!--            v-model="queryParams.modifyTime"-->
+<!--            :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
+<!--            type="date"-->
+<!--            format="YYYY/MM/DD"-->
+<!--            value-format="YYYY-MM-DD"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editID')" prop="modifyId">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyId"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editID')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editBy')" prop="modifyBy">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyBy"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editBy')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="t('common.editName')" prop="modifyName">-->
+<!--        <el-input-->
+<!--            v-model="queryParams.modifyName"-->
+<!--            :placeholder="t('common.pleaseEnter') + t('common.editName')"-->
+<!--            style="width: 200px"-->
+<!--            clearable-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <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>