From 021d52a63abd923c0138b11fb5482d17078101c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Mon, 3 Apr 2023 11:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/.env.production | 2 +- ruoyi-ui/src/api/GPS/car.js | 34 -- ruoyi-ui/src/directive/permission/hasPermi.js | 34 +- ruoyi-ui/src/utils/request.js | 2 + ruoyi-ui/src/views/GPS/car/index.vue | 349 +------------- ruoyi-ui/src/views/GPS/tyre/index.vue | 444 +----------------- .../src/views/carManagement/info/index.vue | 7 +- ruoyi-ui/src/views/dashboard/PieChart.vue | 11 +- ruoyi-ui/src/views/dashboard/RaddarChart.vue | 18 +- ruoyi-ui/src/views/dashboard/Temp.vue | 2 +- .../src/views/deviceManagement/info/index.vue | 8 +- ruoyi-ui/src/views/index.vue | 2 +- .../views/tireManagement/install/index.vue | 8 +- .../views/tireManagement/lifecycle/index.vue | 5 + 14 files changed, 97 insertions(+), 829 deletions(-) diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index f194e6e..044b67c 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -5,7 +5,7 @@ VITE_APP_TITLE = 若依管理系统 VITE_APP_ENV = 'production' # 若依管理系统/生产环境 -VITE_APP_BASE_API = 'http://10.11.41.249:8080/dev-api' +VITE_APP_BASE_API = 'http://47.94.93.46:8080/dev-api' # VITE_APP_BASE_API = 'http://47.94.93.46:80/dev-api' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/ruoyi-ui/src/api/GPS/car.js b/ruoyi-ui/src/api/GPS/car.js index 9ec75b0..4a0ed6d 100644 --- a/ruoyi-ui/src/api/GPS/car.js +++ b/ruoyi-ui/src/api/GPS/car.js @@ -9,37 +9,3 @@ export function listTest(query) { params: query }) } - -// 查询轮胎基础信息详细 -export function getTest(id) { - return request({ - url: '/test/test/' + id, - method: 'get' - }) -} - -// 新增轮胎基础信息 -export function addTest(data) { - return request({ - url: '/test/test', - method: 'post', - data: data - }) -} - -// 修改轮胎基础信息 -export function updateTest(data) { - return request({ - url: '/test/test', - method: 'put', - data: data - }) -} - -// 删除轮胎基础信息 -export function delTest(id) { - return request({ - url: '/test/test/' + id, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/ruoyi-ui/src/directive/permission/hasPermi.js index 44ef3f8..ffd3224 100644 --- a/ruoyi-ui/src/directive/permission/hasPermi.js +++ b/ruoyi-ui/src/directive/permission/hasPermi.js @@ -1,28 +1,28 @@ - /** +/** * v-hasPermi 操作权限处理 * Copyright (c) 2019 ruoyi */ - + import useUserStore from '@/store/modules/user' export default { - mounted(el, binding, vnode) { - const { value } = binding - const all_permission = "*:*:*"; - const permissions = useUserStore().permissions + mounted(el, binding, vnode) { + const {value} = binding + const all_permission = "*:*:*"; + const permissions = useUserStore().permissions - if (value && value instanceof Array && value.length > 0) { - const permissionFlag = value + if (value && value instanceof Array && value.length > 0) { + const permissionFlag = value - const hasPermissions = permissions.some(permission => { - return all_permission === permission || permissionFlag.includes(permission) - }) + const hasPermissions = permissions.some(permission => { + return all_permission === permission || permissionFlag.includes(permission) + }) - if (!hasPermissions) { - el.parentNode && el.parentNode.removeChild(el) - } - } else { - throw new Error(`请设置操作权限标签值`) + if (!hasPermissions) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置操作权限标签值`) + } } - } } diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 50dc934..3d89aae 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -21,10 +21,12 @@ let downloadLoadingInstance; export let isRelogin = {show: false}; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' +console.log(import.meta.env.VITE_APP_BASE_API) // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, + // baseURL: 'http://47.94.93.46/dev-api', // 超时 timeout: 10000 }) diff --git a/ruoyi-ui/src/views/GPS/car/index.vue b/ruoyi-ui/src/views/GPS/car/index.vue index 07d1264..f731080 100644 --- a/ruoyi-ui/src/views/GPS/car/index.vue +++ b/ruoyi-ui/src/views/GPS/car/index.vue @@ -23,11 +23,12 @@ @@ -38,16 +39,6 @@ - - {{ t('option.add') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -