From a3db0a5ff20483c8714fcafea393d6dee939c508 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 30 Sep 2022 15:22:19 +0800
Subject: [PATCH] 事件详情、维修详情图片和视频放在同一栏。
---
src/views/repairsorder/repairsorderDetail.vue | 61 +++++++++++--------
src/views/eventgm/eventgmDetail.vue | 62 +++++++++++---------
src/views/taskinfo/taskinfoPlan.vue | 2
src/views/taskinfo/taskinfo.vue | 2
4 files changed, 74 insertions(+), 53 deletions(-)
diff --git a/src/views/eventgm/eventgmDetail.vue b/src/views/eventgm/eventgmDetail.vue
index fa06d86..6bce9a7 100644
--- a/src/views/eventgm/eventgmDetail.vue
+++ b/src/views/eventgm/eventgmDetail.vue
@@ -106,7 +106,7 @@
>
<div class="avue-group__header avue-group">
<i class="el-icon-s-order avue-group__icon"></i>
- <h1 class="avue-group__title">事件图片</h1>
+ <h1 class="avue-group__title">事件图片和视频</h1>
</div>
</div>
</div>
@@ -118,36 +118,44 @@
:preview-src-list="picUrls"
v-show="picUrls.length > 0"
></el-image>
- <span v-show="picUrls.length == 0">暂无图片</span>
- </el-card>
- <div
- style=""
- role="tab"
- aria-expanded="true"
- aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823"
- >
- <div
- role="button"
- tabindex="0"
- class="el-collapse-item__header focusing is-active"
- >
- <div class="avue-group__header avue-group">
- <i class="el-icon-s-order avue-group__icon"></i>
- <h1 class="avue-group__title">事件视频</h1>
- </div>
- </div>
- </div>
- <el-card>
<video
:src="videoUrls"
- style="width: 200px; height: 200px; object-fit: fill"
+ style="width: 145px; height: 145px; object-fit: fill"
controls
v-show="videoUrls != ''"
></video>
- <span v-show="videoUrls.length == 0">暂无视频</span>
+
+ <span v-show="picUrls.length == 0&&videoUrls.length ==0">暂无数据</span>
</el-card>
+ <!--视频-->
+<!-- <div-->
+<!-- style=""-->
+<!-- role="tab"-->
+<!-- aria-expanded="true"-->
+<!-- aria-controls="el-collapse-content-823"-->
+<!-- aria-describedby="el-collapse-content-823"-->
+<!-- >-->
+<!-- <div-->
+<!-- role="button"-->
+<!-- tabindex="0"-->
+<!-- class="el-collapse-item__header focusing is-active"-->
+<!-- >-->
+<!-- <div class="avue-group__header avue-group">-->
+<!-- <i class="el-icon-s-order avue-group__icon"></i>-->
+<!-- <h1 class="avue-group__title">事件视频</h1>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <el-card>-->
+<!-- <video-->
+<!-- :src="videoUrls"-->
+<!-- style="width: 200px; height: 200px; object-fit: fill"-->
+<!-- controls-->
+<!-- v-show="videoUrls != ''"-->
+<!-- ></video>-->
+<!-- <span v-show="videoUrls.length == 0">暂无视频</span>-->
+<!-- </el-card>-->
<!--事件流程信息-->
<div
style=""
@@ -407,9 +415,9 @@
}
.el-image {
- margin: 10px;
- width: 100px;
- height: 100px;
+ margin-right: 10px;
+ width: 145px;
+ height: 145px;
}
}
}
diff --git a/src/views/repairsorder/repairsorderDetail.vue b/src/views/repairsorder/repairsorderDetail.vue
index bb959ee..6850533 100644
--- a/src/views/repairsorder/repairsorderDetail.vue
+++ b/src/views/repairsorder/repairsorderDetail.vue
@@ -99,36 +99,45 @@
:preview-src-list="picUrls"
v-show="picUrls.length > 0"
></el-image>
- <span v-show="picUrls.length == 0">暂无图片</span>
- </el-card>
- <div
- style=""
- role="tab"
- aria-expanded="true"
- aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823"
- >
- <div
- role="button"
- tabindex="0"
- class="el-collapse-item__header focusing is-active"
- >
- <div class="avue-group__header avue-group">
- <i class="el-icon-s-order avue-group__icon"></i>
- <h1 class="avue-group__title">维修视频</h1>
- </div>
- </div>
- </div>
- <el-card>
<video
:src="videoUrls"
- style="width: 200px; height: 200px; object-fit: fill"
+ style="width: 145px; height: 145px; object-fit: fill"
controls
v-show="videoUrls != ''"
></video>
- <span v-show="videoUrls.length == 0">暂无视频</span>
+
+ <span v-show="picUrls.length == 0&&videoUrls.length ==0">暂无数据</span>
+
</el-card>
+
+<!-- <div-->
+<!-- style=""-->
+<!-- role="tab"-->
+<!-- aria-expanded="true"-->
+<!-- aria-controls="el-collapse-content-823"-->
+<!-- aria-describedby="el-collapse-content-823"-->
+<!-- >-->
+<!-- <div-->
+<!-- role="button"-->
+<!-- tabindex="0"-->
+<!-- class="el-collapse-item__header focusing is-active"-->
+<!-- >-->
+<!-- <div class="avue-group__header avue-group">-->
+<!-- <i class="el-icon-s-order avue-group__icon"></i>-->
+<!-- <h1 class="avue-group__title">维修视频</h1>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <el-card>-->
+<!-- <video-->
+<!-- :src="videoUrls"-->
+<!-- style="width: 200px; height: 200px; object-fit: fill"-->
+<!-- controls-->
+<!-- v-show="videoUrls != ''"-->
+<!-- ></video>-->
+<!-- <span v-show="videoUrls.length == 0">暂无视频</span>-->
+<!-- </el-card>-->
<!--维修人员信息-->
<div
@@ -280,9 +289,9 @@
}
.el-image {
- margin: 10px;
- width: 100px;
- height: 100px;
+ margin-right: 10px;
+ width: 145px;
+ height: 145px;
}
}
}
diff --git a/src/views/taskinfo/taskinfo.vue b/src/views/taskinfo/taskinfo.vue
index a142d93..b2b2869 100644
--- a/src/views/taskinfo/taskinfo.vue
+++ b/src/views/taskinfo/taskinfo.vue
@@ -176,6 +176,8 @@
this.form.endTime = `${year}-${month}-${strDate} 23:59:59`
this.form.source = 'SYSTEMNEW'
this.form.state = '0'
+ } else if (["edit"].includes(type)) {
+ this.form.routeRange = '\'' + this.form.routeRange + '\''
}
done();
},
diff --git a/src/views/taskinfo/taskinfoPlan.vue b/src/views/taskinfo/taskinfoPlan.vue
index 0159d1d..95f34ef 100644
--- a/src/views/taskinfo/taskinfoPlan.vue
+++ b/src/views/taskinfo/taskinfoPlan.vue
@@ -186,6 +186,8 @@
beforeOpen(done, type) {
if (["add"].includes(type)) {
this.form.status = 2
+ }else if (["edit"].includes(type)) {
+ this.form.routeRange = '\'' + this.form.routeRange + '\''
}
done();
},
--
Gitblit v1.9.3