1013
This commit is contained in:
parent
d1fd46446a
commit
e3e9116b59
|
|
@ -162,6 +162,14 @@ export function ticketAccpet(id,data) {
|
|||
data
|
||||
})
|
||||
}
|
||||
//撤回工单，允许创建人在指定状态撤回工单至初始状态
|
||||
export function getTicketRetreat(id,data) {
|
||||
return request({
|
||||
url: `/wf/ticket/${id}/retreat/`,
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
//工单详情
|
||||
export function getTicketDetail(id) {
|
||||
return request({
|
||||
|
|
@ -169,7 +177,8 @@ export function getTicketDetail(id) {
|
|||
method: 'get'
|
||||
})
|
||||
}
|
||||
//工单详情
|
||||
|
||||
//工单流转
|
||||
export function getTicketTransitions(id) {
|
||||
return request({
|
||||
url: `/wf/ticket/${id}/transitions/`,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,140 @@
|
|||
<template>
|
||||
<div style="width: 100%;height: 100%;">
|
||||
<div class="testTracking">
|
||||
<canvas style="display:none;" id="myCanvas" ref="canvas" :width="videoWidth" :height="videoHeight"></canvas>
|
||||
<!--图片展示-->
|
||||
<video ref="video" id="myVideo" :width="videoWidth" :height="videoHeight" autoplay style="display: block;margin:0 auto;border: 2px solid #333333;"></video>
|
||||
<!--确认-->
|
||||
<Button type="primary" @click="setImage" class="takePhoto">拍照</Button>
|
||||
<div id="res"></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {faceLogin} from "@/api/testModel";
|
||||
export default {
|
||||
props:['src'],
|
||||
data () {
|
||||
return {
|
||||
videoWidth: 500,
|
||||
videoHeight: 400,
|
||||
videoArr:[],//所有的摄像头
|
||||
modelSel:'',//
|
||||
myInterval: null,
|
||||
imgSrc: '',
|
||||
isHasFace:false,//默认没有人脸
|
||||
tracker:null,
|
||||
}
|
||||
},
|
||||
created(){
|
||||
},
|
||||
mounted(){
|
||||
this.callCamera();
|
||||
this.changePhoto();
|
||||
},
|
||||
methods: {
|
||||
// 调用摄像头
|
||||
callCamera () {
|
||||
// H5调用电脑摄像头API
|
||||
navigator.mediaDevices.getUserMedia({
|
||||
video: true
|
||||
}).then(success => {
|
||||
// 摄像头开启成功
|
||||
this.$refs['video'].srcObject = success;
|
||||
// 实时拍照效果
|
||||
this.$refs['video'].play()
|
||||
}).catch(error => {
|
||||
alert('摄像头开启失败，请检查摄像头是否可用！')
|
||||
})
|
||||
},
|
||||
// 拍照
|
||||
setImage () {
|
||||
let canvas = document.getElementById("myCanvas");
|
||||
let context = canvas.getContext('2d');
|
||||
let video = document.getElementById("myVideo");
|
||||
context.drawImage(video,0,0,90,68);
|
||||
let image = new Image();
|
||||
image = canvas.toDataURL('image/png');
|
||||
document.getElementById('res').innerHTML = '<img src="'+image+'">';
|
||||
let imgData = {base64:image};
|
||||
faceLogin(imgData).then((res) => {
|
||||
if (res.code >= 200) {
|
||||
this.$message.success("成功");
|
||||
}
|
||||
});
|
||||
},
|
||||
// 关闭摄像头
|
||||
closeCamera () {
|
||||
if (!this.$refs['video'].srcObject) return;
|
||||
let stream = this.$refs['video'].srcObject;
|
||||
let tracks = stream.getTracks();
|
||||
tracks.forEach(track => {
|
||||
track.stop()
|
||||
});
|
||||
this.$refs['video'].srcObject = null
|
||||
},
|
||||
|
||||
|
||||
//切换本地摄像头
|
||||
changePhoto(){
|
||||
/**得到所有的设备*/
|
||||
navigator.mediaDevices.enumerateDevices()
|
||||
.then((devices)=> {
|
||||
this.videoArr = [];
|
||||
devices.forEach((item)=> {
|
||||
if(item.kind == 'videoinput'){
|
||||
this.videoArr.push({
|
||||
'label': item.kind,
|
||||
'id': item.deviceId
|
||||
})
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(err=>{
|
||||
});
|
||||
},
|
||||
/**打开摄像头*/
|
||||
getUserMedia(constraints, success, error) {
|
||||
if (navigator.mediaDevices.getUserMedia) {
|
||||
//最新的标准API
|
||||
navigator.mediaDevices.getUserMedia(constraints).then(success=>{
|
||||
// 摄像头开启成功
|
||||
this.$refs['video'].srcObject = success;
|
||||
// 实时拍照效果
|
||||
this.$refs['video'].play()
|
||||
}).catch(error);
|
||||
|
||||
} else if (navigator.webkitGetUserMedia) {
|
||||
//webkit核心浏览器
|
||||
navigator.webkitGetUserMedia(constraints,success, error)
|
||||
} else if (navigator.mozGetUserMedia) {
|
||||
//firfox浏览器
|
||||
navigator.mozGetUserMedia(constraints, success, error);
|
||||
} else if (navigator.getUserMedia) {
|
||||
//旧版API
|
||||
navigator.getUserMedia(constraints, success, error);
|
||||
}
|
||||
},
|
||||
setFace(data){
|
||||
this.isHasFace = data;
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
.testTracking {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
}
|
||||
.takePhoto{
|
||||
margin: 30px auto;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ const actions = {
|
|||
return new Promise((resolve, reject) => {
|
||||
getInfo(state.token).then(response => {
|
||||
const { data } = response
|
||||
|
||||
sessionStorage.setItem('userId',data.id);
|
||||
if (!data) {
|
||||
reject('验证失败,重新登陆.')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,273 +1,273 @@
|
|||
|
||||
<template>
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<div class="box-card">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
|
||||
<div slot="header" class="clearfix">
|
||||
<span>CPU</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
逻辑核心数
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.count}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
物理核心数
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.lcount}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
当前使用率
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
|
||||
<div slot="header" class="clearfix">
|
||||
<span>内存</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
使用率
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
总内存
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.total}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用内存
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.used}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
|
||||
<div slot="header" class="clearfix">
|
||||
<span>硬盘</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用百分比
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
总大小
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.total}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用大小
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.used}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="box-card">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
|
||||
</div>
|
||||
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>日志列表</span>
|
||||
</div>
|
||||
<div>
|
||||
<el-input
|
||||
v-model="listQuery.name"
|
||||
placeholder="日志名称"
|
||||
style="width: 300px"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button
|
||||
>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置</el-button
|
||||
>
|
||||
<div slot="header" class="clearfix">
|
||||
<span>CPU</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
逻辑核心数
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.count}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
物理核心数
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.lcount}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
当前使用率
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{cpuData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>内存</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
使用率
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
总内存
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.total}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用内存
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{memoryData.used}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="always">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>硬盘</span>
|
||||
</div>
|
||||
<el-row class="row">
|
||||
<el-col :span="8">
|
||||
属性
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
值
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用百分比
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.percent}}%
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
总大小
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.total}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="rowlist">
|
||||
<el-col :span="8">
|
||||
已用大小
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
{{diskData.used}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
style="width: 100%;height:400px">
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="日志名称"
|
||||
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>日志列表</span>
|
||||
</div>
|
||||
<div>
|
||||
<el-input
|
||||
v-model="listQuery.name"
|
||||
placeholder="日志名称"
|
||||
style="width: 300px"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>重置
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
style="width: 100%;height:400px"
|
||||
>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="日志名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="size"
|
||||
label="日志大小"
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="size"
|
||||
label="日志大小"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
label="操作"
|
||||
width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-dialog
|
||||
|
||||
:visible.sync="dialogVisible"
|
||||
width="80%"
|
||||
height:300px
|
||||
>
|
||||
|
||||
|
||||
<div v-html="logdec"> </div>
|
||||
|
||||
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
label="操作"
|
||||
width="100"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-dialog
|
||||
:visible.sync="dialogVisible"
|
||||
width="80%"
|
||||
title="日志详情"
|
||||
>
|
||||
<div v-html="logdec" class="dialogDiv"></div>
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script>
|
||||
import {getlogList,getLog,getServerList} from "@/api/moritor";
|
||||
const defaultCMA = {
|
||||
|
||||
}
|
||||
export default {
|
||||
components: { },
|
||||
data() {
|
||||
return {
|
||||
tableData:[],
|
||||
cpuData:[],
|
||||
diskData:[],
|
||||
memoryData:[],
|
||||
dialogVisible: false,
|
||||
logdec:"",
|
||||
text:"",
|
||||
listQuery: {},
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
this.getlogList();
|
||||
this.getServerList();
|
||||
},
|
||||
methods: {
|
||||
|
||||
getlogList() {
|
||||
getlogList(this.listQuery).then((response) => {
|
||||
if(response.data) {
|
||||
|
||||
this.tableData=response.data;
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
handleFilter() {
|
||||
this.getlogList();
|
||||
},
|
||||
resetFilter() {
|
||||
|
||||
this.getlogList();
|
||||
},
|
||||
getServerList() {
|
||||
getServerList().then((response) => {
|
||||
if (response.data) {
|
||||
this.cpuData = response.data.cpu;
|
||||
this.diskData = response.data.disk;
|
||||
this.memoryData = response.data.memory;
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
handleClick(row){
|
||||
this.dialogVisible = true;
|
||||
getLog(row.name).then((response) => {
|
||||
if (response.data) {
|
||||
this.logdec=response.data.replace(/\n/gm,"<br/>")
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
import {getlogList, getLog, getServerList} from "@/api/moritor";
|
||||
|
||||
},
|
||||
},
|
||||
};
|
||||
const defaultCMA = {}
|
||||
export default {
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
tableData: [],
|
||||
cpuData: [],
|
||||
diskData: [],
|
||||
memoryData: [],
|
||||
dialogVisible: false,
|
||||
logdec: "",
|
||||
text: "",
|
||||
listQuery: {},
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
this.getlogList();
|
||||
this.getServerList();
|
||||
},
|
||||
methods: {
|
||||
|
||||
getlogList() {
|
||||
getlogList(this.listQuery).then((response) => {
|
||||
if (response.data) {
|
||||
|
||||
this.tableData = response.data;
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
handleFilter() {
|
||||
this.getlogList();
|
||||
},
|
||||
resetFilter() {
|
||||
|
||||
this.getlogList();
|
||||
},
|
||||
getServerList() {
|
||||
getServerList().then((response) => {
|
||||
if (response.data) {
|
||||
this.cpuData = response.data.cpu;
|
||||
this.diskData = response.data.disk;
|
||||
this.memoryData = response.data.memory;
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
handleClick(row) {
|
||||
this.dialogVisible = true;
|
||||
getLog(row.name).then((response) => {
|
||||
if (response.data) {
|
||||
this.logdec = response.data.replace(/\n/gm, "<br/>")
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style>
|
||||
::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
::-webkit-scrollbar-track{
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
|
||||
background-color: #fefefe;
|
||||
border-radius: 7px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb{
|
||||
border-radius: 7px;
|
||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
.dialogDiv{
|
||||
height: 70vh;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
.text {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
|
@ -281,17 +281,28 @@ export default {
|
|||
display: table;
|
||||
content: "";
|
||||
}
|
||||
|
||||
.clearfix:after {
|
||||
clear: both
|
||||
}
|
||||
|
||||
.box-card {
|
||||
width: 90%;
|
||||
margin:0 auto;
|
||||
margin-top:30px;
|
||||
margin: 0 auto;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.row{border-bottom: 1px solid #dfe6ec;color: #909399;font-weight: 500;padding: 10px;}
|
||||
.rowlist{
|
||||
border-bottom: 1px solid #dfe6ec;color:#606266;font-weight: 500;padding: 10px;
|
||||
|
||||
.row {
|
||||
border-bottom: 1px solid #dfe6ec;
|
||||
color: #909399;
|
||||
font-weight: 500;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.rowlist {
|
||||
border-bottom: 1px solid #dfe6ec;
|
||||
color: #606266;
|
||||
font-weight: 500;
|
||||
padding: 10px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -17,13 +17,22 @@
|
|||
<span>保存的图片</span>
|
||||
<div id="res"></div>
|
||||
</div>
|
||||
|
||||
<button @click="takePhoto()">拍照</button>
|
||||
<el-dialog :visible.sync="limitedPhoto" title="人脸登录">
|
||||
<div class="testTracking">
|
||||
<faceLogin name="faceLogin"></faceLogin>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import faceLogin from '@/views/testModel/faceLogin'
|
||||
let preDrawAry = [];
|
||||
let img = new Image();
|
||||
// let img = new Image();
|
||||
export default {
|
||||
components:{
|
||||
faceLogin
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
canvas:null,
|
||||
|
|
@ -36,6 +45,7 @@
|
|||
lineW:3,
|
||||
colorF:"#e42343",
|
||||
imgData:'',
|
||||
limitedPhoto:false,
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
|
|
@ -52,25 +62,26 @@
|
|||
setTimeout(function(){
|
||||
_this.draw();
|
||||
},1000)
|
||||
/*
|
||||
this.ctx .clearRect(0, 0, 700, 500);
|
||||
let imgs = new Image();
|
||||
imgs.src ="./../../assets/404_images/404.png";
|
||||
setTimeout(function(){
|
||||
this.draw();
|
||||
this.ctx.drawImage(imgs,0,0,700,500);
|
||||
},1000)*/
|
||||
/* imgs.onload=function(){
|
||||
this.ctx.drawImage(imgs,0,0,700,500);
|
||||
this.ctx.closePath();
|
||||
|
||||
let pattern=this.ctx.createPattern(imgs,"no-repeat")//不加；号
|
||||
this.ctx.fillStyle=pattern;
|
||||
this.ctx.fillRect(0,0,700,500);
|
||||
}*/
|
||||
|
||||
},
|
||||
methods: {
|
||||
takePhoto(){
|
||||
this.limitedPhoto = true;
|
||||
},
|
||||
takeClick(){
|
||||
let canvas = document.getElementById("myCanvas");
|
||||
let context = canvas.getContext('2d');
|
||||
let video = document.getElementById("myVideo");
|
||||
context.drawImage(video,0,0,90,68);
|
||||
let image = new Image();
|
||||
image = canvas.toDataURL('image/png');
|
||||
document.getElementById('res').innerHTML = '<img src="'+image+'">';
|
||||
let imgData = {base64:image};
|
||||
faceLogin(imgData).then((res) => {
|
||||
if (res.code >= 200) {
|
||||
this.$message.success("成功");
|
||||
}
|
||||
});
|
||||
},
|
||||
draw(){
|
||||
debugger;
|
||||
let canvasImg = document.getElementById("canvasImg");
|
||||
|
|
@ -238,24 +249,6 @@
|
|||
var image = new Image();
|
||||
image = canvas.toDataURL('image/png');
|
||||
document.getElementById('res').innerHTML = '<img style="border: 1px solid #666666;" src="'+image+'">';
|
||||
console.log(image);
|
||||
debugger;
|
||||
/*img.setAttribute('crossOrigin', 'Anonymous') ;// 解决某些图片跨域（有些图片仍不可使用)
|
||||
img.src = 'url';
|
||||
img.onload = (imgs) => {
|
||||
let base64 = this.setBase64(imgs);
|
||||
var arr = base64.split(',');
|
||||
var mime = arr[0].match(/:(.*?);/)[1] ;// 获取图片的类型 （image/jpg)
|
||||
var bstr = atob(arr[1]); // 将base64转码
|
||||
var n = bstr.length ;// 获得转码长度
|
||||
var u8arr = new Uint8Array(n); // 获得length个为0的数组
|
||||
while (n--) {
|
||||
u8arr[n] = bstr.charCodeAt(n) // 获得unicode码
|
||||
}
|
||||
this.file = new File([u8arr], 'faceImg', { type: mime }); // 生成文件
|
||||
console.log(this.file);
|
||||
this.url = base64
|
||||
}*/
|
||||
},
|
||||
setBase64(img) {
|
||||
let ctx = document.createElement('canvas');
|
||||
|
|
|
|||
|
|
@ -61,7 +61,9 @@
|
|||
<el-table-column align="center" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-link v-if="scope.row.state_.distribute_type==1&&scope.row.participant_type==2" type="danger" @click="handleGetTicket(scope)">接单</el-link>
|
||||
<el-link v-else-if="scope.row.act_state==1&&scope.row.participant_type!==2" type="primary" @click="handleDetail(scope)">处理</el-link>
|
||||
<el-link v-else-if="(scope.row.act_state==1||scope.row.act_state==3)&&scope.row.participant_type!==2" type="primary" @click="handleDetail(scope)">处理</el-link>
|
||||
<!--如果state_.retreat为可退回，则显示撤回按钮-->
|
||||
<el-link v-if="scope.row.state_.enable_retreat&&userId==scope.row.create_by" type="danger" @click="handleRetreat(scope)">撤回</el-link>
|
||||
<el-link type="success" @click="handlePicture(scope)">查看流程图</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -147,9 +149,10 @@
|
|||
<el-table-column label="创建时间" min-width="100" prop="create_time">
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<template slot-scope="scope" v-if="scope.row.state_">
|
||||
<el-link v-if="scope.row.state_.distribute_type==1&&scope.row.participant_type==2" type="danger" @click="handleGetTicket(scope)">接单</el-link>
|
||||
<el-link v-else-if="scope.row.act_state==1&&scope.row.participant_type!==2" type="primary" @click="handleDetail(scope)">处理</el-link>
|
||||
<el-link v-else-if="(scope.row.act_state==1||scope.row.act_state==3)&&scope.row.participant_type!==2" type="primary" @click="handleDetail(scope)">处理</el-link>
|
||||
<el-link v-if="scope.row.state_.enable_retreat" type="danger" @click="handleRetreat(scope)">撤回</el-link>
|
||||
<el-link type="success" @click="handlePicture(scope)">查看流程图</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -225,120 +228,21 @@
|
|||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
<el-dialog :visible.sync="limitedStep" title="工单处理">
|
||||
<el-steps :active="actives" spac="400px" align-center="" style="padding-top: 20px;">
|
||||
<el-step :title="item.name" v-for="item in flowSteps "
|
||||
:key="item.id" @click.native=stepclick(item.id)>
|
||||
</el-step>
|
||||
</el-steps>
|
||||
<el-dialog :visible.sync="limitedRetreat" title="工单撤回">
|
||||
<el-row>
|
||||
<el-form ref="Form" :model="handleForm" label-width="100px" label-position="right" :rules="handleRule">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标题" style="margin-bottom: 0">
|
||||
<span>{{ticketDetail.title}}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工作流" style="margin-bottom: 0">
|
||||
<span v-if="ticketDetail.workflow_">{{ticketDetail.workflow_.name}}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="流水号" style="margin-bottom: 0">
|
||||
<span>{{ticketDetail.sn}}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="创建时间" style="margin-bottom: 0">
|
||||
<span>{{ticketDetail.create_time}}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-for="item in ticketDetail.ticket_data_" :key="item.id" :span="12">
|
||||
<el-form-item :label="item.field_name" v-if="item.field_state==='1'" style="margin-bottom: 0">
|
||||
<span>{{ticketDetail.ticket_data[item.field_key]}}</span>
|
||||
</el-form-item>
|
||||
<el-form-item :label="item.field_name" v-else>
|
||||
<template v-if="item.field_type=='string'">
|
||||
<el-input v-model="ticketDetail.ticket_data[item.field_key]" :placeholder="item.description"/>
|
||||
</template>
|
||||
<template v-if="item.field_type==='int'">
|
||||
<el-input v-model="ticketDetail.ticket_data[item.field_key]" type="number" :placeholder="item.description" oninput="value=value.replace(/[^\d]/g,'')" />
|
||||
</template>
|
||||
<template v-if="item.field_type==='float'">
|
||||
<el-input v-model="ticketDetail.ticket_data[item.field_key]" type="number" :placeholder="item.description" />
|
||||
</template>
|
||||
<template v-if="item.field_type==='date'">
|
||||
<el-date-picker
|
||||
v-model="ticketDetail.ticket_data[item.field_key]"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker>
|
||||
</template>
|
||||
<template v-if="item.field_type==='datetime'">
|
||||
<el-date-picker
|
||||
v-model="ticketDetail.ticket_data[item.field_key]"
|
||||
type="datetime"
|
||||
placeholder="选择日期"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker>
|
||||
</template>
|
||||
<template v-if="item.field_type==='select'">
|
||||
<el-select style="width: 100%" v-model="ticketDetail.ticket_data[item.field_key]" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item1 in item.field_choice"
|
||||
:key="item1"
|
||||
:label="item1"
|
||||
:value="item1"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
<template v-if="item.field_type==='selects'">
|
||||
<el-select style="width: 100%" multiple v-model="ticketDetail.ticket_data[item.field_key]" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item1 in item.field_choice"
|
||||
:key="item1"
|
||||
:label="item1"
|
||||
:value="item1"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
<template v-if="item.field_type==='textarea'">
|
||||
<el-input type="textarea" :rows="3" v-model="ticketDetail.ticket_data[item.field_key]" placeholder="内容" />
|
||||
</template>
|
||||
<template v-if="item.field_type==='file'">
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:action="upUrl"
|
||||
:on-preview="handlePreview"
|
||||
:on-success="handleUpSuccess"
|
||||
:on-remove="handleRemove"
|
||||
:headers="upHeaders"
|
||||
:file-list="fileList"
|
||||
:limit="1"
|
||||
accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
|
||||
>
|
||||
<el-button size="small" type="primary">上传文件</el-button>
|
||||
</el-upload>
|
||||
</template>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col>
|
||||
<el-form-item label="审批意见">
|
||||
<el-input v-model="handleForm.suggestion" placeholder="审批意见"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="2" style="height: 1px;"></el-col>
|
||||
<el-col :span="20" style="margin:6vh 0">
|
||||
<el-form-item label="撤回原因">
|
||||
<el-input type="textarea" :rows="3" v-model="handleForm.suggestion" placeholder="撤回原因"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<div style="text-align: center">
|
||||
<el-button v-for="item in operationBtn" :key="item.id" class="filter-item" type="primary" @click="operationSubmit(item.id)">{{item.name}}</el-button>
|
||||
<el-button class="filter-item" type="" @click="retreatCancel">取消</el-button>
|
||||
<el-button class="filter-item" type="primary" @click="retreatSubmit">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="limitedAdd" title="新增工单">
|
||||
|
|
@ -439,7 +343,7 @@
|
|||
<script>
|
||||
import { upUrl, upHeaders } from "@/api/file";
|
||||
import {getWorkflowList,getWfCustomfieldList,createTicket,getWfStateList,getTickets,ticketAccpet,getWfTransitionList,
|
||||
ticketHandle,getWfFlowSteps,getTicketDetail,getTicketTransitions,getTicketFlowlog } from "@/api/workflow";
|
||||
ticketHandle,getWfFlowSteps,getTicketDetail,getTicketTransitions,getTicketFlowlog,getTicketRetreat} from "@/api/workflow";
|
||||
import Pagination from "@/components/Pagination";
|
||||
import dagreD3 from 'dagre-d3'
|
||||
import * as d3 from 'd3'
|
||||
|
|
@ -467,8 +371,6 @@
|
|||
transition:''
|
||||
},
|
||||
handleForm:{
|
||||
transition:'',
|
||||
ticket_data:{},
|
||||
suggestion:'',
|
||||
},
|
||||
handleRule:{},
|
||||
|
|
@ -486,6 +388,7 @@
|
|||
listLoading:false,
|
||||
limitedStep:false,
|
||||
limitedAdd:false,
|
||||
limitedRetreat:false,
|
||||
nodes: [],
|
||||
tooltip:null,
|
||||
edges: [],
|
||||
|
|
@ -504,6 +407,7 @@
|
|||
},
|
||||
mounted(){
|
||||
debugger;
|
||||
this.userId = sessionStorage.getItem('userId')
|
||||
this.workflow = this.$route.params.workflow;
|
||||
if(this.workflow){//有传参
|
||||
this.pageForm.workflow = parseInt(this.workflow);
|
||||
|
|
@ -659,6 +563,30 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
retreatCancel(){
|
||||
this.limitedRetreat = false;
|
||||
},
|
||||
retreatSubmit(){
|
||||
this.$confirm("确认撤回吗?", "温馨提示", {
|
||||
confirmButtonText: "确认",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(async () => {
|
||||
getTicketRetreat(this.retreatId,this.handleForm).then(res=>{
|
||||
this.limitedRetreat = false;
|
||||
this.getList();
|
||||
this.$message.success("成功");
|
||||
})
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
});
|
||||
},
|
||||
handleRetreat(scope){
|
||||
this.limitedRetreat = true;
|
||||
this.retreatId = scope.row.id;
|
||||
},
|
||||
handlePicture(scope){
|
||||
let that = this;
|
||||
that.dialogVisible = true;
|
||||
|
|
@ -863,15 +791,6 @@
|
|||
handleDetail(scope){
|
||||
this.$router.push({name:"ticketHandle",params:{ticketId:scope.row.id,workflow:scope.row.workflow}})
|
||||
},
|
||||
operationSubmit(id){
|
||||
this.handleForm.transition = id;
|
||||
this.handleForm.ticket_data = this.ticketDetail.ticket_data;
|
||||
ticketHandle(this.ticketId,this.handleForm).then(res=>{
|
||||
if (res.data){
|
||||
this.limitedStep = false;
|
||||
}
|
||||
})
|
||||
},
|
||||
//接单
|
||||
handleGetTicket(scope){
|
||||
let ticketId = scope.row.id;
|
||||
|
|
|
|||
Loading…
Reference in New Issue