123
This commit is contained in:
xd
parent
5ec8e6e5b7
commit
6989b87b8d
|
|
@ -9,7 +9,7 @@ import defaultSettings from '@/settings'
|
|||
|
||||
NProgress.configure({ showSpinner: false })
|
||||
|
||||
const whiteList = ['/login', '/register', '/ssoLogin','/scan']
|
||||
const whiteList = ['/login', '/register', '/ssoLogin']
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
NProgress.start()
|
||||
|
|
|
|||
|
|
@ -94,13 +94,7 @@ export const constantRoutes = [
|
|||
meta: { title: '个人中心', icon: 'user' }
|
||||
}
|
||||
]
|
||||
},
|
||||
//调用手机摄像扫码
|
||||
{
|
||||
path: '/scan',
|
||||
component: () => import('@/views/scan/scanPage'),
|
||||
hidden: true
|
||||
},
|
||||
}
|
||||
]
|
||||
|
||||
// 动态路由，基于用户权限动态去加载
|
||||
|
|
|
|||
|
|
@ -1,204 +0,0 @@
|
|||
<!-- Scanner.vue -->
|
||||
<template>
|
||||
<div class="scanner">
|
||||
<qrcode-stream
|
||||
ref="qrCodeReaderRef"
|
||||
:camera="camera"
|
||||
@decode="onDecode"
|
||||
@init="onInit"
|
||||
style="height: 100vh"
|
||||
>
|
||||
<div v-if="scanBox">
|
||||
<div class="qr-scanner">
|
||||
<div class="box">
|
||||
<div class="line"></div>
|
||||
<div class="angle"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</qrcode-stream>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { QrcodeStream } from "vue-qrcode-reader";
|
||||
export default {
|
||||
components: { QrcodeStream },
|
||||
data() {
|
||||
return {
|
||||
camera: "auto", // auto为开始获取摄像头，rear为后置，front为前置，off为关闭
|
||||
result: "", // 扫码结果信息
|
||||
error: "", // 错误信息
|
||||
scanBox: false
|
||||
};
|
||||
},
|
||||
created() {},
|
||||
methods: {
|
||||
//回调扫描结果
|
||||
onDecode(result) {
|
||||
if (result) {
|
||||
this.$emit("success", result);
|
||||
}
|
||||
},
|
||||
// 检查是否调用摄像头
|
||||
async onInit(promise) {
|
||||
try {
|
||||
const { capabilities } = await promise;
|
||||
this.$emit('init', capabilities)
|
||||
this.camera = 'rear'
|
||||
setTimeout(() => {
|
||||
this.scanBox = true
|
||||
}, 1000)
|
||||
} catch (error) {
|
||||
if (error.name === "NotAllowedError") {
|
||||
this.error = "ERROR: 您需要授予相机访问权限";
|
||||
} else if (error.name === "NotFoundError") {
|
||||
this.error = "ERROR: 这个设备上没有摄像头";
|
||||
} else if (error.name === "NotSupportedError") {
|
||||
this.error = "ERROR: 所需的安全上下文(HTTPS、本地主机)";
|
||||
} else if (error.name === "NotReadableError") {
|
||||
this.error = "ERROR: 相机被占用";
|
||||
} else if (error.name === "OverconstrainedError") {
|
||||
this.error = "ERROR: 安装摄像头不合适";
|
||||
} else if (error.name === "StreamApiNotSupportedError") {
|
||||
this.error = "ERROR: 此浏览器不支持流API";
|
||||
} else if (error.name === "InsecureContextError") {
|
||||
this.error =
|
||||
"ERROR: 仅允许在安全上下文中访问摄像机。使用HTTPS或本地主机，而不是HTTP。";
|
||||
} else {
|
||||
this.error = "ERROR:摄像机错误";
|
||||
}
|
||||
this.$emit("err", this.error);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.error {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
<style scoped>
|
||||
.scanner {
|
||||
width: 100vw;
|
||||
border-color: #585858;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
.qrcode-stream-camera {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: block;
|
||||
-o-object-fit: cover;
|
||||
object-fit: cover;
|
||||
position: absolute;
|
||||
top: 0%;
|
||||
left: 0%;
|
||||
}
|
||||
.qr-scanner {
|
||||
background-image: linear-gradient(
|
||||
0deg,
|
||||
transparent 24%,
|
||||
rgba(32, 255, 77, 0.1) 25%,
|
||||
rgba(32, 255, 77, 0.1) 26%,
|
||||
transparent 27%,
|
||||
transparent 74%,
|
||||
rgba(32, 255, 77, 0.1) 75%,
|
||||
rgba(32, 255, 77, 0.1) 76%,
|
||||
transparent 77%,
|
||||
transparent
|
||||
),
|
||||
linear-gradient(
|
||||
90deg,
|
||||
transparent 24%,
|
||||
rgba(32, 255, 77, 0.1) 25%,
|
||||
rgba(32, 255, 77, 0.1) 26%,
|
||||
transparent 27%,
|
||||
transparent 74%,
|
||||
rgba(32, 255, 77, 0.1) 75%,
|
||||
rgba(32, 255, 77, 0.1) 76%,
|
||||
transparent 77%,
|
||||
transparent
|
||||
);
|
||||
background-size: 3rem 3rem;
|
||||
background-position: -1rem -1rem;
|
||||
width: 100%;
|
||||
/* height: 100%; */
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
/* background-color: #1110;*/
|
||||
|
||||
/* background-color: #111; */
|
||||
}
|
||||
|
||||
.qr-scanner .box {
|
||||
width: 213px;
|
||||
height: 213px;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
overflow: hidden;
|
||||
border: 0.1rem solid rgba(0, 255, 51, 0.2);
|
||||
/* background: url('http://resource.beige.world/imgs/gongconghao.png') no-repeat center center; */
|
||||
}
|
||||
|
||||
.qr-scanner .line {
|
||||
height: calc(100% - 2px);
|
||||
width: 100%;
|
||||
background: linear-gradient(180deg, rgba(0, 255, 51, 0) 43%, #00ff33 211%);
|
||||
border-bottom: 3px solid #00ff33;
|
||||
transform: translateY(-100%);
|
||||
animation: radar-beam 2s infinite alternate;
|
||||
animation-timing-function: cubic-bezier(0.53, 0, 0.43, 0.99);
|
||||
animation-delay: 1.4s;
|
||||
}
|
||||
|
||||
.qr-scanner .box:after,
|
||||
.qr-scanner .box:before,
|
||||
.qr-scanner .angle:after,
|
||||
.qr-scanner .angle:before {
|
||||
content: "";
|
||||
display: block;
|
||||
position: absolute;
|
||||
width: 3vw;
|
||||
height: 3vw;
|
||||
border: 0.2rem solid transparent;
|
||||
}
|
||||
|
||||
.qr-scanner .box:after,
|
||||
.qr-scanner .box:before {
|
||||
top: 0;
|
||||
border-top-color: #00ff33;
|
||||
}
|
||||
|
||||
.qr-scanner .angle:after,
|
||||
.qr-scanner .angle:before {
|
||||
bottom: 0;
|
||||
border-bottom-color: #00ff33;
|
||||
}
|
||||
|
||||
.qr-scanner .box:before,
|
||||
.qr-scanner .angle:before {
|
||||
left: 0;
|
||||
border-left-color: #00ff33;
|
||||
}
|
||||
|
||||
.qr-scanner .box:after,
|
||||
.qr-scanner .angle:after {
|
||||
right: 0;
|
||||
border-right-color: #00ff33;
|
||||
}
|
||||
|
||||
@keyframes radar-beam {
|
||||
0% {
|
||||
transform: translateY(-100%);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
<template>
|
||||
<div class="visitor">
|
||||
<el-button type="primary" @click="displayScanner(true)">点击调起摄像头扫描二维码</el-button>
|
||||
<!-- 扫码二维码组件 -->
|
||||
<scanner v-if="showScanner" @success="handleScanResult" @err="handleScanError"></scanner>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Scanner from '@/views/scan/scan.vue'
|
||||
|
||||
export default {
|
||||
components: { Scanner },
|
||||
data() {
|
||||
return {
|
||||
showScanner: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 显示摄像头
|
||||
displayScanner(val) {
|
||||
this.showScanner = val
|
||||
},
|
||||
// 处理摄像头打开错误
|
||||
handleScanError(error) {
|
||||
this.$message.error(error)
|
||||
this.displayScanner(false)
|
||||
},
|
||||
// 处理扫描结果
|
||||
async handleScanResult(res) {
|
||||
console.log(res)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1,17 +1,31 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-input v-model="url" type="text" style="width: 20%" />
|
||||
<el-button @click="join" type="primary">连接</el-button>
|
||||
<el-button @click="exit" type="danger">断开</el-button>
|
||||
|
||||
<br />
|
||||
<el-input type="textarea" v-model="message" :rows="9" />
|
||||
<el-button type="info" @click="send">发送消息</el-button>
|
||||
<br />
|
||||
<br />
|
||||
<el-input type="textarea" v-model="text_content" :rows="9" /> 返回内容
|
||||
<br />
|
||||
<br />
|
||||
<div class="app-container">
|
||||
<el-form label-width="100px" :inline="true">
|
||||
<el-row :gutter="8" >
|
||||
<el-col :span="12">
|
||||
<el-input v-model="url" type="text" style="width: 100%" />
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-button @click="join" type="primary">连接</el-button>
|
||||
<el-button @click="exit" type="danger">断开</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8" class="mt10">
|
||||
<el-col :span="24">
|
||||
<el-input type="textarea" v-model="message" :rows="5" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8" class="mt10">
|
||||
<el-col :span="24">
|
||||
<el-button type="info" @click="send">发送消息</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8" class="mt20">
|
||||
<el-col :span="24">
|
||||
<el-input type="textarea" v-model="text_content" :rows="5" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -20,7 +34,7 @@ export default {
|
|||
name: 'WebSocketExample',
|
||||
data() {
|
||||
return {
|
||||
url: "ws://localhost:8080/websocket/message",
|
||||
url: "ws://localhost:3334/websocket/message",
|
||||
message: "",
|
||||
text_content: "",
|
||||
ws: null,
|
||||
|
|
|
|||
Loading…
Reference in New Issue