Skip to content

F
founder_vue
Commit 1a76c60b by liyuhang19990520
Options

解决冲突

parents 6ff221d0 02c79d0c
Showing with 1508 additions and 186 deletions
public/iconfont/demo_index.html
......@@ -55,12 +55,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe644;</span>
<div class="name">复核详情</div>
<div class="code-name">&amp;#xe644;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe642;</span>
<div class="name">复核</div>
<div class="code-name">&amp;#xe642;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe643;</span>
<div class="name">审核有效</div>
<div class="code-name">&amp;#xe643;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe640;</span>
<div class="name">下箭头</div>
<div class="code-name">&amp;#xe640;</div>
......@@ -372,9 +384,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1639448021142') format('woff2'),
url('iconfont.woff?t=1639448021142') format('woff'),
url('iconfont.ttf?t=1639448021142') format('truetype');
src: url('iconfont.woff2?t=1639552343312') format('woff2'),
url('iconfont.woff?t=1639552343312') format('woff'),
url('iconfont.ttf?t=1639552343312') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -401,6 +413,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-fuhexiangqing"></span>
<div class="name">
复核详情
</div>
<div class="code-name">.icon-fuhexiangqing
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-fuhe"></span>
<div class="name">
复核
......@@ -410,6 +431,15 @@
</li>
<li class="dib">
<span class="icon iconfont icon-shenheyouxiao"></span>
<div class="name">
审核有效
</div>
<div class="code-name">.icon-shenheyouxiao
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiajiantou"></span>
<div class="name">
下箭头
......@@ -879,6 +909,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fuhexiangqing"></use>
</svg>
<div class="name">复核详情</div>
<div class="code-name">#icon-fuhexiangqing</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fuhe"></use>
</svg>
<div class="name">复核</div>
......@@ -887,6 +925,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shenheyouxiao"></use>
</svg>
<div class="name">审核有效</div>
<div class="code-name">#icon-shenheyouxiao</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiajiantou"></use>
</svg>
<div class="name">下箭头</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1639448021142') format('woff2'),
url('iconfont.woff?t=1639448021142') format('woff'),
url('iconfont.ttf?t=1639448021142') format('truetype');
src: url('iconfont.woff2?t=1639552343312') format('woff2'),
url('iconfont.woff?t=1639552343312') format('woff'),
url('iconfont.ttf?t=1639552343312') format('truetype');
}
.iconfont {
......@@ -13,10 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-fuhexiangqing:before {
content: "\e644";
}
.icon-fuhe:before {
content: "\e642";
}
.icon-shenheyouxiao:before {
content: "\e643";
}
.icon-xiajiantou:before {
content: "\e640";
}
......
public/iconfont/iconfont.json
......@@ -6,13 +6,27 @@
"description": "",
"glyphs": [
{
"icon_id": "26448924",
"icon_id": "26504089",
"name": "复核详情",
"font_class": "fuhexiangqing",
"unicode": "e644",
"unicode_decimal": 58948
},
{
"icon_id": "26471648",
"name": "复核",
"font_class": "fuhe",
"unicode": "e642",
"unicode_decimal": 58946
},
{
"icon_id": "26471649",
"name": "审核有效",
"font_class": "shenheyouxiao",
"unicode": "e643",
"unicode_decimal": 58947
},
{
"icon_id": "26407926",
"name": "下箭头",
"font_class": "xiajiantou",
......
src/components/ImageEd.vue
......@@ -675,7 +675,11 @@ export default {
//目标删除时间
targetDelTime: '',
// 路由name
routeName: ''
routeName: '',
// 复核详情 -- 左侧条码
fhxqLeftBarcode: '',
// 复核详情 -- 右侧条码
fhxqRightBarcode: '',
};
},
components: {
......@@ -1992,6 +1996,14 @@ export default {
self.targetDelTime = ''
}
})
// 获取复核详情的左侧条码和右侧条码
this.$bus.on('getLeftAndRightBarcode', (barcodeAll) => {
console.log(barcodeAll.leftBarcode);
console.log(barcodeAll.rightBarcode);
self.fhxqLeftBarcode = barcodeAll.leftBarcode
self.fhxqRightBarcode = barcodeAll.rightBarcode
})
},
methods: {
/**
......@@ -2148,6 +2160,7 @@ export default {
* 源数据编辑点击
*/
async sourceChange () {
let self = this
let srcbarcode = sessionStorage.getItem('srcbarcode')
// 倒查
if (this.routeName == 'TL') {
......@@ -2199,12 +2212,41 @@ export default {
this.$router.push({
path: `/ajzwbj/110/${srcbarcode}`,
})
} else if (this.routeName == 'fhxxTL') {
// 倒查 -- 源 - 人员
console.log(23213213213132);
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ryzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLT') {
// 正查 -- 源 - 案件
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLL') {
// 串查 -- 源 - 案件
if (self.fhxqLeftBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqLeftBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
}
},
/**
* 目标数据编辑点击
*/
async targetChange () {
let self = this
let destbarcode = sessionStorage.getItem('destbarcode')
// 倒查
if (this.routeName == 'TL') {
......@@ -2256,6 +2298,34 @@ export default {
this.$router.push({
path: `/ajzwbj/110/${destbarcode}`,
})
} else if (this.routeName == 'fhxxTL') {
// 倒查 -- 目标 - 案件
console.log(23213213213132);
if (self.fhxqRightBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqRightBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLT') {
// 正查 -- 目标 - 人员
if (self.fhxqRightBarcode != null) {
this.$router.push({
path: `/ryzwbj/110/${self.fhxqRightBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
} else if (this.routeName == 'fhxxLL') {
// 串查 -- 源 - 案件
if (self.fhxqRightBarcode != null) {
this.$router.push({
path: `/ajzwbj/110/${self.fhxqRightBarcode}`,
})
} else {
this.$message.error('没有条码号！')
}
}
},
/**
......@@ -5341,6 +5411,7 @@ export default {
this.$bus.off('changImageEditTarget')
this.$bus.off('deleteMessage')
this.$bus.off('targetDeleteMessage')
this.$bus.off('getLeftAndRightBarcode')
},
watch: {
isActive (val) {
......
src/components/swiperbzxx.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-11-13 16:32:50
* @LastEditTime: 2021-12-15 15:08:43
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\swiper.vue
-->
<template>
<div class="parentBox">
<img src="@/assets/img/car.png" alt="" />
<div style="height: 100%">
<el-carousel
style="height: 100%"
:interval="5000"
arrow="always"
ref="carousel"
:autoplay="false"
>
<el-carousel-item
style="height: 100%"
>
<div class="carItem">
<div class="youshang">
<span>1/1</span>
</div>
<div class="wenzi">
<p>
<span>源条码号：</span>
<span>{{ srcbarcode }}</span
>
</p>
</div>
</div>
</el-carousel-item>
</el-carousel>
</div>
<!-- 不可点击的上一条左侧按钮 -->
<div class="left" @click="noData('left')">
<img src="@/assets/img/left.png" alt="" />
</div>
<!-- 不可以点击的下一条的按钮 -->
<div
class="right"
@click="noData('right')"
>
<img
style="transform: rotate(180deg)"
src="@/assets/img/left.png"
alt="暂无图片"
/>
</div>
</div>
</template>
<script>
export default {
data() {
return {
carIndex: 0,
};
},
methods: {
noData(type) {
if (type === "left") {
this.$message.warning("没有上一条了");
} else if (type === "right") {
this.$message.warning("没有下一条了");
}
},
change(index) {
this.carIndex = index;
},
qiehuan(index) {
this.$refs.carousel.setActiveItem(index);
this.$emit("qiehuan", index);
},
btnQiehuan(type) {
//console.log(this.carIndex);
if (type == "left") {
this.$refs.carousel.prev();
this.$emit("prev", this.carIndex);
} else {
this.$refs.carousel.next();
this.$emit("next", this.carIndex);
}
},
},
props: {
srcbarcode: {
type: String,
},
},
};
</script>
<style lang="scss" scoped>
.carItem {
.wenzi {
.Bizhong {
color: #ff0039 !important;
}
}
}
.wenzi {
.Identification {
color: #055fe7 !important;
}
}
.looked {
color: #999 !important;
}
.del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
.el-carousel__item h3 {
color: #475669;
font-size: 18px;
opacity: 0.75;
line-height: 200px;
margin: 0;
}
.el-carousel {
position: relative;
}
.el-carousel__item:nth-child(2n) {
background-color: #99a9bf;
}
.el-carousel__item:nth-child(2n + 1) {
background-color: #d3dce6;
}
.parentBox /deep/ {
width: 100%;
height: 100%;
margin: 0 auto;
position: relative;
text-align: center;
.el-carousel__indicators {
display: none;
}
> img {
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
width: 98%;
height: 98%;
}
> div {
width: 87%;
margin: 0 auto;
}
.el-carousel__item {
background: #ffffff;
box-shadow: -2px 4px 4px 0px rgba(193, 216, 251, 0.35);
border-radius: 10px;
height: 100%;
// border: 1px solid rgba(5, 95, 231, 0.4);
}
.el-carousel__container {
background: #ffffff;
box-shadow: -2px 4px 4px 0px rgba(193, 216, 251, 0.35);
border-radius: 10px;
height: 100%;
border: 1px solid rgba(5, 95, 231, 0.4);
overflow: hidden;
}
.carBtn {
position: absolute;
left: 50%;
transform: translateX(-50%) translateY(0px);
> span {
display: inline-block;
width: 30px;
height: 7px;
background-color: #f2f7fe;
border-radius: 10px;
margin: 0 5px;
cursor: pointer;
}
.active {
background-color: #055fe7;
}
}
.el-carousel__arrow {
display: none;
}
.left {
position: absolute;
width: 24px;
height: 68px;
background: #ECEDF1;
border-radius: 4px;
left: -30px;
top: 50%;
transform: translateY(-50%);
line-height: 68px;
cursor: pointer;
}
.right {
position: absolute;
width: 24px;
height: 68px;
background: #ECEDF1;
border-radius: 4px;
right: -30px;
top: 50%;
transform: translateY(-50%);
line-height: 68px;
cursor: pointer;
}
.carItem {
height: 100%;
position: relative;
.youshang {
width: 80px;
height: 30px;
background-color: #f2f7fe;
border-radius: 0 0 0 30px;
position: absolute;
right: 0;
top: 0;
> span {
&:first-of-type {
color: #666666;
}
}
}
.wenzi {
height: 100%;
display: flex;
flex-flow: column nowrap;
justify-content: space-around;
align-items: flex-start;
padding-left: 30px;
p {
span {
display: inline-block;
font-size: 15px;
&:first-of-type {
color: #666666;
width: 90px;
text-align: left;
}
&:last-of-type {
color: #333333;
}
}
}
}
}
}
</style>
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -1329,7 +1329,7 @@ export default {
height: 20px;
display: flex;
overflow: visible;
background: white;
// background: white;
margin-right: 14px;
}
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -308,7 +308,7 @@
src="../../assets/img/qbryk/bj.svg"
alt=""
/> -->
<span class="iconfont">&#xe635;</span>
<span class="iconfont">&#xe63d;</span>
</div>
</el-tooltip>
<!-- <el-tooltip
......@@ -472,7 +472,7 @@
src="../../assets/img/qbryk/bj.svg"
alt=""
/> -->
<span class="iconfont">&#xe635;</span>
<span class="iconfont">&#xe63d;</span>
</div>
</el-tooltip>
<!-- <el-tooltip
......@@ -1449,7 +1449,7 @@ export default {
height: 20px;
display: flex;
overflow: visible;
background: white;
// background: white;
margin-right: 14px;
}
.iconfont {
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -128,7 +128,7 @@ export default {
let reqUrl = '';
let newReqParams = {};
if (this.type == 'ry') {
reqUrl = '/api/personstore/copyall/'
reqUrl = '/api/personstore/copyall'
// Object.assign(this.reqParam, this.rowData);
// delete this.reqParam.id;
// this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
......@@ -136,7 +136,7 @@ export default {
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.ruleForm.barcode
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/copyall/'
reqUrl = '/api/casestore/copyall'
// let caseBase = {}
// Object.assign(caseBase, this.rowData);
// delete caseBase.id;
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -42,7 +42,7 @@
<el-col :span="12">
<el-form-item label="警综案事件编号：">
<el-input
v-model.trim="ruleForm.jzasjbh"
v-model.trim="ruleForm.asjbh"
placeholder="请输入警综案事件编号"
maxlength="23"
show-word-limit
......@@ -118,6 +118,32 @@
<!-- 五 -->
<el-row>
<el-col :span="12">
<el-form-item label="发案日期：">
<el-date-picker
type="date"
placeholder="请选择发案日期"
v-model="ruleForm.occurdate"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="案件类别：">
<Cascader
:form="ruleForm"
id="ajlbdm"
codeName="CODE_AJLB"
></Cascader>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="损失价值(人民币元)：">
<el-input
v-model.trim="ruleForm.ssjzrmby"
......@@ -141,19 +167,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="案件类别：">
<Cascader
:form="ruleForm"
id="ajlbdm"
codeName="CODE_AJLB"
></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="简要案情：">
<el-input
......@@ -346,7 +359,7 @@ export default {
ssjzrmby: "", // 损失价值
xczzhwkbh: "", // 现场掌指纹卡编号
ajlbdm: "", // 案件类别
jzasjbh: '', // 警综案事件编号
asjbh: '', // 警综案事件编号
sfmaPdbz: "0", // 命案
jyaq: "", // 简要案情
tqdwGajgjgdm: "", // 提取单位代码
......@@ -357,6 +370,7 @@ export default {
zwbdxtlxms: "默认", //
tqdwGajgmc: "默认", //
barcode: "1",
occurdate: '',// 发案日期
// logicDatabaseCode: [],// 逻辑库代码
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -994,8 +994,6 @@ const datas1 = [
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
.delSelection /deep/ .el-table-column--selection {
}
.AllPersonnelBase {
height: 100%;
box-sizing: border-box;
......@@ -1200,7 +1198,7 @@ const datas1 = [
height: 20px;
display: flex;
overflow: visible;
background: white;
// background: white;
margin-right: 14px;
}
......
src/views/Editor/modules/ajdaxx.vue
......@@ -20,8 +20,8 @@
<el-form-item label="案事件编号：" prop="ysxtAsjbh">
<el-input placeholder="请输入案事件编号" v-model="ruleForm.ysxtAsjbh" maxlength="23" show-word-limit disabled></el-input>
</el-form-item>
<el-form-item label="警综案事件编号：" prop="jzasjbh">
<el-input placeholder="请输入警综案事件编号" v-model="ruleForm.jzasjbh" maxlength="23" show-word-limit></el-input>
<el-form-item label="警综案事件编号：" prop="asjbh">
<el-input placeholder="请输入警综案事件编号" v-model="ruleForm.asjbh" maxlength="23" show-word-limit></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
......@@ -168,7 +168,7 @@ export default {
id: '',
ysxtAsjbh: '',
xckybh: '',
jzasjbh: '',
asjbh: '',
asjfsddXzqhdm: '',
xczzhwkbh: '',
ssjzrmby: '',
......@@ -310,7 +310,7 @@ export default {
this.ruleForm.id = this.ajInfo.id
this.ruleForm.ysxtAsjbh = this.ajInfo.ysxtAsjbh
this.ruleForm.xckybh = this.ajInfo.xckybh
this.ruleForm.jzasjbh = this.ajInfo.jzasjbh
this.ruleForm.asjbh = this.ajInfo.asjbh
this.ruleForm.asjfsddXzqhdm = this.ajInfo.asjfsddXzqhdm
this.ruleForm.xczzhwkbh = this.ajInfo.xczzhwkbh
this.ruleForm.ssjzrmby = this.ajInfo.ssjzrmby
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 18:09:25
* @LastEditTime: 2021-12-14 20:37:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -155,7 +155,7 @@ export default {
/**
* 切换掌纹
*/
HandChange(hand) {
HandChange (hand) {
this.activeHand = hand.seq
this.$bus.emit('ajzwbjTDZ')
this.$store.commit('zwbj/setSeq', hand.seq)
......@@ -168,7 +168,15 @@ export default {
*/
async getHandsData () {
let self = this
if (self.isHandRequest) return;
// 如果请求过就不再请求
if (self.isHandRequest) {
if (self.hands.length > 0) {
this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
} else {
self.$bus.emit('ajzwbjImage', 'xxx')
}
return
};
let res = await this.$axios({
method: 'post',
url: '/api/org/case/palm/barcode',
......@@ -186,11 +194,13 @@ export default {
self.hands = res.data.ret
this.activeHand = this.hands[0].seq
this.HandChange(this.hands[0])
if(self.hands.length==0) {
self.$bus.emit('ryzwbjImage', 'xxx')
if (self.hands.length == 0) {
this.$bus.emit('ajzwbjTDZ')
self.$bus.emit('ajzwbjImage', 'xxx')
}
} else {
self.$bus.emit('ryzwbjImage', 'xxx')
this.$bus.emit('ajzwbjTDZ')
self.$bus.emit('ajzwbjImage', 'xxx')
}
self.isHandRequest = true
},
......@@ -216,7 +226,7 @@ export default {
// 指纹编辑区域发送指纹数据，替换指纹图片
console.log(finger);
this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position })
},
/**
* 获取案件指纹原图
......@@ -324,15 +334,19 @@ export default {
zzwChange (event) {
this.zwSelect = event.target.innerText
this.$bus.emit('zwType', this.zwSelect)
if(this.zwSelect == '掌纹') {
if (this.zwSelect == '掌纹') {
// 请求掌纹数据
this.getHandsData()
if(this.hands && this.hands.length>0) {
if (this.hands && this.hands.length > 0) {
this.activeHand = this.hands[0].seq
}
this.$bus.emit('ajzwbjType', '掌纹')
this.$bus.emit('ajzwbjTDZ')
} else {
this.$bus.emit('ajzwbjType', '指纹')
if (this.fingers.length > 0) {
this.FingersChange(0, this.fingers[0])
}
}
},
},
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-14 19:15:15
* @LastEditTime: 2021-12-14 19:28:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -1288,7 +1288,7 @@ export default {
})
.catch((err) => {
console.log(err);
self.clearALL()
// self.clearALL()
});
console.log(self.tzdArr);
......@@ -1303,9 +1303,19 @@ export default {
}
});
// 清空特征点数量
// 清空特征点数量 --- 只清除数组和画布上的session不清楚
this.$bus.on("ryzwbjTDZ", () => {
self.clearALL()
// self.clearALL()
self.tzdnumber = 0;
self.$store.commit("zwbj/setTzdall", null);
self.$store.commit("zwbj/setAutoTzdall", null);
// 特征点
self.autoTzdArr = [];
self.tzdall = [];
self.tzdArr = [];
$(".auto_tzdDom").remove();
$(".tzdDom").remove();
});
$(document).keydown(function (event) {
......@@ -1847,7 +1857,7 @@ export default {
this.$store.commit("zwbj/setAutoTzdall", null);
sessionStorage.removeItem(self.seq);
sessionStorage.removeItem('auto_tzdDom'+self.seq);
sessionStorage.removeItem('auto_tzdDom' + self.seq);
// 特征点
self.autoTzdArr = [];
......@@ -1978,7 +1988,7 @@ export default {
self.$store.commit("zwbj/setAutoTzdall", []);
// 将自动提取的特征点存入session中
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify([]));
}
}
} else {
// 掌纹特征点提取
let handres = await this.$axios({
......
src/views/Editor/modules/imageEdAJ.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 19:15:18
* @LastEditTime: 2021-12-14 19:27:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -435,7 +435,7 @@ export default {
HandsChange (hand) {
let self = this
console.log(hand);
// self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjTDZ')
if (hand && hand.image) {
self.$bus.emit('switchHandTitle', hand.name)
self.$bus.emit('ryzwbjImage', hand.image)
......@@ -509,7 +509,7 @@ export default {
* @param code
*/
getRollOrPainFinger (finger) {
// this.$bus.emit('ryzwbjTDZ')
this.$bus.emit('ryzwbjTDZ')
this.$store.commit('zwbj/setSeq', finger.code)
this.$bus.emit('ryzwbjImage', finger.image)
......@@ -552,7 +552,7 @@ export default {
if (res.data.code === 0) {
for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片
// self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjImage', res.data.ret.image)
}
}
......@@ -586,7 +586,7 @@ export default {
}).then(res => {
if (res.data.code === 0) {
// 指纹编辑区域发送指纹数据，替换指纹图片
// self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjImage', res.data.ret.image)
}
})
......@@ -731,7 +731,7 @@ export default {
//console.log(finger);
this.activerollFinger = finger.code
this.$store.commit('zwbj/setSeq', finger.code)
// self.$bus.emit('ryzwbjTDZ')
self.$bus.emit('ryzwbjTDZ')
// 指纹编辑区域发送指纹数据，替换指纹图片
if (finger && finger.image) {
self.$bus.emit('ryzwbjImage', finger.image)
......@@ -912,6 +912,7 @@ export default {
if (this.zwSelect === '掌纹') {
// 传入判断，为掌纹则开启图像编辑的功能
// this.$bus.emit('isFace', false)
self.$bus.emit('ryzwbjTDZ')
this.$store.commit('ryzwbj/setIsFace', false)
this.$bus.emit('zwType', '掌纹')
// 获取掌纹数据
......
src/views/bzxxgl/fhxxLL.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-13 21:00:53
* @LastEditTime: 2021-12-15 11:44:39
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -44,10 +44,10 @@
<div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.lathpcount}}枚</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件名称：</div>
<div class="label-value">{{allData.ajmc}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.ajlb}}</div>
......@@ -56,11 +56,11 @@
<div class="label-name">源逻辑库：</div>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件级别：</div>
<div class="label-value">{{allData.ajjb}}</div>
</div>
<div class="content-area">
</div> -->
<div class="content-area content-area4">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
</el-input>
</div>
......@@ -92,10 +92,10 @@
<div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.destLathpcount}}枚</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件名称：</div>
<div class="label-value">{{allData.destAjmc}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.destAjlb}}</div>
......@@ -104,11 +104,11 @@
<div class="label-name">源逻辑库：</div>
<div class="label-value">{{allData.destLogicDatabaseName}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件级别：</div>
<div class="label-value">{{allData.destAjjb}}</div>
</div>
<div class="content-area">
</div> -->
<div class="content-area content-area4">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.destJyaq" disabled>
</el-input>
</div>
......@@ -256,13 +256,46 @@ export default {
loading_sd: (state) => state.loading.loading_sd,
}),
},
created () {
async created () {
console.log(this.$route);
this.id = this.$route.params.id
this.getData()
},
methods: {
/**
* 获取指纹（案件）图片
*/
getFingerPic() {
let self = this
this.$axios({
method: 'post',
url: 'api/org/case/barcode/seq',
data: {
barcode: self.allData.ysxtAsjbh,
seqno: self.allData.xczwxh
}
}).then(res => {
console.log(res);
if(res.data.code === 0) {
self.$bus.emit('changImageEdit', res.data.ret.image)
}
})
this.$axios({
method: 'post',
url: 'api/org/case/barcode/seq',
data: {
barcode: self.allData.destYsxtAsjbh,
seqno: self.allData.bzxxXczwxh
}
}).then(res => {
console.log(res);
if(res.data.code === 0) {
self.$bus.emit('changImageEditTarget', res.data.ret.image)
}
})
},
/**
* 確認解除比中关系
*/
confirmRelieveChange () {
......@@ -354,6 +387,8 @@ export default {
if (res.data.code === 0) {
this.allData = res.data.ret
console.log(this.allData);
self.$bus.emit('getLeftAndRightBarcode', { leftBarcode: res.data.ret.ysxtAsjbh, rightBarcode: res.data.ret.destYsxtAsjbh })
this.getFingerPic()
}
}).catch(err => {
console.log(err);
......
src/views/bzxxgl/fhxxLT.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-13 20:22:05
* @LastEditTime: 2021-12-15 11:45:13
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -44,22 +44,22 @@
<div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.lathpcount}}枚</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件名称：</div>
<div class="label-value">{{allData.ajmc}}</div>
</div>
<div class="content-item">
</div> -->
<!-- <div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.ajlb}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">源逻辑库：</div>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件级别：</div>
<div class="label-value">{{allData.ajjb}}</div>
</div>
</div> -->
<div class="content-area">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
</el-input>
......@@ -92,18 +92,18 @@
<div class="label-name">民族：</div>
<div class="label-value">{{allData.mz}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">籍贯：</div>
<div class="label-value">{{allData.jgmc}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">出生日期：</div>
<div class="label-value">{{allData.csrq && $moment(allData.csrq).format('YYYY-MM-DD')}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.personAjlb}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">目标逻辑库：</div>
<div class="label-value">{{allData.destLogicDatabaseName}}</div>
......@@ -272,9 +272,28 @@ export default {
},
methods: {
/**
* 获取指纹（案件）图片
*/
getFingerPic () {
let self = this
this.$axios({
method: 'post',
url: 'api/org/case/barcode/seq',
data: {
barcode: self.allData.ysxtAsjbh,
seqno: self.allData.bzxxXh
}
}).then(res => {
console.log(res);
if (res.data.code === 0) {
self.$bus.emit('changImageEdit', res.data.ret.image)
}
})
},
/**
* 確認解除比中关系
*/
confirmRelieveChange() {
confirmRelieveChange () {
let self = this
this.$axios({
method: 'post',
......@@ -363,6 +382,8 @@ export default {
if (res.data.code === 0) {
this.allData = res.data.ret
console.log(this.allData);
self.$bus.emit('getLeftAndRightBarcode', { leftBarcode: res.data.ret.ysxtAsjbh, rightBarcode: res.data.ret.ysxtAsjbh })
this.getFingerPic()
}
}).catch(err => {
console.log(err);
......
src/views/bzxxgl/fhxxTL.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-14 10:30:57
* @LastEditTime: 2021-12-15 11:33:54
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -44,18 +44,18 @@
<div class="label-name">民族：</div>
<div class="label-value">{{allData.mz}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">籍贯：</div>
<div class="label-value">{{allData.jgmc}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">出生日期：</div>
<div class="label-value">{{allData.csrq && $moment(allData.csrq).format('YYYY-MM-DD')}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.personAjlb}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">目标逻辑库：</div>
<div class="label-value">{{allData.destLogicDatabaseName}}</div>
......@@ -100,22 +100,22 @@
<div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.lathpcount}}枚</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件名称：</div>
<div class="label-value">{{allData.ajmc}}</div>
</div>
<div class="content-item">
</div> -->
<!-- <div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">{{allData.ajlb}}</div>
</div>
</div> -->
<div class="content-item">
<div class="label-name">源逻辑库：</div>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div>
</div>
<div class="content-item">
<!-- <div class="content-item">
<div class="label-name">案件级别：</div>
<div class="label-value">{{allData.ajjb}}</div>
</div>
</div> -->
<div class="content-area">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
</el-input>
......@@ -132,41 +132,40 @@
<div class="fhxx-top-bottom-content">
<div class="fhxx-top-bottom-left">
<div class="content-item">
<div class="label-name red">指位：</div>
<div class="label-value red">{{allData.bzxxZw}}</div>
<div class="label-name red">序号：</div>
<div class="label-value red">{{allData.bzxxXh}}</div>
</div>
<div class="content-item">
<div class="label-name">比中人：</div>
<div class="label-value">{{allData.bzrXm}}</div>
<div class="label-name">比中单位：</div>
<div class="label-value" :title="allData.bzdwGajgmc">{{allData.bzdwGajgmc}}</div>
</div>
<div class="content-item">
<div class="label-name">比中人身份证号：</div>
<div class="label-value">{{allData.bzrGmsfhm}}</div>
<div class="label-name">单位代码：</div>
<div class="label-value">{{allData.bzdwGajgjgdm}}</div>
</div>
<div class="content-item">
<div class="label-name">比中人联系电话：</div>
<div class="label-value">{{allData.bzrLxdh}}</div>
<div class="label-name">比中时间：</div>
<div class="label-value">{{allData.bzsj && $moment(allData.bzsj).format('YYYY-MM-DD HH:mm')}}</div>
</div>
</div>
<div class="fhxx-top-bottom-right">
<div class="content-item">
<div class="label-name red">序号：</div>
<div class="label-value red">{{allData.bzxxXh}}</div>
<div class="label-name red">指位：</div>
<div class="label-value red">{{allData.bzxxZw}}</div>
</div>
<div class="content-item">
<div class="label-name">比中单位：</div>
<div class="label-value" :title="allData.bzdwGajgmc">{{allData.bzdwGajgmc}}</div>
<div class="label-name">比中人：</div>
<div class="label-value">{{allData.bzrXm}}</div>
</div>
<div class="content-item">
<div class="label-name">单位代码：</div>
<div class="label-value">{{allData.bzdwGajgjgdm}}</div>
<div class="label-name">比中人身份证号：</div>
<div class="label-value">{{allData.bzrGmsfhm}}</div>
</div>
<div class="content-item">
<div class="label-name">比中时间：</div>
<div class="label-value">{{allData.bzsj && $moment(allData.bzsj).format('YYYY-MM-DD HH:mm')}}</div>
<div class="label-name">比中人联系电话：</div>
<div class="label-value">{{allData.bzrLxdh}}</div>
</div>
</div>
</div>
<div class="bzxx-textarea">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.bzbz" disabled>
......@@ -273,9 +272,28 @@ export default {
},
methods: {
/**
* 获取指纹（案件）图片
*/
getFingerPic () {
let self = this
this.$axios({
method: 'post',
url: 'api/org/case/barcode/seq',
data: {
barcode: self.allData.ysxtAsjbh,
seqno: self.allData.bzxxXh
}
}).then(res => {
console.log(res);
if (res.data.code === 0) {
self.$bus.emit('changImageEdit', res.data.ret.image)
}
})
},
/**
* 確認解除比中关系
*/
confirmRelieveChange() {
confirmRelieveChange () {
let self = this
this.$axios({
method: 'post',
......@@ -364,6 +382,8 @@ export default {
if (res.data.code === 0) {
this.allData = res.data.ret
console.log(this.allData);
self.$bus.emit('getLeftAndRightBarcode', { leftBarcode: res.data.ret.ysxtAsjxgrybh, rightBarcode: res.data.ret.ysxtAsjbh })
this.getFingerPic()
}
}).catch(err => {
console.log(err);
......
src/views/bzxxgl/scss/fhxxLT.scss
......@@ -11,6 +11,7 @@
}
.relieveDialog {
z-index: 1000;
position: absolute;
left: calc(50% - 221px);
top: calc(50% - 84.5px);
......@@ -237,7 +238,19 @@
}
}
.content-area {
margin-top: 49px;
margin-top: 82px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
height: 70px;
background: #ffffff;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
}
}
}
.content-area4 {
margin-top: 10px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
......
src/views/bzxxgl/scss/fhxxTT.scss 0 → 100644
// 电话验证颜色
$phone: var(--phone, #606266); //#ff4242;
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.rdwcDialog {
position: absolute;
top: 0;
left: 0;
z-index: 100;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
filter: blur(2px);
}
.rdwccontent {
padding: 20px;
box-sizing: border-box;
position: absolute;
top: 30%;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
width: 600px;
height: 152px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
display: flex;
flex-direction: column;
align-items: center;
.title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.rdwcbtns {
display: flex;
align-items: center;
margin-top: 30px;
.rdwcconfirm,
.rdwccancel {
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
.rdwcconfirm {
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044cb9;
color: #044cb9;
}
}
.rdwccancel {
margin-left: 24px;
background: #055fe7;
color: #ffffff;
&:hover {
background: #377fec;
color: #ffffff;
}
&:active {
background: #044cb9;
color: #ffffff;
}
}
}
}
.bzDialog {
position: absolute;
top: 0;
left: 0;
z-index: 100;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
filter: blur(2px);
}
.bzcontent {
box-sizing: border-box;
position: absolute;
top: calc(50% - 337px);
left: calc(50% - 371.5px);
z-index: 1000;
width: 743px;
height: 704px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
.head-title {
box-sizing: border-box;
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
padding: 14px 32px;
.left {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.close {
cursor: pointer;
width: 13px;
height: 13px;
img {
object-fit: contain;
}
}
}
.bzdesc {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
.bz-source {
//border: 1px saddlebrown solid;
width: 743px;
height: 235px;
background: rgba(255, 207, 54, 0.06);
padding: 24px 32px;
.bzitem {
width: 338px;
margin-bottom: 20px;
.bzname {
width: 114px;
}
}
.bzvalue {
&.cc {
font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #ffa219;
}
.dot {
margin-bottom: 2px;
margin-right: 5px;
width: 6px;
height: 6px;
background: #ffa219;
border-radius: 50%;
}
}
/deep/.el-radio {
color: #666;
margin-right: 24px;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
padding-left: 8px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border: 1px solid #055fe7;
background: #055fe7;
}
/deep/.el-radio__inner {
width: 16px;
height: 16px;
&::after {
width: 8px;
height: 8px;
}
}
.bz-src-item {
width: 333px;
height: 150px;
.img {
border: 1px #cccccc solid;
width: 105px;
height: 150px;
position: relative;
top: -105px;
margin-right: 5px;
.title {
text-align: center;
position: relative;
bottom: -100px;
left: 0;
width: 104px;
height: 20px;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #000000 100%);
color: #ffffff;
font-size: 12px;
line-height: 20px;
z-index: 100;
}
}
.item {
height: 150px;
width: 220px;
font-size: 14px;
.title {
color: #999999;
height: 22px;
width: 180px;
height: 22px;
}
.value {
color: #333333;
height: 22px;
width: 180px;
height: 22px;
}
}
}
}
.bz-target {
width: 743px;
height: 160px;
padding: 24px 32px;
.bzitem {
width: 338px;
margin-bottom: 20px;
position: relative;
.bzphone {
/deep/.el-input__inner {
color: $phone;
}
}
.error-desc {
position: absolute;
height: 20px;
bottom: -24px;
right: 36px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #ff3745;
}
.input-error {
position: absolute;
width: 16px;
height: 16px;
right: 51px;
top: 6px;
// img {
// object-fit: contain;
// }
.icon {
width: 16px;
height: 16px;
}
}
.bzname {
width: 114px;
}
}
/deep/.el-input {
width: 180px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
/deep/.el-input__inner {
height: 32px;
line-height: 32px;
}
}
.line {
width: 679px;
height: 1px;
background: #eeeeee;
margin-left: 32px;
}
.bzfooter {
padding: 0 32px;
width: 100%;
.footer-title {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
/deep/.el-textarea {
width: 100%;
}
}
/deep/.el-textarea__inner {
background: #f6f8fa;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
border: 1px solid #eeeeee;
}
}
.bzbtns {
display: flex;
align-items: center;
margin-left: 287px;
margin-top: 30px;
.bzconfirm,
.bzcancel {
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
.bzcancel {
margin-left: 24px;
background: #055fe7;
color: #ffffff;
}
}
}
}
.detail {
z-index: 1000;
position: absolute;
display: flex;
flex-direction: column;
text-align: center;
//justify-content:center;
//top: auto;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
height: 100vh;
.head-title {
width: calc(50vh - 35px);
height: 30px;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
line-height: 30px;
}
.finger {
box-sizing: border-box;
border-radius: 8px;
border: 1px solid #cccccc;
background: #ffffff;
box-shadow: 0px 14px 30px 2px rgba(0, 21, 51, 0.16);
width: calc(50vh - 35px);
height: calc(50vh - 35px);
margin-bottom: 20px;
position: relative;
.wtx {
position: absolute;
width: 100%;
top: 50%;
left: 50%;
transform: translateY(-50%) translateX(-50%);
}
img {
width: 100% !important;
}
span {
font-size: 17px;
}
}
}
.bzActive {
filter: blur(2px);
}
.delText {
position: absolute;
bottom: -30px;
left: 50%;
width: 100%;
text-align: center;
transform: translateX(-50%);
> p {
display: flex;
align-items: center;
width: 100%;
text-align: center;
justify-content: center;
> img {
margin-right: 10px;
}
span {
margin-right: 10px;
color: #e60012;
-webkit-background-clip: text;
font-family: MicrosoftYaHei;
font-size: 16px;
}
}
}
.del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
src/views/cxyrd/modules/TLCandidate.vue
......@@ -159,12 +159,6 @@ export default {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
// this.$axios
// .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}`)
// .then(response => {
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
}
else {
self.$bus.emit("changImageEditTarget", 'xxx');
......
src/views/zljc/Index.vue
......@@ -69,9 +69,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
:picker-options="pickerOptions"
></el-date-picker>
</el-form-item>
</el-form>
......@@ -267,6 +265,24 @@ export default {
},
data () {
return {
pickerOptions: {
shortcuts: [{
text: '最近三天',
onClick (picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
picker.$emit('pick', [start, end]);
}
}],
disabledDate: a => {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
}
},
formInline: {
barcode: '', // 条码号
inspectionFlag: null, // 检查结果选择
......@@ -401,14 +417,6 @@ export default {
this.jssj = null
}
},
// 当前时间之后的时间不选
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
......
src/views/zljc/jcxq.vue
......@@ -12,40 +12,119 @@
</el-radio-group>
</div>
<div class="headRight">
<el-button class='hg' v-if="roleArr.includes('D-1-9')">一键合格</el-button>
<el-button class="bhg">提交结果</el-button>
<el-button
class='hg'
@click="yjhg"
v-if="roleArr.includes('D-1-9')"
>一键合格</el-button>
<el-button :class="[personStatus!=null&&leftStatus!=null&&rightStatus!=null&&palmStatus!=null&&faceStatus!=null?'bhg':'jh']">提交结果</el-button>
</div>
</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="leftStatus===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="leftStatus===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='zsnyzw'&&leftStatus==null"
@click="tjZsNyzw1"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='zsnyzw'&&leftStatus==null"
@click="tjZsNyzw0"
>&#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="rightStatus===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="rightStatus===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='ysnyzw'&&rightStatus==null"
@click="tjYsNyzw1"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='ysnyzw'&&rightStatus==null"
@click="tjYsNyzw0"
>&#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="palmStatus===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="palmStatus===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='zw'&&palmStatus==null"
@click="tjZw1"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='zw'&&palmStatus==null"
@click="tjZw0"
>&#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="faceStatus===1"
>&#xe629;</span>
<span
class="iconfont sbColors"
v-if="faceStatus===0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
v-if="radio1=='rx'&&faceStatus==null"
@click="tjRx1"
>&#xe63e;</span>
<span
class="iconfont sbColor"
v-if="radio1=='rx'&&faceStatus==null"
@click="tjRx0"
>&#xe63f;</span>
</div>
</div>
......@@ -58,29 +137,39 @@
</div>
<div class="content">
<ryxx
ref="ryxx"
v-if="radio1=='ryxx'"
:rowData="rowData"
@personStatus="changePersonStatus($event)"
></ryxx>
<nyzw
v-if="radio1=='zsnyzw'"
ref="zsnyzw"
:radio1='radio1'
:rowData="rowData"
@leftStatus="changeLeftStatus($event)"
>
</nyzw>
<nyzw
v-if="radio1=='ysnyzw'"
ref="ysnyzw"
:radio1='radio1'
:rowData="rowData"
@rightStatus="changeRightStatus($event)"
>
</nyzw>
<zw
v-if="radio1=='zw'"
ref="zw"
:rowData="rowData"
@palmStatus='changePalmStatus($event)'
>
</zw>
<rx
v-if="radio1=='rx'"
ref='rx'
:rowData="rowData"
@faceStatus='changeFaceStatus($event)'
>
</rx>
......@@ -116,8 +205,120 @@ export default {
rowData: {
barcode: '', // 人员条码号
id: '', // 人员id
},
personStatus: null, // 人员检查结果
leftStatus: null,// 左手检查结果
rightStatus: null,// 右手检查结果
palmStatus: null, // 掌纹检查结果
faceStatus: null, // 人像检查结果
}
},
methods: {
// 人员信息提交
tjRyxx1 () {
this.$refs.ryxx.saveRyxx(1)
},
tjRyxx0 () {
this.$refs.ryxx.saveRyxx(0)
},
changePersonStatus (data) {
this.personStatus = data
},
// 左手指纹信息提交
tjZsNyzw1 () {
this.$refs.zsnyzw.saveZsNyAll(1)
},
tjZsNyzw0 () {
this.$refs.zsnyzw.saveZsNyAll(0)
},
changeLeftStatus (data) {
this.leftStatus = data
},
// 右手指纹信息提交
tjYsNyzw1 () {
this.$refs.ysnyzw.saveYsNyAll(1)
},
tjYsNyzw0 () {
this.$refs.ysnyzw.saveYsNyAll(0)
},
changeRightStatus (data) {
this.rightStatus = data
},
// 掌纹信息提交
tjZw1 () {
this.$refs.zw.saveZw(1)
},
tjZw0 () {
this.$refs.zw.saveZw(0)
},
changePalmStatus (data) {
this.palmStatus = data
},
// 人像信息提交
tjRx1 () {
this.$refs.rx.saveRx(1)
},
tjRx0 () {
this.$refs.rx.saveRx(0)
},
changeFaceStatus (data) {
this.faceStatus = data
},
// 一键合格
yjhg () {
let reqParam = {
personId: null, //人员id
type: 0, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
personStatus: 1, // 检查结果
// 左手
roll1Status: 1,
roll2Status: 1,
roll3Status: 1,
roll4Status: 1,
roll5Status: 1,
plain1Status: 1,
plain2Status: 1,
plain3Status: 1,
plain4Status: 1,
plain5Status: 1,
// 右手
roll6Status: 1,
roll7Status: 1,
roll8Status: 1,
roll9Status: 1,
roll10Status: 1,
plain6Status: 1,
plain7Status: 1,
plain8Status: 1,
plain9Status: 1,
plain10Status: 1,
// 掌纹
palm1Status: 1,
palm2Status: 1,
palm3Status: 1,
palm4Status: 1,
// 人像
face1Status: 1,
face2Status: 1,
face3Status: 1,
face4Status: 1,
}
reqParam.personId = this.rowData.id
this.$axios
.post("/api/zljc/result/save", reqParam)
.then((response) => {
console.log(response)
this.personStatus = response.data.ret.personStatus
this.leftStatus = response.data.ret.leftStatus
this.rightStatus = response.data.ret.rightStatus
this.palmStatus = response.data.ret.palmStatus
this.faceStatus = response.data.ret.faceStatus
this.$emit('personStatus', response.data.ret.personStatus)
})
}
}
}
</script>
......@@ -136,7 +337,7 @@ export default {
height: 100%;
.fixedBox {
position: absolute;
top: 0.5px;
top: 1px;
left: 0;
width: 100%;
background-color: #fff;
......@@ -178,6 +379,7 @@ export default {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
border: none;
}
/deep/.hg {
width: 96px;
......@@ -187,6 +389,11 @@ export default {
width: 96px;
background: #ff0039;
}
/deep/.jh {
width: 96px;
color: #aeafb4;
background: #ecedf1;
}
}
}
.headResults {
......
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=""
......@@ -139,8 +150,8 @@ export default {
},
created () {
console.log(this.rowData, '跳转参数人员信息')
// this.id = this.rowData.id
// this.barcode = this.rowData.barcode
this.id = this.rowData.id
this.barcode = this.rowData.barcode
// console.log(this.id, 'ididididid')
// this.getInfo()
......@@ -157,23 +168,100 @@ export default {
data () {
return {
// radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
id: '',
barcode: '',
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 },
],
leftStatus: null,// 左手检查结果
rightCheckedDescription: null,// 右手检查结果
leftCheckedDescription: null,// 左手检查结果
rightCheckedDescription: null,// 右手检查结果
}
},
methods: {
saveZsNyAll (e) { // 左手全部合格 全部不合格
let params = {
personId: null, //人员id
type: 2, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
leftCheckedDescription: '', // 左手检查描述
roll1Status: null,
roll2Status: null,
roll3Status: null,
roll4Status: null,
roll5Status: null,
plain1Status: null,
plain2Status: null,
plain3Status: null,
plain4Status: null,
plain5Status: null,
}
params.personId = this.id
params.roll1Status = e
params.roll2Status = e
params.roll3Status = e
params.roll4Status = e
params.roll5Status = e
params.plain1Status = e
params.plain2Status = e
params.plain3Status = e
params.plain4Status = e
params.plain5Status = e
this.$axios
.post("/api/zljc/result/save", params)
.then((response) => {
console.log(response)
this.leftStatus = response.data.ret.leftStatus
this.$emit('leftStatus', response.data.ret.leftStatus)
})
},
saveYsNyAll (e) { // 右手全部合格 全部不合格
let params = {
personId: null, //人员id
type: 3, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
rightCheckedDescription: '', // 右手检查描述
roll6Status: null,
roll7Status: null,
roll8Status: null,
roll9Status: null,
roll10Status: null,
plain6Status: null,
plain7Status: null,
plain8Status: null,
plain9Status: null,
plain10Status: null,
}
params.personId = this.id
params.roll6Status = e
params.roll7Status = e
params.roll8Status = e
params.roll9Status = e
params.roll10Status = e
params.plain6Status = e
params.plain7Status = e
params.plain8Status = e
params.plain9Status = e
params.plain10Status = e
this.$axios
.post("/api/zljc/result/save", params)
.then((response) => {
console.log(response)
this.rightStatus = response.data.ret.rightStatus
this.$emit('rightStatus', response.data.ret.rightStatus)
})
},
getPlainByBarcode () { // 人员平面压缩图
let self = this;
this.$axios
......@@ -309,9 +397,6 @@ export default {
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......@@ -360,6 +445,7 @@ export default {
box-sizing: border-box;
}
.imgbox {
position: relative;
width: 660px;
height: 554px;
// border-radius: 8px;
......@@ -370,6 +456,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,16 +84,21 @@ export default {
},
created () {
console.log(this.rowData, '跳转参数人员信息')
this.getPalmByBarcode()
this.id = this.rowData.id
this.barcode = this.rowData.barcode
this.getFaceByBarcode()
},
data () {
return {
// radio1: 'zsnyzw',// zsnyzw 左手，ysnyzw右手
id: '',
barcode: '',
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 },
],
faceStatus: null, // 人像检查结果
faceCheckedDescription: '', // 人像检查描述
}
},
methods: {
......@@ -107,9 +113,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;
}
});
});
......@@ -124,6 +135,31 @@ export default {
//console.log(error);
});
},
saveRx (e) {
let reqParam = {
personId: null, //人员id
type: 5, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
faceCheckedDescription: '', // 人像检查描述
face1Status: null,
face2Status: null,
face3Status: null,
face4Status: null,
}
reqParam.personId = this.id
reqParam.face1Status = e
reqParam.face2Status = e
reqParam.face3Status = e
reqParam.face4Status = e
this.$axios
.post("/api/zljc/result/save", reqParam)
.then((response) => {
console.log(response)
this.faceStatus = response.data.ret.faceStatus
this.$emit('faceStatus', response.data.ret.faceStatus)
})
},
showDetail (item) {
console.log(item)
},
......@@ -185,12 +221,17 @@ export default {
.w48 {
width: 48px;
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;
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......
src/views/zljc/modules/ryxx.vue
......@@ -453,7 +453,6 @@ export default {
console.log(this.rowData, '跳转参数人员信息')
this.id = this.rowData.id
this.barcode = this.rowData.barcode
// console.log(this.id, 'ididididid')
this.getInfo()
},
......@@ -504,11 +503,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 +525,25 @@ export default {
}
});
},
saveRyxx (e) {
let reqParam = {
personId: null, //人员id
type: 1, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
personCheckedDescription: '', // 检查说明
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)
this.personStatus = response.data.ret.personStatus
this.$emit('personStatus', response.data.ret.personStatus)
})
},
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"
......@@ -83,16 +84,21 @@ export default {
},
created () {
console.log(this.rowData, '跳转参数人员信息')
this.id = this.rowData.id
this.barcode = this.rowData.barcode
this.getPalmByBarcode()
},
data () {
return {
id: '',
barcode: '',
// 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 },
],
palmStatus: null, // 掌纹检查结果
palmCheckedDescription: '', // 检查描述
}
},
methods: {
......@@ -126,6 +132,30 @@ export default {
//console.log(error);
});
},
saveZw (e) {
let reqParam = {
personId: null, //人员id
type: 4, //用来判断人员、左手、右手页面传来，0代表全部，1代表从人员页面，2代表从左手页面，3代表从右手页面
palmCheckedDescription: '', // 检查描述
palm1Status: null,
palm2Status: null,
palm3Status: null,
palm4Status: null,
}
reqParam.personId = this.id
reqParam.palm1Status = e
reqParam.palm2Status = e
reqParam.palm3Status = e
reqParam.palm4Status = e
this.$axios
.post("/api/zljc/result/save", reqParam)
.then((response) => {
console.log(response)
this.palmStatus = response.data.ret.palmStatus
this.$emit('palmStatus', response.data.ret.palmStatus)
})
},
showDetail (item) {
console.log(item)
},
......@@ -190,9 +220,6 @@ export default {
}
}
}
.zw {
// background-color: #111;
}
}
/deep/ .el-carousel {
......
vue.config.js
......@@ -91,8 +91,8 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
target: "http://192.168.128.121:8099/", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.121:8099/", // 湖南-张
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......
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