Skip to content

F
founder_vue
Commit 058a7a37 by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 63464490 0c1b5b11
Showing with 969 additions and 142 deletions
src/router/modules/leftMenu.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-14 19:13:54 * @LastEditTime: 2021-12-14 19:23:14
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -294,8 +294,8 @@ export default [ ...@@ -294,8 +294,8 @@ export default [
path: "/bzxxfh", path: "/bzxxfh",
name: "bzxxfh", name: "bzxxfh",
meta: { meta: {
title: "比中信息复核", title: "地市比中信息复核",
auth: "G-1", auth: "5",
parentId: 'bzxxgl' parentId: 'bzxxgl'
}, },
component: () => import("@/views/bzxxgl/bzxxfh.vue") component: () => import("@/views/bzxxgl/bzxxfh.vue")
......
src/views/Editor/modules/ajzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-13 21:33:22 * @LastEditTime: 2021-12-14 18:09:25
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -157,11 +157,11 @@ export default { ...@@ -157,11 +157,11 @@ export default {
*/ */
HandChange(hand) { HandChange(hand) {
this.activeHand = hand.seq this.activeHand = hand.seq
this.$bus.emit('ajzwbjTDZ')
this.$store.commit('zwbj/setSeq', hand.seq) this.$store.commit('zwbj/setSeq', hand.seq)
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
console.log(hand); console.log(hand);
this.$bus.emit('ajzwbjImage', { finger_image: hand.image, finger_dealFlag: hand.dealFlag, finger_position: hand.fingerPosition }) this.$bus.emit('ajzwbjImage', { finger_image: hand.image, finger_dealFlag: hand.dealFlag, finger_position: hand.fingerPosition })
this.$bus.emit('ajzwbjTDZ')
}, },
/** /**
* 获取掌纹数据 * 获取掌纹数据
...@@ -211,11 +211,12 @@ export default { ...@@ -211,11 +211,12 @@ export default {
*/ */
changeCaseFingerPNG (finger) { changeCaseFingerPNG (finger) {
//console.log(finger); //console.log(finger);
this.$bus.emit('ajzwbjTDZ')
this.$store.commit('zwbj/setSeq', finger.code) this.$store.commit('zwbj/setSeq', finger.code)
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
console.log(finger); console.log(finger);
this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position }) this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position })
this.$bus.emit('ajzwbjTDZ')
}, },
/** /**
* 获取案件指纹原图 * 获取案件指纹原图
...@@ -239,8 +240,8 @@ export default { ...@@ -239,8 +240,8 @@ export default {
if (res.data.code === 0) { if (res.data.code === 0) {
for (const key in res.data.ret) { for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', (res.data.ret.image))
self.$bus.emit('ajzwbjTDZ') self.$bus.emit('ajzwbjTDZ')
self.$bus.emit('ajzwbjImage', (res.data.ret.image))
} }
} }
}) })
......
src/views/Editor/modules/imageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-14 14:34:13 * @LastEditTime: 2021-12-14 19:15:15
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -1153,6 +1153,7 @@ export default { ...@@ -1153,6 +1153,7 @@ export default {
}); });
this.$bus.on("ryzwbjImage", (sourceImage) => { this.$bus.on("ryzwbjImage", (sourceImage) => {
console.log(sessionStorage.getItem(self.seq));
// console.log(sourceImage); // console.log(sourceImage);
// 缩放为1 // 缩放为1
self.zoomLevel = 1; self.zoomLevel = 1;
...@@ -1162,9 +1163,10 @@ export default { ...@@ -1162,9 +1163,10 @@ export default {
imageEditor imageEditor
.loadImageFromURL( .loadImageFromURL(
"data:image/jpeg;base64," + sourceImage, "data:image/jpeg;base64," + sourceImage,
"FingerImage" "SampleImage"
) )
.then(function (sizeValue) { .then(function (sizeValue) {
console.log(sessionStorage.getItem(self.seq));
// 更新工具栏的优先级 // 更新工具栏的优先级
setTimeout(() => { setTimeout(() => {
// TODO // TODO
...@@ -1196,14 +1198,12 @@ export default { ...@@ -1196,14 +1198,12 @@ export default {
// 记录实际图片和canvas盒子展示的 宽高比 // 记录实际图片和canvas盒子展示的 宽高比
self.width_ratio = self.canvasBox_width / self.newWidth self.width_ratio = self.canvasBox_width / self.newWidth
self.height_ratio = self.canvasBox_height / self.newHeight self.height_ratio = self.canvasBox_height / self.newHeight
self.width_ratio_2 = self.newWidth / self.canvasBox_width
self.height_ratio_2 = self.newHeight / self.canvasBox_height
console.log(self.canvasBox_width); console.log(self.canvasBox_width);
console.log(self.newWidth); console.log(self.newWidth);
console.log(self.width_ratio); console.log(self.width_ratio);
console.log(self.height_ratio); console.log(self.height_ratio);
console.log(sessionStorage.getItem(self.seq));
// 切换指纹图片时，清空特征点数组 // 切换指纹图片时，清空特征点数组
self.tzdnumber = 0; self.tzdnumber = 0;
self.tzdArr = []; self.tzdArr = [];
...@@ -1285,7 +1285,9 @@ export default { ...@@ -1285,7 +1285,9 @@ export default {
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
self.clearALL()
}); });
console.log(self.tzdArr); console.log(self.tzdArr);
}); });
...@@ -1842,6 +1844,7 @@ export default { ...@@ -1842,6 +1844,7 @@ export default {
this.$store.commit("zwbj/setAutoTzdall", null); this.$store.commit("zwbj/setAutoTzdall", null);
sessionStorage.removeItem(self.seq); sessionStorage.removeItem(self.seq);
sessionStorage.removeItem('auto_tzdDom'+self.seq);
// 特征点 // 特征点
self.autoTzdArr = []; self.autoTzdArr = [];
...@@ -1893,7 +1896,6 @@ export default { ...@@ -1893,7 +1896,6 @@ export default {
* @return {*} * @return {*}
*/ */
async getAutoTzd (flag) { async getAutoTzd (flag) {
debugger
this.isHandTZD = false; this.isHandTZD = false;
this.isdirection = false; this.isdirection = false;
let self = this; let self = this;
...@@ -1906,7 +1908,6 @@ export default { ...@@ -1906,7 +1908,6 @@ export default {
this.isAutoTzd = true; this.isAutoTzd = true;
this.clearALL(); this.clearALL();
if (self.seq <= 20) { if (self.seq <= 20) {
debugger
// 指纹特征点提取 // 指纹特征点提取
let res = await this.$axios({ let res = await this.$axios({
method: "get", method: "get",
...@@ -1932,6 +1933,7 @@ export default { ...@@ -1932,6 +1933,7 @@ export default {
$(".auto_tzdDom").css("display", "flex"); $(".auto_tzdDom").css("display", "flex");
$(".auto_tzdDom").css("align-items", "center"); $(".auto_tzdDom").css("align-items", "center");
$(".auto_tzdDom").css("position", "absolute"); $(".auto_tzdDom").css("position", "absolute");
$(".auto_tzdDom").css('transform-origin', '4px center');
$(".auto_tzdDom .head").css("width", "8px"); $(".auto_tzdDom .head").css("width", "8px");
$(".auto_tzdDom .head").css("height", "8px"); $(".auto_tzdDom .head").css("height", "8px");
...@@ -1943,11 +1945,11 @@ export default { ...@@ -1943,11 +1945,11 @@ export default {
$(".auto_tzdDom .direction").css("background-color", "#FFFD0F"); $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"left", "left",
(item.zwtzd_tzxzb * self.width_ratio - 4) / self.zoomLevel + "px" (item.zwtzd_tzxzb * self.width_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"top", "top",
(item.zwtzd_tzyzb * self.height_ratio - 4) / self.zoomLevel + "px" (item.zwtzd_tzyzb * self.height_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$("#auto_tzdDom" + self.tzdId).css( $("#auto_tzdDom" + self.tzdId).css(
...@@ -1957,8 +1959,6 @@ export default { ...@@ -1957,8 +1959,6 @@ export default {
self.tzdId++; self.tzdId++;
// 特征点数量 // 特征点数量
self.tzdnumber++; self.tzdnumber++;
console.log(self.width_ratio);
console.log(self.height_ratio);
}); });
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
...@@ -1975,7 +1975,7 @@ export default { ...@@ -1975,7 +1975,7 @@ export default {
self.$store.commit("zwbj/setAutoTzdall", []); self.$store.commit("zwbj/setAutoTzdall", []);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify([])); sessionStorage.setItem(`auto${self.seq}`, JSON.stringify([]));
} }
} else { } else {
// 掌纹特征点提取 // 掌纹特征点提取
let handres = await this.$axios({ let handres = await this.$axios({
...@@ -2000,7 +2000,7 @@ export default { ...@@ -2000,7 +2000,7 @@ export default {
}); });
console.log(self.autoTzdArr); console.log(self.autoTzdArr);
self.autoTzdArr.forEach((item, index) => { self.autoTzdArr.forEach((item, index) => {
self.$set(self.autoTzdArr[index], "id", "tzd" + self.tzdId); self.$set(self.autoTzdArr[index], "id", "auto_tzdDom" + self.tzdId);
$( $(
`<div id="auto_tzdDom${self.tzdId}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>` `<div id="auto_tzdDom${self.tzdId}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>`
).appendTo(".tzdDrawing"); ).appendTo(".tzdDrawing");
...@@ -2020,11 +2020,11 @@ export default { ...@@ -2020,11 +2020,11 @@ export default {
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"left", "left",
(item.zwtzd_tzxzb * self.width_ratio - 4) / self.zoomLevel + "px" (item.zwtzd_tzxzb * self.width_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"top", "top",
(item.zwtzd_tzyzb * self.height_ratio - 4) / self.zoomLevel + "px" (item.zwtzd_tzyzb * self.height_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$("#auto_tzdDom" + self.tzdId).css( $("#auto_tzdDom" + self.tzdId).css(
...@@ -2055,7 +2055,7 @@ export default { ...@@ -2055,7 +2055,7 @@ export default {
} else { } else {
// 从session中拿 // 从session中拿
if (sessionStorage.getItem(`auto${this.seq}`)) { if (sessionStorage.getItem(`auto${this.seq}`)) {
console.log(JSON.parse(sessionStorage.getItem(`auto${this.seq}`))); // console.log(JSON.parse(sessionStorage.getItem(`auto${this.seq}`)));
self.autoTzdArr = JSON.parse( self.autoTzdArr = JSON.parse(
sessionStorage.getItem(`auto${this.seq}`) sessionStorage.getItem(`auto${this.seq}`)
); );
...@@ -2067,24 +2067,24 @@ export default { ...@@ -2067,24 +2067,24 @@ export default {
$(".auto_tzdDom").css("display", "flex"); $(".auto_tzdDom").css("display", "flex");
$(".auto_tzdDom").css("align-items", "center"); $(".auto_tzdDom").css("align-items", "center");
$(".auto_tzdDom").css("position", "absolute"); $(".auto_tzdDom").css("position", "absolute");
$(".auto_tzdDom").css("transform-origin", "0.25rem center"); $(".auto_tzdDom").css("transform-origin", "4px center");
$(".auto_tzdDom .head").css("width", "0.5rem"); $(".auto_tzdDom .head").css("width", "8px");
$(".auto_tzdDom .head").css("height", "0.5rem"); $(".auto_tzdDom .head").css("height", "8px");
$(".auto_tzdDom .head").css("border-radius", "0.5rem"); $(".auto_tzdDom .head").css("border-radius", "8px");
$(".auto_tzdDom .head").css("background-color", "#FFFD0F"); $(".auto_tzdDom .head").css("background-color", "#FFFD0F");
$(".auto_tzdDom .direction").css("width", "1.25rem"); $(".auto_tzdDom .direction").css("width", "20px");
$(".auto_tzdDom .direction").css("height", "0.125rem"); $(".auto_tzdDom .direction").css("height", "2px");
$(".auto_tzdDom .direction").css("background-color", "#FFFD0F"); $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"left", "left",
((item.zwtzd_tzxzb - 4) / 16) / self.zoomLevel + "rem" (item.zwtzd_tzxzb * self.width_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css( $(`#auto_tzdDom${self.tzdId}`).css(
"top", "top",
((item.zwtzd_tzyzb - 4) / 16) / self.zoomLevel + "rem" (item.zwtzd_tzyzb * self.height_ratio) / self.zoomLevel + "px"
); );
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$("#auto_tzdDom" + self.tzdId).css( $("#auto_tzdDom" + self.tzdId).css(
...@@ -2951,8 +2951,8 @@ export default { ...@@ -2951,8 +2951,8 @@ export default {
self.tzdArr.forEach((item) => { self.tzdArr.forEach((item) => {
self.tzdall.push({ self.tzdall.push({
zwtzd_tzfx: item.angle, zwtzd_tzfx: item.angle,
zwtzd_tzxzb: item.x * self.width_ratio_2, zwtzd_tzxzb: item.x / self.width_ratio,
zwtzd_tzyzb: item.y * self.height_ratio_2, zwtzd_tzyzb: item.y / self.height_ratio,
}); });
}); });
} }
...@@ -3074,23 +3074,24 @@ export default { ...@@ -3074,23 +3074,24 @@ export default {
// console.log(sessionKeys[j]); // console.log(sessionKeys[j]);
// console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j]))); // console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j])));
// console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i]))); // console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
// TODO sessionKeys[j] 是手动标记的特征点
// 首先需要对手动标记的特征点的 left 和 top 进行缩放处理成 图片上的相对位置再进行存储
let handTzdArr = JSON.parse(sessionStorage.getItem(sessionKeys[j]))
if (handTzdArr != null) {
handTzdArr.forEach(item => {
item.zwtzd_tzxzb = item.zwtzd_tzxzb / self.width_ratio
item.zwtzd_tzyzb = item.zwtzd_tzyzb / self.height_ratio
})
}
let arr; let arr;
if ( if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && handTzdArr != null) {
JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && arr = handTzdArr;
JSON.parse(sessionStorage.getItem(sessionKeys[j])) != null } else if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) != null && handTzdArr == null) {
) {
arr = JSON.parse(sessionStorage.getItem(sessionKeys[j]));
} else if (
JSON.parse(sessionStorage.getItem(sessionKeys[i])) != null &&
JSON.parse(sessionStorage.getItem(sessionKeys[j])) == null
) {
arr = JSON.parse(sessionStorage.getItem(sessionKeys[i])); arr = JSON.parse(sessionStorage.getItem(sessionKeys[i]));
} else { } else {
// console.log(sessionStorage.getItem(sessionKeys[i])); // console.log(sessionStorage.getItem(sessionKeys[i]));
// console.log(sessionStorage.getItem(sessionKeys[j])); // console.log(sessionStorage.getItem(sessionKeys[j]));
arr = JSON.parse( arr = handTzdArr.concat(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
sessionStorage.getItem(sessionKeys[j])
).concat(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
} }
allTZData.push({ allTZData.push({
fpt5TraitMinutiaSet: { fpt5TraitMinutiaSet: {
......
src/views/Editor/modules/ryzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-12 22:12:06 * @LastEditTime: 2021-12-14 19:15:18
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -435,6 +435,7 @@ export default { ...@@ -435,6 +435,7 @@ export default {
HandsChange (hand) { HandsChange (hand) {
let self = this let self = this
console.log(hand); console.log(hand);
// self.$bus.emit('ryzwbjTDZ')
if (hand && hand.image) { if (hand && hand.image) {
self.$bus.emit('switchHandTitle', hand.name) self.$bus.emit('switchHandTitle', hand.name)
self.$bus.emit('ryzwbjImage', hand.image) self.$bus.emit('ryzwbjImage', hand.image)
...@@ -445,7 +446,6 @@ export default { ...@@ -445,7 +446,6 @@ export default {
} else { } else {
self.$bus.emit('ryzwbjImage', 'xxx') self.$bus.emit('ryzwbjImage', 'xxx')
} }
self.$bus.emit('ryzwbjTDZ')
}, },
/** /**
* 获取掌纹数据 * 获取掌纹数据
...@@ -509,9 +509,9 @@ export default { ...@@ -509,9 +509,9 @@ export default {
* @param code * @param code
*/ */
getRollOrPainFinger (finger) { getRollOrPainFinger (finger) {
// this.$bus.emit('ryzwbjTDZ')
this.$store.commit('zwbj/setSeq', finger.code) this.$store.commit('zwbj/setSeq', finger.code)
this.$bus.emit('ryzwbjImage', finger.image) this.$bus.emit('ryzwbjImage', finger.image)
this.$bus.emit('ryzwbjTDZ')
this.preSeq = finger.code this.preSeq = finger.code
//console.log(finger); //console.log(finger);
...@@ -552,8 +552,8 @@ export default { ...@@ -552,8 +552,8 @@ export default {
if (res.data.code === 0) { if (res.data.code === 0) {
for (const key in res.data.ret) { for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
// self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjImage', res.data.ret.image) self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
} }
} }
}) })
...@@ -584,13 +584,10 @@ export default { ...@@ -584,13 +584,10 @@ export default {
cancelToken: source.token, cancelToken: source.token,
// url: `/api/org/plain/${1}/${seq}?mnt=1` // url: `/api/org/plain/${1}/${seq}?mnt=1`
}).then(res => { }).then(res => {
// //console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
for (const key in res.data.ret) { // 指纹编辑区域发送指纹数据，替换指纹图片
// 指纹编辑区域发送指纹数据，替换指纹图片 // self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjImage', res.data.ret.image) self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
}
} }
}) })
clearTimeout(self.timer) clearTimeout(self.timer)
...@@ -623,7 +620,6 @@ export default { ...@@ -623,7 +620,6 @@ export default {
loading: false loading: false
// url: '/api/png/roll/1?mnt=1' // url: '/api/png/roll/1?mnt=1'
}) })
// //console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
for (const key in res.data.ret) { for (const key in res.data.ret) {
const element = res.data.ret[key]; const element = res.data.ret[key];
...@@ -671,7 +667,6 @@ export default { ...@@ -671,7 +667,6 @@ export default {
loading: false loading: false
// url: '/api/png/plain/1?mnt=1' // url: '/api/png/plain/1?mnt=1'
}) })
// //console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
//console.log(res); //console.log(res);
if (res.data.ret.length > 0) { if (res.data.ret.length > 0) {
...@@ -729,20 +724,21 @@ export default { ...@@ -729,20 +724,21 @@ export default {
// sessionStorage.setItem(`auto${this.preSeq}`, JSON.stringify(self.autopretzdall)) // sessionStorage.setItem(`auto${this.preSeq}`, JSON.stringify(self.autopretzdall))
// } // }
self.$store.commit('zwbj/setTzdall', null) // self.$store.commit('zwbj/setTzdall', null)
self.$store.commit('zwbj/setAutoTzdall', null) // self.$store.commit('zwbj/setAutoTzdall', null)
} }
this.preSeq = finger.code this.preSeq = finger.code
//console.log(finger); //console.log(finger);
this.activerollFinger = finger.code this.activerollFinger = finger.code
this.$store.commit('zwbj/setSeq', finger.code) this.$store.commit('zwbj/setSeq', finger.code)
// self.$bus.emit('ryzwbjTDZ')
// 指纹编辑区域发送指纹数据，替换指纹图片 // 指纹编辑区域发送指纹数据，替换指纹图片
if (finger && finger.image) { if (finger && finger.image) {
self.$bus.emit('ryzwbjImage', finger.image) self.$bus.emit('ryzwbjImage', finger.image)
} else { } else {
self.$bus.emit('ryzwbjImage', 'xxx') self.$bus.emit('ryzwbjImage', 'xxx')
} }
self.$bus.emit('ryzwbjTDZ')
// 平面指纹原图 // 平面指纹原图
if (finger && finger.image) { if (finger && finger.image) {
...@@ -929,7 +925,6 @@ export default { ...@@ -929,7 +925,6 @@ export default {
this.HandsChange(self.hand) this.HandsChange(self.hand)
} else { } else {
self.$bus.emit('ryzwbjImage', 'xxx') self.$bus.emit('ryzwbjImage', 'xxx')
self.$bus.emit('ryzwbjTDZ')
} }
} else if (this.zwSelect === '人像') { } else if (this.zwSelect === '人像') {
// 传入判断，为人像则关闭图像编辑的功能 // 传入判断，为人像则关闭图像编辑的功能
......
src/views/zljc/jcxq.vue
<template> <template>
<div :class="[ radio1==1 ? ' jcxq p1' : 'jcxq p2' ]"> <div :class="[ radio1=='ryxx' ? ' jcxq p1' : 'jcxq p2' ]">
<div class='fixedBox'> <div class='fixedBox'>
<div class="head"> <div class="head">
<div class="headLeft"> <div class="headLeft">
<el-radio-group v-model="radio1"> <el-radio-group v-model="radio1">
<el-radio-button label="1">人员信息</el-radio-button> <el-radio-button label="ryxx">人员信息</el-radio-button>
<el-radio-button label="2">左手捺印指纹</el-radio-button> <el-radio-button label="zsnyzw">左手捺印指纹</el-radio-button>
<el-radio-button label="3">右手捺印指纹</el-radio-button> <el-radio-button label="ysnyzw">右手捺印指纹</el-radio-button>
<el-radio-button label="4">掌纹信息</el-radio-button> <el-radio-button label="zw">掌纹信息</el-radio-button>
<el-radio-button label="5">人像信息</el-radio-button> <el-radio-button label="rx">人像信息</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="headRight"> <div class="headRight">
...@@ -51,18 +51,39 @@ ...@@ -51,18 +51,39 @@
</div> </div>
<div <div
class="line" class="line"
v-if="radio1==1" v-if="radio1=='ryxx'"
> >
<div></div> <div></div>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<ryxx <ryxx
v-if="radio1==1" v-if="radio1=='ryxx'"
:rowData="rowData" :rowData="rowData"
></ryxx> ></ryxx>
<nyzw v-else> <nyzw
v-if="radio1=='zsnyzw'"
:radio1='radio1'
:rowData="rowData"
>
</nyzw>
<nyzw
v-if="radio1=='ysnyzw'"
:radio1='radio1'
:rowData="rowData"
>
</nyzw> </nyzw>
<zw
v-if="radio1=='zw'"
:rowData="rowData"
>
</zw>
<rx
v-if="radio1=='rx'"
:rowData="rowData"
>
</rx>
</div> </div>
</div> </div>
</template> </template>
...@@ -70,10 +91,14 @@ ...@@ -70,10 +91,14 @@
<script> <script>
import ryxx from "./modules/ryxx.vue" import ryxx from "./modules/ryxx.vue"
import nyzw from "./modules/nyzw.vue" import nyzw from "./modules/nyzw.vue"
import zw from "./modules/zw.vue"
import rx from "./modules/rx.vue"
export default { export default {
components: { components: {
ryxx, ryxx,
nyzw, nyzw,
zw,
rx
}, },
created () { created () {
console.log(this.$route.params, '跳转参数到详情页') console.log(this.$route.params, '跳转参数到详情页')
...@@ -82,7 +107,7 @@ export default { ...@@ -82,7 +107,7 @@ export default {
}, },
data () { data () {
return { return {
radio1: '1', radio1: 'ryxx',
rowData: { rowData: {
barcode: '', // 人员条码号 barcode: '', // 人员条码号
id: '', // 人员id id: '', // 人员id
......
src/views/zljc/modules/nyzw.vue
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<div class='zwTip'> <div class='zwTip'>
<div> <div>
<div class='w88'></div> <div class='w88'></div>
<div class="w660">{{radio1==2?'左手':'右手'}}滚动指纹</div> <div class="w660">{{radio1=='zsnyzw'?'左手':'右手'}}滚动指纹</div>
<div class="w48"></div> <div class="w48"></div>
<div class="w660">{{radio1==2?'左手':'右手'}}平面指纹</div> <div class="w660">{{radio1=='zsnyzw'?'左手':'右手'}}平面指纹</div>
<div class="w88"> <div class="w88">
<!-- <span class="iconfont icon-baocun"></span>保存 --> <!-- <span class="iconfont icon-baocun"></span>保存 -->
</div> </div>
...@@ -19,56 +19,144 @@ ...@@ -19,56 +19,144 @@
:autoplay="false" :autoplay="false"
trigger="click" trigger="click"
> >
<el-carousel-item <div v-if="radio1=='zsnyzw'">
v-for="item in arrLeft" <el-carousel-item
:key="item.id" v-for="item in arrLeft"
> :key="item.id"
<div class="plamItem"> >
<div class="yuan"> <div class="plamItem">
<div class='Top'> <div class="yuan">
<p>{{ item.text }}</p> <div class='Top'>
<div class="imgbox"> <p>{{ item.text }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.gdImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div> </div>
</div> </div>
<div class='btns'> <div class="mubiao">
<div <div class='Top'>
class='btnhg' <p>{{ item.text }}</p>
@click="showDetail(item)" <div class="imgbox">
>合格</div> <img
<div :src="'data:image/jpeg;base64,' + item.pmImg"
class='btnhg' alt=""
@click="showDetail(item)" >
>不合格</div> </div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div> </div>
</div> </div>
<div class="mubiao"> </el-carousel-item>
<div class='Top'> </div>
<p>{{ item.text }}</p> <div v-if="radio1=='ysnyzw'">
<div class="imgbox"> <el-carousel-item
v-for="item in arrRight"
:key="item.id"
>
<div class="plamItem">
<div class="yuan">
<div class='Top'>
<p>{{ item.text }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.gdImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div> </div>
</div> </div>
<div class='btns'> <div class="mubiao">
<div <div class='Top'>
class='btnhg' <p>{{ item.text }}</p>
@click="showDetail(item)" <div class="imgbox">
>合格</div> <img
<div :src="'data:image/jpeg;base64,' + item.pmImg"
class='btnhg' alt=""
@click="showDetail(item)" >
>不合格</div> </div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div> </div>
</div> </div>
</div> </el-carousel-item>
</el-carousel-item> </div>
</el-carousel> </el-carousel>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'nyzw',
props: {
rowData: {
default: false
},
radio1: {
default: false
}
},
created () {
console.log(this.rowData, '跳转参数人员信息')
// this.id = this.rowData.id
// this.barcode = this.rowData.barcode
// console.log(this.id, 'ididididid')
// this.getInfo()
this.getPlainByBarcode()
this.getRollByBarcode()
},
// watch: {
// radio1 (newVal, oldVal) {
// console.log(oldVal, newVal, 112233);
// this.getPlainByBarcode()
// this.getRollByBarcode()
// }
// },
data () { data () {
return { return {
radio1: 2, // radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
arrLeft: [ arrLeft: [
{ pmId: 16, gdId: 6, text: '左拇指', pmImg: null, gdImg: null }, { pmId: 16, gdId: 6, text: '左拇指', pmImg: null, gdImg: null },
{ pmId: 17, gdId: 7, text: '左食指', pmImg: null, gdImg: null }, { pmId: 17, gdId: 7, text: '左食指', pmImg: null, gdImg: null },
...@@ -91,25 +179,30 @@ export default { ...@@ -91,25 +179,30 @@ export default {
this.$axios this.$axios
.post( .post(
"/api/png/plainByBarcode/barcode", "/api/png/plainByBarcode/barcode",
{ barcode: this.ysryjbxx.ysxtAsjxgrybh }, { barcode: this.rowData.barcode },
{ loading: false } // { loading: false }
) )
.then((response) => { .then((response) => {
if (response.data.code == 0) { if (response.data.code == 0) {
this.PlainImgNum = response.data.ret.length;
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
self.PlainImg.forEach((item) => { self.arrLeft.forEach((item) => {
if (item.code == element.seq) { if (item.pmId == element.seq) {
item.img = element.image; item.pmImg = element.image;
console.log(112233) // console.log(112233)
} }
}); });
self.arrRight.forEach((item) => {
if (item.pmId == element.seq) {
item.pmImg = element.image;
// console.log(112233)
}
})
}); });
// 去掉加载状态 // 去掉加载状态
self.PlainImgfingerLoading = false; // self.PlainImgfingerLoading = false;
} else if (response.data.code == 4) { } else if (response.data.code == 4) {
// 去掉加载状态 // 去掉加载状态
self.PlainImgfingerLoading = false; // self.PlainImgfingerLoading = false;
} }
}) })
.catch(function (error) { .catch(function (error) {
...@@ -121,29 +214,31 @@ export default { ...@@ -121,29 +214,31 @@ export default {
this.$axios this.$axios
.post( .post(
"/api/png/rollByBarcode/barcode", "/api/png/rollByBarcode/barcode",
{ barcode: this.ysryjbxx.ysxtAsjxgrybh }, { barcode: this.rowData.barcode },
{ loading: false } // { loading: false }
) )
.then((response) => { .then((response) => {
if (response.data.code == 0) { if (response.data.code == 0) {
// this.RollImgNum = response.data.ret.length; // this.RollImgNum = response.data.ret.length;
response.data.ret.forEach((element, index) => { response.data.ret.forEach((element, index) => {
self.RollImg.forEach((item) => { self.arrLeft.forEach((item) => {
if (item.code == element.seq) { if (item.gdId == element.seq) {
item.img = element.image; item.gdImg = element.image;
console.log(112233) // console.log(112233)
}
});
self.arrRight.forEach((item) => {
if (item.gdId == element.seq) {
item.gdImg = element.image;
// console.log(112233)
} }
}); });
}); });
// 去掉加载状态 // 去掉加载状态
self.RollImgfingerLoading = false; // self.RollImgfingerLoading = false;
console.log('RollImgNum', this.RollImgNum)
console.log('RollImgfingerLoading', this.RollImgfingerLoading)
} else if (response.data.code == 4) { } else if (response.data.code == 4) {
// 去掉加载状态 // 去掉加载状态
self.RollImgfingerLoading = false; // self.RollImgfingerLoading = false;
} }
}) })
.catch(function (error) { .catch(function (error) {
...@@ -258,6 +353,7 @@ export default { ...@@ -258,6 +353,7 @@ export default {
width: 660px; width: 660px;
height: 648px; height: 648px;
margin-right: 24px; margin-right: 24px;
margin-top: 16px;
.Top { .Top {
border-radius: 8px; border-radius: 8px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
...@@ -265,14 +361,14 @@ export default { ...@@ -265,14 +361,14 @@ export default {
} }
.imgbox { .imgbox {
width: 660px; width: 660px;
height: 570px; height: 554px;
border-radius: 8px; // border-radius: 8px;
border: 1px solid #cccccc; // border: 1px solid #cccccc;
background-color: #ccc; // background-color: #ccc;
box-sizing: border-box; // box-sizing: border-box;
text-align: center; text-align: center;
img { img {
height: 570px; height: 554px;
} }
} }
.btns { .btns {
...@@ -304,14 +400,18 @@ export default { ...@@ -304,14 +400,18 @@ export default {
} }
} }
p { p {
line-height: 30px; line-height: 32px;
text-align: center; text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
} }
} }
.mubiao { .mubiao {
width: 660px; width: 660px;
height: 648px; height: 648px;
margin-left: 24px; margin-left: 24px;
margin-top: 16px;
.Top { .Top {
border-radius: 8px; border-radius: 8px;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
...@@ -319,14 +419,14 @@ export default { ...@@ -319,14 +419,14 @@ export default {
} }
.imgbox { .imgbox {
width: 660px; width: 660px;
height: 570px; height: 554px;
border-radius: 8px; // border-radius: 8px;
border: 1px solid #cccccc; // border: 1px solid #cccccc;
background-color: #ccc; // background-color: #ccc;
box-sizing: border-box; // box-sizing: border-box;
text-align: center; text-align: center;
img { img {
height: 570px; height: 554px;
} }
} }
.btns { .btns {
...@@ -359,8 +459,11 @@ export default { ...@@ -359,8 +459,11 @@ export default {
} }
p { p {
line-height: 30px; line-height: 32px;
text-align: center; text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
} }
} }
} }
......
src/views/zljc/modules/rx.vue 0 → 100644
<template>
<div class='nyzw'>
<div class='zwTip'>
<div>
<div class='w88'></div>
<div class="w660"></div>
<div class="w48">人像</div>
<div class="w660"></div>
<div class="w88">
<!-- <span class="iconfont icon-baocun"></span>保存 -->
</div>
</div>
</div>
<div class='zw'>
<el-carousel
@mousewheel.native="rollScroll($event)"
direction="vertical"
ref="carousel"
:autoplay="false"
trigger="click"
>
<el-carousel-item
v-for="item in arr"
:key="item.id"
>
<div class="plamItem">
<div class="yuan">
<div class='Top'>
<p>{{ item.zstext }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.zsImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div>
<div class="mubiao">
<div class='Top'>
<p>{{ item.ystext }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.ysImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div>
</div>
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
<script>
export default {
name: 'rx',
props: {
rowData: {
default: false
},
},
created () {
console.log(this.rowData, '跳转参数人员信息')
this.getPalmByBarcode()
},
data () {
return {
// radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
arr: [
{ zsId: 1, ysId: 2, zstext: '正面像', ystext: '左侧像', zsImg: null, ysImg: null },
{ zsId: 4, ysId: 11, zstext: '右侧像', ystext: '身份证', zsImg: null, ysImg: null },
],
}
},
methods: {
getFaceByBarcode () { // 获取人像
let self = this;
this.$axios
.post(
"/api/org/face/barcode",
{ barcode: this.rowData.barcode },
// { loading: false }
)
.then((response) => {
if (response.data.code == 0) {
response.data.ret.forEach((element, index) => {
self.FaceImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image;
}
});
});
// 去掉加载状态
// self.FaceLoading = false;
} else if (response.data.code == 4) {
// 去掉加载状态
// self.FaceLoading = false;
}
})
.catch(function (error) {
//console.log(error);
});
},
showDetail (item) {
console.log(item)
},
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 {
}
},
}
}
</script>
<style lang="scss"scoped>
.nyzw {
padding: 0 24px;
box-sizing: border-box;
.zwTip {
margin-top: 24px;
div {
height: 48px;
background: #f6f8fa;
display: flex;
.w88 {
width: 88px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
vertical-align: middle;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
span {
font-size: 12px;
margin-right: 4px;
}
}
.w660 {
width: 660px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #282f3c;
}
.w48 {
width: 48px;
height: 100%;
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
position: relative;
height: 648px;
.el-carousel__container {
height: 648px;
}
ul.el-carousel__indicators {
position: absolute;
top: 100px;
right: 10px;
}
.el-carousel__indicators {
.el-carousel__button {
width: 20px;
height: 20px;
background-color: #fff;
border: 2px solid #bbc1d1;
border-radius: 50%;
&:hover {
background: #bbc1d1;
border: 2px solid #bbc1d1;
}
}
.is-active {
.el-carousel__button {
box-shadow: 0px 0px 8px 0px rgba(5, 95, 231, 0.5);
background: #045fe7;
}
}
}
}
.plamItem {
height: 648px;
display: flex;
justify-content: center;
.yuan {
width: 660px;
height: 648px;
margin-right: 24px;
margin-top: 16px;
.Top {
border-radius: 8px;
border: 1px solid #d1d1d1;
box-sizing: border-box;
}
.imgbox {
width: 660px;
height: 554px;
// border-radius: 8px;
// border: 1px solid #cccccc;
// background-color: #ccc;
// box-sizing: border-box;
text-align: center;
img {
height: 554px;
}
}
.btns {
display: flex;
justify-content: center;
margin-top: 10px;
.btnhg {
width: 72px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
margin-right: 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
.btnbhg {
width: 86px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
}
p {
line-height: 32px;
text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
.mubiao {
width: 660px;
height: 648px;
margin-left: 24px;
margin-top: 16px;
.Top {
border-radius: 8px;
border: 1px solid #d1d1d1;
box-sizing: border-box;
}
.imgbox {
width: 660px;
height: 554px;
// border-radius: 8px;
// border: 1px solid #cccccc;
// background-color: #ccc;
// box-sizing: border-box;
text-align: center;
img {
height: 554px;
}
}
.btns {
display: flex;
justify-content: center;
margin-top: 10px;
.btnhg {
width: 72px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
margin-right: 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
.btnbhg {
width: 86px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
}
p {
line-height: 32px;
text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
}
</style>
\ No newline at end of file
src/views/zljc/modules/zw.vue 0 → 100644
<template>
<div class='nyzw'>
<div class='zwTip'>
<div>
<div class='w88'></div>
<div class="w660">左手</div>
<div class="w48"></div>
<div class="w660">右手</div>
<div class="w88">
<!-- <span class="iconfont icon-baocun"></span>保存 -->
</div>
</div>
</div>
<div class='zw'>
<el-carousel
@mousewheel.native="rollScroll($event)"
direction="vertical"
ref="carousel"
:autoplay="false"
trigger="click"
>
<el-carousel-item
v-for="item in arr"
:key="item.id"
>
<div class="plamItem">
<div class="yuan">
<div class='Top'>
<p>{{ item.zstext }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.zsImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div>
<div class="mubiao">
<div class='Top'>
<p>{{ item.ystext }}</p>
<div class="imgbox">
<img
:src="'data:image/jpeg;base64,' + item.ysImg"
alt=""
>
</div>
</div>
<div class='btns'>
<div
class='btnhg'
@click="showDetail(item)"
>合格</div>
<div
class='btnhg'
@click="showDetail(item)"
>不合格</div>
</div>
</div>
</div>
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
<script>
export default {
name: 'nyzw',
props: {
rowData: {
default: false
},
},
created () {
console.log(this.rowData, '跳转参数人员信息')
this.getPalmByBarcode()
},
data () {
return {
// radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
arr: [
{ zsId: 32, ysId: 31, zstext: '左手平面掌纹', ystext: '右手平面掌纹', zsImg: null, ysImg: null },
{ zsId: 34, ysId: 33, zstext: '左手侧面掌纹', ystext: '右手侧面掌纹', zsImg: null, ysImg: null },
],
}
},
methods: {
getPalmByBarcode () { // 获取掌纹
let self = this;
this.$axios
.post(
"/api/png/palm/barcode",
{ barcode: this.rowData.barcode },
// { loading: false }
)
.then((response) => {
if (response.data.code == 0) {
response.data.ret.forEach((element, index) => {
self.arr.forEach((item) => {
if (item.zsId == element.seq) {
item.zsImg = element.image;
} else if (item.ysId == element.seq) {
item.ysImg = element.image;
}
});
});
// 去掉加载状态
// self.PlamLoading = false;
} else if (response.data.code == 4) {
// 去掉加载状态
// self.PlamLoading = false;
}
})
.catch(function (error) {
//console.log(error);
});
},
showDetail (item) {
console.log(item)
},
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 {
}
},
}
}
</script>
<style lang="scss"scoped>
.nyzw {
padding: 0 24px;
box-sizing: border-box;
.zwTip {
margin-top: 24px;
div {
height: 48px;
background: #f6f8fa;
display: flex;
.w88 {
width: 88px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
vertical-align: middle;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
span {
font-size: 12px;
margin-right: 4px;
}
}
.w660 {
width: 660px;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #282f3c;
}
.w48 {
width: 48px;
height: 100%;
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
position: relative;
height: 648px;
.el-carousel__container {
height: 648px;
}
ul.el-carousel__indicators {
position: absolute;
top: 100px;
right: 10px;
}
.el-carousel__indicators {
.el-carousel__button {
width: 20px;
height: 20px;
background-color: #fff;
border: 2px solid #bbc1d1;
border-radius: 50%;
&:hover {
background: #bbc1d1;
border: 2px solid #bbc1d1;
}
}
.is-active {
.el-carousel__button {
box-shadow: 0px 0px 8px 0px rgba(5, 95, 231, 0.5);
background: #045fe7;
}
}
}
}
.plamItem {
height: 648px;
display: flex;
justify-content: center;
.yuan {
width: 660px;
height: 648px;
margin-right: 24px;
margin-top: 16px;
.Top {
border-radius: 8px;
border: 1px solid #d1d1d1;
box-sizing: border-box;
}
.imgbox {
width: 660px;
height: 554px;
// border-radius: 8px;
// border: 1px solid #cccccc;
// background-color: #ccc;
// box-sizing: border-box;
text-align: center;
img {
height: 554px;
}
}
.btns {
display: flex;
justify-content: center;
margin-top: 10px;
.btnhg {
width: 72px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
margin-right: 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
.btnbhg {
width: 86px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
}
p {
line-height: 32px;
text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
.mubiao {
width: 660px;
height: 648px;
margin-left: 24px;
margin-top: 16px;
.Top {
border-radius: 8px;
border: 1px solid #d1d1d1;
box-sizing: border-box;
}
.imgbox {
width: 660px;
height: 554px;
// border-radius: 8px;
// border: 1px solid #cccccc;
// background-color: #ccc;
// box-sizing: border-box;
text-align: center;
img {
height: 554px;
}
}
.btns {
display: flex;
justify-content: center;
margin-top: 10px;
.btnhg {
width: 72px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
margin-right: 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
.btnbhg {
width: 86px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
}
p {
line-height: 32px;
text-align: center;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
}
</style>
\ No newline at end of file
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