|
@@ -42,6 +42,7 @@
|
|
<!-- 机位 -->
|
|
<!-- 机位 -->
|
|
<div>
|
|
<div>
|
|
<div>机位:</div>
|
|
<div>机位:</div>
|
|
|
|
+ <div></div>
|
|
<div>
|
|
<div>
|
|
<a-dropdown>
|
|
<a-dropdown>
|
|
<a-menu slot="overlay">
|
|
<a-menu slot="overlay">
|
|
@@ -75,7 +76,7 @@
|
|
<div class="checkWork-head-row">
|
|
<div class="checkWork-head-row">
|
|
<div>
|
|
<div>
|
|
<div>进度:2/13</div>
|
|
<div>进度:2/13</div>
|
|
- <div>耗时:3时5分钟</div>
|
|
|
|
|
|
+ <div>耗时:{{tj.haoshi}}</div>
|
|
<!-- <div>得分:10.2/22.3</div> -->
|
|
<!-- <div>得分:10.2/22.3</div> -->
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
@@ -150,15 +151,15 @@
|
|
<div><!-- 分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/> --></div>
|
|
<div><!-- 分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/> --></div>
|
|
<div>
|
|
<div>
|
|
<!-- 不适用 -->
|
|
<!-- 不适用 -->
|
|
- <a-icon type="minus-circle" class="choose-bhs"/>
|
|
|
|
|
|
+ <a-icon @click="pingfen(0)" type="minus-circle" class="choose-bhs"/>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<!-- 不合格 -->
|
|
<!-- 不合格 -->
|
|
- <a-icon type="close-circle" class="choose-bhg"/>
|
|
|
|
|
|
+ <a-icon @click="pingfen(1)" type="close-circle" class="choose-bhg"/>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<!-- 合格 -->
|
|
<!-- 合格 -->
|
|
- <a-icon type="check-circle" class="choose-hg"/>
|
|
|
|
|
|
+ <a-icon @click="pingfen(2)" type="check-circle" class="choose-hg"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -187,11 +188,11 @@
|
|
<!-- 图片列表 -->
|
|
<!-- 图片列表 -->
|
|
<div class="imglist">
|
|
<div class="imglist">
|
|
<div>
|
|
<div>
|
|
- <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
|
|
|
|
|
|
+ <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
|
|
<a-icon class="aicon" type="close" />
|
|
<a-icon class="aicon" type="close" />
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
- <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
|
|
|
|
|
|
+ <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
|
|
<a-icon class="aicon" type="close" />
|
|
<a-icon class="aicon" type="close" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -224,9 +225,24 @@
|
|
showLoading: true, // 页面加载条
|
|
showLoading: true, // 页面加载条
|
|
isEditImg: false, // 是否编辑图片
|
|
isEditImg: false, // 是否编辑图片
|
|
PED: null, // 图片编辑对象
|
|
PED: null, // 图片编辑对象
|
|
|
|
+ hsID: null, // 耗时计时器id
|
|
|
|
+ // 统计
|
|
|
|
+ tj:{
|
|
|
|
+ haoshi: '0时0分'
|
|
|
|
+ }
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
|
|
+ let _this = this
|
|
|
|
+ moment.locale('zh-cn');
|
|
this.videoInit()
|
|
this.videoInit()
|
|
|
|
+ // 耗时计算
|
|
|
|
+ this.haoshi()
|
|
|
|
+ this.hsID = setInterval(function(){
|
|
|
|
+ _this.haoshi()
|
|
|
|
+ }, 60000)
|
|
|
|
+ },
|
|
|
|
+ destroyed() {
|
|
|
|
+ clearInterval(this.hsID)
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
// 初始化播放器
|
|
// 初始化播放器
|
|
@@ -303,7 +319,14 @@
|
|
console.log(JSON.stringify(e),'error')
|
|
console.log(JSON.stringify(e),'error')
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- // 发送消息给app
|
|
|
|
|
|
+ // 耗时计算
|
|
|
|
+ haoshi(){
|
|
|
|
+ let _this = this
|
|
|
|
+ // 耗时
|
|
|
|
+ let s = moment('2020-09-07 10:16:20')
|
|
|
|
+ _this.tj.haoshi = moment().diff(s,'hours') + '时' + moment().diff(s,'minutes')%60 + '分'
|
|
|
|
+ },
|
|
|
|
+ // 发送消息给app 页面
|
|
sendMsg (action,msg) {
|
|
sendMsg (action,msg) {
|
|
uni.postMessage({
|
|
uni.postMessage({
|
|
data: {
|
|
data: {
|
|
@@ -336,15 +359,24 @@
|
|
let _this = this
|
|
let _this = this
|
|
_this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
|
|
_this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
|
|
this.PED = new window.PED.imageInfo(url,function(data){
|
|
this.PED = new window.PED.imageInfo(url,function(data){
|
|
- console.log(data)
|
|
|
|
- _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
|
|
|
|
|
|
+ // 保存图片编辑
|
|
|
|
+ // _this.saveEditImg(data)
|
|
|
|
+ _this.sendMsg('saveEditImg',data)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 关闭图片编辑
|
|
// 关闭图片编辑
|
|
closeImgsEdit(){
|
|
closeImgsEdit(){
|
|
- console.log('0000000000000000')
|
|
|
|
this.PED.hidePED()
|
|
this.PED.hidePED()
|
|
this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
|
|
this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
|
|
|
|
+ },
|
|
|
|
+ // 更新编辑后的图片
|
|
|
|
+ updateItemImg(path){
|
|
|
|
+ console.log(path)
|
|
|
|
+ },
|
|
|
|
+ // 考评项相关代码
|
|
|
|
+ // 评分,0 不适用,1 不合格,2 合格
|
|
|
|
+ pingfen(type){
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|