Skip to content

F
founder_vue
Commit 43dba356 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 1c8a8fe6 0f7d5f9f
Showing with 2058 additions and 1656 deletions
.env.development
VUE_APP_AUTO_WRITE = dev VUE_APP_AUTO_WRITE = dev
VUE_APP_BB_IP = http://192.168.128.102:8075/ VUE_APP_BB_IP = http://192.168.128.103:8075/
\ No newline at end of file \ No newline at end of file
src/components/ImageEd.scss
...@@ -1402,7 +1402,7 @@ div { ...@@ -1402,7 +1402,7 @@ div {
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: -64px; top: -64px;
right: 59px; right: 140px;
width: 240px; width: 240px;
height: 82px; height: 82px;
background: #ffffff; background: #ffffff;
...@@ -1453,7 +1453,7 @@ div { ...@@ -1453,7 +1453,7 @@ div {
height: 64px; height: 64px;
padding: 0; padding: 0;
top: -40px; top: -40px;
right: 290px !important; right: 370px !important;
/deep/.tui-colorpicker-container { /deep/.tui-colorpicker-container {
width: 137px; width: 137px;
height: 64px; height: 64px;
...@@ -1478,7 +1478,7 @@ div { ...@@ -1478,7 +1478,7 @@ div {
height: 64px; height: 64px;
padding: 0; padding: 0;
top: -40px; top: -40px;
right: 200px !important; right: 280px !important;
/deep/.tui-colorpicker-container { /deep/.tui-colorpicker-container {
width: 137px; width: 137px;
height: 64px; height: 64px;
...@@ -1512,7 +1512,7 @@ div { ...@@ -1512,7 +1512,7 @@ div {
top: -120px; top: -120px;
} }
.color-filter { .color-filter {
right: 315px; right: 400px;
} }
.brightness { .brightness {
right: 0; right: 0;
......
src/components/ImageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-02-12 14:54:24 * @LastEditTime: 2022-02-14 15:16:35
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
--> -->
...@@ -374,38 +374,37 @@ ...@@ -374,38 +374,37 @@
<!-- <div class="pointer"></div> <!-- <div class="pointer"></div>
<div class="tzd"></div> --> <div class="tzd"></div> -->
<!-- 只显示匹配特征的位置 --> <!-- 只显示匹配特征的位置 -->
<!-- <div v-if="only_pptz"> <div v-if="only_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz && item.zwtzd_tzppzt==1&&only_pptz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz && item.tzppzt==1&&only_pptz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}" v-show="xstz && item.zwtzd_tzppzt==1&&only_pptz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}" v-show="xstz && item.tzppzt==1&&only_pptz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> </div>
<div v-else-if="all_pptz"> <div v-else-if="all_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&all_pptz}" v-show="xstz && all_pptz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> </div>
<div v-if="!only_pptz&&!all_pptz"> <div v-if="!only_pptz&&!all_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> --> </div>
<!-- 注释 -->
<!-- <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz"> <!-- <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_source" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_source+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_source-pixel_18+'px'}" v-show="xstz && xssz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}" <div class="auto_tzdDom" v-for="(item, i) in bdjqData_source" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_source+'px', top: item.zwtzd_tzyzb*height_ratio_source+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}"
v-show="xstz"> v-show="xstz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
...@@ -452,43 +451,43 @@ ...@@ -452,43 +451,43 @@
<div class="tzdDrawing_2_target"></div> <div class="tzdDrawing_2_target"></div>
<div class="tzdDrawing_target"> <div class="tzdDrawing_target">
<!-- <div class="pointer"></div> --> <!-- <div class="pointer"></div> -->
<!-- <div v-if="only_pptz"> <div v-if="only_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz && item.zwtzd_tzppzt==1&&only_pptz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz && item.tzppzt==1&&only_pptz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&only_pptz}" v-show="xstz && item.zwtzd_tzppzt==1&&only_pptz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&only_pptz}" v-show="xstz && item.tzppzt==1&&only_pptz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> </div>
<div v-else-if="all_pptz"> <div v-else-if="all_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.zwtzd_tzppzt==1&&all_pptz}" v-show="xstz && all_pptz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" :class="{pptz: item.tzppzt==1&&all_pptz}" v-show="xstz && all_pptz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> </div>
<div v-if="!only_pptz&&!all_pptz"> <div v-if="!only_pptz&&!all_pptz">
<div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz"> <div class="auto_tzdDom_number" v-for="(item, i) in bdjqData_target" :key="i+'number'" :style="{left: item.zwtzd_tzxzb*width_ratio_target+pixel_8+'px', top: item.zwtzd_tzyzb*height_ratio_target-pixel_18+'px'}" v-show="xstz && xssz">
{{item.zwtzd_tzppbs}} {{item.tzppbs}}
</div> </div>
<div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz"> <div class="auto_tzdDom" v-for="(item, i) in bdjqData_target" :key="i" :style="{left: item.zwtzd_tzxzb*width_ratio_target+'px', top: item.zwtzd_tzyzb*height_ratio_target+'px', transform: 'rotate('+-item.zwtzd_tzfx+'deg)'}" v-show="xstz">
<div class="head"></div> <div class="head"></div>
<div class="direction" v-show="xsfx"></div> <div class="direction" v-show="xsfx"></div>
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
<div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div> <div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div>
<div class="shade_target" v-show="type=='source'" @click.self="targetEdit"></div> <div class="shade_target" v-show="type=='source'" @click.self="targetEdit"></div>
</div> </div>
</div> </div>
<div class="lt_main_footer"> <div class="lt_main_footer" style="padding-left: 4.375rem;">
<!-- <div class="btn" :class="{grayActive: isGrayActive}" @click.stop="changeGray">灰度</div> --> <!-- <div class="btn" :class="{grayActive: isGrayActive}" @click.stop="changeGray">灰度</div> -->
<div class="btn" :class="{vintageActive: isVintageActive}" @click.stop="changeVintage">棕褐色</div> <div class="btn" :class="{vintageActive: isVintageActive}" @click.stop="changeVintage">棕褐色</div>
<div class="btn" :class="{horseshoeMirrorActive: isHorseshoeMirrorActive}" @click.stop="changeHorseshoeMirror"> <div class="btn" :class="{horseshoeMirrorActive: isHorseshoeMirrorActive}" style="display: none;" @click.stop="changeHorseshoeMirror">
马蹄镜 马蹄镜
</div> </div>
<div class="btn" :class="{equalizationActive: isEqualizationActive}" @click.stop="changeEqualization">均衡化</div> <div class="btn" :class="{equalizationActive: isEqualizationActive}" @click.stop="changeEqualization">均衡化</div>
...@@ -599,7 +598,7 @@ const bdjqData = { ...@@ -599,7 +598,7 @@ const bdjqData = {
zwTxzl: null, zwTxzl: null,
zwTxsj: null, zwTxsj: null,
fpt5TraitMinutiaList: null, fpt5TraitMinutiaList: null,
zw_pptzxzjd: 90, pptzxzjd: 90,
fpt5TraitMinutiaSet: { fpt5TraitMinutiaSet: {
minutia: [ minutia: [
{ {
...@@ -607,32 +606,32 @@ const bdjqData = { ...@@ -607,32 +606,32 @@ const bdjqData = {
zwtzd_tzxzb: "211.69230769230768", zwtzd_tzxzb: "211.69230769230768",
zwtzd_tzyzb: "228.51282051282053", zwtzd_tzyzb: "228.51282051282053",
zwtzd_tzfx: "320", zwtzd_tzfx: "320",
zwtzd_tzppzt: 1, tzppzt: 1,
zwtzd_tzppbs: 1 tzppbs: 1
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "320.8205128205128", zwtzd_tzxzb: "320.8205128205128",
zwtzd_tzyzb: "216.2051282051282", zwtzd_tzyzb: "216.2051282051282",
zwtzd_tzfx: "251", zwtzd_tzfx: "251",
zwtzd_tzppzt: null, tzppzt: null,
zwtzd_tzppbs: null tzppbs: null
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "452.1025641025641", zwtzd_tzxzb: "452.1025641025641",
zwtzd_tzyzb: "299.0769230769231", zwtzd_tzyzb: "299.0769230769231",
zwtzd_tzfx: "260", zwtzd_tzfx: "260",
zwtzd_tzppzt: 1, tzppzt: 1,
zwtzd_tzppbs: 3 tzppbs: 3
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "332.3076923076923", zwtzd_tzxzb: "332.3076923076923",
zwtzd_tzyzb: "294.97435897435895", zwtzd_tzyzb: "294.97435897435895",
zwtzd_tzfx: "305", zwtzd_tzfx: "305",
zwtzd_tzppzt: 0, tzppzt: 0,
zwtzd_tzppbs: 4 tzppbs: 4
}, },
] ]
} }
...@@ -680,7 +679,7 @@ const bdjqData = { ...@@ -680,7 +679,7 @@ const bdjqData = {
zwTxzl: null, zwTxzl: null,
zwTxsj: null, zwTxsj: null,
fpt5TraitMinutiaList: null, fpt5TraitMinutiaList: null,
zw_pptzxzjd: 45, pptzxzjd: 45,
fpt5TraitMinutiaSet: { fpt5TraitMinutiaSet: {
minutia: [ minutia: [
{ {
...@@ -688,32 +687,32 @@ const bdjqData = { ...@@ -688,32 +687,32 @@ const bdjqData = {
zwtzd_tzxzb: "325.7313432835821", zwtzd_tzxzb: "325.7313432835821",
zwtzd_tzyzb: "174.80597014925374", zwtzd_tzyzb: "174.80597014925374",
zwtzd_tzfx: "270", zwtzd_tzfx: "270",
zwtzd_tzppzt: 1, tzppzt: 1,
zwtzd_tzppbs: 1 tzppbs: 1
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "188.17910447761193", zwtzd_tzxzb: "188.17910447761193",
zwtzd_tzyzb: "375.4029850746269", zwtzd_tzyzb: "375.4029850746269",
zwtzd_tzfx: "293.16887978511846", zwtzd_tzfx: "293.16887978511846",
zwtzd_tzppzt: 0, tzppzt: 0,
zwtzd_tzppbs: 2 tzppbs: 2
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "196.77611940298507", zwtzd_tzxzb: "196.77611940298507",
zwtzd_tzyzb: "430.8059701492537", zwtzd_tzyzb: "430.8059701492537",
zwtzd_tzfx: "311.24960709400705", zwtzd_tzfx: "311.24960709400705",
zwtzd_tzppzt: 0, tzppzt: 0,
zwtzd_tzppbs: 3 tzppbs: 3
}, },
{ {
zwtzdTzzl: null, zwtzdTzzl: null,
zwtzd_tzxzb: "233.07462686567163", zwtzd_tzxzb: "233.07462686567163",
zwtzd_tzyzb: "226.38805970149255", zwtzd_tzyzb: "226.38805970149255",
zwtzd_tzfx: "312.33540187620036", zwtzd_tzfx: "312.33540187620036",
zwtzd_tzppzt: 1, tzppzt: 1,
zwtzd_tzppbs: 4 tzppbs: 4
}, },
] ]
} }
...@@ -997,7 +996,7 @@ export default { ...@@ -997,7 +996,7 @@ export default {
// 特殊显示匹配特征的位置 // 特殊显示匹配特征的位置
all_pptz: false, all_pptz: false,
// 根据特征匹配旋正旋转角度 // 根据特征匹配旋正旋转角度
zw_pptzxzjd: 0 pptzxzjd: 0
}; };
}, },
components: { components: {
...@@ -2661,6 +2660,11 @@ export default { ...@@ -2661,6 +2660,11 @@ export default {
self.showType = showType self.showType = showType
}) })
// 获取传递过来的 源条码号，源指位号，目标条码号，目标指位号
this.$bus.on('target_info', (target_info) => {
console.log(target_info);
self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target)
})
}, },
methods: { methods: {
/** /**
...@@ -2681,9 +2685,9 @@ export default { ...@@ -2681,9 +2685,9 @@ export default {
this.bdjqData_target = bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet.minutia this.bdjqData_target = bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet.minutia
} }
if(bdjqData.ret.personDestFingerTrait && bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet && bdjqData.ret.personDestFingerTrait.fingerMsg) { if(bdjqData.ret.personDestFingerTrait && bdjqData.ret.personDestFingerTrait.fingerMsg.fpt5TraitMinutiaSet && bdjqData.ret.personDestFingerTrait.fingerMsg) {
this.zw_pptzxzjd = bdjqData.ret.personDestFingerTrait.fingerMsg.zw_pptzxzjd this.pptzxzjd = bdjqData.ret.personDestFingerTrait.fingerMsg.pptzxzjd
} }
console.log(this.zw_pptzxzjd); console.log(this.pptzxzjd);
console.log(this.bdjqData_source); console.log(this.bdjqData_source);
console.log(this.bdjqData_target); console.log(this.bdjqData_target);
} else { } else {
...@@ -3390,11 +3394,14 @@ export default { ...@@ -3390,11 +3394,14 @@ export default {
features6Change () { features6Change () {
// this.features6 = !this.features6 // this.features6 = !this.features6
this.features6 = true this.features6 = true
console.log(11111); let canvasImage = this.imageEditor2._graphics.getCanvasImage();
this.rotateImage_target(this.zw_pptzxzjd); console.log(canvasImage);
if(canvasImage.angle == this.pptzxzjd) {
return;
}
this.rotateImage_target(this.pptzxzjd);
// 旋转操作会存入撤销堆，需要保证历史记录顺序 // 旋转操作会存入撤销堆，需要保证历史记录顺序
this.historys2.unshift('旋转') this.historys2.unshift('旋转')
// zw_pptzxzjd
}, },
/** /**
* 恢复按钮按下事件 * 恢复按钮按下事件
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
...@@ -175,11 +175,10 @@ export default { ...@@ -175,11 +175,10 @@ export default {
barcode.push(this.rowData[i].followCase.barcode) barcode.push(this.rowData[i].followCase.barcode)
} }
} }
let reqParam = { let reqParam = {
barcode: '', //条码号 barcode: '', //条码号
seqNo: [],// 指纹序号 seqNo: [],// 指纹序号
palmNo: [], // 掌纹序号
imageType: '',// 数据类型（原图） imageType: '',// 数据类型（原图）
baseMsg: null, // 基本信息 1导出 0不导出 baseMsg: null, // 基本信息 1导出 0不导出
featureFlag: null, // 导出特征 1导出 0不导出 featureFlag: null, // 导出特征 1导出 0不导出
...@@ -188,9 +187,22 @@ export default { ...@@ -188,9 +187,22 @@ export default {
reqParam.barcode = barcode reqParam.barcode = barcode
if (barcode.length > 1) { if (barcode.length > 1) {
reqParam.seqNo = [] reqParam.seqNo = null
reqParam.palmNo = null
} else { } else {
reqParam.seqNo = this.checkedTargets let self = this
console.log(this.checkedTargets, ' this.checkedTargets')
self.checkedTargets.map(item => {
console.log(item)
if (item <= 99) {
reqParam.seqNo.push(item)
} else {
reqParam.palmNo.push(item)
}
})
// reqParam.seqNo = this.checkedTargets
} }
reqParam.imageType = this.sjlx reqParam.imageType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0; reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
......
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: 2022-01-19 14:48:31 * @LastEditTime: 2022-02-14 15:02:30
* @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
...@@ -174,7 +174,8 @@ export default { ...@@ -174,7 +174,8 @@ export default {
// 如果请求过就不再请求 // 如果请求过就不再请求
if (self.isHandRequest) { if (self.isHandRequest) {
if (self.hands.length > 0) { 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 }) // this.$bus.emit('ajzwbjImage', { finger_image: self.hands[0].image, finger_dealFlag: self.hands[0].dealFlag, finger_position: self.hands[0].finger_position })
self.HandChange(self.hands[0])
} else { } else {
self.$bus.emit('ajzwbjImage', 'xxx') self.$bus.emit('ajzwbjImage', 'xxx')
} }
...@@ -360,12 +361,13 @@ export default { ...@@ -360,12 +361,13 @@ export default {
// 请求掌纹数据 // 请求掌纹数据
this.getHandsData() this.getHandsData()
if (this.hands && this.hands.length > 0) { if (this.hands && this.hands.length > 0) {
this.activeHand = this.hands[0].seq // this.activeHand = this.hands[0].seq
this.HandChange(this.hands[0])
} }
this.$bus.emit('ajzwbjType', '掌纹') this.$bus.emit('ajzwbjType', '掌纹')
this.$bus.emit('ajzwbjTDZ')
} else { } else {
this.$bus.emit('ajzwbjType', '指纹') this.$bus.emit('ajzwbjType', '指纹')
this.$bus.emit('ajzwbjTDZ')
if (this.fingers.length > 0) { if (this.fingers.length > 0) {
this.FingersChange(0, this.fingers[0]) this.FingersChange(0, this.fingers[0])
} }
......
src/views/Editor/modules/imageEdAJ.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-02-11 17:29:15 * @LastEditTime: 2022-02-14 14:47:12
* @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
...@@ -1853,7 +1853,7 @@ export default { ...@@ -1853,7 +1853,7 @@ export default {
).then(res => { }).catch(err => { }) ).then(res => { }).catch(err => { })
return return
} }
// console.log(self.seq); console.log(self.seq);
// console.log(sessionStorage.getItem(self.seq)); // console.log(sessionStorage.getItem(self.seq));
// console.log(ajzwbjImage); // console.log(ajzwbjImage);
let sourceImage = ajzwbjImage.finger_image let sourceImage = ajzwbjImage.finger_image
......
src/views/bzxxgl/fhxxLL.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 17:02:00 * @LastEditTime: 2022-02-14 16:07:23
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
--> -->
<template> <template>
<div class="fhxxLT fhxxLL" id="fhxxLL"> <div class="fhxxLT fhxxLL" id="fhxxLL">
<div class="fhxxLTDom" :class="{ bzActive: loading_sd}"> <div class="fhxxLTDom" :class="{ bzActive: loading_sd}">
<div class="fhxxLT-left"> <div class="fhxxLT-left">
<div class="line-imageEd"></div> <div class="line-imageEd"></div>
<ImageEd class="fhxxLT-imageEd"></ImageEd> <ImageEd class="fhxxLT-imageEd"></ImageEd>
</div> </div>
<div class="fhxxLT-right"> <div class="fhxxLT-right">
<div class="fhxx-top"> <div class="fhxx-top">
<div class="fhxx-title">{{getShOrFhName()}}信息-串查</div> <div class="fhxx-title">{{getShOrFhName()}}信息-串查</div>
<div class="scroll-content"> <div class="scroll-content">
<div class="fhxx-top-top"> <div class="fhxx-top-top">
<div class="fhxx-top-top-left"> <div class="fhxx-top-top-left">
<div class="fhxx-top-top-left-title"> <div class="fhxx-top-top-left-title">
<div class="title-line"></div> <div class="title-line"></div>
<div class="title-name">案件信息</div> <div class="title-name">案件信息</div>
</div> </div>
<div class="fhxx-top-top-left-content"> <div class="fhxx-top-top-left-content">
<div class="content-item"> <div class="content-item">
<div class="label-name">案事件编号：</div> <div class="label-name">案事件编号：</div>
<div class="label-value">{{allData.ysxtAsjbh}}</div> <div class="label-value">{{allData.ysxtAsjbh}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">现场勘验编号：</div> <div class="label-name">现场勘验编号：</div>
<div class="label-value">{{allData.xckybh}}</div> <div class="label-value">{{allData.xckybh}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案发地点：</div> <div class="label-name">案发地点：</div>
<el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" placement="top">
placement="top"> <div class="label-value">{{allData.asjfsddDzmc}}</div>
<div class="label-value">{{allData.asjfsddDzmc}}</div> </el-tooltip>
</el-tooltip> </div>
</div> <div class="content-item">
<div class="content-item"> <div class="label-name">发案日期：</div>
<div class="label-name">发案日期：</div> <div class="label-value">{{allData.farq &&
<div class="label-value">{{allData.farq &&
$moment(allData.farq).format('YYYY-MM-DD HH:mm:ss')}} $moment(allData.farq).format('YYYY-MM-DD HH:mm:ss')}}
</div> </div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">现场指纹枚数：</div> <div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.lathpcount}}枚</div> <div class="label-value">{{allData.lathpcount}}枚</div>
</div> </div>
<!-- <div class="content-item"> <!-- <div class="content-item">
<div class="label-name">案件名称：</div> <div class="label-name">案件名称：</div>
<div class="label-value">{{allData.ajmc}}</div> <div class="label-value">{{allData.ajmc}}</div>
</div> --> </div> -->
<div class="content-item"> <div class="content-item">
<div class="label-name">案件类别：</div> <div class="label-name">案件类别：</div>
<el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" <el-tooltip class="item" effect="dark" :content="allData.asjfsddDzmc" placement="top">
placement="top"> <div class="label-value">{{allData.asjfsddDzmc}}</div>
<div class="label-value">{{allData.asjfsddDzmc}}</div> </el-tooltip>
</el-tooltip> </div>
</div> <div class="content-item">
<div class="content-item"> <div class="label-name">源逻辑库：</div>
<div class="label-name">源逻辑库：</div> <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
<el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
placement="top"> </el-tooltip>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div> </div>
</el-tooltip> <!-- <div class="content-item">
</div>
<!-- <div class="content-item">
<div class="label-name">案件级别：</div> <div class="label-name">案件级别：</div>
<div class="label-value">{{allData.ajjb}}</div> <div class="label-value">{{allData.ajjb}}</div>
</div> --> </div> -->
<div class="content-area content-area4"> <div class="content-area content-area4">
<el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
disabled> </el-input>
</el-input> </div>
</div> </div>
</div> </div>
</div> <div class="fhxx-top-top-right">
<div class="fhxx-top-top-right"> <div class="fhxx-top-top-left-title">
<div class="fhxx-top-top-left-title"> <div class="title-line"></div>
<div class="title-line"></div> <div class="title-name">案件信息</div>
<div class="title-name">案件信息</div> </div>
</div> <div class="fhxx-top-top-left-content">
<div class="fhxx-top-top-left-content"> <div class="content-item">
<div class="content-item"> <div class="label-name">案事件编号：</div>
<div class="label-name">案事件编号：</div> <div class="label-value">{{allData.destYsxtAsjbh}}</div>
<div class="label-value">{{allData.destYsxtAsjbh}}</div> </div>
</div> <div class="content-item">
<div class="content-item"> <div class="label-name">现场勘验编号：</div>
<div class="label-name">现场勘验编号：</div> <div class="label-value">{{allData.destXckybh}}</div>
<div class="label-value">{{allData.destXckybh}}</div> </div>
</div> <div class="content-item">
<div class="content-item"> <div class="label-name">案发地点：</div>
<div class="label-name">案发地点：</div> <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
<el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
placement="top"> </el-tooltip>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div> </div>
</el-tooltip> <div class="content-item">
</div> <div class="label-name">发案日期：</div>
<div class="content-item"> <div class="label-value">{{allData.destFarq &&
<div class="label-name">发案日期：</div>
<div class="label-value">{{allData.destFarq &&
$moment(allData.destFarq).format('YYYY-MM-DD HH:mm:ss')}} $moment(allData.destFarq).format('YYYY-MM-DD HH:mm:ss')}}
</div> </div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">现场指纹枚数：</div> <div class="label-name">现场指纹枚数：</div>
<div class="label-value">{{allData.destLathpcount}}枚</div> <div class="label-value">{{allData.destLathpcount}}枚</div>
</div> </div>
<!-- <div class="content-item"> <!-- <div class="content-item">
<div class="label-name">案件名称：</div> <div class="label-name">案件名称：</div>
<div class="label-value">{{allData.destAjmc}}</div> <div class="label-value">{{allData.destAjmc}}</div>
</div> --> </div> -->
<div class="content-item"> <div class="content-item">
<div class="label-name">案件类别：</div> <div class="label-name">案件类别：</div>
<el-tooltip class="item" effect="dark" :content="allData.destAjlb" <el-tooltip class="item" effect="dark" :content="allData.destAjlb" placement="top">
placement="top"> <div class="label-value">{{allData.destAjlb}}</div>
<div class="label-value">{{allData.destAjlb}}</div> </el-tooltip>
</el-tooltip> </div>
</div> <div class="content-item">
<div class="content-item"> <div class="label-name">源逻辑库：</div>
<div class="label-name">源逻辑库：</div> <el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" placement="top">
<el-tooltip class="item" effect="dark" :content="allData.srcLogicDatabaseName" <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
placement="top"> </el-tooltip>
<div class="label-value">{{allData.srcLogicDatabaseName}}</div> </div>
</el-tooltip> <!-- <div class="content-item">
</div>
<!-- <div class="content-item">
<div class="label-name">案件级别：</div> <div class="label-name">案件级别：</div>
<div class="label-value">{{allData.destAjjb}}</div> <div class="label-value">{{allData.destAjjb}}</div>
</div> --> </div> -->
<div class="content-area content-area4"> <div class="content-area content-area4">
<el-input type="textarea" :rows="3" placeholder="暂无内容" <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.destJyaq" disabled>
v-model="allData.destJyaq" disabled> </el-input>
</el-input> </div>
</div>
</div>
</div>
</div>
<div class="fhxx-top-line"></div>
<div class="fhxx-top-bottom">
<div class="fhxx-top-top-left-title">
<div class="title-line"></div>
<div class="title-name">案件信息</div>
</div>
<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.xczwxh}}</div>
</div>
<div class="content-item">
<div class="label-name">比中单位：</div>
<div class="label-value">{{allData.bzdwGajgmc}}</div>
</div>
<div class="content-item">
<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.bzsj &&
$moment(allData.bzsj).format('YYYY-MM-DD HH:mm:ss')}}
</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.bzxxXczwxh}}</div>
</div>
<div class="content-item">
<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.bzrGmsfhm}}</div>
</div>
<div class="content-item">
<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>
</el-input>
</div>
</div>
</div>
</div> </div>
<div class="fhxx-bottom"> </div>
<div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> </div>
<div class="fhxx-bottom-textarea"> <div class="fhxx-top-line"></div>
<el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj"> <div class="fhxx-top-bottom">
</el-input> <div class="fhxx-top-top-left-title">
<div class="title-line"></div>
<div class="title-name">案件信息</div>
</div>
<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.xczwxh}}</div>
</div>
<div class="content-item">
<div class="label-name">比中单位：</div>
<div class="label-value">{{allData.bzdwGajgmc}}</div>
</div>
<div class="content-item">
<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.bzsj &&
$moment(allData.bzsj).format('YYYY-MM-DD HH:mm:ss')}}
</div> </div>
</div>
</div> </div>
<div class="fhxx-btns"> <div class="fhxx-top-bottom-right">
<div class="pass" @click="gotoProgress(true)">通过</div> <div class="content-item">
<div class="no-pass" @click="gotoProgress(false)">未通过</div> <div class="label-name red">序号：</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div> <div class="label-value red">{{allData.bzxxXczwxh}}</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top"> </div>
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div> <div class="content-item">
</el-tooltip> <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.bzrGmsfhm}}</div>
</div>
<div class="content-item">
<div class="label-name">比中人联系电话：</div>
<div class="label-value">{{allData.bzrLxdh}}</div>
</div>
</div> </div>
</div>
<div class="bzxx-textarea">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="allData.bzbz" disabled>
</el-input>
</div>
</div> </div>
</div> </div>
<!-- 确认解除 --> <div class="fhxx-bottom">
<div class="relieveDialog" v-show="isRelieveVisible"> <!-- <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> -->
<div class="close"> <div class="fhxx-bottom-textarea">
<i class="iconfont icon-danchuangguanbianniu" @click="isRelieveVisible=false"></i> <el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj">
</div> </el-input>
<div class="desc">是否确认解除比中关系？</div>
<div class="btns">
<div class="btn confirmBtn" @click="confirmRelieveChange">确认</div>
<div class="btn cancelBtn" @click="isRelieveVisible=false">取消</div>
</div>
</div>
<!-- 加载动画 -->
<div class="loading" v-show="loading_sd">
<div class="loading-finger">
<img src="@/assets/img/loadingfinger.gif" alt="" />
</div>
<div class="loading-name">
<img src="@/assets/img/loadingtxt.gif" alt="" />
</div> </div>
</div>
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div>
</div> </div>
</div>
</div>
<!-- 确认解除 -->
<div class="relieveDialog" v-show="isRelieveVisible">
<div class="close">
<i class="iconfont icon-danchuangguanbianniu" @click="isRelieveVisible=false"></i>
</div>
<div class="desc">是否确认解除比中关系？</div>
<div class="btns">
<div class="btn confirmBtn" @click="confirmRelieveChange">确认</div>
<div class="btn cancelBtn" @click="isRelieveVisible=false">取消</div>
</div>
</div> </div>
<!-- 加载动画 -->
<div class="loading" v-show="loading_sd">
<div class="loading-finger">
<img src="@/assets/img/loadingfinger.gif" alt="" />
</div>
<div class="loading-name">
<img src="@/assets/img/loadingtxt.gif" alt="" />
</div>
</div>
</div>
</template> </template>
<script> <script>
import {mapState} from 'vuex' import { mapState } from 'vuex'
import ImageEd from '@/components/ImageEd.vue' import ImageEd from '@/components/ImageEd.vue'
export default { export default {
name: 'fhxxLT', name: 'fhxxLT',
data() { data () {
return { return {
isRelieveVisible: false, isRelieveVisible: false,
fhyj: '', fhyj: '',
...@@ -290,7 +282,7 @@ export default { ...@@ -290,7 +282,7 @@ export default {
formData: null formData: null
} }
}, },
mounted() { mounted () {
this.$bus.emit('suoluetu', '指纹') this.$bus.emit('suoluetu', '指纹')
if (localStorage.getItem('userInfo')) { if (localStorage.getItem('userInfo')) {
this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name
...@@ -308,7 +300,7 @@ export default { ...@@ -308,7 +300,7 @@ export default {
loading_sd: (state) => state.loading.loading_sd, loading_sd: (state) => state.loading.loading_sd,
}), }),
}, },
async created() { async created () {
this.id = this.$route.params.id this.id = this.$route.params.id
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
...@@ -323,12 +315,12 @@ export default { ...@@ -323,12 +315,12 @@ export default {
if (this.$route.query.shxx) { if (this.$route.query.shxx) {
this.shxx = JSON.parse(this.$route.query.shxx) this.shxx = JSON.parse(this.$route.query.shxx)
} }
logger.info("$route-LL",this.$route) logger.info("$route-LL", this.$route)
this.getData() this.getData()
}, },
methods: { methods: {
getShOrFhName() { getShOrFhName () {
let _that = this let _that = this
if (_that.isFromSh === 'true') { if (_that.isFromSh === 'true') {
return _that.isSh === 'true' ? '审核' : '复核' return _that.isSh === 'true' ? '审核' : '复核'
...@@ -339,7 +331,7 @@ export default { ...@@ -339,7 +331,7 @@ export default {
/** /**
* 获取指纹（案件）图片 * 获取指纹（案件）图片
*/ */
getFingerPic() { getFingerPic () {
let self = this let self = this
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -383,7 +375,7 @@ export default { ...@@ -383,7 +375,7 @@ export default {
/** /**
* 確認解除比中关系 * 確認解除比中关系
*/ */
confirmRelieveChange() { confirmRelieveChange () {
let self = this let self = this
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -417,10 +409,10 @@ export default { ...@@ -417,10 +409,10 @@ export default {
/** /**
* 解除比中关系 * 解除比中关系
*/ */
relieveChange() { relieveChange () {
this.isRelieveVisible = true this.isRelieveVisible = true
}, },
gotoProgress(isPass) {// 进入处理逻辑 gotoProgress (isPass) {// 进入处理逻辑
let _that = this let _that = this
if (!isPass && !_that.fhyj) { if (!isPass && !_that.fhyj) {
this.$message.error('请填写不通过意见！') this.$message.error('请填写不通过意见！')
...@@ -455,7 +447,7 @@ export default { ...@@ -455,7 +447,7 @@ export default {
/** /**
* 未通过 * 未通过
*/ */
noPassChange() { noPassChange () {
let self = this let self = this
if (self.isFromSh === 'true') { if (self.isFromSh === 'true') {
self.doSh(false) self.doSh(false)
...@@ -495,7 +487,7 @@ export default { ...@@ -495,7 +487,7 @@ export default {
/** /**
* 通过 * 通过
*/ */
passChange() { passChange () {
let self = this let self = this
if (self.isFromSh === 'true') { if (self.isFromSh === 'true') {
self.doSh(true) self.doSh(true)
...@@ -535,7 +527,7 @@ export default { ...@@ -535,7 +527,7 @@ export default {
/** /**
* 获取数据 * 获取数据
*/ */
getData() { getData () {
let self = this let self = this
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -566,7 +558,7 @@ export default { ...@@ -566,7 +558,7 @@ export default {
}) })
}, },
doSh(isPass) { doSh (isPass) {
let TITLE = '审核' let TITLE = '审核'
let _that = this let _that = this
var ruleForm = {} var ruleForm = {}
...@@ -601,7 +593,7 @@ export default { ...@@ -601,7 +593,7 @@ export default {
}) })
} }
}).catch(err => { }).catch(err => {
}) })
}, },
}, },
......
src/views/bzxxgl/fhxxLT.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 16:49:16 * @LastEditTime: 2022-02-14 15:36:41
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -609,6 +609,8 @@ export default { ...@@ -609,6 +609,8 @@ export default {
sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh) sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
sessionStorage.setItem('destseqno', this.allData.bzxxZwXh) sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh) sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: this.allData.ysxtAsjbh, seq_source: this.allData.bzxxXh, barcode_target: this.allData.ysxtAsjxgrybh, seq_target: this.allData.bzxxZwXh})
} }
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
......
src/views/bzxxgl/fhxxTL.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 16:47:39 * @LastEditTime: 2022-02-14 16:08:52
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -187,21 +187,21 @@ ...@@ -187,21 +187,21 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div class="fhxx-bottom">
<div class="fhxx-bottom"> <!-- <div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> -->
<div class="fhxx-bottom-title">{{getShOrFhName()}}意见</div> <div class="fhxx-bottom-textarea">
<div class="fhxx-bottom-textarea"> <el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj">
<el-input type="textarea" :rows="3" placeholder="在此输入意见" v-model="fhyj"> </el-input>
</el-input> </div>
</div>
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div> </div>
</div>
<div class="fhxx-btns">
<div class="pass" @click="gotoProgress(true)">通过</div>
<div class="no-pass" @click="gotoProgress(false)">未通过</div>
<div v-show="!isFromSh && jcbzFlag" class="relieve" @click="relieveChange">解除比中关系</div>
<el-tooltip class="item" effect="dark" content="只有认定人才能解除比中关系" placement="top">
<div v-show="!isFromSh && !jcbzFlag" class="relieve jcbzFlag">解除比中关系</div>
</el-tooltip>
</div> </div>
</div> </div>
</div> </div>
...@@ -229,434 +229,434 @@ ...@@ -229,434 +229,434 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex' import { mapState } from 'vuex'
import ImageEd from '@/components/ImageEd.vue' import ImageEd from '@/components/ImageEd.vue'
export default { export default {
name: 'fhxxLT', name: 'fhxxLT',
data() { data () {
return { return {
// 確認解除彈窗 // 確認解除彈窗
isRelieveVisible: false, isRelieveVisible: false,
id: '', id: '',
fhyj: '', fhyj: '',
allData: { allData: {
ysxtAsjbh: '', ysxtAsjbh: '',
ysxtAsjxgrybh: '', ysxtAsjxgrybh: '',
xckybh: '', xckybh: '',
asjfsddDzmc: '', asjfsddDzmc: '',
farq: '', farq: '',
lathpcount: '', lathpcount: '',
ajmc: '', ajmc: '',
ajlb: '', ajlb: '',
srcLogicDatabaseName: '', srcLogicDatabaseName: '',
ajjb: '', ajjb: '',
jyaq: '', jyaq: '',
xm: '', xm: '',
bmch: '', bmch: '',
xb: '', xb: '',
mz: '', mz: '',
jgmc: '', jgmc: '',
csrq: '', csrq: '',
personAjlb: '', personAjlb: '',
destLogicDatabaseName: '', destLogicDatabaseName: '',
xzzDzmc: '', xzzDzmc: '',
hjdzDzmc: '', hjdzDzmc: '',
personBz: '', personBz: '',
bzxxXh: '', bzxxXh: '',
bzdwGajgmc: '', bzdwGajgmc: '',
bzdwGajgjgdm: '', bzdwGajgjgdm: '',
bzsj: '', bzsj: '',
bzxxZw: '', bzxxZw: '',
bzxxZwXh: '', bzxxZwXh: '',
bzrXm: '', bzrXm: '',
bzrGmsfhm: '', bzrGmsfhm: '',
bzrLxdh: '', bzrLxdh: '',
bzbz: '' bzbz: ''
}, },
isFromSh: false, isFromSh: false,
curLevel: -1, curLevel: -1,
isSh: false, isSh: false,
shxx: '', shxx: '',
// 比中人姓名 // 比中人姓名
bzrName: '', bzrName: '',
// userid // userid
userId: JSON.parse(localStorage.getItem('userInfo')).user.id, userId: JSON.parse(localStorage.getItem('userInfo')).user.id,
// 是否可以解除比中关系 // 是否可以解除比中关系
jcbzFlag: false, jcbzFlag: false,
// 查询参数 // 查询参数
formData: null formData: null
} }
}, },
components: { components: {
ImageEd, ImageEd,
}, },
computed: { computed: {
...mapState({ ...mapState({
loading_sd: (state) => state.loading.loading_sd, loading_sd: (state) => state.loading.loading_sd,
}), }),
}, },
mounted() { mounted () {
this.$bus.emit('suoluetu', '指纹') this.$bus.emit('suoluetu', '指纹')
if (localStorage.getItem('userInfo')) { if (localStorage.getItem('userInfo')) {
this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name this.bzrName = JSON.parse(localStorage.getItem('userInfo')).user.name
} }
if (this.$route.query.formData) { if (this.$route.query.formData) {
this.formData = this.$route.query.formData this.formData = this.$route.query.formData
} }
}, },
created() { created () {
this.id = this.$route.params.id this.id = this.$route.params.id
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
} }
if (this.$route.query.isSh) { if (this.$route.query.isSh) {
this.isSh = this.$route.query.isSh this.isSh = this.$route.query.isSh
} }
if (this.$route.query.level) { if (this.$route.query.level) {
this.curLevel = this.$route.query.level this.curLevel = this.$route.query.level
} }
if (this.$route.query.shxx) { if (this.$route.query.shxx) {
this.shxx = JSON.parse(this.$route.query.shxx) this.shxx = JSON.parse(this.$route.query.shxx)
} }
logger.info("$route-TL", this.$route) logger.info("$route-TL", this.$route)
this.getData() this.getData()
},
methods: {
getShOrFhName () {
let _that = this
if (_that.isFromSh === 'true') {
return _that.isSh === 'true' ? '审核' : '复核'
} else {
return '复核'
}
}, },
methods: { /**
getShOrFhName() { * 获取指纹（人员）图片
let _that = this */
if (_that.isFromSh === 'true') { getPersonPic () {
return _that.isSh === 'true' ? '审核' : '复核' let self = this
} else { if (self.allData.bzxxZwXh) {
return '复核' if (self.allData.bzxxZwXh > 30) {
} // 掌纹
}, this.$axios({
/** method: 'post',
* 获取指纹（人员）图片 url: '/api/png/palm/barcode/seq',
*/ data: {
getPersonPic() { barcode: self.allData.ysxtAsjxgrybh,
let self = this hpseqno: self.allData.bzxxZwXh
if (self.allData.bzxxZwXh) { }
if (self.allData.bzxxZwXh > 30) { }).then(res => {
// 掌纹 if (res.data.code === 0) {
this.$axios({ if (res.data.ret.image != null) {
method: 'post', self.$bus.emit('changImageEdit', res.data.ret.image)
url: '/api/png/palm/barcode/seq',
data: {
barcode: self.allData.ysxtAsjxgrybh,
hpseqno: self.allData.bzxxZwXh
}
}).then(res => {
if (res.data.code === 0) {
if (res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image)
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
}) } else {
} else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) { self.$bus.emit('changImageEdit', 'xxx')
// 滚动 }
this.$axios({ })
method: 'post', } else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) {
url: '/api/png/roll/barcode/seq', // 滚动
data: { this.$axios({
barcode: self.allData.ysxtAsjxgrybh, method: 'post',
seqno: self.allData.bzxxZwXh url: '/api/png/roll/barcode/seq',
} data: {
}).then(res => { barcode: self.allData.ysxtAsjxgrybh,
if (res.data.code === 0) { seqno: self.allData.bzxxZwXh
if (res.data.ret.image != null) { }
self.$bus.emit('changImageEdit', res.data.ret.image) }).then(res => {
} else { if (res.data.code === 0) {
self.$bus.emit('changImageEdit', 'xxx') if (res.data.ret.image != null) {
} self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
}) } else {
} else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) { self.$bus.emit('changImageEdit', 'xxx')
// 平面 }
this.$axios({ })
method: 'post', } else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) {
url: '/api/png/plain/barcode/seq', // 平面
data: { this.$axios({
barcode: self.allData.ysxtAsjxgrybh, method: 'post',
seqno: self.allData.bzxxZwXh url: '/api/png/plain/barcode/seq',
} data: {
}).then(res => { barcode: self.allData.ysxtAsjxgrybh,
if (res.data.code === 0) { seqno: self.allData.bzxxZwXh
if (res.data.ret.image != null) { }
self.$bus.emit('changImageEdit', res.data.ret.image) }).then(res => {
} else { if (res.data.code === 0) {
self.$bus.emit('changImageEdit', 'xxx') if (res.data.ret.image != null) {
} self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
})
}
}
},
/**
* 获取指纹（案件）图片
*/
getCasePic() {
let self = this
this.$axios({
method: 'post',
url: '/api/org/case/barcode/seqNo',
data: {
barcode: self.allData.ysxtAsjbh,
seqno: self.allData.bzxxXh
}
}).then(res => {
console.log(res)
if (res.data.code === 0) {
if (res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
})
}
}
},
/**
* 获取指纹（案件）图片
*/
getCasePic () {
let self = this
this.$axios({
method: 'post',
url: '/api/org/case/barcode/seqNo',
data: {
barcode: self.allData.ysxtAsjbh,
seqno: self.allData.bzxxXh
}
}).then(res => {
console.log(res)
if (res.data.code === 0) {
if (res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
}) } else {
}, self.$bus.emit('changImageEditTarget', 'xxx')
/** }
* 確認解除比中关系 })
*/ },
confirmRelieveChange() { /**
let self = this * 確認解除比中关系
this.$axios({ */
method: 'post', confirmRelieveChange () {
url: '/api/hit/delete', let self = this
params: { this.$axios({
querytype: 1, method: 'post',
ids: Number(self.id), url: '/api/hit/delete',
params: {
querytype: 1,
ids: Number(self.id),
}
}).then(res => {
console.log(res)
if (res.data.code === 0) {
self.$message.success('解除比中关系成功！')
if (self.formData != null) {
self.$router.replace({
path: '/bzxxfh',
query: {
formData: this.formData
}
})
} else {
self.$router.replace({
path: '/bzxxfh',
})
} }
}).then(res => { }
console.log(res) }).catch(err => {
if (res.data.code === 0) { console.log(err)
self.$message.success('解除比中关系成功！') })
if (self.formData != null) { this.isRelieveVisible = false
self.$router.replace({ },
path: '/bzxxfh', /**
query: { * 解除比中关系
formData: this.formData */
} relieveChange () {
}) this.isRelieveVisible = true
} else { },
self.$router.replace({ gotoProgress (isPass) {// 进入处理逻辑
path: '/bzxxfh', let _that = this
}) if (!isPass && !_that.fhyj) {
} this.$message.error('请填写不通过意见！')
return
}
let tip = isPass ? '通过' : '不通过'
let yj = isPass ? '' : ' 意见：' + _that.fhyj
yj = '' // 暂时不显示
_that.$confirm(
'是否 "' + tip + '" ?' + yj,
'提示',
{
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning',
})
.then(() => {
if (isPass) {
_that.passChange()
} else {
_that.noPassChange()
} }
}).catch(err => {
console.log(err)
}) })
this.isRelieveVisible = false .catch(() => {
}, this.$message({
/** type: 'info',
* 解除比中关系 message: '已取消',
*/
relieveChange() {
this.isRelieveVisible = true
},
gotoProgress(isPass) {// 进入处理逻辑
let _that = this
if (!isPass && !_that.fhyj) {
this.$message.error('请填写不通过意见！')
return
}
let tip = isPass ? '通过' : '不通过'
let yj = isPass ? '' : ' 意见：' + _that.fhyj
yj = '' // 暂时不显示
_that.$confirm(
'是否 "' + tip + '" ?' + yj,
'提示',
{
confirmButtonText: '是',
cancelButtonText: '否',
type: 'warning',
}) })
.then(() => { })
if (isPass) { },
_that.passChange()
} else {
_that.noPassChange()
}
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消',
})
})
},
/** /**
* 未通过 * 未通过
*/ */
noPassChange() { noPassChange () {
let self = this let self = this
if (self.isFromSh === 'true') { if (self.isFromSh === 'true') {
self.doSh(false) self.doSh(false)
return return
}
this.$axios({
method: 'post',
url: '/api/hit/update',
data: {
querytype: 1,
id: Number(self.id),
status: 1,
des: self.fhyj,
userId: this.userId
} }
this.$axios({ }).then(res => {
method: 'post', console.log(res)
url: '/api/hit/update', if (res.data.code === 0) {
data: { self.$message.success('复核未通过！')
querytype: 1, if (self.formData != null) {
id: Number(self.id), self.$router.replace({
status: 1, path: '/bzxxfh',
des: self.fhyj, query: {
userId: this.userId formData: this.formData
} }
}).then(res => { })
console.log(res) } else {
if (res.data.code === 0) { self.$router.replace({
self.$message.success('复核未通过！') path: '/bzxxfh',
if (self.formData != null) { })
self.$router.replace({
path: '/bzxxfh',
query: {
formData: this.formData
}
})
} else {
self.$router.replace({
path: '/bzxxfh',
})
}
} }
}).catch(err => {
console.log(err)
})
},
/**
* 通过
*/
passChange() {
let self = this
if (self.isFromSh === 'true') {
self.doSh(true)
return
} }
this.$axios({ }).catch(err => {
method: 'post', console.log(err)
url: '/api/hit/update', })
data: { },
querytype: 1, /**
id: Number(self.id), * 通过
status: 2, */
des: self.fhyj, passChange () {
userId: this.userId let self = this
if (self.isFromSh === 'true') {
self.doSh(true)
return
}
this.$axios({
method: 'post',
url: '/api/hit/update',
data: {
querytype: 1,
id: Number(self.id),
status: 2,
des: self.fhyj,
userId: this.userId
}
}).then(res => {
console.log(res)
if (res.data.code === 0) {
self.$message.success('复核通过！')
if (self.formData != null) {
self.$router.replace({
path: '/bzxxfh',
query: {
formData: this.formData
}
})
} else {
self.$router.replace({
path: '/bzxxfh',
})
} }
}).then(res => { }
console.log(res) }).catch(err => {
if (res.data.code === 0) { console.log(err)
self.$message.success('复核通过！') })
if (self.formData != null) { },
self.$router.replace({ /**
path: '/bzxxfh', * 获取数据
query: { */
formData: this.formData getData () {
} let self = this
}) this.$axios({
} else { method: 'post',
self.$router.replace({ url: '/api/hit/lthit/info',
path: '/bzxxfh', data: {
}) id: self.id,
} queryType: 1
},
loading: true
}).then(res => {
console.log(res)
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
})
if (this.bzrName == this.allData.bzrXm) {
this.jcbzFlag = true
} else {
this.jcbzFlag = false
} }
}).catch(err => { this.getCasePic()
console.log(err) this.getPersonPic()
}) sessionStorage.setItem('srcseqno', this.allData.bzxxXh)
}, sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
/** sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
* 获取数据 sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
*/ }
getData() { }).catch(err => {
let self = this console.log(err)
this.$axios({ })
method: 'post', },
url: '/api/hit/lthit/info',
data: { doSh (isPass) {
id: self.id, let TITLE = '审核'
queryType: 1 let _that = this
}, var ruleForm = {}
loading: true ruleForm.querytype = _that.shxx.querytype
}).then(res => { ruleForm.id = _that.shxx.id
console.log(res)
if (res.data.code === 0) { let shzt // 1 审核无效 2 审核有效
this.allData = res.data.ret let fhzt //1 代表 复核无效，2 代表 复核有效
console.log(this.allData) if (_that.isSh === 'true') {
self.$bus.emit('getLeftAndRightBarcode', { shzt = isPass ? '2' : '1'
leftBarcode: res.data.ret.ysxtAsjxgrybh, fhzt = '2'
rightBarcode: res.data.ret.ysxtAsjbh } else {
shzt = '0'
fhzt = isPass ? '2' : '1'
}
ruleForm.fhzt = fhzt
ruleForm.shzt = shzt
ruleForm.des = _that.fhyj
ruleForm.level = _that.curLevel
ruleForm.userId = user.getUser().id
NetUtil.bzxxsh
.sh(ruleForm)
.then(res => {
if (res.code === 0) {
let _path = _that.curLevel === '0' ? '/dsBzxxsh' : '/stBzxxsh' // 市级 0 省级 1 字段名：level
_that.$router.replace({
path: _path,
query: {
formData: _that.formData
}
}) })
if (this.bzrName == this.allData.bzrXm) {
this.jcbzFlag = true
} else {
this.jcbzFlag = false
}
this.getCasePic()
this.getPersonPic()
sessionStorage.setItem('srcseqno', this.allData.bzxxXh)
sessionStorage.setItem('srcbarcode', this.allData.ysxtAsjbh)
sessionStorage.setItem('destseqno', this.allData.bzxxZwXh)
sessionStorage.setItem('destbarcode', this.allData.ysxtAsjxgrybh)
} }
}).catch(err => { }).catch(err => {
console.log(err)
}) })
},
doSh(isPass) {
let TITLE = '审核'
let _that = this
var ruleForm = {}
ruleForm.querytype = _that.shxx.querytype
ruleForm.id = _that.shxx.id
let shzt // 1 审核无效 2 审核有效
let fhzt //1 代表 复核无效，2 代表 复核有效
if (_that.isSh === 'true') {
shzt = isPass ? '2' : '1'
fhzt = '2'
} else {
shzt = '0'
fhzt = isPass ? '2' : '1'
}
ruleForm.fhzt = fhzt
ruleForm.shzt = shzt
ruleForm.des = _that.fhyj
ruleForm.level = _that.curLevel
ruleForm.userId = user.getUser().id
NetUtil.bzxxsh
.sh(ruleForm)
.then(res => {
if (res.code === 0) {
let _path = _that.curLevel === '0' ? '/dsBzxxsh' : '/stBzxxsh' // 市级 0 省级 1 字段名：level
_that.$router.replace({
path: _path,
query: {
formData: _that.formData
}
})
}
}).catch(err => {
})
},
}, },
}
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/bzxxgl/fhxxTT.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2022-01-18 16:53:29 * @LastEditTime: 2022-02-14 16:33:24
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -1347,7 +1347,7 @@ export default { ...@@ -1347,7 +1347,7 @@ export default {
this.loadingIndex++ this.loadingIndex++
// 平面 目标 // 平面 目标
this.$axios this.$axios
.post('/api/png/plain/barcode', { .post('/api/png/roll/barcode', {
barcode: this.destbarcode, barcode: this.destbarcode,
}) })
.then(function (response) { .then(function (response) {
...@@ -1369,6 +1369,7 @@ export default { ...@@ -1369,6 +1369,7 @@ export default {
} }
}) })
}) })
console.log(self.destFingersRightR);
// 去掉加载状态 // 去掉加载状态
self.fingerLoading = false self.fingerLoading = false
} else if (response.data.code == 4) { } else if (response.data.code == 4) {
...@@ -1386,7 +1387,7 @@ export default { ...@@ -1386,7 +1387,7 @@ export default {
this.loadingIndex++ this.loadingIndex++
// 滚动 目标数据 // 滚动 目标数据
this.$axios this.$axios
.post('/api/png/roll/barcode', {barcode: this.destbarcode}) .post('/api/png/plain/barcode', {barcode: this.destbarcode})
.then(function (response) { .then(function (response) {
self.loadingIndex-- self.loadingIndex--
if (response.data.code == 0) { if (response.data.code == 0) {
......
src/views/cxyrd/QueryConfirm.vue
<template> <template>
<el-container class="confirm-page" direction="vertical"> <el-container
class="confirm-page"
direction="vertical"
>
<div class="confirm_header_search"> <div class="confirm_header_search">
<div class="width100 margin_top24_bottom24" style="display: flex; align-items: center; position: relative"> <div
class="width100 margin_top24_bottom24"
style="display: flex; align-items: center; position: relative"
>
<div class="display_style"> <div class="display_style">
<span class="labelFont">条码号：</span> <span class="labelFont">条码号：</span>
<el-input maxlength="23" show-word-limit clearable class="el_input tmh" v-model="reqParam.contrastCustomSearchReq.barcode" placeholder="请输入条码号"></el-input> <el-input
maxlength="23"
show-word-limit
clearable
class="el_input tmh"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
</div> </div>
<div class="display_style"> <div class="display_style">
<span class="labelFont">用户：</span> <span class="labelFont">用户名：</span>
<el-select class="el_select" v-model="reqParam.contrastCustomSearchReq.userid" @change="selectUserInfo" clearable @clear="clearUser"> <el-select
<el-option v-for="(item, index) in userOption" :key="index" :label="item.label" :value="item.userid"> class="el_select"
v-model="reqParam.contrastCustomSearchReq.userid"
@change="selectUserInfo"
clearable
@clear="clearUser"
>
<el-option
v-for="(item, index) in userOption"
:key="index"
:label="item.label"
:value="item.userid"
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="display_style"> <div class="display_style">
<span class="labelFont">查询ID：</span> <span class="labelFont">查询ID：</span>
<el-input class="el_input" placeholder="请输入查询ID" v-model="reqParam.contrastCustomSearchReq.qqid"></el-input> <el-input
class="el_input"
placeholder="请输入查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input>
</div> </div>
<div class="display_style"> <div class="display_style">
<span class="labelFont">任务号：</span> <span class="labelFont">任务号：</span>
<el-input class="el_input" placeholder="请输入任务号" v-model="reqParam.contrastCustomSearchReq.qid"></el-input> <el-input
class="el_input"
placeholder="请输入任务号"
v-model="reqParam.contrastCustomSearchReq.qid"
></el-input>
</div> </div>
<div class="display_style send_time" style="display: flex; align-items: center"> <div
class="display_style send_time"
style="display: flex; align-items: center"
>
<span class="labelFont">发送时间：</span> <span class="labelFont">发送时间：</span>
<el-date-picker v-model="startEndDate" style="display: flex; align-items: center" class="el_data_picker" type="daterange" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" :picker-options="{ <el-date-picker
v-model="startEndDate"
style="display: flex; align-items: center"
class="el_data_picker"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}"> }"
>
</el-date-picker> </el-date-picker>
</div> </div>
<div class="pRight"> <div class="pRight">
<div class="clear_btn" @click="clearParams('yes')" :style="{ visibility: newStr ? '' : 'hidden' }"> <div
class="clear_btn"
@click="clearParams('yes')"
:style="{ visibility: newStr ? '' : 'hidden' }"
>
清空 清空
</div> </div>
<el-button type="primary" class="f-primary-button" @click="search">筛选 <el-button
type="primary"
class="f-primary-button"
@click="search"
>筛选
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="width100 margin_top24_bottom24 display_style"> <div class="width100 margin_top24_bottom24 display_style">
<div class="display_style prevent"> <div class="display_style prevent">
<label class="btnLabel">查询类型：</label> <label class="btnLabel">查询类型：</label>
<div v-for="(btn, index) in queryTypeBtns" :key="index"> <div
v-for="(btn, index) in queryTypeBtns"
:key="index"
>
<!-- <div--> <!-- <div-->
<!-- class="btn"--> <!-- class="btn"-->
<!-- @click="getQueryType(btn, 'querytypes')"--> <!-- @click="getQueryType(btn, 'querytypes')"-->
...@@ -51,7 +106,10 @@ ...@@ -51,7 +106,10 @@
<!-- : ''--> <!-- : ''-->
<!-- ]"--> <!-- ]"-->
<!-- >--> <!-- >-->
<div class="btn1" @click="getQueryType(btn, 'querytypes')" :class="[ <div
class="btn1"
@click="getQueryType(btn, 'querytypes')"
:class="[
btn.value === '2' btn.value === '2'
? 'btn-active-zc' ? 'btn-active-zc'
: btn.value === '3' : btn.value === '3'
...@@ -61,7 +119,8 @@ ...@@ -61,7 +119,8 @@
: btn.value === '0' : btn.value === '0'
? 'btn-active-cc' ? 'btn-active-cc'
: '', : '',
]"> ]"
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -69,12 +128,19 @@ ...@@ -69,12 +128,19 @@
<p class="shu"></p> <p class="shu"></p>
<div class="display_style prevent"> <div class="display_style prevent">
<label class="btnLabel">优先级：</label> <label class="btnLabel">优先级：</label>
<div v-for="(btn, index) in queryClassBtns" :key="index"> <div
<div class="btn" @click="getQueryType(btn, 'queryclasss')" :class="[ v-for="(btn, index) in queryClassBtns"
:key="index"
>
<div
class="btn"
@click="getQueryType(btn, 'queryclasss')"
:class="[
reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value) reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '', : '',
]"> ]"
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -82,12 +148,19 @@ ...@@ -82,12 +148,19 @@
<p class="shu"></p> <p class="shu"></p>
<div class="display_style"> <div class="display_style">
<label class="btnLabel">是否远程：</label> <label class="btnLabel">是否远程：</label>
<div v-for="(btn, index) in remoteFlagBtns" :key="index"> <div
<div class="btn" @click="getQueryType(btn, 'remoteflags')" :class="[ v-for="(btn, index) in remoteFlagBtns"
:key="index"
>
<div
class="btn"
@click="getQueryType(btn, 'remoteflags')"
:class="[
reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value) reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '', : '',
]"> ]"
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -101,14 +174,24 @@ ...@@ -101,14 +174,24 @@
<div class="width100 margin_top24_bottom24 display_style"> <div class="width100 margin_top24_bottom24 display_style">
<label class="width70 btnLabel">状态选择：</label> <label class="width70 btnLabel">状态选择：</label>
<!-- -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除--> <!-- -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除-->
<div class="btn" @click="allQueryType()">全部 <div
class="btn"
@click="allQueryType()"
>全部
</div> </div>
<div v-for="(btn, index) in queryStateBtns" :key="index"> <div
<div class="btn" @click="getQueryType(btn, 'querystates')" :class="[ v-for="(btn, index) in queryStateBtns"
:key="index"
>
<div
class="btn"
@click="getQueryType(btn, 'querystates')"
:class="[
reqParam.contrastCustomSearchReq.querystates.includes(btn.value) reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
? 'btn-active' ? 'btn-active'
: '', : '',
]"> ]"
>
{{ btn.name }} {{ btn.name }}
</div> </div>
</div> </div>
...@@ -117,7 +200,10 @@ ...@@ -117,7 +200,10 @@
<div class="confirm_main"> <div class="confirm_main">
<div class="confirm_main_search margin0 width100"> <div class="confirm_main_search margin0 width100">
<div class="display_style style-one"> <div class="display_style style-one">
<el-button type="info" @click="batch">批量操作 <el-button
type="info"
@click="batch"
>批量操作
</el-button> </el-button>
<div class="middle style-middle"> <div class="middle style-middle">
<!-- <div class="font" @click="clearAll()"> <!-- <div class="font" @click="clearAll()">
...@@ -125,14 +211,24 @@ ...@@ -125,14 +211,24 @@
<i class="iconfont icon-xiala"></i> <i class="iconfont icon-xiala"></i>
</div> --> </div> -->
<div class="el-tag-box"> <div class="el-tag-box">
<el-tag style="margin-right: 10px" :key="index" v-for="(tag, index) in dynamicTags" closable :disable-transitions="false" @close="handleClose(tag)"> <el-tag
style="margin-right: 10px"
:key="index"
v-for="(tag, index) in dynamicTags"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>
{{ tag.name }} {{ tag.name }}
</el-tag> </el-tag>
</div> </div>
</div> </div>
</div> </div>
<div class="display_style confirm_main_button"> <div class="display_style confirm_main_button">
<div class="rgrd" @click="$refs.recognitionDialog.open()"> <div
class="rgrd"
@click="$refs.recognitionDialog.open()"
>
<!-- <img src="@/assets/img/person1.png" alt="" /> --> <!-- <img src="@/assets/img/person1.png" alt="" /> -->
<i class="iconfont icon-rengongrending"></i> <i class="iconfont icon-rengongrending"></i>
<span>人工认定</span> <span>人工认定</span>
...@@ -141,9 +237,19 @@ ...@@ -141,9 +237,19 @@
<div class="margin0"> <div class="margin0">
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<el-button type="info">自定义列</el-button> <el-button type="info">自定义列</el-button>
<el-dropdown-menu slot="dropdown" class="el-dropdown-content-bg"> <el-dropdown-menu
<el-checkbox-group v-model="checkedProps" @change="changeCheckbox"> slot="dropdown"
<el-checkbox v-for="(item, index) in defaultTableProps" :label="item.prop" :key="index"> class="el-dropdown-content-bg"
>
<el-checkbox-group
v-model="checkedProps"
@change="changeCheckbox"
>
<el-checkbox
v-for="(item, index) in defaultTableProps"
:label="item.prop"
:key="index"
>
{{ item.colume }} {{ item.colume }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -152,31 +258,76 @@ ...@@ -152,31 +258,76 @@
</div> </div>
<!-- 自定义列 止 --> <!-- 自定义列 止 -->
<!-- 复制条码号 起 --> <!-- 复制条码号 起 -->
<el-button type="info" v-if="roleArr.includes('C-1-3')" v-clipboard:copy="barcode" @click="getBarcode" v-clipboard:success="onCopy" v-clipboard:error="onError"> <el-button
type="info"
v-if="roleArr.includes('C-1-3')"
v-clipboard:copy="barcode"
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
>
复制条码 复制条码
</el-button> </el-button>
<!-- 复制条码号 止 --> <!-- 复制条码号 止 -->
<el-button type="info" @click="delMore" v-if="roleArr.includes('C-1-4')">删除 <el-button
type="info"
@click="delMore"
v-if="roleArr.includes('C-1-4')"
>删除
</el-button> </el-button>
<!-- <el-button>发查询</el-button>--> <!-- <el-button>发查询</el-button>-->
</div> </div>
</div> </div>
<el-tag class="removeDia" style="width: 100%; color: #666666; margin-bottom: 0.5rem" v-show="isShowTip"> <el-tag
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"></i> class="removeDia"
style="width: 100%; color: #666666; margin-bottom: 0.5rem"
v-show="isShowTip"
>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem"
></i>
已选择 已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​ <span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span> <span v-html="'&nbsp;&nbsp;'"></span>
<el-link type="primary" :underline="false" :style="{ <el-link
type="primary"
:underline="false"
:style="{
marginLeft: '1.25rem', marginLeft: '1.25rem',
color: selectionData.length > 0 ? '#055FE7' : '#C2C4C7', color: selectionData.length > 0 ? '#055FE7' : '#C2C4C7',
}" @click="toggleSelection()">清除 }"
@click="toggleSelection()"
>清除
</el-link> </el-link>
</el-tag> </el-tag>
<div class="confirm_main_table"> <div class="confirm_main_table">
<el-table style="width: 100%" :height="height" :border="false" @selection-change="handleSelectionChange" ref="confirmTable" tooltip-effect="dark" :data="list" :key="tableKey" :class="{ delSelection: !selectBoo }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="queryId" @row-click="confirm" @expand-change="hadnlExpandChange"> <el-table
style="width: 100%"
:height="height"
:border="false"
@selection-change="handleSelectionChange"
ref="confirmTable"
tooltip-effect="dark"
:data="list"
:key="tableKey"
:class="{ delSelection: !selectBoo }"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="queryId"
@row-click="confirm"
@expand-change="hadnlExpandChange"
>
<!-- @select-all="handleSelectAll" --> <!-- @select-all="handleSelectAll" -->
<el-table-column type="selection" height width="auto"></el-table-column> <el-table-column
<el-table-column prop="" label="任务号/查询ID" :width="cxyrdWidth1"> type="selection"
height
width="auto"
></el-table-column>
<el-table-column
prop=""
label="任务号/查询ID"
:width="cxyrdWidth1"
>
<template #header> <template #header>
<div class="tableHeader"> <div class="tableHeader">
<span>任务号 </span> <span>任务号 </span>
...@@ -184,47 +335,78 @@ ...@@ -184,47 +335,78 @@
</div> </div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<svg-icon style=" <svg-icon
style="
width: 0.875rem; width: 0.875rem;
height: 0.6875rem; height: 0.6875rem;
margin-bottom: 0.125rem; margin-bottom: 0.125rem;
margin-left: 0.3125rem; margin-left: 0.3125rem;
" v-if="scope.row.children || scope.row.children === null" icon-class="tree_f"> "
v-if="scope.row.children || scope.row.children === null"
icon-class="tree_f"
>
</svg-icon> </svg-icon>
<svg-icon style=" <svg-icon
style="
width: 0.8125rem; width: 0.8125rem;
height: 0.375rem; height: 0.375rem;
margin: 0 0 0.1875rem 0; margin: 0 0 0.1875rem 0;
" v-else-if="!scope.row.children || scope.row.children !== null" icon-class="tree_c"></svg-icon> "
v-else-if="!scope.row.children || scope.row.children !== null"
icon-class="tree_c"
></svg-icon>
{{ {{
scope.row.children || scope.row.children === null scope.row.children || scope.row.children === null
? scope.row.qid ? scope.row.qid
: scope.row.qqid : scope.row.qqid
}} }}
<div v-show="scope.row.children && scope.row.children !== null" class="children-count"> <div
v-show="scope.row.children && scope.row.children !== null"
class="children-count"
>
{{ scope.row.children ? scope.row.children.length : 0 }} {{ scope.row.children ? scope.row.children.length : 0 }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(item, index) in tableProps" show-overflow-tooltip :key="index" :label="item.colume" :prop="item.prop" :width="item.width" :sortable=" <el-table-column
v-for="(item, index) in tableProps"
show-overflow-tooltip
:key="index"
:label="item.colume"
:prop="item.prop"
:width="item.width"
:sortable="
item.prop == 'affirmtime' || item.prop == 'affirmtime' ||
item.prop == 'requestdatetime' || item.prop == 'requestdatetime' ||
item.prop == 'queryclass' item.prop == 'queryclass'
? true ? true
: false : false
"> "
>
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="item.prop === 'querytype'"> <template v-if="item.prop === 'querytype'">
<div v-if="scope.row.querytype === '3'" style="color: #055fe7"> <div
v-if="scope.row.querytype === '3'"
style="color: #055fe7"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div v-else-if="scope.row.querytype === '0'" style="color: #fa9500"> <div
v-else-if="scope.row.querytype === '0'"
style="color: #fa9500"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div v-else-if="scope.row.querytype === '1'" style="color: #e60012"> <div
v-else-if="scope.row.querytype === '1'"
style="color: #e60012"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div v-else-if="scope.row.querytype === '2'" style="color: #00b47a"> <div
v-else-if="scope.row.querytype === '2'"
style="color: #00b47a"
>
{{ scope.row.queryTypeName }} {{ scope.row.queryTypeName }}
</div> </div>
<div v-else> <div v-else>
...@@ -236,9 +418,16 @@ ...@@ -236,9 +418,16 @@
{{ scope.row.barcode }} {{ scope.row.barcode }}
<!-- {{ scope.row.artificialAffirmFlag }} --> <!-- {{ scope.row.artificialAffirmFlag }} -->
<div v-if="scope.row.barcode && scope.row.artificialAffirmFlag !='1'"> <div v-if="scope.row.barcode && scope.row.artificialAffirmFlag !='1'">
<img class="history" :src="historyUrl" @click.stop="getDialog(scope.row)" /> <img
class="history"
:src="historyUrl"
@click.stop="getDialog(scope.row)"
/>
</div> </div>
<div v-if="scope.row.barcode && scope.row.artificialAffirmFlag=='1'" class="rgbq"> <div
v-if="scope.row.barcode && scope.row.artificialAffirmFlag=='1'"
class="rgbq"
>
<p>人工</p> <p>人工</p>
</div> </div>
</div> </div>
...@@ -268,30 +457,51 @@ ...@@ -268,30 +457,51 @@
{{ dataFormat(scope.row, item.prop) }}</template> {{ dataFormat(scope.row, item.prop) }}</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="auto" label="操作" align="left"> <el-table-column
width="auto"
label="操作"
align="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
<Confirmation content="复制条码" v-if="scope.row.barcode && roleArr.includes('C-1-5')"> <Confirmation
<img style=" content="复制条码"
v-if="scope.row.barcode && roleArr.includes('C-1-5')"
>
<img
style="
width: 1rem; width: 1rem;
height: 1rem; height: 1rem;
margin-right: 1.125rem; margin-right: 1.125rem;
cursor: pointer; cursor: pointer;
" src="@/assets/img/qbryk/fz.svg" @click.stop=" "
src="@/assets/img/qbryk/fz.svg"
@click.stop="
() => { () => {
delSelect(); delSelect();
edit(scope.row); edit(scope.row);
} }
" /> "
/>
</Confirmation> </Confirmation>
<div @click.stop="() => {}"> <div @click.stop="() => {}">
<Confirmation :ref="getPopConfirmRef(scope.$index)" v-if="scope.row.barcode && roleArr.includes('C-1-6')" @onConfirm="delOne(scope.row.qqid)" content="删除" :hintBoo="true"> <Confirmation
:ref="getPopConfirmRef(scope.$index)"
v-if="scope.row.barcode && roleArr.includes('C-1-6')"
@onConfirm="delOne(scope.row.qqid)"
content="删除"
:hintBoo="true"
>
<div slot="reference"> <div slot="reference">
<img style="width: 1rem; height: 1rem; cursor: pointer" :src="delUrl" @click=" <img
style="width: 1rem; height: 1rem; cursor: pointer"
:src="delUrl"
@click="
() => { () => {
clickCancle(scope.$index) clickCancle(scope.$index)
delSelect() delSelect()
} }
" /> "
/>
</div> </div>
</Confirmation> </Confirmation>
</div> </div>
...@@ -304,16 +514,34 @@ ...@@ -304,16 +514,34 @@
<span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{ <span class="count">共{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
size size
}}页</span> }}页</span>
<el-pagination class="paging" background @size-change="handleSizeChange" @current-change="handleCurrPageChange" :current-page="reqParam.page.currPage" :page-sizes="[10, 20, 50, 100]" :page-size="reqParam.page.pageSize" layout="prev, pager, next" :total="reqParam.page.total"> <el-pagination
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :visible.sync="historyDialogVisible" style="z-index: 1500"> <el-dialog
:visible.sync="historyDialogVisible"
style="z-index: 1500"
>
</el-dialog> </el-dialog>
<recognitionDialog ref="recognitionDialog"></recognitionDialog> <recognitionDialog ref="recognitionDialog"></recognitionDialog>
<Fcxtj :isShowFcx="isShowFcx" :type="dialogType" ref="fcxtj" :dialogQid="dialogQid"></Fcxtj> <Fcxtj
:isShowFcx="isShowFcx"
:type="dialogType"
ref="fcxtj"
:dialogQid="dialogQid"
></Fcxtj>
</el-container> </el-container>
</template> </template>
...@@ -1134,1052 +1362,1050 @@ const setQueryClass = [ ...@@ -1134,1052 +1362,1050 @@ const setQueryClass = [
] ]
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.delSelection /deep/ .el-table-column--selection .cell { .delSelection /deep/ .el-table-column--selection .cell {
display: none; display: none;
} }
/deep/ .el-pager { /deep/ .el-pager {
.number { .number {
background-color: transparent !important; background-color: transparent !important;
} }
.number.active { .number.active {
background-color: #055fe7 !important; background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03); box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px; border-radius: 6px;
} }
.el-icon.more.btn-quicknext.el-icon-more, .el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more { .el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important; background-color: transparent !important;
} }
} }
/deep/ .btn-prev, /deep/ .btn-prev,
/deep/ .btn-next { /deep/ .btn-next {
background-color: transparent !important; background-color: transparent !important;
} }
/deep/ .el-pagination__sizes { /deep/ .el-pagination__sizes {
position: absolute; position: absolute;
right: 0; right: 0;
} }
/deep/ .btn-next { /deep/ .btn-next {
//margin-right: 120px !important; //margin-right: 120px !important;
} }
.paging { .paging {
float: right; float: right;
} }
.el-dropdown-menu { .el-dropdown-menu {
width: 120px; width: 120px;
/*height: 288px;*/ /*height: 288px;*/
.el-checkbox-group { .el-checkbox-group {
.el-checkbox { .el-checkbox {
height: 32px; height: 32px;
width: 120px; width: 120px;
padding-left: 16px; padding-left: 16px;
line-height: 32px; line-height: 32px;
&:hover { &:hover {
background: #f5f5f7; background: #f5f5f7;
} }
}
}
} }
}
}
</style> </style>
<style scoped> <style scoped>
.el-popper[x-placement^="bottom-end"] { .el-popper[x-placement^="bottom-end"] {
border-style: none; border-style: none;
} }
.el-popper[x-placement^="bottom-end"] .popper__arrow::after { .el-popper[x-placement^="bottom-end"] .popper__arrow::after {
border-style: none; border-style: none;
} }
.el-popper[x-placement^="bottom-end"] .popper__arrow { .el-popper[x-placement^="bottom-end"] .popper__arrow {
border-style: none; border-style: none;
} }
.el-dropdown-content-bg { .el-dropdown-content-bg {
transform: translate(23px, -8px); transform: translate(23px, -8px);
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
.width70 { .width70 {
width: 70px !important; width: 70px !important;
display: inline-block; display: inline-block;
} }
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
/deep/ .el-table th { // 滚动条的宽度
background-color: #f6f8fa; /deep/ .el-table__body-wrapper::-webkit-scrollbar {
border: none; width: 6px; // 横向滚动条
} height: 6px; // 纵向滚动条 必写
}
/deep/ .el-table td, // 滚动条的滑块
.el-table th.is-leaf { /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #ffffff; background-color: #dadde0;
border: none; border-radius: 3px;
border-bottom: 1px #f6f8fa solid; }
border-top: 1px #f6f8fa solid;
}
// 表格最外边框 /deep/ .el-table th {
.el-table--border, background-color: #f6f8fa;
.el-table--group { border: none;
border: none; }
}
/deep/ .el-popover { /deep/ .el-table td,
padding: 15px 20px !important; .el-table th.is-leaf {
} background-color: #ffffff;
border: none;
border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid;
}
/deep/ .el-popconfirm__action { // 表格最外边框
display: flex; .el-table--border,
justify-content: center; .el-table--group {
} border: none;
}
/deep/ .el-popover.el-popper { /deep/ .el-popover {
background: #006aff; padding: 15px 20px !important;
} }
/deep/ .el-form-item__label { /deep/ .el-popconfirm__action {
color: #333333; display: flex;
} justify-content: center;
}
/deep/ .el-table th > .cell { /deep/ .el-popover.el-popper {
font-size: 14px; background: #006aff;
font-family: HarmonyOS_Sans_SC_Medium; }
font-weight: normal;
color: #282f3c;
}
/deep/ .el-table td > .cell { /deep/ .el-form-item__label {
font-size: 14px; color: #333333;
font-family: HarmonyOS_Sans_SC; }
color: #333333;
}
/deep/ .el-input__inner { /deep/ .el-table th > .cell {
background: #ffffff; font-size: 14px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03); font-family: HarmonyOS_Sans_SC_Medium;
border-radius: 4px; font-weight: normal;
border: none; color: #282f3c;
} }
// 输入框选中样式 /deep/ .el-table td > .cell {
/deep/ .el-input.is-active .el-input__inner, font-size: 14px;
/deep/ .el-input__inner:focus { font-family: HarmonyOS_Sans_SC;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important; color: #333333;
border-color: none !important; }
color: #055fe7;
}
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
/deep/ .el-input.is-active .el-input__inner, // 输入框选中样式
/deep/ .el-input__inner:hover { /deep/ .el-input.is-active .el-input__inner,
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important; /deep/ .el-input__inner:focus {
border-color: none !important; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
} border-color: none !important;
color: #055fe7;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效 /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input.is-active .el-input__inner, /deep/ .el-input__inner:hover {
/deep/ .el-input__inner:focus-within { box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important; border-color: none !important;
border-color: none !important; }
color: #055fe7;
.el-range-input { // :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
color: #055fe7; /deep/ .el-input.is-active .el-input__inner,
} /deep/ .el-input__inner:focus-within {
} box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
/deep/ .el-input.is-active .el-input__inner, .el-range-input {
/deep/ .el-input__inner:hover { color: #055fe7;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important; }
border-color: none !important; }
}
div { /deep/ .el-input.is-active .el-input__inner,
margin: 0; /deep/ .el-input__inner:hover {
padding: 0; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
display: inline-block; border-color: none !important;
/*border: none;*/ }
}
.rgrd { div {
display: flex !important; margin: 0;
align-items: center; padding: 0;
justify-content: center; display: inline-block;
float: left; /*border: none;*/
color: #055fe7; }
margin-right: 10px;
transform: translateY(5px);
cursor: pointer;
> i {
margin-right: 5px;
cursor: pointer;
}
> span { .rgrd {
cursor: pointer; display: flex !important;
line-height: 24px !important; align-items: center;
color: #055fe7 !important; justify-content: center;
} float: left;
} color: #055fe7;
margin-right: 10px;
transform: translateY(5px);
cursor: pointer;
> i {
margin-right: 5px;
cursor: pointer;
}
hr { > span {
background-color: #eeeeee; cursor: pointer;
height: 1px; line-height: 24px !important;
border: none; color: #055fe7 !important;
margin: 16px 0 16px 0; }
} }
label { hr {
width: 70px; background-color: #eeeeee;
height: 22px; height: 1px;
font-size: 14px; border: none;
font-family: HarmonyOS_Sans_SC; margin: 16px 0 16px 0;
color: #999999; }
line-height: 22px;
}
i { label {
height: 16px; width: 70px;
width: 16px; height: 22px;
margin: 0 9px 0 9px; font-size: 14px;
} font-family: HarmonyOS_Sans_SC;
color: #999999;
line-height: 22px;
}
b { i {
width: 64px; height: 16px;
height: 24px; width: 16px;
font-size: 16px; margin: 0 9px 0 9px;
font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC; }
font-weight: bold;
color: #333333;
line-height: 24px;
}
.style-middle { b {
display: flex !important; width: 64px;
justify-content: flex-start; height: 24px;
align-items: center; font-size: 16px;
} font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC;
font-weight: bold;
color: #333333;
line-height: 24px;
}
.font { .style-middle {
> span { display: flex !important;
cursor: pointer; justify-content: flex-start;
font-size: 14px !important; align-items: center;
color: #666666 !important; }
}
cursor: pointer; .font {
> span {
cursor: pointer;
font-size: 14px !important;
color: #666666 !important;
}
> i { cursor: pointer;
cursor: pointer;
color: #b1b6c2;
margin: 0 !important;
transform: rotate(-90deg);
display: inline-block;
margin-left: 5px !important;
&::before { > i {
width: 10px; cursor: pointer;
display: inline-block; color: #b1b6c2;
} margin: 0 !important;
} transform: rotate(-90deg);
display: inline-block;
margin-left: 5px !important;
width: 80px; &::before {
height: 16px; width: 10px;
font-size: 14px; display: inline-block;
font-family: HarmonyOS_Sans_SC;
color: #666666;
line-height: 16px;
margin: 0 6px 0 8px;
cursor: pointer;
} }
}
.history { width: 80px;
width: 12px; height: 16px;
height: 12px; font-size: 14px;
margin-left: 4px; font-family: HarmonyOS_Sans_SC;
margin-bottom: 3px; color: #666666;
cursor: pointer; line-height: 16px;
} margin: 0 6px 0 8px;
cursor: pointer;
}
.children-count { .history {
width: 34px; width: 12px;
height: 21px; height: 12px;
font-size: 12px; margin-left: 4px;
line-height: 21px; margin-bottom: 3px;
text-align: center; cursor: pointer;
background: #f6f8fa; }
border-radius: 11px;
position: absolute;
right: 10px;
}
/deep/ .el-tag .el-icon-close::before { .children-count {
display: block; width: 34px;
color: #fff; height: 21px;
} font-size: 12px;
line-height: 21px;
text-align: center;
background: #f6f8fa;
border-radius: 11px;
position: absolute;
right: 10px;
}
/deep/ .el-tag .el-icon-close { /deep/ .el-tag .el-icon-close::before {
background-color: #b1b6c2; display: block;
// right: 1px !important; color: #fff;
} }
.el-icon-arrow-down { /deep/ .el-tag .el-icon-close {
color: #999999; background-color: #b1b6c2;
border: #999999 1px solid; // right: 1px !important;
border-radius: 50%; /*边设置为圆形*/ }
font-size: 12px;
}
.el-button { .el-icon-arrow-down {
width: 72px; color: #999999;
height: 32px; border: #999999 1px solid;
border-radius: 4px; border-radius: 50%; /*边设置为圆形*/
margin: 0; font-size: 12px;
padding: 0; }
}
.el-button__inner { .el-button {
width: 72px; width: 72px;
height: 16px; height: 32px;
font-size: 14px; border-radius: 4px;
font-family: HarmonyOS_Sans_SC; margin: 0;
color: #2e3846; padding: 0;
line-height: 16px; }
}
.el-tag { .el-button__inner {
color: #055fe7 !important; width: 72px;
height: 32px; height: 16px;
box-sizing: border-box !important; font-size: 14px;
padding: 0 8px !important; font-family: HarmonyOS_Sans_SC;
background: #ddebff; color: #2e3846;
border-radius: 4px; line-height: 16px;
font-size: 0.75rem; }
}
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
}
.confirm-page { .confirm-page {
width: 100%; width: 100%;
padding: 20px 20px; padding: 20px 20px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
div { div {
display: inline-block; display: inline-block;
} }
.footer { .footer {
width: 1544px; width: 1544px;
//width: calc(100vw - 367px); //width: calc(100vw - 367px);
position: absolute; position: absolute;
bottom: 27px; bottom: 27px;
left: 24px; left: 24px;
.count {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
}
.paging {
float: right;
}
}
}
/deep/ .el-range-separator { .count {
line-height: 24px !important; font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
} }
.prevent { .paging {
margin-right: 10px !important; float: right;
} }
}
}
.shu { /deep/ .el-range-separator {
display: inline-block; line-height: 24px !important;
width: 1px; }
height: 12px;
margin-right: 20px !important;
background: #999999;
}
.display_style { .prevent {
display: inline-block; margin-right: 10px !important;
margin: 5px 24px 5px 0; }
}
/deep/ .el-button span { .shu {
cursor: pointer; display: inline-block;
} width: 1px;
height: 12px;
margin-right: 20px !important;
background: #999999;
}
.style-one { .display_style {
display: flex !important; display: inline-block;
} margin: 5px 24px 5px 0;
}
.margin_top24_bottom24 { /deep/ .el-button span {
display: flex; cursor: pointer;
align-items: center; }
}
.send_time { .style-one {
display: flex; display: flex !important;
align-items: center; }
/deep/ .el-input__icon { .margin_top24_bottom24 {
height: 32px; display: flex;
} align-items: center;
}
/deep/ .el-input__icon.el-range__icon.el-icon-date { .send_time {
position: absolute; display: flex;
right: 6px; align-items: center;
}
}
.display_style span { /deep/ .el-input__icon {
height: 24px; height: 32px;
font-size: 14px; }
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 20px;
margin: 0;
padding: 0;
}
.el_select { /deep/ .el-input__icon.el-range__icon.el-icon-date {
width: 168px; position: absolute;
height: 32px; right: 6px;
background: #ffffff; }
border-radius: 4px; }
// border: 1px solid #e6e6e8;
}
/deep/ .el-input__icon { .display_style span {
line-height: 32px !important; height: 24px;
} font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 20px;
margin: 0;
padding: 0;
}
.el_data_picker { .el_select {
width: 256px; width: 168px;
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #e6e6e8; // border: 1px solid #e6e6e8;
} }
.el_input { /deep/ .el-input__icon {
width: 168px; line-height: 32px !important;
height: 32px; }
background: #ffffff;
border-radius: 4px;
// border: 1px solid #e6e6e8;
}
.tmh { .el_data_picker {
width: 300px; width: 256px;
} height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
}
/deep/ .el-input__inner { .el_input {
height: 32px !important; width: 168px;
} height: 32px;
background: #ffffff;
border-radius: 4px;
// border: 1px solid #e6e6e8;
}
.btnLabel { .tmh {
font-family: HarmonyOS_Sans_SC_Medium; width: 300px;
color: #282f3c; }
font-size: 14px;
}
.btn { /deep/ .el-input__inner {
width: fit-content; height: 32px !important;
display: flex; }
align-items: center;
justify-content: center;
font-family: HarmonyOS_Sans_SC;
border: none;
height: 22px;
padding: 0;
margin: 0 15px 0 12px;
font-size: 14px;
font-weight: 350;
color: #666666;
cursor: pointer;
}
.btn:hover { .btnLabel {
color: #055fe7; font-family: HarmonyOS_Sans_SC_Medium;
} color: #282f3c;
font-size: 14px;
}
.btn-active { .btn {
color: #055fe7; width: fit-content;
} display: flex;
align-items: center;
justify-content: center;
font-family: HarmonyOS_Sans_SC;
border: none;
height: 22px;
padding: 0;
margin: 0 15px 0 12px;
font-size: 14px;
font-weight: 350;
color: #666666;
cursor: pointer;
}
.btn1 { .btn:hover {
width: fit-content; color: #055fe7;
display: flex; }
align-items: center;
justify-content: center;
font-family: HarmonyOS_Sans_SC;
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 12px;
font-size: 14px;
font-weight: 350;
cursor: pointer;
}
.btn1:hover { .btn-active {
font-weight: bolder; color: #055fe7;
} }
.btn-active-zc { .btn1 {
color: #00b47a; width: fit-content;
} display: flex;
align-items: center;
justify-content: center;
font-family: HarmonyOS_Sans_SC;
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 12px;
font-size: 14px;
font-weight: 350;
cursor: pointer;
}
.btn-active-dc { .btn1:hover {
color: #e60012; font-weight: bolder;
} }
.btn-active-cc { .btn-active-zc {
color: #fa9500; color: #00b47a;
} }
.btn-active-ca { .btn-active-dc {
color: #055fe7; color: #e60012;
} }
.clear_btn { .btn-active-cc {
width: fit-content; color: #fa9500;
font-family: HarmonyOS_Sans_SC; }
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 0;
font-size: 14px;
font-weight: 350;
color: #333333;
cursor: pointer;
color: #055fe7;
&:hover {
color: #055fe7;
}
&:active { .btn-active-ca {
color: #055fe7; color: #055fe7;
} }
}
.el-button--primary { .clear_btn {
width: 72px; width: fit-content;
height: 32px; font-family: HarmonyOS_Sans_SC;
line-height: 22px; border: none;
padding: 0; height: 22px;
background: #055fe7; padding: 0;
border-radius: 4px; margin: 0 12px 0 0;
} font-size: 14px;
font-weight: 350;
color: #333333;
cursor: pointer;
color: #055fe7;
&:hover {
color: #055fe7;
}
.el-checkbox-button__inner { &:active {
width: 56px; color: #055fe7;
height: 22px; }
font-size: 14px; }
font-family: HarmonyOS_Sans_SC;
color: #ffffff;
line-height: 22px;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.confirm_main_button { .el-button--primary {
.el-button--info { width: 72px;
margin-right: 0; height: 32px;
} line-height: 22px;
} padding: 0;
background: #055fe7;
border-radius: 4px;
}
.el-button--info { .el-checkbox-button__inner {
width: 96px; width: 56px;
height: 32px; height: 22px;
font-weight: 350; font-size: 14px;
color: #2e3846; font-family: HarmonyOS_Sans_SC;
background: #ffffff; color: #ffffff;
border: 1px solid #aeb5c2; line-height: 22px;
border-radius: 4px; -webkit-background-clip: text;
margin: 0 8px 0 8px; -webkit-text-fill-color: transparent;
} }
.el-button--info:hover { .confirm_main_button {
border: 1px solid #055fe7; .el-button--info {
color: #055fe7; margin-right: 0;
} }
}
.el-button--info:active { .el-button--info {
border: 1px solid #044cb9; width: 96px;
color: #044cb9; height: 32px;
} font-weight: 350;
color: #2e3846;
background: #ffffff;
border: 1px solid #aeb5c2;
border-radius: 4px;
margin: 0 8px 0 8px;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner, .el-button--info:hover {
.el-checkbox__input.is-indeterminate .el-checkbox__inner { border: 1px solid #055fe7;
background-color: #055fe7 !important; color: #055fe7;
border: 1px solid #055fe7 !important; }
}
/deep/ .el-checkbox__inner:hover { .el-button--info:active {
border-color: #055fe7; border: 1px solid #044cb9;
/*background: #f5f5f7;*/ color: #044cb9;
} }
/deep/ .el-checkbox__input + .el-checkbox__label { /deep/ .el-checkbox__input.is-checked .el-checkbox__inner,
color: #333333; .el-checkbox__input.is-indeterminate .el-checkbox__inner {
font-size: 14px; background-color: #055fe7 !important;
} border: 1px solid #055fe7 !important;
}
/deep/ .el-checkbox__input.is-focus .el-checkbox__inner { /deep/ .el-checkbox__inner:hover {
border-color: #055fe7 !important; border-color: #055fe7;
} /*background: #f5f5f7;*/
}
.confirm_main_search { /deep/ .el-checkbox__input + .el-checkbox__label {
width: 100%; color: #333333;
height: 34px; font-size: 14px;
margin-bottom: 10px; }
display: flex !important;
justify-content: space-between;
align-items: center;
> div {
&:first-of-type {
.el-button--info {
margin-left: 0;
margin-right: 15px;
}
}
}
}
.confirm_main_button { /deep/ .el-checkbox__input.is-focus .el-checkbox__inner {
position: absolute; border-color: #055fe7 !important;
right: 0px; }
}
.el-table /deep/ { .confirm_main_search {
td.el-table__cell, width: 100%;
th.el-table__cell.is-leaf { height: 34px;
border-bottom: none; margin-bottom: 10px;
} display: flex !important;
justify-content: space-between;
align-items: center;
> div {
&:first-of-type {
.el-button--info {
margin-left: 0;
margin-right: 15px;
}
} }
}
}
.labelFont { .confirm_main_button {
font-size: 14px !important; position: absolute;
font-family: HarmonyOS_Sans_SC !important; right: 0px;
color: #333333 !important; }
}
.confirm_header_search { .el-table /deep/ {
width: 100%; td.el-table__cell,
padding: 20px 20px; th.el-table__cell.is-leaf {
background: #f6f8fa; border-bottom: none;
border-radius: 10px; }
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2); }
margin-bottom: 15px;
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
}
.confirm_main { .labelFont {
width: 100%; font-size: 14px !important;
// height: 60px; font-family: HarmonyOS_Sans_SC !important;
height: 620px; color: #333333 !important;
border-bottom: 1px solid #eeeeee; }
}
.confirm_main_table { .confirm_header_search {
margin: 6px 0 15px 0; width: 100%;
padding: 0; padding: 20px 20px;
width: 100%; background: #f6f8fa;
height: 528px; border-radius: 10px;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
margin-bottom: 15px;
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
}
.mineral-table { .confirm_main {
// height: 450px; width: 100%;
} // height: 60px;
} height: 620px;
border-bottom: 1px solid #eeeeee;
}
/deep/ .el-table td, .confirm_main_table {
.el-table th.is-leaf { margin: 6px 0 15px 0;
background-color: #ffffff; padding: 0;
border: none; width: 100%;
// border-bottom: 1px #f6f8fa solid; height: 528px;
border-top: 1px #eeeeee solid;
}
// 去除table表格最底部边框 .mineral-table {
.el-table__row > td { // height: 450px;
border: none; }
} }
// 去除table表格最底部边框 /deep/ .el-table td,
.el-table::before { .el-table th.is-leaf {
height: 0px; background-color: #ffffff;
} border: none;
// border-bottom: 1px #f6f8fa solid;
border-top: 1px #eeeeee solid;
}
/deep/ .el-table .el-table__header-wrapper tr th { // 去除table表格最底部边框
background-color: #ecf1f7 !important; .el-table__row > td {
font-size: 14px !important; border: none;
font-family: HarmonyOS_Sans_SC_Medium !important; }
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/ .el-table .el-table__body tr.current-row > td { // 去除table表格最底部边框
background-color: #f2f7fe !important; .el-table::before {
} height: 0px;
}
/deep/ .el-table .el-table__body tr:hover > td { /deep/ .el-table .el-table__header-wrapper tr th {
background-color: #f2f7fe !important; background-color: #ecf1f7 !important;
} font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/ .el-table__row { /deep/ .el-table .el-table__body tr.current-row > td {
height: 48px !important; background-color: #f2f7fe !important;
} }
/deep/ .el-table__row--level-1 { /deep/ .el-table .el-table__body tr:hover > td {
.el-table__cell { background-color: #f2f7fe !important;
background-color: #f5f6f7 !important; }
}
}
/deep/ .el-table th > .cell { /deep/ .el-table__row {
font-family: HarmonyOS_Sans_SC_Medium; height: 48px !important;
} }
/deep/ .el-table .el-table__cell { /deep/ .el-table__row--level-1 {
padding: 0 !important; .el-table__cell {
} background-color: #f5f6f7 !important;
}
}
/deep/ .el-table__body { /deep/ .el-table th > .cell {
width: 100% !important; font-family: HarmonyOS_Sans_SC_Medium;
} }
// el-table 左侧固定 样式统一 /deep/ .el-table .el-table__cell {
/deep/ .el-table__fixed { padding: 0 !important;
height: 100% !important; }
&::before { /deep/ .el-table__body {
height: 0; width: 100% !important;
} }
}
/deep/ .el-table__fixed-header-wrapper { // el-table 左侧固定 样式统一
height: 48px !important; /deep/ .el-table__fixed {
height: 100% !important;
.el-table__header {
width: 100% !important;
height: 48px !important;
background-color: #ecf1f7 !important;
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 3rem !important;
padding: 0 !important;
}
thead { &::before {
font-size: 0.875rem !important; height: 0;
font-family: HarmonyOS_Sans_SC_Medium !important; }
color: #282f3c !important; }
.cell { /deep/ .el-table__fixed-header-wrapper {
font-weight: normal !important; height: 48px !important;
}
} .el-table__header {
width: 100% !important;
height: 48px !important;
background-color: #ecf1f7 !important;
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 3rem !important;
padding: 0 !important;
}
th { thead {
border: none !important; font-size: 0.875rem !important;
background-color: #ecf1f7 !important; font-family: HarmonyOS_Sans_SC_Medium !important;
} color: #282f3c !important;
}
/deep/ .hover-row { .cell {
.el-table__cell { font-weight: normal !important;
background-color: #f2f7fe !important;
}
} }
}
/deep/ .el-table__fixed-right { th {
height: 100% !important; border: none !important;
background-color: #ecf1f7 !important;
}
}
&::before { /deep/ .hover-row {
height: 0; .el-table__cell {
} background-color: #f2f7fe !important;
} }
}
// 批量操作 /deep/ .el-table__fixed-right {
.el-tag { height: 100% !important;
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
margin-bottom: 16px;
display: flex;
align-items: center;
}
/deep/ .el-link--inner { &::before {
color: rgb(5, 95, 231); height: 0;
} }
}
.icon-tanhao1 { // 批量操作
display: flex; .el-tag {
justify-content: center; color: #055fe7 !important;
align-items: center; height: 32px;
} box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
margin-bottom: 16px;
display: flex;
align-items: center;
}
// 表格高度 -- 展示下面的border /deep/ .el-link--inner {
.split-line { color: rgb(5, 95, 231);
height: 650px; }
border-bottom: 1px solid #eeeeee;
}
// 复选框 .icon-tanhao1 {
/deep/ .el-checkbox__inner { display: flex;
cursor: pointer; justify-content: center;
} align-items: center;
}
/deep/ .el-checkbox__input { // 表格高度 -- 展示下面的border
line-height: 16px; .split-line {
} height: 650px;
border-bottom: 1px solid #eeeeee;
}
.search { // 复选框
/deep/ .el-input__inner { /deep/ .el-checkbox__inner {
background: #ffffff; cursor: pointer;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03); }
border-radius: 4px;
border: none;
}
// 输入框选中样式 /deep/ .el-checkbox__input {
/deep/ .el-input.is-active .el-input__inner, line-height: 16px;
/deep/ .el-input__inner:focus { }
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
}
/deep/ .el-input.is-active .el-input__inner, .search {
/deep/ .el-input__inner:hover { /deep/ .el-input__inner {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08); background: #ffffff;
border-color: none; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
} border-radius: 4px;
border: none;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。 // 输入框选中样式
/deep/ .el-input.is-active .el-input__inner, /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus-within { /deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none; border-color: none;
color: #055fe7; color: #055fe7;
}
.el-range-input { /deep/ .el-input.is-active .el-input__inner,
color: #055fe7; /deep/ .el-input__inner:hover {
} box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
} border-color: none;
}
/deep/ .el-input.is-active .el-input__inner, // :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/ .el-input__inner:hover { /deep/ .el-input.is-active .el-input__inner,
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08); /deep/ .el-input__inner:focus-within {
border-color: none; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
} border-color: none;
} color: #055fe7;
/deep/ .el-input__inner:hover { .el-range-input {
cursor: text; color: #055fe7;
} }
}
// @import "@/assets/css/globalBase.scss"; /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
}
/deep/ .el-input__inner:hover {
cursor: text;
}
// @import "@/assets/css/globalBase.scss";
</style> </style>
<!--table树--> <!--table树-->
<style scoped lang="scss"> <style scoped lang="scss">
.el-select-dropdown__item.selected { .el-select-dropdown__item.selected {
color: #006aff; color: #006aff;
} }
.tableHeader { .tableHeader {
> span { > span {
&:last-of-type { &:last-of-type {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
}
}
} }
}
}
.rgbq { .rgbq {
padding: 0 5px; padding: 0 5px;
width: 32px; width: 32px;
background: #ddebff; background: #ddebff;
border-radius: 2px; border-radius: 2px;
font-size: 12px; font-size: 12px;
color: #055fe7; color: #055fe7;
} }
.pRight { .pRight {
position: absolute; position: absolute;
right: 0; right: 0;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }
.removeDia { .removeDia {
//width: 1600px !important; //width: 1600px !important;
} }
.el-table { .el-table {
/deep/ .el-checkbox { /deep/ .el-checkbox {
.is-indeterminate { .is-indeterminate {
.el-checkbox__inner { .el-checkbox__inner {
background-color: #055fe7 !important; background-color: #055fe7 !important;
border: 1px solid #055fe7 !important; border: 1px solid #055fe7 !important;
} }
}
}
} }
}
}
.el-tree /deep/ .el-tree-node__expand-icon.expanded { .el-tree /deep/ .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
/*有子节点 且未展开*/ /*有子节点 且未展开*/
.el-table /deep/ .el-icon-arrow-right:before { .el-table /deep/ .el-icon-arrow-right:before {
content: ""; content: "";
display: block; display: block;
width: 16px; width: 16px;
height: 16px; height: 16px;
font-size: 16px; font-size: 16px;
background-size: 16px; background-size: 16px;
} }
/*有子节点 且已展开*/ /*有子节点 且已展开*/
.el-table /deep/ .el-table__expand-icon--expanded { .el-table /deep/ .el-table__expand-icon--expanded {
.el-icon-arrow-right:before { .el-icon-arrow-right:before {
content: ""; content: "";
display: block; display: block;
width: 15px; width: 15px;
height: 20px; height: 20px;
font-size: 18px; font-size: 18px;
background-size: 21px; background-size: 21px;
} }
} }
/*没有子节点*/ /*没有子节点*/
.el-tree .el-tree
/deep/ /deep/
.el-tree-node__expand-icon.is-leaf::before .el-tree-node__expand-icon.is-leaf::before
.el-table .el-table
/deep/ /deep/
.el-table__placeholder::before { .el-table__placeholder::before {
content: ""; content: "";
display: block; display: block;
width: 16px; width: 16px;
height: 18px; height: 18px;
font-size: 16px; font-size: 16px;
background-size: 16px; background-size: 16px;
} }
/deep/ .el-table--enable-row-hover .el-table__body tr:hover { /deep/ .el-table--enable-row-hover .el-table__body tr:hover {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<style lang="scss"> <style lang="scss">
.el-tag-box { .el-tag-box {
// width: 930px; // width: 930px;
display: flex !important; display: flex !important;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
width: 1070px; width: 1070px;
overflow: auto; overflow: auto;
} }
/* 设置滚动条的样式 */ /* 设置滚动条的样式 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
/* 滚动槽 */ /* 滚动槽 */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 6px; border-radius: 6px;
} }
/* 滚动条滑块 */ /* 滚动条滑块 */
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 6px; border-radius: 6px;
background: #dadde0; background: #dadde0;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5); -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
} }
::-webkit-scrollbar-thumb:window-inactive { ::-webkit-scrollbar-thumb:window-inactive {
background: #dadde0; background: #dadde0;
} }
.el-table__expand-icon { .el-table__expand-icon {
.el-icon-arrow-right { .el-icon-arrow-right {
cursor: pointer !important; cursor: pointer !important;
} }
cursor: pointer !important; cursor: pointer !important;
position: absolute; position: absolute;
right: 45px; right: 45px;
cursor: pointer; cursor: pointer;
color: #b51f1f; color: #b51f1f;
transition: transform 0.2s ease-in-out; transition: transform 0.2s ease-in-out;
width: 11px; width: 11px;
height: 11px; height: 11px;
/* border: black 1px solid; */ /* border: black 1px solid; */
margin: 0; margin: 0;
background-image: url("../../assets/img/confirm/expend.png"); background-image: url("../../assets/img/confirm/expend.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.el-table__expand-icon.el-table__expand-icon--expanded { .el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px; width: 11px;
height: 11px; height: 11px;
background-image: url("../../assets/img/confirm/shrink.png"); background-image: url("../../assets/img/confirm/shrink.png");
background-position: center; background-position: center;
background-size: 11px; background-size: 11px;
background-repeat: no-repeat; background-repeat: no-repeat;
transform: rotate(180deg) !important; transform: rotate(180deg) !important;
} }
// 修改下拉框样式 // 修改下拉框样式
.el-select-dropdown__item { .el-select-dropdown__item {
padding-left: 20px; padding-left: 20px;
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td { /deep/ .el-table .el-table__body tr.current-row > td {
......
src/views/cxyrd/modules/LLCandidate.vue
...@@ -154,7 +154,11 @@ export default { ...@@ -154,7 +154,11 @@ export default {
//目标表格点击 //目标表格点击
targetBh: "", targetBh: "",
// 表格的索引 // 表格的索引
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
created () { created () {
...@@ -188,6 +192,8 @@ export default { ...@@ -188,6 +192,8 @@ export default {
msg: null, msg: null,
delTime: null, delTime: null,
}); });
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
return; return;
} }
// 默认选中第一条数据 // 默认选中第一条数据
...@@ -199,8 +205,16 @@ export default { ...@@ -199,8 +205,16 @@ export default {
}); });
}, },
mounted () { mounted () {
let self = this
// 监听键盘事件 // 监听键盘事件
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
}, },
methods: { methods: {
/** /**
...@@ -1094,6 +1108,8 @@ export default { ...@@ -1094,6 +1108,8 @@ export default {
this.$emit("targetObj", val); this.$emit("targetObj", val);
this.targetBh = val.destbarcode; this.targetBh = val.destbarcode;
let self = this; let self = this;
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
// 存储目标条码号 // 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode); sessionStorage.setItem("destbarcode", val.destbarcode);
...@@ -1208,6 +1224,12 @@ export default { ...@@ -1208,6 +1224,12 @@ export default {
//console.info(val); //console.info(val);
}, },
}, },
beforeDestroy () {
this.$bus.off("changImageEditTarget");
this.$bus.off("targetDeleteMessage");
this.$bus.off('target_info')
this.$bus.off('bzJudgeTL')
},
watch: { watch: {
checked (newValue, oldValue) { checked (newValue, oldValue) {
if (newValue) { if (newValue) {
......
src/views/cxyrd/modules/LLSrc.vue
...@@ -416,6 +416,7 @@ export default { ...@@ -416,6 +416,7 @@ export default {
let barcode = val.barcode; let barcode = val.barcode;
// 存储原条码号 // 存储原条码号
sessionStorage.setItem("srcbarcode", barcode); sessionStorage.setItem("srcbarcode", barcode);
self.barcode = barcode
//console.log(barcode); //console.log(barcode);
self.$axios self.$axios
.post("/api/org/case/barcode", { .post("/api/org/case/barcode", {
...@@ -542,6 +543,8 @@ export default { ...@@ -542,6 +543,8 @@ export default {
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false); self.$store.commit("loading/setLoading", false);
}, 500); }, 500);
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else { } else {
this.$bus.emit("changImageEdit", "xxx"); this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
...@@ -626,6 +629,7 @@ export default { ...@@ -626,6 +629,7 @@ export default {
beforeDestroy() { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource"); this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
}, },
}; };
// 某任务下查询的所有信息 // 某任务下查询的所有信息
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -326,7 +326,11 @@ export default { ...@@ -326,7 +326,11 @@ export default {
isDelete: false, isDelete: false,
// 搜索类型 // 搜索类型
searchType: '指纹', searchType: '指纹',
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
mounted () { mounted () {
...@@ -339,6 +343,13 @@ export default { ...@@ -339,6 +343,13 @@ export default {
self.isShowOptions = false self.isShowOptions = false
}) })
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
}, },
created () { created () {
let self = this; let self = this;
...@@ -374,12 +385,15 @@ export default { ...@@ -374,12 +385,15 @@ export default {
} else { } else {
self.$bus.emit("bzJudge", null); self.$bus.emit("bzJudge", null);
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
} }
}); });
}, },
beforeDestroy () { beforeDestroy () {
this.$bus.off("deleteMessage"); this.$bus.off("deleteMessage");
this.$bus.off("initCandidate"); this.$bus.off("initCandidate");
this.$bus.off('target_info')
}, },
methods: { methods: {
/** /**
...@@ -1323,6 +1337,9 @@ export default { ...@@ -1323,6 +1337,9 @@ export default {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中 // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit("bzJudge", val); this.$bus.emit("bzJudge", val);
if (val != null) { if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) { if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", { self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！", msg: "该条数据已删除！",
......
src/views/cxyrd/modules/LTSrc.vue
...@@ -497,7 +497,7 @@ export default { ...@@ -497,7 +497,7 @@ export default {
let self = this; let self = this;
// this.isActive = index; // this.isActive = index;
this.isActive = imageInfo.seq; this.isActive = imageInfo.seq;
//console.log(this.isActive); // console.log(this.isActive);
// 存储源数据序号 // 存储源数据序号
if (imageInfo) { if (imageInfo) {
// 改变数据为点击状态 // 改变数据为点击状态
...@@ -524,6 +524,8 @@ export default { ...@@ -524,6 +524,8 @@ export default {
self.$bus.emit("initCandidate", []); self.$bus.emit("initCandidate", []);
} }
}); });
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else { } else {
this.$bus.emit("changImageEdit", "xxx"); this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
...@@ -607,6 +609,7 @@ export default { ...@@ -607,6 +609,7 @@ export default {
beforeDestroy () { beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource"); this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
}, },
}; };
// 某任务下查询的所有信息 // 某任务下查询的所有信息
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -75,7 +75,11 @@ export default { ...@@ -75,7 +75,11 @@ export default {
isDelete: false, isDelete: false,
searchType: '指纹', searchType: '指纹',
// 表格的索引 // 表格的索引
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
created () { created () {
...@@ -114,6 +118,8 @@ export default { ...@@ -114,6 +118,8 @@ export default {
} }
}); });
} else { } else {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
self.tableIndex = null self.tableIndex = null
self.$bus.emit('bzJudgeTL', null) self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) { if (self.isDelete) {
...@@ -130,6 +136,16 @@ export default { ...@@ -130,6 +136,16 @@ export default {
}); });
// 监听键盘事件 // 监听键盘事件
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
if(!source_info.barcode_source) {
self.$bus.emit('target_info', {barcode_source: '', seq_source: '', barcode_target: '', seq_target: ''})
}
})
}, },
methods: { methods: {
/** /**
...@@ -220,6 +236,8 @@ export default { ...@@ -220,6 +236,8 @@ export default {
let self = this; let self = this;
console.log(val); console.log(val);
if (val != null) { if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) { if (val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', { self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！', msg: '该条数据已删除！',
...@@ -370,6 +388,7 @@ export default { ...@@ -370,6 +388,7 @@ export default {
this.$bus.off('initTLCandidate') this.$bus.off('initTLCandidate')
this.$bus.off('deleteMessage') this.$bus.off('deleteMessage')
this.$bus.off('updateTLSourceData') this.$bus.off('updateTLSourceData')
this.$bus.off('target_info')
}, },
}; };
</script> </script>
......
src/views/cxyrd/modules/TLSrc.vue
...@@ -524,7 +524,10 @@ export default { ...@@ -524,7 +524,10 @@ export default {
if (this.hand) { if (this.hand) {
this.changeStyleHand(0, this.hand) this.changeStyleHand(0, this.hand)
} else { } else {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
this.$bus.emit('changImageEdit', 'xxx') this.$bus.emit('changImageEdit', 'xxx')
this.$bus.emit('changImageEditTarget', 'xxx')
} }
}, },
/** /**
...@@ -603,6 +606,7 @@ export default { ...@@ -603,6 +606,7 @@ export default {
async handleCurrentChange (val, old) { async handleCurrentChange (val, old) {
let self = this; let self = this;
if (val != null) { if (val != null) {
self.barcode = val.barcode
// 发送请求 // 发送请求
// self.$store.commit('loading/setLoadingSd', true) // self.$store.commit('loading/setLoadingSd', true)
// 被删除 // 被删除
...@@ -1326,6 +1330,8 @@ export default { ...@@ -1326,6 +1330,8 @@ export default {
changeStyleHand (index, imageInfo) { changeStyleHand (index, imageInfo) {
let self = this let self = this
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1375,6 +1381,8 @@ export default { ...@@ -1375,6 +1381,8 @@ export default {
let self = this; let self = this;
// 如果图片存在 // 如果图片存在
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1443,6 +1451,8 @@ export default { ...@@ -1443,6 +1451,8 @@ export default {
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1504,6 +1514,8 @@ export default { ...@@ -1504,6 +1514,8 @@ export default {
const source = CancelToken.source(); const source = CancelToken.source();
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1565,6 +1577,8 @@ export default { ...@@ -1565,6 +1577,8 @@ export default {
//console.log(imageInfo); //console.log(imageInfo);
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
......
src/views/cxyrd/modules/TTFace.vue
...@@ -247,6 +247,9 @@ export default { ...@@ -247,6 +247,9 @@ export default {
scouceCode(val) { scouceCode(val) {
// var val = "Rmmmmmmmmmmmmmmmmmmmmmm"; // var val = "Rmmmmmmmmmmmmmmmmmmmmmm";
let self = this; let self = this;
for(let key in self.souceGets) {
self.souceGets[key] = ''
}
this.loadingIndex++; this.loadingIndex++;
this.$emit("loadingIndex", true); this.$emit("loadingIndex", true);
this.$axios this.$axios
...@@ -275,6 +278,9 @@ export default { ...@@ -275,6 +278,9 @@ export default {
let self = this; let self = this;
this.loadingIndex++; this.loadingIndex++;
this.$emit("loadingIndex", true); this.$emit("loadingIndex", true);
for(let key in self.targetGets) {
self.targetGets[key] = ''
}
this.$axios this.$axios
.post("/api/org/face/barcode", { barcode: val }) .post("/api/org/face/barcode", { barcode: val })
.then((res) => { .then((res) => {
......
src/views/rgrd/modules/LLCandidate.vue
...@@ -118,7 +118,11 @@ export default { ...@@ -118,7 +118,11 @@ export default {
//目标表格点击 //目标表格点击
targetBh: "", targetBh: "",
// 表格的索引 // 表格的索引
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
created() { created() {
...@@ -152,6 +156,8 @@ export default { ...@@ -152,6 +156,8 @@ export default {
msg: null, msg: null,
delTime: null, delTime: null,
}); });
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
return; return;
} }
// 默认选中第一条数据 // 默认选中第一条数据
...@@ -163,8 +169,16 @@ export default { ...@@ -163,8 +169,16 @@ export default {
}); });
}, },
mounted () { mounted () {
let self = this
// 监听键盘事件 // 监听键盘事件
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
}, },
methods: { methods: {
/** /**
...@@ -1053,11 +1067,13 @@ export default { ...@@ -1053,11 +1067,13 @@ export default {
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange(val, old) {
let self = this
if (!val) return; if (!val) return;
if (this.isDelete) return; if (this.isDelete) return;
this.$emit("targetObj", val); this.$emit("targetObj", val);
this.targetBh = val.destbarcode; this.targetBh = val.destbarcode;
let self = this; // 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == "1") { if (val.removeFlag == "1") {
// 存储目标条码号 // 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode); sessionStorage.setItem("destbarcode", val.destbarcode);
...@@ -1163,6 +1179,12 @@ export default { ...@@ -1163,6 +1179,12 @@ export default {
//console.info(val); //console.info(val);
}, },
}, },
beforeDestroy () {
this.$bus.off("changImageEditTarget");
this.$bus.off("targetDeleteMessage");
this.$bus.off('target_info')
this.$bus.off('bzJudgeTL')
},
watch: { watch: {
checked(newValue, oldValue) { checked(newValue, oldValue) {
if (newValue) { if (newValue) {
......
src/views/rgrd/modules/LLSrc.vue
...@@ -399,6 +399,7 @@ export default { ...@@ -399,6 +399,7 @@ export default {
sessionStorage.setItem("qqid", self.qqid); sessionStorage.setItem("qqid", self.qqid);
sessionStorage.setItem("qid", self.qid); sessionStorage.setItem("qid", self.qid);
let barcode = val.barcode; let barcode = val.barcode;
self.barcode = barcode
// 存储原条码号 // 存储原条码号
sessionStorage.setItem("srcbarcode", barcode); sessionStorage.setItem("srcbarcode", barcode);
//console.log(barcode); //console.log(barcode);
...@@ -529,6 +530,8 @@ export default { ...@@ -529,6 +530,8 @@ export default {
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit("loading/setLoading", false); self.$store.commit("loading/setLoading", false);
}, 500); }, 500);
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else { } else {
this.$bus.emit("changImageEdit", "xxx"); this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
...@@ -599,6 +602,7 @@ export default { ...@@ -599,6 +602,7 @@ export default {
beforeDestroy() { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource"); this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
}, },
}; };
// 某任务下查询的所有信息 // 某任务下查询的所有信息
......
src/views/rgrd/modules/LTCandidate.vue
...@@ -281,7 +281,11 @@ export default { ...@@ -281,7 +281,11 @@ export default {
isDelete: false, isDelete: false,
// 搜索类型 // 搜索类型
searchType: "指纹", searchType: "指纹",
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
mounted () { mounted () {
...@@ -291,6 +295,12 @@ export default { ...@@ -291,6 +295,12 @@ export default {
self.searchType = type; self.searchType = type;
}); });
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
})
}, },
created () { created () {
let self = this; let self = this;
...@@ -326,12 +336,15 @@ export default { ...@@ -326,12 +336,15 @@ export default {
} else { } else {
self.$bus.emit("bzJudge", null); self.$bus.emit("bzJudge", null);
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: ''})
} }
}); });
}, },
beforeDestroy () { beforeDestroy () {
this.$bus.off("deleteMessage"); this.$bus.off("deleteMessage");
this.$bus.off("initCandidate"); this.$bus.off("initCandidate");
this.$bus.off('target_info')
}, },
methods: { methods: {
/** /**
...@@ -1189,6 +1202,8 @@ export default { ...@@ -1189,6 +1202,8 @@ export default {
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中 // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit("bzJudge", val); this.$bus.emit("bzJudge", val);
if (val != null) { if (val != null) {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', {barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno})
if (val.removeFlag == 1) { if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", { self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！", msg: "该条数据已删除！",
......
src/views/rgrd/modules/LTSrc.vue
...@@ -540,6 +540,8 @@ export default { ...@@ -540,6 +540,8 @@ export default {
self.$bus.emit("initCandidate", []); self.$bus.emit("initCandidate", []);
} }
}); });
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.seq})
} else { } else {
this.$bus.emit("changImageEdit", "xxx"); this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit("changImageEditTarget", "xxx"); this.$bus.emit("changImageEditTarget", "xxx");
...@@ -621,6 +623,7 @@ export default { ...@@ -621,6 +623,7 @@ export default {
beforeDestroy() { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource"); this.$bus.off("updateFinderSource");
this.$bus.off('source_info')
}, },
}; };
// 某任务下查询的所有信息 // 某任务下查询的所有信息
......
src/views/rgrd/modules/TLCandidate.vue
...@@ -62,7 +62,11 @@ export default { ...@@ -62,7 +62,11 @@ export default {
isDelete: false, isDelete: false,
searchType: "指纹", searchType: "指纹",
// 表格的索引 // 表格的索引
tableIndex: null tableIndex: null,
// 源条码号
barcode_source: '',
// 源指位号
seq_source: ''
}; };
}, },
created () { created () {
...@@ -101,6 +105,8 @@ export default { ...@@ -101,6 +105,8 @@ export default {
} }
}); });
} else { } else {
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: '', seq_target: '' })
self.$bus.emit("bzJudgeTL", null); self.$bus.emit("bzJudgeTL", null);
if (self.isDelete) { if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx') // self.$bus.emit('changImageEditTarget', 'xxx')
...@@ -116,6 +122,16 @@ export default { ...@@ -116,6 +122,16 @@ export default {
}); });
// 监听键盘事件 // 监听键盘事件
this.keyDown() this.keyDown()
// 获取传递过来的 源条码号，源指位号
this.$bus.on('source_info', (source_info) => {
console.log(source_info);
self.barcode_source = source_info.barcode_source
self.seq_source = source_info.seq_source
if (!source_info.barcode_source) {
self.$bus.emit('target_info', { barcode_source: '', seq_source: '', barcode_target: '', seq_target: '' })
}
})
}, },
methods: { methods: {
/** /**
...@@ -182,6 +198,8 @@ export default { ...@@ -182,6 +198,8 @@ export default {
let self = this; let self = this;
console.log(val); console.log(val);
if (!val) return; if (!val) return;
// 传递目标数据 -- 目标条码号，目标指位号
self.$bus.emit('target_info', { barcode_source: self.barcode_source, seq_source: self.seq_source, barcode_target: val.destbarcode, seq_target: val.destseqno })
if (val.removeFlag == 1) { if (val.removeFlag == 1) {
self.$bus.emit("targetDeleteMessage", { self.$bus.emit("targetDeleteMessage", {
msg: "该条数据已删除！", msg: "该条数据已删除！",
...@@ -352,6 +370,7 @@ export default { ...@@ -352,6 +370,7 @@ export default {
this.$bus.off("initTLCandidate"); this.$bus.off("initTLCandidate");
this.$bus.off("deleteMessage"); this.$bus.off("deleteMessage");
this.$bus.off("updateTLSourceData"); this.$bus.off("updateTLSourceData");
this.$bus.off('target_info')
}, },
}; };
</script> </script>
......
src/views/rgrd/modules/TLSrc.vue
...@@ -713,7 +713,10 @@ export default { ...@@ -713,7 +713,10 @@ export default {
if (this.hand) { if (this.hand) {
this.changeStyleHand(0, this.hand); this.changeStyleHand(0, this.hand);
} else { } else {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: '', seq_source: ''})
this.$bus.emit("changImageEdit", "xxx"); this.$bus.emit("changImageEdit", "xxx");
this.$bus.emit('changImageEditTarget', 'xxx')
} }
}, },
/** /**
...@@ -1504,6 +1507,8 @@ export default { ...@@ -1504,6 +1507,8 @@ export default {
changeStyleHand(index, imageInfo) { changeStyleHand(index, imageInfo) {
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1550,6 +1555,8 @@ export default { ...@@ -1550,6 +1555,8 @@ export default {
let self = this; let self = this;
// 如果图片存在 // 如果图片存在
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1616,6 +1623,8 @@ export default { ...@@ -1616,6 +1623,8 @@ export default {
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1680,6 +1689,8 @@ export default { ...@@ -1680,6 +1689,8 @@ export default {
const source = CancelToken.source(); const source = CancelToken.source();
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
...@@ -1744,6 +1755,8 @@ export default { ...@@ -1744,6 +1755,8 @@ export default {
//console.log(imageInfo); //console.log(imageInfo);
let self = this; let self = this;
if (imageInfo.image) { if (imageInfo.image) {
// 传递源数据 -- 源条码号，源指位号
self.$bus.emit('source_info', {barcode_source: self.barcode, seq_source: imageInfo.code})
// 改变数据为点击状态 // 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1"); self.$set(imageInfo, "clickLog", "1");
this.isActive = imageInfo.code; this.isActive = imageInfo.code;
......
src/views/zzwlr/xzry.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:31:34 * @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-02-08 10:44:40 * @LastEditTime: 2022-02-13 21:42:29
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
jzrybh: "", // 警综人员编号 jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号 asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号 zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因 cjxxyydm: [], // 采集信息原因
xm: "", // 姓名 xm: "", // 姓名
bmch: "", // 别名 bmch: "", // 别名
...@@ -392,7 +392,6 @@ ...@@ -392,7 +392,6 @@
this.$set(this.rules.zjhm[1], "pattern", /^[0-9a-zA-Z]+$/) this.$set(this.rules.zjhm[1], "pattern", /^[0-9a-zA-Z]+$/)
} }
}, },
}, },
methods: { methods: {
isRight() { isRight() {
......
src/views/zzwlr/xzryedit.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-07 10:31:34 * @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-02-08 16:03:36 * @LastEditTime: 2022-02-13 21:43:46
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue * @FilePath: \founder_vue\src\views\zzwlr\Index.vue
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
jzrybh: "", // 警综人员编号 jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号 asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号 zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因 cjxxyydm: [], // 采集信息原因
xm: "", // 姓名 xm: "", // 姓名
bmch: "", // 别名 bmch: "", // 别名
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-12 14:54:31 * @LastEditTime: 2022-02-14 16:50:09
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -113,13 +113,13 @@ module.exports = { ...@@ -113,13 +113,13 @@ module.exports = {
// target: "http://192.168.128.108:8099/", // 张 认定 // target: "http://192.168.128.108:8099/", // 张 认定
// target: "http://192.168.128.101:8099", // 湖南-马 // target: "http://192.168.128.101:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.111:8099", // 湖南-张呈光 // target: "http://192.168.128.108:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
target: "http://zwpt.xzclub.top:9333/", // target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.103:8099", // 江 target: "http://192.168.128.103:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -129,9 +129,9 @@ module.exports = { ...@@ -129,9 +129,9 @@ module.exports = {
"/security": { "/security": {
// target: "http://192.168.128.106:8765", // 湖南-王 // target: "http://192.168.128.106:8765", // 湖南-王
// target: "http://192.168.128.111:8765/", // 张 认定 target: "http://192.168.128.108:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王 // target: "http://www.meetfood.cn:2390", // 湖南-王
target: "http://zwpt.xzclub.top:9333/", // target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765", // target: "http://192.168.128.109:8765",
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
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