diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index d7d0a13..3a6b7d8 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -1,285 +1,110 @@ - {{ form.onlineStatus == 1 ? "在线" : "离线" }} + {{ form.onlineStatus == 1 ? "在线" : "离线" + }} @@ -833,52 +519,27 @@ 开始时间 - + 结束时间 - + - +
- + 使用记录 维修记录 换电记录 @@ -887,21 +548,9 @@
- - - + + +
@@ -954,7 +603,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "Device", - dicts: ["as_online_status", "as_device_status", "et_device_lock_status","et_device_report_status"], + dicts: ["as_online_status", "as_device_status", "et_device_lock_status", "et_device_report_status"], components: { Map, OrderRecord, @@ -1035,7 +684,7 @@ export default { status: null, version: null, hardwareVersion: null, - deptId:this.deptId + deptId: this.deptId }, //不分页 queryParams2: { @@ -1114,7 +763,7 @@ export default { this.userName = this.$store.state.user.name; this.getList(); if (this.userName === "admin") { - console.log("admin==========================="+this.userName) + console.log("admin===========================" + this.userName) listHardwareVersionExcludeParent(this.queryParams).then((response) => { this.hardwareVersionOptions = response.data; this.loading2 = false; @@ -1128,31 +777,31 @@ export default { } }, watch: { - "form.modelId": function (newVal) { - if (!this.isUpdating) { - this.fetchData(newVal); - } - }, - "form.deptId": function (newVal) { - if (!this.isUpdating) { - this.fetchData2(newVal); - } - }, - "form.areaId": function (newVal) { - if (!this.isUpdating) { - this.fetchData3(newVal); - } - }, - "form.hardwareVersionId": function (hardwareVersionId) { - if (hardwareVersionId && this.userName == 'admin') { - this.selectHardwareVersion(hardwareVersionId); - } - }, - "queryParams.deptId": function (newVal) { - if (!this.isUpdating) { - this.fetchData4(newVal); - } - }, + // "form.modelId": function (newVal) { + // if (!this.isUpdating) { + // this.fetchData(newVal); + // } + // }, + // "form.deptId": function (newVal) { + // if (!this.isUpdating) { + // this.fetchData2(newVal); + // } + // }, + // "form.areaId": function (newVal) { + // if (!this.isUpdating) { + // this.fetchData3(newVal); + // } + // }, + // "form.hardwareVersionId": function (hardwareVersionId) { + // if (hardwareVersionId && this.userName == 'admin') { + // this.selectHardwareVersion(hardwareVersionId); + // } + // }, + // "queryParams.deptId": function (newVal) { + // if (!this.isUpdating) { + // this.fetchData4(newVal); + // } + // }, open2(val) { if (!val) { console.log("========关闭地图============="); @@ -1167,8 +816,8 @@ export default { this.$eventBus.$off("close-all-dialogs", this.closeDialog); }, methods: { - fetchData(){ - this.queryParams.onlineStatus=0 + fetchData() { + this.queryParams.onlineStatus = 0 this.getList(); }, startTimecg(value) { @@ -1177,6 +826,32 @@ export default { this.gettj(); } }, + handleDeptChange(val) { + if (!this.isUpdating) { + this.fetchData2(val); + } + }, + + // 处理运营区变化 + handleAreaChange(val) { + if (!this.isUpdating) { + this.fetchData3(val); + } + }, + + // 处理车型变化 + handleModelChange(val) { + if (!this.isUpdating) { + this.fetchData(val); + } + }, + + // 处理硬件版本变化 + handleHardwareVersionChange(val) { + if (val && this.userName == 'admin') { + this.selectHardwareVersion(val); + } + }, endTimecg(value) { console.log("start变化", value); if (this.startTime != "" && this.endTime != "") { @@ -1294,17 +969,17 @@ export default { /** 当选择运营区时 根据运营区id，获取代理商和型号 */ fetchData3(areaId) { if (areaId) { - this.isUpdating = true; // 设置标志位 - selectDeptByAreaId(areaId).then((response) => { - this.form.deptId = response.data.sysDept.deptId; - this.modelOptions = response.data.modelList; - let modelOptions = response.data.modelList; - modelOptions.length > 0 - ? (this.form.modelId = modelOptions[0].modelId) - : (this.form.modelId = null); - }).finally(() => { - this.isUpdating = false; // 清除标志位 - }); + this.isUpdating = true; // 设置标志位 + selectDeptByAreaId(areaId).then((response) => { + this.form.deptId = response.data.sysDept.deptId; + this.modelOptions = response.data.modelList; + let modelOptions = response.data.modelList; + modelOptions.length > 0 + ? (this.form.modelId = modelOptions[0].modelId) + : (this.form.modelId = null); + }).finally(() => { + this.isUpdating = false; // 清除标志位 + }); } else { this.reset2(); } @@ -1338,7 +1013,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }, oneClickOffline(row) { const deviceIds = row.deviceId || this.ids; @@ -1351,7 +1026,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 一键出仓*/ oneClickListing(row) { @@ -1365,7 +1040,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 更新*/ refresh(row) { @@ -1387,7 +1062,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }, onMapGeo(data, lat, lng) { console.log("onMapGeo", data); @@ -1544,9 +1219,9 @@ export default { this.open = true; this.title = "添加设备"; this.$nextTick(() => { - if(this.deptId){ - this.form.deptId=this.deptId - } + if (this.deptId) { + this.form.deptId = this.deptId + } }) }, /** 详情按钮 */ @@ -1583,12 +1258,12 @@ export default { startTime: this.formatDate(this.startTime), endTime: this.formatDate(this.endTime), }; - this.showPlaceSearchMap=false + this.showPlaceSearchMap = false gettrajectory(data).then((response) => { this.tripRouteStr = response.data; // this.re - this.showPlaceSearchMap=true + this.showPlaceSearchMap = true setTimeout(() => { this.$refs.map.trajectory(); @@ -1609,26 +1284,36 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { + this.isUpdating = true; this.reset(); const deviceId = row.deviceId || this.ids; + getDevice(deviceId).then((response) => { this.form = response.data; - // console.log("111111111111111111",this.form) - // selectAreaListByDeptId(response.data.deptId).then((response) => { - // this.areaOptions = response.data.areaList; - // let areaOptions = response.data.areaList; - // areaOptions.length > 0 - // ? (this.form.areaId = areaOptions[0].areaId) - // : (this.form.areaId = null); - // this.modelOptions = response.data.modelList; - // let modelOptions = response.data.modelList; - // console.log("==============",this.modelOptions.length) - // modelOptions.length > 0 - // ? (this.form.modelId = modelOptions[0].modelId) - // : (this.form.modelId = null); - // }); - this.open = true; - this.title = "修改设备"; + + this.selectHardwareVersion(response.data.hardwareVersionId) + if (response.data.deptId) { + selectAreaListByDeptId(response.data.deptId).then((res) => { + // 方案1: 使用Vue.set确保响应式更新 + this.$set(this, 'modelOptions', []); + this.$set(this, 'areaOptions', []); + this.$set(this, 'modelOptions', res.data.modelList); + this.$set(this, 'areaOptions', res.data.areaList); + + // 方案2: 使用nextTick确保DOM更新 + this.$nextTick(() => { + this.modelOptions = res.data.modelList; + this.areaOptions = res.data.areaList; + }); + this.open = true; + this.title = "修改设备"; + // 不再需要setTimeout和$forceUpdate + }).finally(() => { + this.isUpdating = false; + }); + } else { + this.isUpdating = false; + } }); }, handleListing(row) { @@ -1652,7 +1337,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); } }); }, @@ -1677,7 +1362,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); } }); }, @@ -1695,7 +1380,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }); }, handleLock(row) { @@ -1712,7 +1397,7 @@ export default { this.getList(); this.$modal.msgSuccess("操作成功"); }) - .catch(() => {}); + .catch(() => { }); }); }, toLog(row) { @@ -1786,7 +1471,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { @@ -1802,6 +1487,28 @@ export default { }; +