From 908b91b1c2e2619b93c95feb064efa1d58ad9f80 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 30 Jan 2026 16:12:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 41e1040..a9e3736 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -176,20 +176,18 @@
</div>
<div class="rightBox" v-if="!dialogReadonly">
<div class="detail-title">推荐设备</div>
- <template v-if="formData.deviceLoadDemand && pointList.length">
- <el-table
- ref="deviceTableRef"
- :data="deviceList"
- row-key="id"
- @selection-change="handleDeviceSelectionChange"
- >
- <el-table-column type="selection" width="55" :reserve-selection="true" />
- <el-table-column prop="nickname" label="设备名称" />
- <el-table-column prop="deviceName" label="设备型号" />
- <el-table-column prop="devicePayload" label="设备负载" />
- </el-table>
- </template>
- <div v-else class="tipSelect">请先选择设备需求并在地图上绘制工单范围</div>
+ <el-table
+ :empty-text="(formData.deviceLoadDemand && pointList.length) ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'"
+ ref="deviceTableRef"
+ :data="(formData.deviceLoadDemand && pointList.length) ? deviceList : []"
+ row-key="id"
+ @selection-change="handleDeviceSelectionChange"
+ >
+ <el-table-column type="selection" width="55" :reserve-selection="true" />
+ <el-table-column prop="nickname" label="设备名称" />
+ <el-table-column prop="deviceName" label="设备型号" />
+ <el-table-column prop="devicePayload" label="设备负载" />
+ </el-table>
</div>
</div>
@@ -264,7 +262,7 @@
</template>
<script setup>
-import { computed, ref, onMounted, nextTick } from 'vue'
+import { computed, ref, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { dateRangeFormat, fieldRules, flyVisual, geomAnalysis, getDictLabel } from '@ztzf/utils'
import {
@@ -321,7 +319,6 @@
let viewer
let drawPolygonExample
let pointList = ref([])
-const requester = inject('requester')
const suddenlyEdit = ref(false)
const processList = ref([])
let viewPlane
@@ -638,6 +635,18 @@
</script>
<style lang="scss" scoped>
+.el-table{
+ height: 0;
+ flex: 1;
+ :deep(){
+ .el-scrollbar__view{
+ height: 100%;
+ }
+ .el-table__empty-text{
+ line-height: normal;
+ }
+ }
+}
.content {
display: flex;
gap: 0 20px;
@@ -659,6 +668,8 @@
.rightBox {
width: 350px;
+ display: flex;
+ flex-direction: column;
.title {
font-weight: 500;
font-size: 14px;
--
Gitblit v1.9.3