From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/enterprise/dispatchUnitDetails.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/company/src/components/enterprise/dispatchUnitDetails.vue b/company/src/components/enterprise/dispatchUnitDetails.vue
index 1e537aa..fab9807 100644
--- a/company/src/components/enterprise/dispatchUnitDetails.vue
+++ b/company/src/components/enterprise/dispatchUnitDetails.vue
@@ -19,10 +19,10 @@
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
<div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">寰呭鏍�</div>
- <div class="info_list_item_val" v-if="form.unitStatus === 1">
- <span style="color:#2E68EC;" v-if="form.worktypeStatus ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
- <span style="color: green" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
- <span style="color: red;" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ <div class="info_list_item_val" v-if="form.unitStatus === 1">
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus == null || form.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+ form.worktypeStatus" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
</div>
<div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
@@ -56,12 +56,16 @@
prop="name"
label="鎿嶄綔瑙嗛">
<template slot-scope="{row}">
- <video loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
+ <video v-if="row.videoUrlFull" loop controls width="150px" height="150px" :src="row.videoUrlFull"></video>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column
- prop="checkDate"
label="瀹℃牳閫氳繃鏃ユ湡">
+ <template slot-scope="{row}">
+ <span v-if="row.status === 2">-</span>
+ <span v-else>{{row.checkDate}}</span>
+ </template>
</el-table-column>
<el-table-column
label="鐘舵��">
@@ -92,7 +96,7 @@
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
<span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
- 鎻愪氦鎰忚: -
+ 鎻愪氦鎰忚: - {{activity.content}}
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
@@ -131,6 +135,7 @@
code: '',
content: '',
unitStatus: '',
+ worktypeStatus: '',
duLogList: [],
duSolutionList: [],
saveDuSolutionDTOList: [
--
Gitblit v1.9.3