|
@@ -31,7 +31,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
- <div class="implement-detail detail-item" v-if="detail.TaskState == '未找到'">
|
|
|
+ <div class="implement-detail detail-item" v-if="detail.TaskState === '未找到'">
|
|
|
<el-form :model="detail" label-width="150px">
|
|
|
<el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
|
|
|
<el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
|
|
@@ -51,8 +51,8 @@
|
|
|
<el-form-item label="全景图:" v-show="panoramaList && panoramaList.length">
|
|
|
<div class="img-item" @click="dialogVisible = true" v-for="item in panoramaList"
|
|
|
:key="item.Key">
|
|
|
- <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`"
|
|
|
- style="width:100%;" :alt="item.Name">
|
|
|
+ 4 <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`"
|
|
|
+ style="width:100%;" :alt="item.Name">
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="资产照片:" v-show="imgList && imgList.length">
|
|
@@ -78,27 +78,32 @@
|
|
|
<el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
- <div class="operation-detail detail-item">
|
|
|
+ <div class="operation-detail detail-item" v-if="detail.TaskState === '未找到'">
|
|
|
<el-form>
|
|
|
<el-form-item label="操作信息:"></el-form-item>
|
|
|
<div class="block">
|
|
|
<el-timeline>
|
|
|
- <el-timeline-item timestamp="2018/4/12" placement="top">
|
|
|
+ <el-timeline-item
|
|
|
+ placement="top"
|
|
|
+ v-for="(item,index) in arr"
|
|
|
+ :key="index"
|
|
|
+ :timestamp="item.timestamp"
|
|
|
+ >
|
|
|
<el-card>
|
|
|
- <h4>更新 Github 模板</h4>
|
|
|
- <p>王小虎 提交于 2018/4/12 20:46</p>
|
|
|
- </el-card>
|
|
|
- </el-timeline-item>
|
|
|
- <el-timeline-item timestamp="2018/4/3" placement="top">
|
|
|
- <el-card>
|
|
|
- <h4>更新 Github 模板</h4>
|
|
|
- <p>王小虎 提交于 2018/4/3 20:46</p>
|
|
|
- </el-card>
|
|
|
- </el-timeline-item>
|
|
|
- <el-timeline-item timestamp="2018/4/2" placement="top">
|
|
|
- <el-card>
|
|
|
- <h4>更新 Github 模板</h4>
|
|
|
- <p>王小虎 提交于 2018/4/2 20:46</p>
|
|
|
+ <small>{{item.content}}</small>
|
|
|
+ <p>{{item.title}}</p>
|
|
|
+ <img
|
|
|
+ v-for="isImg in item.imgs"
|
|
|
+ :key="isImg.Key"
|
|
|
+ :src="`/image-service/common/image_get?systemId=dataPlatform&key=${isImg.Key}`">
|
|
|
+
|
|
|
+ <video controls style="width:100%;" v-for="v in videoList" :key="index"
|
|
|
+ :title="v.Name">
|
|
|
+ <source
|
|
|
+ :src="`/image-service/common/image_get?systemId=dataPlatform&key=${v.Key}`"
|
|
|
+ type="video/mp4">
|
|
|
+ 您的浏览器不支持 HTML5 video ,暂无法播放。
|
|
|
+ </video>
|
|
|
</el-card>
|
|
|
</el-timeline-item>
|
|
|
</el-timeline>
|
|
@@ -116,16 +121,53 @@
|
|
|
import {mapGetters} from "vuex"
|
|
|
|
|
|
export default {
|
|
|
- components: {
|
|
|
-
|
|
|
- },
|
|
|
+ components: {},
|
|
|
created() {
|
|
|
- console.log(this.detail)
|
|
|
- // ConfirmTime 确认信息时间
|
|
|
- // PositivePhotoTime string 正面照片时间
|
|
|
- // QrCodeTime 打印二维码时间
|
|
|
- // RegionPhotoTime string 局部照片时间
|
|
|
- // SidePhotoTime string 侧面照片时间
|
|
|
+ let {ConfirmTime, PositivePhotoTime, QrCodeTime, NameplateTime, SidePhotoTime, VideoTime, EquipProblemTime, EquipProblem, TaskPicList} = this.detail;
|
|
|
+ let arr = []
|
|
|
+ QrCodeTime && arr.push({
|
|
|
+ timestamp: QrCodeTime,
|
|
|
+ time: new Date(QrCodeTime).getTime(),
|
|
|
+ content: '黏贴二维码',
|
|
|
+ imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('带二维码的设备近景照片'))
|
|
|
+ })
|
|
|
+ PositivePhotoTime && arr.push({
|
|
|
+ timestamp: PositivePhotoTime,
|
|
|
+ time: new Date(PositivePhotoTime).getTime(),
|
|
|
+ content: '拍摄正面照片',
|
|
|
+ imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备正面照片'))
|
|
|
+ })
|
|
|
+ NameplateTime && arr.push({
|
|
|
+ timestamp: NameplateTime,
|
|
|
+ time: new Date(NameplateTime).getTime(),
|
|
|
+ content: '拍摄铭牌照片',
|
|
|
+ imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('铭牌照片'))
|
|
|
+ })
|
|
|
+ SidePhotoTime && arr.push({
|
|
|
+ timestamp: SidePhotoTime,
|
|
|
+ time: new Date(SidePhotoTime).getTime(),
|
|
|
+ content: '拍摄侧面照片',
|
|
|
+ imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备左侧照片' || '设备右侧照片'))
|
|
|
+ })
|
|
|
+ VideoTime && arr.push({
|
|
|
+ timestamp: VideoTime,
|
|
|
+ time: new Date(VideoTime).getTime(),
|
|
|
+ content: '拍摄30s视频',
|
|
|
+ videoList: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('视频资料'))
|
|
|
+ })
|
|
|
+ EquipProblemTime && arr.push({
|
|
|
+ timestamp: EquipProblemTime,
|
|
|
+ time: new Date(EquipProblemTime).getTime(),
|
|
|
+ content: '记录设备问题',
|
|
|
+ title: EquipProblem
|
|
|
+ })
|
|
|
+ ConfirmTime && arr.push({
|
|
|
+ timestamp: ConfirmTime,
|
|
|
+ time: new Date(ConfirmTime).getTime(),
|
|
|
+ content: '确认信息',
|
|
|
+ title: '已确认的设备信息'
|
|
|
+ })
|
|
|
+ this.arr = arr.map(i => ({...i})).sort((a, b) => a.time - b.time)
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters("layout", ["projectId"]),
|
|
@@ -198,6 +240,7 @@
|
|
|
return {
|
|
|
dialogVisible: false,//全景图弹出框
|
|
|
nowUrl: '',//当前正在显示的图
|
|
|
+ arr: [],
|
|
|
};
|
|
|
},
|
|
|
methods: {},
|