diff --git a/.env.production b/.env.production index bbd9562..1fe549c 100644 --- a/.env.production +++ b/.env.production @@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统 ENV = 'production' # 共享电动车管理系统/生产环境 -# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' -VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api' +VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api' +# VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api' # 小程序外链跳转设备 VUE_APP_WX_DEVICE_URL = 'weixin://dl/business/?appid=wx4d178f8c80348214&env_version=release' diff --git a/src/api/system/hardwareVersion.js b/src/api/system/hardwareVersion.js index 1741ae0..35cac74 100644 --- a/src/api/system/hardwareVersion.js +++ b/src/api/system/hardwareVersion.js @@ -9,6 +9,15 @@ export function listHardwareVersion(query) { }) } +// 查询硬件版本列表 排除父节点 +export function listHardwareVersionExcludeParent(query) { + return request({ + url: '/system/hardwareVersion/list/exclude', + method: 'get', + params: query + }) +} + // 查询硬件版本详细 export function getHardwareVersion(id) { return request({ diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 48d3c03..2d3701d 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -809,7 +809,7 @@ { - this.hardwareVersionOptions = response.rows; + listHardwareVersionExcludeParent(this.queryParams).then((response) => { + this.hardwareVersionOptions = response.data; this.loading2 = false; }); console.log("当前用户信息:", this.$store.state.user.name); @@ -1483,13 +1483,13 @@ export default { endTime: this.formatDate(this.endTime), }; this.showPlaceSearchMap=false - + gettrajectory(data).then((response) => { this.tripRouteStr = response.data; // this.re this.showPlaceSearchMap=true setTimeout(() => { - + this.$refs.map.trajectory(); }, 600); diff --git a/src/views/system/hardwareVersion/index.vue b/src/views/system/hardwareVersion/index.vue index abd2286..77983f6 100644 --- a/src/views/system/hardwareVersion/index.vue +++ b/src/views/system/hardwareVersion/index.vue @@ -100,6 +100,14 @@ @click="handleUpdate(scope.row)" v-hasPermi="['system:hardwareVersion:edit']" >修改 + 新增