From d38770f158cd4b9efe2a37bdc357824136e02ffe Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 21 Jan 2026 14:34:13 +0800
Subject: [PATCH] feat: 修改背景样式
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 2
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue | 8 +-
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 2
applications/task-work-order/src/styles/common/cockpit.scss | 101 ++++++++----------------
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 4
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue | 62 +++++++--------
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 2
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 29 +++++--
8 files changed, 93 insertions(+), 117 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 684f5d0..765a052 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -1,6 +1,6 @@
//变量
$gd-placeholder: #86909C;
-$form-bg:#F2F3F5;
+$form-bg: #F2F3F5;
.gd-table {
height: 0;
@@ -79,14 +79,14 @@
}
.gd-input {
- .el-input__wrapper,.el-textarea__inner {
+ .el-input__wrapper, .el-textarea__inner {
padding: 0 8px !important;
background: $form-bg;
box-shadow: none !important;
border: none;
}
- .el-input__inner,.el-textarea__inner {
+ .el-input__inner, .el-textarea__inner {
&::placeholder {
color: $gd-placeholder;
}
@@ -458,10 +458,10 @@
padding: 30px;
display: flex;
flex-direction: column;
-
background: #FFFFFF;
border: 1px solid #CCCCCC;
border-radius: 6px 6px 6px 6px;
+
.el-dialog__header {
span {
@@ -484,83 +484,48 @@
height: 0;
flex: 1;
- .detail-container {
- padding: 0 10px;
-
- .detail-title {
- margin-bottom: 30px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 18px;
- color: #FFFFFF;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
-
- .el-row {
- .el-col {
- margin-bottom: 20px;
- display: flex;
- align-items: center;
-
- .label {
- width: 88px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 14px;
- color: #86909C;
- line-height: 22px;
- text-align: right;
- font-style: normal;
- text-transform: none;
- }
-
- .val {
- margin-left: 12px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #4E5969;
- line-height: 22px;
- text-align: left;
- font-style: normal;
- text-transform: none;
- }
- }
- }
-
-
- .gd-table-container {
- height: 360px;
-
- .gd-pagination-parent {
- justify-content: center;
- }
- }
+ .detail-title {
+ margin-bottom: 20px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #161B2C;
}
- .dialog-form {
- .el-form-item {
+ // 查看
+ .detail-row-view {
+ background: #F2F3F5;
+ border-radius: 2px 2px 2px 2px;
+ gap: 20px 0;
+ padding: 20px;
+
+ .el-col {
display: flex;
align-items: center;
+ margin-bottom: 0;
- .el-form-item__label {
- display: flex;
- align-items: center;
+ .label {
+ width: 88px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 14px;
- color: #4E5969;
+ color: #86909C;
line-height: 22px;
text-align: right;
font-style: normal;
text-transform: none;
}
- .el-form-item__content {
- display: flex;
- align-items: center;
+ .val {
+ margin-left: 12px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #4E5969;
+ line-height: 22px;
+ text-align: left;
+ font-style: normal;
+ text-transform: none;
}
}
}
@@ -894,3 +859,5 @@
}
}
+
+
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index db38371..611bc25 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -7,7 +7,7 @@
destroy-on-close
>
<div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">标题</div>
<div class="val">{{ formData.title }}</div>
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
index c1ff179..0c9103c 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
@@ -6,38 +6,36 @@
@closed="visible = false"
destroy-on-close
>
- <div class="detail-container" v-if="dialogReadonly">
- <el-row>
- <el-col :span="12">
- <div class="label">标题</div>
- <div class="val">{{ formData.title }}</div>
- </el-col>
- <el-col :span="12">
- <div class="label">数据名称</div>
- <div class="val">{{ formData.dataName }}</div>
- </el-col>
- <el-col :span="12">
- <div class="label">提出部门</div>
- <div class="val">{{ formData.proposeDeptName }}</div>
- </el-col>
- <el-col :span="12">
- <div class="label">数据提供部门</div>
- <div class="val">{{ formData.dataProvideDeptName }}</div>
- </el-col>
- <el-col :span="12">
- <div class="label">评分</div>
- <div class="val">{{ formData.score }}</div>
- </el-col>
- <el-col :span="12">
- <div class="label">是否解决</div>
- <div class="val">{{ formData.isResolved === '1' ? '是' : '否' }}</div>
- </el-col>
- <el-col :span="24">
- <div class="label">评价内容</div>
- <div class="val">{{ formData.evaluationContent }}</div>
- </el-col>
- </el-row>
- </div>
+ <el-row class="detail-row-view" v-if="dialogReadonly">
+ <el-col :span="12">
+ <div class="label">标题</div>
+ <div class="val">{{ formData.title }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">数据名称</div>
+ <div class="val">{{ formData.dataName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">提出部门</div>
+ <div class="val">{{ formData.proposeDeptName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">数据提供部门</div>
+ <div class="val">{{ formData.dataProvideDeptName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">评分</div>
+ <div class="val">{{ formData.score }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">是否解决</div>
+ <div class="val">{{ formData.isResolved === '1' ? '是' : '否' }}</div>
+ </el-col>
+ <el-col :span="24">
+ <div class="label">评价内容</div>
+ <div class="val">{{ formData.evaluationContent }}</div>
+ </el-col>
+ </el-row>
<el-form
class="gd-dialog-form"
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
index 273c01d..b478151 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -239,7 +239,7 @@
})
ElMessage.success('文件上传成功！')
- }
+ }
}
// 上传失败处理函数
@@ -399,7 +399,7 @@
const handleRejectionConfirm = reason => {
// 从 uploadedFiles.value 中提取所有 attachId
const id = uploadedFiles.value.map(file => file.attachId)
-
+
gdSupplyDemandAuditRejectApi({ attachIds: id, auditOpinion: reason, demandId: demandId.value })
.then(() => {
ElMessage.success('拒绝申请成功')
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
index 53a659f..99608fa 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
@@ -7,7 +7,7 @@
destroy-on-close
>
<div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">需求名称</div>
<div class="val">{{ formData.demandName }}</div>
@@ -259,7 +259,7 @@
function getDeptNameById(deptId, deptList) {
// 处理类型转换，确保比较的是相同类型
const targetId = String(deptId)
-
+
// 递归遍历部门树
function findDept(deptList) {
for (const dept of deptList) {
@@ -273,11 +273,11 @@
}
return ''
}
-
+
if (!targetId || !Array.isArray(deptList) || deptList.length === 0) {
return ''
}
-
+
return findDept(deptList)
}
// 提交新增/编辑
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index 30150ef..d45ba68 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -30,7 +30,7 @@
<!-- 工单信息展示 -->
<div class="work-order-info" v-if="selectedWorkOrder">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="info-item">
<span class="label">工单类型</span>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 1239f70..31eeb9a 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -11,7 +11,7 @@
<div class="leftBox">
<!-- 查看模式 -->
<div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">巡查任务名称</div>
<div class="val">{{ formData.patrolTaskName }}</div>
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 1391c15..6d05750 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
@@ -4,16 +4,20 @@
v-model="visible"
:title="titleEnum[dialogMode]"
@closed="visible = false"
- :style="{ width: pxToRem(1216) }"
+ width="80%"
destroy-on-close
>
<div class="content" style="display: flex">
<div class="processBox">
- <div v-for="(item, index) in processList">{{ index }}-{{ item.flowName }}{{ item.flowDesc }}</div>
+ <el-steps direction="vertical" :active="processList.length">
+ <el-step v-for="item in processList" :title="item.flowName" :description="item.flowDesc" />
+ </el-steps>
+ <!-- <div v-for="(item, index) in processList">{{ index }}-{{ item.flowName }}{{ item.flowDesc }}</div>-->
</div>
<div class="leftBox">
- <div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <div v-if="dialogReadonly">
+ <div class="detail-title">工单详情</div>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">工单名称</div>
<div class="val">{{ formData.workOrderName }}</div>
@@ -38,7 +42,8 @@
<div class="val">{{ formData.remark }}</div>
</el-col>
</el-row>
- <el-table ref="deviceTableRef" :data="deviceList" row-key="id">
+ <div class="detail-title" :style="{ marginTop: pxToRem(20) }">已选设备</div>
+ <el-table class="setHeight" ref="deviceTableRef" :data="deviceList" row-key="id">
<el-table-column prop="nickname" label="设备名称" />
<el-table-column prop="deviceName" label="设备型号" />
<el-table-column prop="devicePayload" label="设备负载" />
@@ -129,7 +134,7 @@
/>
</div>
<div class="rightBox" v-if="!dialogReadonly">
- <div class="title">推荐设备</div>
+ <div class="detail-title">推荐设备</div>
<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="设备名称" />
@@ -140,7 +145,7 @@
</div>
<template #footer>
-<!-- <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>-->
+ <!-- <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>-->
<el-button
class="save-btn"
color="#4C34FF"
@@ -182,7 +187,6 @@
</el-button>
</template>
</template>
-
</template>
<RefuseOrderDialog
@@ -399,7 +403,7 @@
material: Cesium.Color.RED,
},
})
- viewer.flyTo(mian)
+ viewer.flyTo(mian, { duration: 0 })
}
// 同步关联场景
@@ -451,6 +455,8 @@
.leftBox {
width: 0;
flex: 1;
+ display: flex;
+ flex-direction: column;
.gd-cesium {
width: 100%;
height: 423px;
@@ -464,4 +470,9 @@
}
}
}
+
+.setHeight {
+ max-height: 300px;
+ min-height: 200px;
+}
</style>
--
Gitblit v1.9.3