Skip to content

F
founder_vue
Commit 91a882b2 by 张超军
Options

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

parents 7437bb35 3d55b4ab
Showing with 152 additions and 48 deletions
src/views/zljc/jcxq.vue
......@@ -18,34 +18,84 @@
</div>
<div class="headResults ">
<div class='lableresult'>
<span class="iconfont cgColors">&#xe629;</span>
<span class="iconfont sbColors">&#xe63c;</span>
<span class="iconfont cgColor">&#xe63e;</span>
<span class="iconfont sbColor">&#xe63f;</span>
<span
class="iconfont cgColors"
v-if="personStatus===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="personStatus===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='ryxx'&&personStatus==null"
@click="tjRyxx1"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='ryxx'&&personStatus==null"
@click="tjRyxx0"
>&#xe63f;</span>
</div>
<div class='lableresult'>
<!-- <span class="iconfont cgColors">&#xe629;</span>
<span class="iconfont sbColors">&#xe63c;</span> -->
<span class="iconfont cgColor">&#xe63e;</span>
<!-- <span class="iconfont sbColor">&#xe63f;</span> -->
<span
class="iconfont cgColors"
v-if="leftCheckedDescription===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="leftCheckedDescription===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='zsnyzw'&&leftCheckedDescription==null"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='zsnyzw'&&leftCheckedDescription==null"
>&#xe63f;</span>
</div>
<div class='lableresult'>
<!-- <span class="iconfont cgColors">&#xe629;</span> -->
<span class="iconfont sbColors">&#xe63c;</span>
<!-- <span class="iconfont cgColor">&#xe63e;</span>
<span class="iconfont sbColor">&#xe63f;</span> -->
<span
class="iconfont cgColors"
v-if="rightCheckedDescription===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="rightCheckedDescription===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='ysnyzw'&&rightCheckedDescription==null"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='ysnyzw'&&rightCheckedDescription==null"
>&#xe63f;</span>
</div>
<div class='lableresult'>
<span class="iconfont cgColors">&#xe629;</span>
<!-- <span class="iconfont sbColors">&#xe63c;</span>
<span class="iconfont cgColor">&#xe63e;</span>
<span class="iconfont sbColor">&#xe63f;</span> -->
<span class="iconfont sbColors">&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='zw'"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='zw'"
>&#xe63f;</span>
</div>
<div class='lableresult'>
<!-- <span class="iconfont cgColors">&#xe629;</span>
<span class="iconfont cgColors">&#xe629;</span>
<span class="iconfont sbColors">&#xe63c;</span>
<span class="iconfont cgColor">&#xe63e;</span> -->
<span class="iconfont sbColor">&#xe63f;</span>
<span
class="iconfont cgColor"
v-if="radio1=='rx'"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='rx'"
>&#xe63f;</span>
</div>
</div>
......@@ -58,6 +108,7 @@
</div>
<div class="content">
<ryxx
ref="ryxx"
v-if="radio1=='ryxx'"
:rowData="rowData"
></ryxx>
......@@ -111,7 +162,20 @@ export default {
rowData: {
barcode: '', // 人员条码号
id: '', // 人员id
}
},
personStatus: null, // 人员检查结果
leftCheckedDescription: null,// 左手检查结果
rightCheckedDescription: null,// 右手检查结果
}
},
methods: {
// 人员信息提交
tjRyxx1 () {
this.$refs.ryxx.saveRyxx(1)
},
tjRyxx0 () {
this.$refs.ryxx.saveRyxx(0)
}
}
}
......@@ -131,7 +195,7 @@ export default {
height: 100%;
.fixedBox {
position: absolute;
top: 0.5px;
top: 1px;
left: 0;
width: 100%;
background-color: #fff;
......
src/views/zljc/modules/nyzw.vue
......@@ -18,6 +18,7 @@
ref="carousel"
:autoplay="false"
trigger="click"
:loop="false"
>
<div v-if="radio1=='zsnyzw'">
<el-carousel-item
......@@ -29,6 +30,16 @@
<div class='Top'>
<p>{{ item.text }}</p>
<div class="imgbox">
<div class="tpType">
<img
src="@/assets/img/zljc/hg.png"
alt=""
>
<img
src="@/assets/img/zljc/bhg.png"
alt=""
>
</div>
<img
:src="'data:image/jpeg;base64,' + item.gdImg"
alt=""
......@@ -158,18 +169,18 @@ export default {
return {
// radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
arrLeft: [
{ pmId: 16, gdId: 6, text: '左拇指', pmImg: null, gdImg: null },
{ pmId: 17, gdId: 7, text: '左食指', pmImg: null, gdImg: null },
{ pmId: 18, gdId: 8, text: '左中指', pmImg: null, gdImg: null },
{ pmId: 19, gdId: 9, text: '左环指', pmImg: null, gdImg: null },
{ pmId: 20, gdId: 10, text: '左环指', pmImg: null, gdImg: null },
{ pmId: 16, gdId: 6, text: '左拇指', pmImg: null, gdImg: null, roll1Status: null, plain1Status: null, },
{ pmId: 17, gdId: 7, text: '左食指', pmImg: null, gdImg: null, roll2Status: null, plain2Status: null },
{ pmId: 18, gdId: 8, text: '左中指', pmImg: null, gdImg: null, roll3Status: null, plain3Status: null },
{ pmId: 19, gdId: 9, text: '左环指', pmImg: null, gdImg: null, roll4Status: null, plain4Status: null },
{ pmId: 20, gdId: 10, text: '左小指', pmImg: null, gdImg: null, roll5Status: null, plain5Status: null },
],
arrRight: [
{ pmId: 11, gdId: 1, text: '右拇指', pmImg: null, gdImg: null },
{ pmId: 12, gdId: 2, text: '右食指', pmImg: null, gdImg: null },
{ pmId: 13, gdId: 3, text: '右中指', pmImg: null, gdImg: null },
{ pmId: 14, gdId: 4, text: '右环指', pmImg: null, gdImg: null },
{ pmId: 15, gdId: 5, text: '右环指', pmImg: null, gdImg: null },
{ pmId: 11, gdId: 1, text: '右拇指', pmImg: null, gdImg: null, roll6Status: null, plain6Status: null },
{ pmId: 12, gdId: 2, text: '右食指', pmImg: null, gdImg: null, roll7Status: null, plain7Status: null },
{ pmId: 13, gdId: 3, text: '右中指', pmImg: null, gdImg: null, roll8Status: null, plain8Status: null },
{ pmId: 14, gdId: 4, text: '右环指', pmImg: null, gdImg: null, roll9Status: null, plain9Status: null },
{ pmId: 15, gdId: 5, text: '右小指', pmImg: null, gdImg: null, roll10Status: null, plain10Status: null },
],
}
},
......@@ -309,9 +320,6 @@ export default {
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......@@ -360,6 +368,7 @@ export default {
box-sizing: border-box;
}
.imgbox {
position: relative;
width: 660px;
height: 554px;
// border-radius: 8px;
......@@ -370,6 +379,18 @@ export default {
img {
height: 554px;
}
.tpType {
position: absolute;
left: 50%;
top: 50%;
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
img {
height: 96px;
}
}
}
.btns {
display: flex;
......
src/views/zljc/modules/rx.vue
......@@ -18,6 +18,7 @@
ref="carousel"
:autoplay="false"
trigger="click"
:loop="false"
>
<el-carousel-item
v-for="item in arr"
......@@ -83,15 +84,15 @@ export default {
},
created () {
console.log(this.rowData, '跳转参数人员信息')
this.getPalmByBarcode()
this.getFaceByBarcode()
},
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 },
{ zsId: 1, ysId: 2, zstext: '正面像', ystext: '左侧像', zsImg: null, ysImg: null, face1Status: null, face2Status: null },
{ zsId: 4, ysId: 11, zstext: '右侧像', ystext: '身份证', zsImg: null, ysImg: null, face3Status: null, face4Status: null },
],
}
},
......@@ -107,9 +108,14 @@ export default {
.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.arr.forEach((item) => {
if (item.zsId == element.seq) {
item.zsImg = element.image;
}
});
self.arr.forEach((item) => {
if (item.ysId == element.seq) {
item.ysImg = element.image;
}
});
});
......@@ -188,9 +194,6 @@ export default {
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......
src/views/zljc/modules/ryxx.vue
......@@ -504,11 +504,12 @@ export default {
},
jcsm: '',// 检查说明
personStatus: null, // 人员检查结果
}
},
methods: {
getInfo () {
console.log(this.rowData.id, 'sadhagdsadhksak')
// console.log(this.rowData.id, 'sadhagdsadhksak')
this.$axios
.get("/api/personstore/base/" + this.id)
.then((response) => {
......@@ -525,6 +526,23 @@ export default {
}
});
},
saveRyxx (e) {
let reqParam = {
personId: null, //人员id
jcspersonCheckedDescriptionm: '', // 检查说明
type: 1, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
personStatus: null, // 检查结果
}
reqParam.personId = this.id
reqParam.personCheckedDescription = this.jcsm
reqParam.personStatus = e
this.$axios
.post("/api/zljc/result/save", reqParam)
.then((response) => {
console.log(response)
})
},
handleCheckedTargetsChange (value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.targets.length;
......
src/views/zljc/modules/zw.vue
......@@ -18,6 +18,7 @@
ref="carousel"
:autoplay="false"
trigger="click"
:loop="false"
>
<el-carousel-item
v-for="item in arr"
......@@ -90,8 +91,8 @@ export default {
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 },
{ zsId: 32, ysId: 31, zstext: '左手平面掌纹', ystext: '右手平面掌纹', zsImg: null, ysImg: null, palm1Status: null, palm2Status: null },
{ zsId: 34, ysId: 33, zstext: '左手侧面掌纹', ystext: '右手侧面掌纹', zsImg: null, ysImg: null, palm3Status: null, palm4Status: null },
],
}
},
......@@ -190,9 +191,6 @@ export default {
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......
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