|
@@ -4,97 +4,100 @@
|
|
<div class="attribute-detail detail-item">
|
|
<div class="attribute-detail detail-item">
|
|
<el-form :model="detail" label-width="150px">
|
|
<el-form :model="detail" label-width="150px">
|
|
<el-form-item label="设备基本信息"></el-form-item>
|
|
<el-form-item label="设备基本信息"></el-form-item>
|
|
- <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="任务创建时间:">{{ detail.createTime || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="任务当前状态:">{{ detail.taskState || '--' }}</el-form-item>
|
|
<el-form-item label="任务执行方案:">
|
|
<el-form-item label="任务执行方案:">
|
|
- {{detail.SchemeId?detail.SchemeId == 1 ? '极简' : '标准':'--' }}
|
|
|
|
|
|
+ {{ detail.schemeId ? detail.schemeId == 1 ? '极简' : '标准' : '--' }}
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="设备类:">{{
|
|
<el-form-item label="设备类:">{{
|
|
- detail.EquipCategory?detail.EquipCategory.EquipName?detail.EquipCategory.EquipName:'--':'--' }}
|
|
|
|
|
|
+ detail.equipFamily ? detail.equipFamily.equipName ? detail.equipFamily.equipName : '--' : '--'
|
|
|
|
+ }}
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="设计图纸中编码:">{{ detail.CADID || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="全局名称:">{{ detail.equipName || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="设备本地名称:">{{ detail.localName || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="设备本地编码:">{{ detail.equipId || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="设计图纸中编码:">{{ detail.cadId || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="安装位置:">{{ detail.installLocation || '--' }}</el-form-item>
|
|
<el-form-item label="生产厂家:">{{ detail.manufacturer || '--' }}</el-form-item>
|
|
<el-form-item label="生产厂家:">{{ detail.manufacturer || '--' }}</el-form-item>
|
|
- <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="型号:">{{ detail.specification || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="供应商:">{{ detail.supplier || '--' }}</el-form-item>
|
|
<el-form-item label="包含部件:">
|
|
<el-form-item label="包含部件:">
|
|
- {{Name ? Name :'-'}}{{Count ? ':' + Count +'个' :'-'}}
|
|
|
|
|
|
+ {{ Name ? Name : '-' }}{{ Count ? ':' + Count + '个' : '-' }}
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</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 :model="detail" label-width="150px">
|
|
- <el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
|
|
|
|
- <el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="执行任务人:">{{ detail.workerName || '--' }}</el-form-item>
|
|
|
|
+ <el-form-item label="执行时间:">{{ detail.processTime || '--' }}</el-form-item>
|
|
<el-form-item label="未找到对象信息"></el-form-item>
|
|
<el-form-item label="未找到对象信息"></el-form-item>
|
|
- <el-form-item label="设备信息:" v-if="!detail.isComponent">{{ detail.EquipLocalName || detail.EquipName
|
|
|
|
- ||'--' }}
|
|
|
|
|
|
+ <el-form-item label="设备信息:" v-if="!detail.isComponent">{{
|
|
|
|
+ detail.localName || detail.equipName
|
|
|
|
+ || '--'
|
|
|
|
+ }}
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="部件信息:" v-else>
|
|
<el-form-item label="部件信息:" v-else>
|
|
- <div v-if="detail.Component && detail.Component.length">
|
|
|
|
- <p v-for="item in detail.Component?detail.Component:[]" :key="item.TaskId"
|
|
|
|
|
|
+ <div v-if="detail.component && detail.component.length">
|
|
|
|
+ <p v-for="item in detail.component?detail.component:[]" :key="item.taskId"
|
|
show-overflow-tooltip>
|
|
show-overflow-tooltip>
|
|
- {{ item.EquipLocalName || item.EquipName }}
|
|
|
|
|
|
+ {{ item.localName || item.equipName }}
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div v-else>--</div>
|
|
<div v-else>--</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="全景图:" v-show="panoramaList && panoramaList.length">
|
|
<el-form-item label="全景图:" v-show="panoramaList && panoramaList.length">
|
|
<div class="img-item" @click="dialogVisible = true" v-for="item in panoramaList"
|
|
<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">
|
|
|
|
|
|
+ :key="item.key">
|
|
|
|
+ <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`"
|
|
|
|
+ style="width:100%;" :alt="item.name">
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="设备照片:" v-show="imgList && imgList.length">
|
|
<el-form-item label="设备照片:" v-show="imgList && imgList.length">
|
|
<div class="img-item">
|
|
<div class="img-item">
|
|
<div class="demo-image__preview">
|
|
<div class="demo-image__preview">
|
|
<el-image style="width:100%;" v-for="item in imgList"
|
|
<el-image style="width:100%;" v-for="item in imgList"
|
|
- :key="item.Key" :title="item.Name"
|
|
|
|
- @click="nowUrl = item.Key"
|
|
|
|
- :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}&width=400`"
|
|
|
|
|
|
+ :key="item.key" :title="item.name"
|
|
|
|
+ @click="nowUrl = item.key"
|
|
|
|
+ :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}&width=400`"
|
|
:preview-src-list="srcList">
|
|
:preview-src-list="srcList">
|
|
</el-image>
|
|
</el-image>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="现场视频:" v-show="videoList && videoList.length">
|
|
<el-form-item label="现场视频:" v-show="videoList && videoList.length">
|
|
- <video controls style="width:100%;" v-for="item in videoList" :key="item.Key"
|
|
|
|
- :title="item.Name">
|
|
|
|
- <source :src="`/image-service/common/file_get?systemId=dataPlatform&key=${item.Key}`"
|
|
|
|
|
|
+ <video controls style="width:100%;" v-for="item in videoList" :key="item.key"
|
|
|
|
+ :title="item.name">
|
|
|
|
+ <source :src="`/image-service/common/file_get?systemId=dataPlatform&key=${item.key}`"
|
|
type="video/mp4">
|
|
type="video/mp4">
|
|
您的浏览器不支持 HTML5 video ,暂无法播放。
|
|
您的浏览器不支持 HTML5 video ,暂无法播放。
|
|
</video>
|
|
</video>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="备注信息:">{{ detail.note || '--' }}</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
- <div class="operation-detail detail-item" v-if="detail.TaskState === '未找到'">
|
|
|
|
|
|
+ <div class="operation-detail detail-item" v-if="detail.taskState === '未找到'">
|
|
<el-form>
|
|
<el-form>
|
|
<el-form-item label="操作信息:"></el-form-item>
|
|
<el-form-item label="操作信息:"></el-form-item>
|
|
<div class="block">
|
|
<div class="block">
|
|
<el-timeline>
|
|
<el-timeline>
|
|
<el-timeline-item
|
|
<el-timeline-item
|
|
- placement="top"
|
|
|
|
- v-for="(item,index) in arr"
|
|
|
|
- :key="index"
|
|
|
|
- :timestamp="item.timestamp"
|
|
|
|
|
|
+ placement="top"
|
|
|
|
+ v-for="(item,index) in arr"
|
|
|
|
+ :key="index"
|
|
|
|
+ :timestamp="item.timestamp"
|
|
>
|
|
>
|
|
<el-card>
|
|
<el-card>
|
|
- <small>{{item.content}}</small>
|
|
|
|
- <p>{{item.title}}</p>
|
|
|
|
|
|
+ <small>{{ item.content }}</small>
|
|
|
|
+ <p>{{ item.title }}</p>
|
|
<img
|
|
<img
|
|
- v-for="isImg in item.imgs"
|
|
|
|
- :key="isImg.Key"
|
|
|
|
- :src="`/image-service/common/image_get?systemId=dataPlatform&key=${isImg.Key}`">
|
|
|
|
|
|
+ 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"
|
|
<video controls style="width:100%;" v-for="v in videoList" :key="index"
|
|
- :title="v.Name">
|
|
|
|
|
|
+ :title="v.name">
|
|
<source
|
|
<source
|
|
- :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.Key}`"
|
|
|
|
|
|
+ :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.key}`"
|
|
type="video/mp4">
|
|
type="video/mp4">
|
|
您的浏览器不支持 HTML5 video ,暂无法播放。
|
|
您的浏览器不支持 HTML5 video ,暂无法播放。
|
|
</video>
|
|
</video>
|
|
@@ -112,53 +115,53 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
- import {mapGetters} from "vuex"
|
|
|
|
- import {categoryCount, modelCategoryCount} from "@/api/data_admin/buildTaskApi"
|
|
|
|
|
|
+import { mapGetters } from "vuex"
|
|
|
|
+import { categoryCount, modelCategoryCount } from "@/api/data_admin/buildTaskApi"
|
|
|
|
|
|
- export default {
|
|
|
|
- components: {},
|
|
|
|
- created() {
|
|
|
|
- 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(),
|
|
|
|
|
|
+export default {
|
|
|
|
+ components: {},
|
|
|
|
+ created() {
|
|
|
|
+ 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: '确认信息',
|
|
content: '确认信息',
|
|
title: '已确认的设备信息'
|
|
title: '已确认的设备信息'
|
|
})
|
|
})
|
|
@@ -167,21 +170,21 @@
|
|
computed: {
|
|
computed: {
|
|
...mapGetters("layout", ["projectId"]),
|
|
...mapGetters("layout", ["projectId"]),
|
|
notFoundList() {
|
|
notFoundList() {
|
|
- if (this.detail && this.detail.Component && this.detail.Component.length) {//是否存在部件
|
|
|
|
- let index = this.detail.Component.findIndex(item => {
|
|
|
|
- return item.TaskState == -1
|
|
|
|
|
|
+ if (this.detail && this.detail.component && this.detail.component.length) {//是否存在部件
|
|
|
|
+ let index = this.detail.component.findIndex(item => {
|
|
|
|
+ return item.taskState == -1
|
|
})
|
|
})
|
|
if (index != -1) {//部件中存在未找到的对象
|
|
if (index != -1) {//部件中存在未找到的对象
|
|
this.detail.isComponent = true
|
|
this.detail.isComponent = true
|
|
- return this.detail.Component[index].TaskPicList ? this.detail.Component[index].TaskPicList : []
|
|
|
|
|
|
+ return this.detail.component[index].taskPicList ? this.detail.component[index].taskPicList : []
|
|
} else {//部件全部找到
|
|
} else {//部件全部找到
|
|
this.detail.isComponent = false
|
|
this.detail.isComponent = false
|
|
- return this.detail.TaskPicList ? this.detail.TaskPicList : []
|
|
|
|
|
|
+ return this.detail.taskPicList ? this.detail.taskPicList : []
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
this.detail.isComponent = false
|
|
this.detail.isComponent = false
|
|
- if (this.detail && this.detail.TaskPicList && this.detail.TaskPicList.length) {
|
|
|
|
- return this.detail.TaskPicList
|
|
|
|
|
|
+ if (this.detail && this.detail.taskPicList && this.detail.taskState.length) {
|
|
|
|
+ return this.detail.taskPicList
|
|
} else {
|
|
} else {
|
|
return []
|
|
return []
|
|
}
|
|
}
|
|
@@ -190,7 +193,7 @@
|
|
panoramaList() {
|
|
panoramaList() {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
return this.notFoundList.filter(item => {
|
|
return this.notFoundList.filter(item => {
|
|
- return item.Type == 'panorama'
|
|
|
|
|
|
+ return item.type == 'panorama'
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
return []
|
|
return []
|
|
@@ -199,7 +202,7 @@
|
|
imgList() {
|
|
imgList() {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
return this.notFoundList.filter(item => {
|
|
return this.notFoundList.filter(item => {
|
|
- return item.Type == 'image'
|
|
|
|
|
|
+ return item.type == 'image'
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
return []
|
|
return []
|
|
@@ -208,7 +211,7 @@
|
|
videoList() {
|
|
videoList() {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
if (this.notFoundList && this.notFoundList.length) {
|
|
return this.notFoundList.filter(item => {
|
|
return this.notFoundList.filter(item => {
|
|
- return item.Type == 'video'
|
|
|
|
|
|
+ return item.type == 'video'
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
return []
|
|
return []
|
|
@@ -216,14 +219,14 @@
|
|
},
|
|
},
|
|
srcList() {
|
|
srcList() {
|
|
let nowIndex = this.imgList.findIndex(item => {
|
|
let nowIndex = this.imgList.findIndex(item => {
|
|
- return item.Key == this.nowUrl
|
|
|
|
|
|
+ return item.key == this.nowUrl
|
|
})
|
|
})
|
|
let index = nowIndex >= 1 ? nowIndex : 0;
|
|
let index = nowIndex >= 1 ? nowIndex : 0;
|
|
let tempArr1 = this.imgList.slice(0, index);
|
|
let tempArr1 = this.imgList.slice(0, index);
|
|
let tempArr2 = this.imgList.slice(index, this.imgList.length);
|
|
let tempArr2 = this.imgList.slice(index, this.imgList.length);
|
|
|
|
|
|
let res = tempArr2.concat(tempArr1).map(item => {
|
|
let res = tempArr2.concat(tempArr1).map(item => {
|
|
- return `/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`
|
|
|
|
|
|
+ return `/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`
|
|
});
|
|
});
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
@@ -245,7 +248,7 @@
|
|
// 查询设备部件数量
|
|
// 查询设备部件数量
|
|
handleContent(row) {
|
|
handleContent(row) {
|
|
let param = {
|
|
let param = {
|
|
- taskId: row.taskId,
|
|
|
|
|
|
+ id: row.id,
|
|
equipId: row.equipId
|
|
equipId: row.equipId
|
|
}
|
|
}
|
|
this.Name = ''
|
|
this.Name = ''
|
|
@@ -261,7 +264,7 @@
|
|
// 查询模型部件数量
|
|
// 查询模型部件数量
|
|
handleModelContent(row) {
|
|
handleModelContent(row) {
|
|
let param = {
|
|
let param = {
|
|
- taskId: row.taskId,
|
|
|
|
|
|
+ id: row.id,
|
|
equipId: row.equipId
|
|
equipId: row.equipId
|
|
}
|
|
}
|
|
this.Name = ''
|
|
this.Name = ''
|