Commit 38932b3b by liyuhang19990520

合并代码

parent ab5c93df
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-03 20:45:45 * @LastEditTime: 2021-12-06 10:47:24
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...@@ -80,6 +80,7 @@ _axios.interceptors.response.use( ...@@ -80,6 +80,7 @@ _axios.interceptors.response.use(
if (response.data.code == 401) { if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer) if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => { resTimer = setTimeout(() => {
CancelToken
MessageBox.confirm('登陆超时请重新登录, 是否继续?', '提示', { MessageBox.confirm('登陆超时请重新登录, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-23 17:43:14 * @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-12-03 16:03:12 * @LastEditTime: 2021-12-06 10:01:49
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
<span>目标数据</span> <span>目标数据</span>
</p> </p>
<el-carousel <el-carousel
@mousewheel.native="rollScroll($event)"
direction="vertical" direction="vertical"
ref="carousel"
:autoplay="false" :autoplay="false"
trigger="click" trigger="click"
v-if="isPlam" v-if="isPlam"
...@@ -146,6 +148,7 @@ export default { ...@@ -146,6 +148,7 @@ export default {
targetSrc: "", targetSrc: "",
isShowDetail: false, isShowDetail: false,
checkItem: {}, checkItem: {},
timeOut: null,
arr: [ arr: [
{ {
id: "31", id: "31",
...@@ -176,6 +179,21 @@ export default { ...@@ -176,6 +179,21 @@ export default {
}); });
}, },
methods: { methods: {
rollScroll(event) {
let _that = this;
// chrome、ie使用的wheelDelta,火狐使用detail
let scrollVal = event.wheelDelta || event.detail;
// 节流
if (!_that.timeOut) {
_that.timeOut = setTimeout(() => {
_that.timeOut = null;
scrollVal > 0
? _that.$refs.carousel.prev()
: _that.$refs.carousel.next();
}, 300);
} else {
}
},
showDetail(item) { showDetail(item) {
this.checkItem = item; this.checkItem = item;
console.log(this.checkItem); console.log(this.checkItem);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment