Skip to content

F
founder_vue
Commit c12b3a8c by 张超军
Options

1.采集接口对接。2.禅道bug调整。

parent 76d062d4
Showing with 515 additions and 515 deletions
src/components/ImageEd.scss
...@@ -183,7 +183,7 @@ div { ...@@ -183,7 +183,7 @@ div {
top: 35px; top: 35px;
left: 0; left: 0;
width: 240px; width: 240px;
height: 195px; height: 175px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px; border-radius: 4px;
...@@ -482,12 +482,31 @@ div { ...@@ -482,12 +482,31 @@ div {
.tui-brush-color-picker { .tui-brush-color-picker {
z-index: 100; z-index: 100;
background: #ffffff; background: #ffffff;
padding: 5px; // padding: 5px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
position: absolute; position: absolute;
right: 370px; right: 400px;
top: 97px; top: 97px;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
box-sizing: border-box;
padding-left: 16px;
padding-top: 9px;
}
/deep/.tui-colorpicker-palette-button.tui-colorpicker-selected {
&::before {
content: "888";
width: 10px;
height: 10px;
border-radius: 50%;
background-color: green;
position: absolute;
left: 0;
top: 0;
}
}
} }
.circle_mix { .circle_mix {
margin-right: 8px; margin-right: 8px;
...@@ -528,7 +547,7 @@ div { ...@@ -528,7 +547,7 @@ div {
top: 35px; top: 35px;
left: 0; left: 0;
width: 240px; width: 240px;
height: 224px; height: 200px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px; border-radius: 4px;
...@@ -657,6 +676,13 @@ div { ...@@ -657,6 +676,13 @@ div {
position: absolute; position: absolute;
right: 472px; right: 472px;
top: 173px; top: 173px;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
box-sizing: border-box;
padding-left: 16px;
padding-top: 9px;
}
} }
.size_mix { .size_mix {
margin-right: 8px; margin-right: 8px;
...@@ -783,7 +809,7 @@ div { ...@@ -783,7 +809,7 @@ div {
top: 35px; top: 35px;
left: 0; left: 0;
width: 240px; width: 240px;
height: 200px; height: 190px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06); box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
...@@ -952,6 +978,7 @@ div { ...@@ -952,6 +978,7 @@ div {
} }
} }
.desc { .desc {
margin-top: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -962,6 +989,7 @@ div { ...@@ -962,6 +989,7 @@ div {
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #e6e9ec; border: 1px solid #e6e9ec;
text-align: center;
} }
} }
} }
...@@ -1243,7 +1271,7 @@ div { ...@@ -1243,7 +1271,7 @@ div {
.multiply, .multiply,
.blend, .blend,
.brightness { .brightness {
z-index: 9999999; z-index: 9;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: -84px; top: -84px;
...@@ -1289,8 +1317,38 @@ div { ...@@ -1289,8 +1317,38 @@ div {
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #e6e9ec; border: 1px solid #e6e9ec;
text-align: center;
} }
} }
}
.blend {
width: 137px !important;
height: 64px;
padding: 0;
top: -60px;
right: 290px !important;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
box-sizing: border-box;
padding-left: 16px;
padding-top: 9px;
}
}
.multiply {
width: 137px !important;
height: 64px;
padding: 0;
top: -60px;
right: 200px !important;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
box-sizing: border-box;
padding-left: 16px;
padding-top: 9px;
}
} }
.brightness { .brightness {
width: 240px; width: 240px;
...@@ -1329,14 +1387,14 @@ div { ...@@ -1329,14 +1387,14 @@ div {
} }
.lt_main_middle .lt_middle_main { .lt_main_middle .lt_middle_main {
width: 100%; width: 100%;
height: 750px; height: 740px;
display: flex; display: flex;
.source { .source {
z-index: 0; z-index: 0;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
// width: 560px; // width: 560px;
height: 750px; height: 740px;
margin-right: 16px; margin-right: 16px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
...@@ -1530,7 +1588,7 @@ div { ...@@ -1530,7 +1588,7 @@ div {
} }
} }
.tzdDrawing_source { .tzdDrawing_source {
z-index: 99; z-index: 100;
width: 540px; width: 540px;
height: 540px; height: 540px;
position: absolute; position: absolute;
...@@ -1561,7 +1619,7 @@ div { ...@@ -1561,7 +1619,7 @@ div {
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
// width: 560px; // width: 560px;
height: 750px; height: 740px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
z-index: 0; z-index: 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: 2021-12-26 18:57:44 * @LastEditTime: 2021-12-27 15:09:58
* @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
--> -->
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
<div class="btn light_dbd" :class="{brightnessActive: isBrightnessActive}" @click.stop="changeBrightness">亮度/对比度 <div class="btn light_dbd" :class="{brightnessActive: isBrightnessActive}" @click.stop="changeBrightness">亮度/对比度
</div> </div>
<!-- 去白弹框 --> <!-- 去白弹框 -->
<div class="remove-white" v-show="optionsRemoveWhite"> <div class="remove-white number-range" v-show="optionsRemoveWhite">
<div class="title">去白</div> <div class="title">去白</div>
<div class="content"> <div class="content">
<el-slider class="range-narrow" id="input-range-remove-white-distance" v-model="inputRemoveWhiteRange" :min="0" :max="255"></el-slider> <el-slider class="range-narrow" id="input-range-remove-white-distance" v-model="inputRemoveWhiteRange" :min="0" :max="255"></el-slider>
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
</div> </div>
</div> </div>
<!-- 滤色器弹框 --> <!-- 滤色器弹框 -->
<div class="color-filter" v-show="optionsColorFilter"> <div class="color-filter number-range" v-show="optionsColorFilter" @click.stop>
<div class="title">滤色器</div> <div class="title">滤色器</div>
<div class="content"> <div class="content">
<el-slider class="range-narrow" id="input-range-color-filter-value" v-model="inputColorFilterRange" :min="0" :max="255"></el-slider> <el-slider class="range-narrow" id="input-range-color-filter-value" v-model="inputColorFilterRange" :min="0" :max="255"></el-slider>
...@@ -426,19 +426,19 @@ ...@@ -426,19 +426,19 @@
</div> </div>
</div> </div>
<!-- 正片叠底弹框 --> <!-- 正片叠底弹框 -->
<div class="multiply" v-show="optionsMultiply"> <div class="multiply" v-show="optionsMultiply" @click.stop>
<div class="content"> <div class="content">
<div id="tui-multiply-color-picker"></div> <div id="tui-multiply-color-picker"></div>
</div> </div>
</div> </div>
<!-- 差异化弹框 --> <!-- 差异化弹框 -->
<div class="blend" v-show="optionsBlend"> <div class="blend" v-show="optionsBlend" @click.stop>
<div class="content"> <div class="content">
<div id="tui-blend-color-picker"></div> <div id="tui-blend-color-picker"></div>
</div> </div>
</div> </div>
<!-- 亮度/对比度弹框 --> <!-- 亮度/对比度弹框 -->
<div class="brightness" v-show="optionsBrightness"> <div class="brightness number-range" v-show="optionsBrightness" @click.stop>
<div class="title">亮度</div> <div class="title">亮度</div>
<div class="content"> <div class="content">
<el-slider class="range-narrow" id="input-range-brightness-value" v-model="inputBrightnessRange" :min="-255" :max="255"></el-slider> <el-slider class="range-narrow" id="input-range-brightness-value" v-model="inputBrightnessRange" :min="-255" :max="255"></el-slider>
...@@ -1170,7 +1170,7 @@ export default { ...@@ -1170,7 +1170,7 @@ export default {
*/ */
imageEditor._graphics.canvasImage.canvas.on("mouse:down", e => { imageEditor._graphics.canvasImage.canvas.on("mouse:down", e => {
// 开启拖拽 // 开启拖拽
if (self.zoomLevel > 1) { if (self.zoomLevel > 1 && self.isHand) {
self.startHand = true self.startHand = true
} }
}) })
...@@ -1201,7 +1201,7 @@ export default { ...@@ -1201,7 +1201,7 @@ export default {
* 目标图像 * 目标图像
*/ */
imageEditor2._graphics.canvasImage.canvas.on("mouse:down", e => { imageEditor2._graphics.canvasImage.canvas.on("mouse:down", e => {
if (self.zoomLevel2 > 1) { if (self.zoomLevel2 > 1 && self.isHand) {
// 开启拖拽 // 开启拖拽
self.startHand = true self.startHand = true
} }
...@@ -2176,6 +2176,16 @@ export default { ...@@ -2176,6 +2176,16 @@ export default {
self.isHistoryOptions = false self.isHistoryOptions = false
self.isActive_history = false self.isActive_history = false
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.05)");
// 滤色器
self.optionsColorFilter = false
// 差异化
self.optionsBlend = false
// 正片叠底
self.optionsMultiply = false
// 亮度/对比度
self.optionsBrightness = false
// 去白
self.optionsRemoveWhite = false
}) })
document.body.addEventListener("mouseup", function (e) { document.body.addEventListener("mouseup", function (e) {
...@@ -4214,11 +4224,15 @@ export default { ...@@ -4214,11 +4224,15 @@ export default {
this.isCircleOptions = !this.isCircleOptions; this.isCircleOptions = !this.isCircleOptions;
if (this.isActive_circle) { if (this.isActive_circle) {
$(".icon_circle").css("background", "#055FE7"); $(".icon_circle").css("background", "#055FE7");
$(".body-container").css('z-index', 100) // $(".body-container").css('z-index', 100)
$(".tzdDrawing_source").css('pointer-evnets', 'none')
$(".tzdDrawing_target").css('pointer-evnets', 'none')
} else { } else {
$(".tzdDrawing_source").css('pointer-evnets', 'auto')
$(".tzdDrawing_target").css('pointer-evnets', 'auto')
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)");
this.isMrSizeActive = false; this.isMrSizeActive = false;
$(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
} }
if (this.type == "source") { if (this.type == "source") {
if (this.isActive_circle) { if (this.isActive_circle) {
...@@ -4587,10 +4601,14 @@ export default { ...@@ -4587,10 +4601,14 @@ export default {
} }
if (this.isActive_line) { if (this.isActive_line) {
$(".icon_line").css("background", "#055FE7"); $(".icon_line").css("background", "#055FE7");
$(".body-container").css('z-index', 100) // $(".body-container").css('z-index', 100)
$(".tzdDrawing_source").css('pointer-events', 'none')
$(".tzdDrawing_target").css('pointer-events', 'none')
} else { } else {
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.05)");
$(".body-container").css('z-index', 99) $(".tzdDrawing_source").css('pointer-events', 'auto')
$(".tzdDrawing_target").css('pointer-events', 'auto')
// $(".body-container").css('z-index', 99)
this.isShowCurve = false; this.isShowCurve = false;
} }
}, },
...@@ -5513,14 +5531,17 @@ export default { ...@@ -5513,14 +5531,17 @@ export default {
// 开启拖拽 // 开启拖拽
// this.imageEditor._graphics._attachZoomEvents2(); // this.imageEditor._graphics._attachZoomEvents2();
// this.imageEditor._graphics.startHandMode() // this.imageEditor._graphics.startHandMode()
$(".tzdDrawing_source").css('z-index', 99)
$(".body-container").css('z-index', 100) // $(".tzdDrawing_source").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 99) $(".tzdDrawing_source").css('pointer-events', 'none')
// $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99)
} else { } else {
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); // $(".drag").css("background", "rgba(5, 95, 231, 0.05)");
$(".tzdDrawing_source").css('z-index', 100) // $(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 100) // $(".tzdDrawing_target").css('z-index', 100)
$(".tzdDrawing_source").css('pointer-events', 'auto')
// this.imageEditor.changeCursor('auto'); // this.imageEditor.changeCursor('auto');
// this.imageEditor2.changeCursor('auto'); // this.imageEditor2.changeCursor('auto');
// 停止拖拽 // 停止拖拽
...@@ -5536,16 +5557,18 @@ export default { ...@@ -5536,16 +5557,18 @@ export default {
// this.imageEditor2._graphics._attachZoomEvents2(); // this.imageEditor2._graphics._attachZoomEvents2();
this.imageEditor.changeCursor('grab'); this.imageEditor.changeCursor('grab');
this.imageEditor2.changeCursor('grab'); this.imageEditor2.changeCursor('grab');
$(".tzdDrawing_source").css('z-index', 99) $(".tzdDrawing_target").css('pointer-events', 'none')
$(".body-container").css('z-index', 100) // $(".tzdDrawing_source").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 99) // $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99)
} else { } else {
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.05)");
// 停止拖拽 // 停止拖拽
$(".tzdDrawing_target").css('pointer-events', 'auto')
// this.imageEditor2._graphics._attachZoomEvents3(); // this.imageEditor2._graphics._attachZoomEvents3();
$(".tzdDrawing_source").css('z-index', 100) // $(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 100) // $(".tzdDrawing_target").css('z-index', 100)
} }
} }
...@@ -5570,6 +5593,7 @@ export default { ...@@ -5570,6 +5593,7 @@ export default {
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.05)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
this.startHand = false;
// 是否放大 // 是否放大
// this.isEnlarge = false // this.isEnlarge = false
// 目标是否放大 // 目标是否放大
...@@ -5705,15 +5729,17 @@ export default { ...@@ -5705,15 +5729,17 @@ export default {
if (this.isEnlarge) { if (this.isEnlarge) {
$(".enlarge").css("background", "#055FE7"); $(".enlarge").css("background", "#055FE7");
// this.imageEditor.changeCursor("zoom-in"); // this.imageEditor.changeCursor("zoom-in");
$(".tzdDrawing_source").css('z-index', 100) // $(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 1) // $(".body-container").css('z-index', 1)
$(".tzdDrawing_source").css('pointer-events', 'auto')
this.isShowEnlargeSynchro = true; this.isShowEnlargeSynchro = true;
this.isEnlargeSynchro = false; this.isEnlargeSynchro = false;
} else { } else {
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.05)");
// this.imageEditor.changeCursor("auto"); // this.imageEditor.changeCursor("auto");
$(".tzdDrawing_source").css('z-index', 1) // $(".tzdDrawing_source").css('z-index', 1)
$(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
$(".tzdDrawing_source").css('pointer-events', 'none')
this.isShowEnlargeSynchro = false; this.isShowEnlargeSynchro = false;
this.isEnlargeSynchro = false; this.isEnlargeSynchro = false;
} }
......
src/views/AllPersonnelBase/modules/xzry.vue
...@@ -590,7 +590,12 @@ export default { ...@@ -590,7 +590,12 @@ export default {
if (response.data.code === 0) { if (response.data.code === 0) {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.dialogVisible = false; this.dialogVisible = false;
this.$router.pushToTab(`/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`) this.$router.pushToTab({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: {
type: 0
}
})
} else { } else {
this.$message.error("新增失败"); this.$message.error("新增失败");
} }
......
src/views/Editor/modules/ajdaxx.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
label-position="left" label-position="left"
:rules="rules" :rules="rules"
ref="ruleForm" ref="ruleForm"
label-width="10.125rem" label-width="10.325rem"
class="demo-ruleForm" class="demo-ruleForm"
:status-icon="true" :status-icon="true"
> >
...@@ -603,7 +603,24 @@ export default { ...@@ -603,7 +603,24 @@ export default {
SelectCode, SelectCode,
Cascader, Cascader,
dcfptxAj dcfptxAj
},
watch: {
drawer(newValue, oldValue) {
if(newValue) {
//监听页面滚动
this.$nextTick(() => {
document.querySelector('.el-drawer__body').addEventListener("scroll", (e) => {
console.log(e);
if(e.target.scrollTop > 400) {
$('.arrow-down-img').css('transform', 'rotate(180deg)');
} else {
$('.arrow-down-img').css('transform', 'rotate(0deg)');
} }
});
})
}
}
},
}; };
</script> </script>
......
src/views/Editor/modules/ajzwbjLeft.scss
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
} }
} }
.left-right-hand { .left-right-hand {
margin-top: 5px; margin-top: 16px;
.lr-hand { .lr-hand {
// width: 100%; // width: 100%;
width: 268px; width: 268px;
height: 640px; height: 624px;
overflow: auto; overflow: auto;
:nth-child(even) { :nth-child(even) {
margin-left: 8px; margin-left: 8px;
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -1176,6 +1176,7 @@ $previewHeight: var(--previewHeight, 100%); ...@@ -1176,6 +1176,7 @@ $previewHeight: var(--previewHeight, 100%);
flex-wrap: wrap; flex-wrap: wrap;
padding: 16px 14px; padding: 16px 14px;
.hand-item { .hand-item {
margin-bottom: 9px;
/deep/.el-checkbox__label { /deep/.el-checkbox__label {
padding-left: 5px; padding-left: 5px;
} }
......
src/views/Editor/modules/rydaxx.scss
...@@ -7,21 +7,21 @@ ...@@ -7,21 +7,21 @@
} }
.header { .header {
border-bottom: 1px solid #eeeeee;
position: fixed; position: fixed;
background: #FFFFFF; background: #ffffff;
height: 50px; height: 50px;
width: 943px; width: 955px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 32px; padding: 0 32px;
border-bottom: 1px solid #EEEEEE;
z-index: 999; z-index: 999;
.header-title { .header-title {
font-size: 16px; font-size: 16px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #282F3C; color: #282f3c;
} }
.header-close { .header-close {
...@@ -48,17 +48,17 @@ ...@@ -48,17 +48,17 @@
.ayzzwjbxx { .ayzzwjbxx {
padding: 24px 32px; padding: 24px 32px;
/deep/.el-input.is-disabled .el-input__inner { /deep/.el-input.is-disabled .el-input__inner {
background-color: #ECEDF1; background-color: #ecedf1;
color: #AEAFB4; color: #aeafb4;
cursor: not-allowed; cursor: not-allowed;
} }
/deep/ .el-form-item.is-error .el-input__inner { /deep/ .el-form-item.is-error .el-input__inner {
width: 264px; width: 264px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6E6E8; border: 1px solid #e6e6e8;
} }
/deep/ .el-input { /deep/ .el-input {
...@@ -66,9 +66,10 @@ ...@@ -66,9 +66,10 @@
height: 40px; height: 40px;
} }
/deep/ .el-input.is-active .el-input__inner, /deep/ .el-input__inner:focus { /deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important;
border: 1px solid #E6E6E8 !important; border: 1px solid #e6e6e8 !important;
border-radius: 4px; border-radius: 4px;
} }
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
.line { .line {
width: 4px; width: 4px;
height: 16px; height: 16px;
background: #055FE7; background: #055fe7;
border-radius: 2px; border-radius: 2px;
margin-right: 10px; margin-right: 10px;
} }
...@@ -88,7 +89,7 @@ ...@@ -88,7 +89,7 @@
.name { .name {
font-size: 16px; font-size: 16px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #282F3C; color: #282f3c;
} }
} }
...@@ -105,7 +106,7 @@ ...@@ -105,7 +106,7 @@
width: 410px; width: 410px;
} }
/deep/.el-form-item__label { /deep/.el-form-item__label {
width: 50px !important; width: 155px !important;
} }
/deep/.el-radio { /deep/.el-radio {
margin-right: 10px; margin-right: 10px;
...@@ -143,14 +144,14 @@ ...@@ -143,14 +144,14 @@
right: 0; right: 0;
font-size: 12px; font-size: 12px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #FF3745; color: #ff3745;
} }
/deep/ .el-input__icon.el-input__validateIcon.el-icon-circle-close { /deep/ .el-input__icon.el-input__validateIcon.el-icon-circle-close {
width: 16px; width: 16px;
height: 16px; height: 16px;
&::before { &::before {
content: " "; content: " ";
width: 16px; width: 16px;
height: 16px; height: 16px;
...@@ -173,7 +174,7 @@ ...@@ -173,7 +174,7 @@
/deep/ .el-form-item.el-form-item--feedback.is-error.is-required { /deep/ .el-form-item.el-form-item--feedback.is-error.is-required {
input { input {
color: #FF3745; color: #ff3745;
} }
} }
} }
...@@ -188,9 +189,9 @@ ...@@ -188,9 +189,9 @@
/deep/ .el-form-item.is-error .el-input__inner { /deep/ .el-form-item.is-error .el-input__inner {
width: 164px; width: 164px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6E6E8; border: 1px solid #e6e6e8;
} }
} }
...@@ -215,20 +216,22 @@ ...@@ -215,20 +216,22 @@
/deep/ .el-form-item.is-error .el-input__inner { /deep/ .el-form-item.is-error .el-input__inner {
width: 408px; width: 408px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E6E6E8; border: 1px solid #e6e6e8;
} }
} }
.input3 { .input3 {
/deep/ .el-form-item__content, /deep/ .el-textarea, /deep/ .el-textarea__inner { /deep/ .el-form-item__content,
/deep/ .el-textarea,
/deep/ .el-textarea__inner {
width: 722px; width: 722px;
height: 76px; height: 76px;
background: #F6F8FA; background: #f6f8fa;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18); box-shadow: inset 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px; border-radius: 4px;
border: 1px solid #EEEEEE; // border: 1px solid #eeeeee;
.el-input__count { .el-input__count {
background: transparent; background: transparent;
} }
...@@ -243,7 +246,7 @@ ...@@ -243,7 +246,7 @@
.horizontal-line { .horizontal-line {
width: 100%; width: 100%;
height: 1px; height: 1px;
background: #E6E6E8; background: #e6e6e8;
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -275,21 +278,24 @@ ...@@ -275,21 +278,24 @@
.horizontal-line { .horizontal-line {
width: 100%; width: 100%;
height: 1px; height: 1px;
background: #E6E6E8; background: #e6e6e8;
margin-bottom: 20px; margin-bottom: 20px;
} }
.form-footer { .form-footer {
box-shadow: 0px -2px 20px 0px rgba(0, 0, 0, 0.06);
z-index: 999; z-index: 999;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
right: 0; right: 0;
background: #FFFFFF; background: #ffffff;
height: 100px; height: 100px;
width: 943px; width: 958px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.save, .cancel, .export { .save,
.cancel,
.export {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -298,54 +304,54 @@ ...@@ -298,54 +304,54 @@
.save { .save {
width: 72px; width: 72px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
border-radius: 4px; border-radius: 4px;
border: 1px solid #AEB5C2; border: 1px solid #aeb5c2;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #2E3846; color: #2e3846;
&:hover { &:hover {
border: 1px solid #055fe7; border: 1px solid #055fe7;
color: #055fe7; color: #055fe7;
} }
&:active { &:active {
border: 1px solid #044CB9; border: 1px solid #044cb9;
color: #044CB9; color: #044cb9;
} }
} }
.cancel { .cancel {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #FFFFFF; color: #ffffff;
width: 72px; width: 72px;
height: 40px; height: 40px;
background: #055FE7; background: #055fe7;
border-radius: 4px; border-radius: 4px;
margin: 0 16px; margin: 0 16px;
&:hover { &:hover {
background: #377FEC; background: #377fec;
color: #FFFFFF; color: #ffffff;
} }
&:active { &:active {
background: #044CB9; background: #044cb9;
color: #FFFFFF; color: #ffffff;
} }
} }
.export { .export {
width: 96px; width: 96px;
height: 40px; height: 40px;
background: #DDEBFF; background: #ddebff;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #055FE7; color: #055fe7;
&:hover { &:hover {
background: #EDF4FF; background: #edf4ff;
color: #055FE7; color: #055fe7;
} }
&:active { &:active {
background: #CCE0FF; background: #cce0ff;
color: #055FE7; color: #055fe7;
} }
} }
} }
...@@ -359,7 +365,7 @@ ...@@ -359,7 +365,7 @@
bottom: 130px; bottom: 130px;
width: 40px; width: 40px;
height: 40px; height: 40px;
background: #FFFFFF; background: #ffffff;
box-shadow: 0px 0px 5px 0px rgba(5, 95, 231, 0.4); box-shadow: 0px 0px 5px 0px rgba(5, 95, 231, 0.4);
border-radius: 20px; border-radius: 20px;
display: flex; display: flex;
...@@ -373,11 +379,40 @@ ...@@ -373,11 +379,40 @@
&:hover { &:hover {
border: 1px solid #0b6cd9; border: 1px solid #0b6cd9;
} }
.arrow-down-img {
transition: transform .4s linear;
}
}
/* 设置滚动条的样式 */
::-webkit-scrollbar {
width: 6px;
}
/* 滚动槽 */
::-webkit-scrollbar-track {
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
::-webkit-scrollbar-thumb {
border-radius: 3px;
background: rgba(0, 0, 0, 0.1);
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
}
::-webkit-scrollbar-thumb:window-inactive {
background: #dadde0;
}
/deep/.el-select .el-input.is-focus .el-input__inner {
border-color: #dcdfe6;
} }
// 滚动条的宽度 // 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar { /deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条 width: 12px; // 横向滚动条
height: 6px; // 纵向滚动条 必写 height: 6px; // 纵向滚动条 必写
} }
...@@ -388,7 +423,7 @@ ...@@ -388,7 +423,7 @@
} }
/deep/ .el-drawer__container ::-webkit-scrollbar { /deep/ .el-drawer__container ::-webkit-scrollbar {
display: none; // display: none;
} }
// 修改多选框样式 // 修改多选框样式
...@@ -422,3 +457,32 @@ ...@@ -422,3 +457,32 @@
height: 1400px; height: 1400px;
} }
} }
/deep/.el-select {
.el-input.is-focus {
.el-input__inner {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06) !important;
border: 1px solid #e6e6e8 !important;
border-radius: 4px;
}
}
}
/deep/.el-form-item.el-form-item--feedback {
.el-form-item__label {
padding-left: 10px !important;
}
}
/deep/.el-form-item.el-form-item--feedback.is-required {
.el-form-item__label {
padding-left: 0 !important;
}
}
/deep/.el-input__prefix {
left: unset;
right: 1.3rem;
}
/deep/.el-input--prefix .el-input__inner {
padding-left: 15px;
}
\ No newline at end of file
src/views/Editor/modules/rydaxx.vue
<template> <template>
<el-drawer <el-drawer size="50%" class="rydaxx-drawer" :modal="false" @close="closeDrawer" :append-to-body="true" :modal-append-to-body="false" :visible.sync="drawer" :with-header="false">
size="50%"
class="rydaxx-drawer"
:modal="false"
@close="closeDrawer"
:append-to-body="true"
:modal-append-to-body="false"
:visible.sync="drawer"
:with-header="false"
>
<div class="header"> <div class="header">
<div class="header-title">人员档案信息</div> <div class="header-title">人员档案信息</div>
<div <div class="header-close" @click="closeDrawer">
class="header-close" <svg class="icon" aria-hidden="true">
@click="closeDrawer"
>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-fanhui"></use> <use xlink:href="#icon-fanhui"></use>
</svg> </svg>
</div> </div>
</div> </div>
<div class="content drawer-content"> <div class="content drawer-content">
<el-form <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="10.125rem" class="demo-ruleForm" :status-icon="true">
:model="ruleForm"
label-position="left"
:rules="rules"
ref="ruleForm"
label-width="10.125rem"
class="demo-ruleForm"
:status-icon="true"
>
<div class="ayzzwjbxx"> <div class="ayzzwjbxx">
<div class="title"> <div class="title">
<div class="line"></div> <div class="line"></div>
...@@ -40,69 +17,25 @@ ...@@ -40,69 +17,25 @@
</div> </div>
<div class="ayzzwjbxx-items"> <div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="人员编号：" prop="rybh">
label="人员编号：" <el-input placeholder="请输入人员编号" v-model="ruleForm.rybh" maxlength="23" show-word-limit disabled></el-input>
prop="rybh"
>
<el-input
placeholder="请输入人员编号"
v-model="ruleForm.rybh"
maxlength="23"
show-word-limit
disabled
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="警综人员编号：" prop="jzrybh">
label="警综人员编号：" <el-input placeholder="请输入警综人员编号" v-model="ruleForm.jzrybh" maxlength="23" show-word-limit></el-input>
prop="jzrybh"
>
<el-input
placeholder="请输入警综人员编号"
v-model="ruleForm.jzrybh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="采集信息原因：" prop="cjxxyydm">
label="采集信息原因：" <SelectCode codeUrl="/api/code/cjxxyydm" width="16.5" :clearable="true" :form="ruleForm" id="cjxxyydm" multiple :multipleLimit="5"></SelectCode>
prop="cjxxyydm"
>
<SelectCode
codeUrl="/api/code/cjxxyydm"
width="16.5"
:clearable="true"
:form="ruleForm"
id="cjxxyydm"
multiple
:multipleLimit="5"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="指掌纹卡编号：" prop="zzhwkbh">
label="指掌纹卡编号：" <el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzhwkbh" maxlength="23" show-word-limit></el-input>
prop="zzhwkbh"
>
<el-input
placeholder="请输入指掌纹卡编号"
v-model="ruleForm.zzhwkbh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<div></div> <div></div>
<el-form-item <el-form-item label="案事件相关人员编号：" prop="asjxgrybh">
label="案事件相关人员编号：" <el-input placeholder="请输入案事件相关人员编号" v-model="ruleForm.asjxgrybh" maxlength="23" show-word-limit></el-input>
prop="asjxgrybh"
>
<el-input
placeholder="请输入案事件相关人员编号"
v-model="ruleForm.asjxgrybh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -113,183 +46,58 @@ ...@@ -113,183 +46,58 @@
</div> </div>
<div class="ayzzwjbxx-items"> <div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="姓名：" prop="xm">
label="姓名：" <el-input placeholder="请输入姓名" v-model="ruleForm.xm" maxlength="50" show-word-limit></el-input>
prop="xm"
>
<el-input
placeholder="请输入姓名"
v-model="ruleForm.xm"
maxlength="50"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="别名/绰号：" prop="bmch">
label="别名/绰号：" <el-input placeholder="请输入别名/绰号" v-model="ruleForm.bmch" maxlength="50" show-word-limit></el-input>
prop="bmch"
>
<el-input
placeholder="请输入别名/绰号"
v-model="ruleForm.bmch"
maxlength="50"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="性别：" prop="xbdm">
label="性别：" <SelectCode codeUrl="/api/code/sex" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="xbdm"></SelectCode>
prop="xbdm"
>
<SelectCode
codeUrl="/api/code/sex"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xbdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="出生日期：" prop="csrq">
label="出生日期：" <el-date-picker type="date" placeholder="请输入出生日期" v-model="ruleForm.csrq" :picker-options="{
prop="csrq"
>
<el-date-picker
type="date"
placeholder="请输入出生日期"
v-model="ruleForm.csrq"
:picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}" }"></el-date-picker>
></el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="国籍：" prop="gjdm">
label="国籍：" <SelectCode codeUrl="/api/code/nationality" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="gjdm"></SelectCode>
prop="gjdm"
>
<SelectCode
codeUrl="/api/code/nationality"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="gjdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="民族：" prop="mzdm">
label="民族：" <SelectCode codeUrl="/api/code/nation" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="mzdm"></SelectCode>
prop="mzdm"
>
<SelectCode
codeUrl="/api/code/nation"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="mzdm"
></SelectCode>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="证件类型：" prop="cyzjdm" class="select">
label="证件类型：" <SelectCode codeUrl="/api/code/certificates" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cyzjdm"></SelectCode>
prop="cyzjdm"
class="select"
>
<SelectCode
codeUrl="/api/code/certificates"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="cyzjdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="证件号码：" prop="zjhm" class="input2">
label="证件号码：" <el-input placeholder="请输入证件号码" v-model="ruleForm.zjhm" maxlength="30" show-word-limit></el-input>
prop="zjhm"
class="input2"
>
<el-input
placeholder="请输入证件号码"
v-model="ruleForm.zjhm"
maxlength="30"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select">
label="户籍地行政区：" <SelectCode codeUrl="/api/code/administrative" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="hjdzXzqhdm"></SelectCode>
prop="hjdzXzqhdm"
class="select"
>
<SelectCode
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="hjdzXzqhdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2">
label="户籍地址：" <el-input placeholder="请输入户籍地址" v-model="ruleForm.hjdzDzmc" maxlength="100" show-word-limit></el-input>
prop="hjdzDzmc"
class="input2"
>
<el-input
placeholder="请输入户籍地址"
v-model="ruleForm.hjdzDzmc"
maxlength="100"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select">
label="现住址行政区：" <SelectCode codeUrl="/api/code/administrative" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="xzzXzqhdm"></SelectCode>
prop="xzzXzqhdm"
class="select"
>
<SelectCode
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xzzXzqhdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="现地址：" prop="xzzDzmc" class="input2">
label="现地址：" <el-input placeholder="请输入现住址" v-model="ruleForm.xzzDzmc" maxlength="100" show-word-limit></el-input>
prop="xzzDzmc"
class="input2"
>
<el-input
placeholder="请输入现住址"
v-model="ruleForm.xzzDzmc"
maxlength="100"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item ayzzwjbxx-item2"> <div class="ayzzwjbxx-item ayzzwjbxx-item2">
<el-form-item <el-form-item label="备注信息：" prop="bz" class="input3">
label="备注信息：" <el-input type="textarea" :rows="2" placeholder="请输入备注信息" v-model="ruleForm.bz" maxlength="1024" show-word-limit></el-input>
prop="bz"
class="input3"
>
<el-input
type="textarea"
:rows="2"
placeholder="请输入备注信息"
v-model="ruleForm.bz"
maxlength="1024"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -299,16 +107,9 @@ ...@@ -299,16 +107,9 @@
<span class="name">人员逻辑分库</span> <span class="name">人员逻辑分库</span>
</div> </div>
<div class="ryljfk"> <div class="ryljfk">
<el-form-item <el-form-item prop="logicdbtype2" class="fk">
prop="logicdbtype2"
class="fk"
>
<el-checkbox-group v-model="ruleForm.logicdbtype2"> <el-checkbox-group v-model="ruleForm.logicdbtype2">
<el-checkbox <el-checkbox v-for="(value,key) in ryljfkArr" :key="key" :label="value.code">{{ value.name }}</el-checkbox>
v-for="(value,key) in ryljfkArr"
:key="key"
:label="value.code"
>{{ value.name }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</div> </div>
...@@ -319,66 +120,28 @@ ...@@ -319,66 +120,28 @@
</div> </div>
<div class="ayzzwjbxx-items"> <div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="捺印单位：" prop="nydwGajgjgdm">
label="捺印单位："
prop="nydwGajgjgdm"
>
<!-- <el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>--> <!-- <el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>-->
<Cascader <Cascader :form="ruleForm" id="nydwGajgjgdm"></Cascader>
:form="ruleForm"
id="nydwGajgjgdm"
></Cascader>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="捺印人姓名：" prop="nyryXm">
label="捺印人姓名：" <el-input placeholder="请输入捺印人姓名" v-model="ruleForm.nyryXm" maxlength="50" show-word-limit></el-input>
prop="nyryXm"
>
<el-input
placeholder="请输入捺印人姓名"
v-model="ruleForm.nyryXm"
maxlength="50"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item <el-form-item label="捺印时间：" prop="nysj">
label="捺印时间：" <el-date-picker type="date" placeholder="请输入捺印时间" v-model="ruleForm.nysj" :picker-options="{
prop="nysj"
>
<el-date-picker
type="date"
placeholder="请输入捺印时间"
v-model="ruleForm.nysj"
:picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}" }"></el-date-picker>
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="捺印人身份证号：" prop="nyryGmsfhm">
label="捺印人身份证号：" <el-input placeholder="请输入捺印人身份证号" v-model="ruleForm.nyryGmsfhm" maxlength="18" show-word-limit></el-input>
prop="nyryGmsfhm"
>
<el-input
placeholder="请输入捺印人身份证号"
v-model="ruleForm.nyryGmsfhm"
maxlength="18"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<div></div> <div></div>
<el-form-item <el-form-item label="捺印人联系电话：" prop="nyryLxdh">
label="捺印人联系电话：" <el-input placeholder="请输入捺印人联系电话" v-model="ruleForm.nyryLxdh" maxlength="18" show-word-limit></el-input>
prop="nyryLxdh"
>
<el-input
placeholder="请输入捺印人联系电话"
v-model="ruleForm.nyryLxdh"
maxlength="18"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
...@@ -388,75 +151,31 @@ ...@@ -388,75 +151,31 @@
<span class="name">操作记录列表</span> <span class="name">操作记录列表</span>
</div> </div>
<div class="czjl-table"> <div class="czjl-table">
<el-table <el-table :header-cell-style="{background: '#F6F8FA',color:'#282F3C'}" :data="tableData" border style="width: 100%">
:header-cell-style="{background: '#F6F8FA',color:'#282F3C'}" <el-table-column align="center" :width="width1" type="index">
:data="tableData"
border
style="width: 100%"
>
<el-table-column
align="center"
:width="width1"
type="index"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="czr" align="center" label="操作人" width="auto">
prop="czr"
align="center"
label="操作人"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="czrq" align="center" label="操作日期" width="auto">
prop="czrq"
align="center"
label="操作日期"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="czsj" align="center" label="操作事件" width="auto">
prop="czsj"
align="center"
label="操作事件"
width="auto"
>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
<div class="horizontal-line"></div> <div class="horizontal-line"></div>
<div class="form-footer"> <div class="form-footer">
<div <div class="save" @click="submitForm('ruleForm')">保存</div>
class="save" <div class="cancel" @click="closeDrawer('ruleForm')">取消</div>
@click="submitForm('ruleForm')" <div class="export" @click="isShowDcftpxBtn">FPTX导出</div>
>保存</div>
<div
class="cancel"
@click="closeDrawer('ruleForm')"
>取消</div>
<div
class="export"
@click="isShowDcftpxBtn"
>FPTX导出</div>
</div> </div>
</el-form> </el-form>
</div> </div>
<div <div class="arrow-down" @click="goBottom">
class="arrow-down" <img class="arrow-down-img" src="@/assets/img/jiantou.gif" alt="">
@click="goBottom"
>
<img
class="arrow-down-img"
src="@/assets/img/jiantou.gif"
alt=""
>
</div> </div>
<!-- 导出FPTX弹窗 --> <!-- 导出FPTX弹窗 -->
<dcftpx <dcftpx :isShowDcftpx="isShowDcftpx" :rowData="rowData" @closeDcftpx="closeDcftpx"></dcftpx>
:isShowDcftpx="isShowDcftpx"
:rowData="rowData"
@closeDcftpx="closeDcftpx"
></dcftpx>
</el-drawer> </el-drawer>
</template> </template>
...@@ -609,7 +328,21 @@ export default { ...@@ -609,7 +328,21 @@ export default {
//console.log(this.ryInfo); //console.log(this.ryInfo);
this.initData() this.initData()
}, },
mounted () {
},
methods: { methods: {
/**
* @description: 页面滚动,导航切换显示
* @param {*}
* @return {*}
*/
windowScroll () {
console.log(111);
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
// let dom = document.querySelector(".dom").offsetTop;
console.log(scrollTop);
},
disabledDate (a) { disabledDate (a) {
if (a.getTime() > new Date().getTime()) { if (a.getTime() > new Date().getTime()) {
return true; return true;
...@@ -757,11 +490,31 @@ export default { ...@@ -757,11 +490,31 @@ export default {
beforeDestroy () { beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
}, },
destroyed () {
window.removeEventListener("scroll", this.windowScroll);//销毁滚动事件
},
components: { components: {
SelectCode, SelectCode,
Cascader, Cascader,
dcftpx dcftpx
},
watch: {
drawer(newValue, oldValue) {
if(newValue) {
//监听页面滚动
this.$nextTick(() => {
document.querySelector('.el-drawer__body').addEventListener("scroll", (e) => {
console.log(e);
if(e.target.scrollTop > 400) {
$('.arrow-down-img').css('transform', 'rotate(180deg)');
} else {
$('.arrow-down-img').css('transform', 'rotate(0deg)');
}
});
})
} }
}
},
}; };
</script> </script>
......
src/views/Editor/modules/ryzwbjLeft.scss
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
} }
.face-image { .face-image {
width: 120px; width: 120px;
height: 161px; height: 160px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #cccccc; border: 1px solid #cccccc;
display: flex; display: flex;
...@@ -316,9 +316,12 @@ ...@@ -316,9 +316,12 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
img { img {
width: 100%; object-fit: contain;
height: auto;
} }
// .face-pic {
// width: 100%;
// height: 100%;
// }
.zwtx { .zwtx {
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -156,11 +156,11 @@ ...@@ -156,11 +156,11 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="lt_candidate_bottom"> <div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span> <span>共计&nbsp;<span>{{ total }}条</span>&nbsp;数据</span>
</div> </div>
</div> </div>
<transition name="slide-fade"> <transition name="slide-fade">
<div class="selectFinger" v-show="isShowOptions"> <div class="selectFinger" v-show="isShowOptions" @click.stop>
<div class="left-title">左手</div> <div class="left-title">左手</div>
<div class="line" :class="{ active: leftRoll }"> <div class="line" :class="{ active: leftRoll }">
<div class="selected"> <div class="selected">
...@@ -316,6 +316,9 @@ export default { ...@@ -316,6 +316,9 @@ export default {
this.$bus.on('searchTypeLT', (type) => { this.$bus.on('searchTypeLT', (type) => {
self.searchType = type self.searchType = type
}) })
document.body.addEventListener('click', (e) => {
self.isShowOptions = false
})
}, },
created () { created () {
let self = this; let self = this;
...@@ -1154,6 +1157,7 @@ export default { ...@@ -1154,6 +1157,7 @@ export default {
* @return {*} * @return {*}
*/ */
icons (h, { column }) { icons (h, { column }) {
let self = this
if (this.searchType == '指纹') { if (this.searchType == '指纹') {
return h("div", [ return h("div", [
h("span", column.label), h("span", column.label),
...@@ -1161,7 +1165,10 @@ export default { ...@@ -1161,7 +1165,10 @@ export default {
class: "el-icon-arrow-down", class: "el-icon-arrow-down",
style: "color:#B1B6C2;margin-left:5px;cursor:pointer;", style: "color:#B1B6C2;margin-left:5px;cursor:pointer;",
on: { on: {
click: this.switchOptions click: (e) => {
e.stopPropagation()
self.switchOptions()
}
} }
}) })
]); ]);
...@@ -1201,6 +1208,34 @@ export default { ...@@ -1201,6 +1208,34 @@ export default {
self.tableData = [] self.tableData = []
self.total = 0 self.total = 0
} }
// 篩選初始化
// 对勾
this.rightRoll = false;
this.rightPain = true;
this.leftRoll = false;
this.leftPain = false;
// 左手
this.leftRM = false;
this.leftRS = false;
this.leftRZ = false;
this.leftRH = false;
this.leftRX = false;
this.leftPM = false;
this.leftPS = false;
this.leftPZ = false;
this.leftPH = false;
this.leftPX = false;
// 右手
this.rightRM = false;
this.rightRS = false;
this.rightRZ = false;
this.rightRH = false;
this.rightRX = false;
this.rightPM = false;
this.rightPS = false;
this.rightPZ = false;
this.rightPH = false;
this.rightPX = true;
}) })
}, },
/** /**
...@@ -1369,7 +1404,7 @@ const candidates = [ ...@@ -1369,7 +1404,7 @@ const candidates = [
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100% - 40px); height: calc(100% - 25px);
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
...@@ -1582,6 +1617,7 @@ const candidates = [ ...@@ -1582,6 +1617,7 @@ const candidates = [
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #999999; color: #999999;
margin-right: 16px; margin-right: 16px;
cursor: pointer;
&.active { &.active {
color: #006aff; color: #006aff;
...@@ -1621,6 +1657,11 @@ const candidates = [ ...@@ -1621,6 +1657,11 @@ const candidates = [
/deep/ .el-table__body { /deep/ .el-table__body {
width: 100% !important; width: 100% !important;
} }
/deep/ .el-table {
&::before {
display: none;
}
}
/deep/ .el-input__inner { /deep/ .el-input__inner {
border: none; border: none;
......
src/views/cxyrd/modules/LTSrc.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="lt_middle_bottom"> <div class="lt_middle_bottom">
<span>该任务共计<span>{{ total }}条</span>查询</span> <span>该任务共计&nbsp;<span>{{ total }}条</span>&nbsp;查询</span>
<div class="btn" @click="changeTableHeight"> <div class="btn" @click="changeTableHeight">
<span>{{ options }}</span> <span>{{ options }}</span>
<div class="ico"><img src="@/assets/img/bottom.png" alt=""></div> <div class="ico"><img src="@/assets/img/bottom.png" alt=""></div>
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
</div> </div>
<!--指纹个数提示--> <!--指纹个数提示-->
<div class="lt_middle_bottom"> <div class="lt_middle_bottom">
<span v-show="fingerShowType=='指纹'">该查询ID共计<span>{{ fingerTotal }}枚</span>{{fingerShowType}}</span> <span v-show="fingerShowType=='指纹'">该查询ID共计&nbsp;<span>{{ fingerTotal }}枚</span>&nbsp;{{fingerShowType}}</span>
<span v-show="fingerShowType=='掌纹'">该查询ID共计<span>{{ handTotal }}枚</span>{{fingerShowType}}</span> <span v-show="fingerShowType=='掌纹'">该查询ID共计&nbsp;<span>{{ handTotal }}枚</span>&nbsp;{{fingerShowType}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -631,7 +631,7 @@ const datas = [ ...@@ -631,7 +631,7 @@ const datas = [
.lt_middle_src_data { .lt_middle_src_data {
border-radius: 8px; border-radius: 8px;
width: 100%; width: 100%;
height: 320px; height: 360px;
.Bizhong { .Bizhong {
.cell { .cell {
...@@ -725,9 +725,10 @@ const datas = [ ...@@ -725,9 +725,10 @@ const datas = [
.lt_middle_src_data { .lt_middle_src_data {
.lt_middle_bottom { .lt_middle_bottom {
margin-top: -10px; margin-top: -4px;
display: flex; display: flex;
justify-content: center; justify-content: center;
border-top: 1px solid #cccccc;
.btn { .btn {
margin-left: 32px; margin-left: 32px;
......
src/views/zzwcj/fingerprint.vue
...@@ -679,6 +679,8 @@ var r10 = require('@/assets/img/zw/fingers/10-r.png') ...@@ -679,6 +679,8 @@ var r10 = require('@/assets/img/zw/fingers/10-r.png')
export default { export default {
data () { data () {
return { return {
// 采集类型
cj_type: 0,
// 主题模式 // 主题模式
themeType: '深色', themeType: '深色',
// 实现展示上传进度 // 实现展示上传进度
...@@ -1401,6 +1403,15 @@ export default { ...@@ -1401,6 +1403,15 @@ export default {
getPersonInfo () { getPersonInfo () {
let self = this let self = this
this.rybh = this.$route.params.rybh this.rybh = this.$route.params.rybh
console.log(this.$route);
self.cj_type = Number(this.$route.query.type)
console.log(self.cj_type);
this.pop = true
this.isAlter = true
this.errTitle = '信息获取中'
this.errDescription = '正在获取信息，请稍后...'
self.$axios({ self.$axios({
// 測試 // 測試
// url: '/apiInfo/hmdataImport/getYthcjryxxByRybh', // url: '/apiInfo/hmdataImport/getYthcjryxxByRybh',
...@@ -1410,10 +1421,11 @@ export default { ...@@ -1410,10 +1421,11 @@ export default {
method: 'post', method: 'post',
params: { params: {
rybh: self.rybh, rybh: self.rybh,
username: self.username username: self.username,
type: self.cj_type
} }
}).then(res => { }).then(res => {
//console.log(res) // console.log(res)
// 2021 08 12 10 00 29 // 2021 08 12 10 00 29
// 2020-06-04 00:06:00 // 2020-06-04 00:06:00
...@@ -1461,12 +1473,17 @@ export default { ...@@ -1461,12 +1473,17 @@ export default {
self.collectInfoMsg.nyry_lxdh = data.nyrlxdh self.collectInfoMsg.nyry_lxdh = data.nyrlxdh
self.collectInfoMsg.nysj = data.nysj self.collectInfoMsg.nysj = data.nysj
if(self.cj_type === 0) {
self.rGdzw = []
self.rPmzw = []
} else {
if (data.rGdzw) { if (data.rGdzw) {
self.rGdzw = data.rGdzw.split('-') self.rGdzw = data.rGdzw.split('-')
} }
if (data.rPmzw) { if (data.rPmzw) {
self.rPmzw = data.rPmzw.split('-') self.rPmzw = data.rPmzw.split('-')
} }
}
// //console.log(self.rGdzw); // //console.log(self.rGdzw);
// //console.log(self.rPmzw); // //console.log(self.rPmzw);
// 测试全部采集用*************************** // 测试全部采集用***************************
...@@ -1525,9 +1542,9 @@ export default { ...@@ -1525,9 +1542,9 @@ export default {
// 新系统现在不需要人像数据 // 新系统现在不需要人像数据
self.isFace = false self.isFace = false
self.dealIsGetFinger() self.dealIsGetFinger()
// //console.log(self.fingersRight);
// //console.log(self.fingersLeft);
} }
this.pop = false
this.isAlter = false
}) })
}, },
/** /**
...@@ -8096,9 +8113,9 @@ export default { ...@@ -8096,9 +8113,9 @@ export default {
<package><packageHead><version>${this.packageHeader.version}</version><createTime>${this.packageHeader.createTime}</createTime><originSystem>${this.packageHeader.originSystem}</originSystem><fsdw_gajgjgdm>${this.packageHeader.fsdw_gajgjgdm}</fsdw_gajgjgdm><fsdw_gajgmc>${this.packageHeader.fsdw_gajgmc}</fsdw_gajgmc><fsdw_xtlx>${this.packageHeader.fsdw_xtlx}</fsdw_xtlx><fsr_xm>${this.packageHeader.fsr_xm}</fsr_xm><fsr_gmsfhm>${this.packageHeader.fsr_gmsfhm}</fsr_gmsfhm><fsr_lxdh>${this.packageHeader.fsr_lxdh}</fsr_lxdh></packageHead><fingerprintPackage><descriptiveMsg><collectingReasonSet><cjxxyydm>${this.descriptiveMsg.cjxxyydm}</cjxxyydm></collectingReasonSet><ysxt_asjxgrybh>${this.descriptiveMsg.ysxt_asjxgrybh}</ysxt_asjxgrybh><jzrybh>${this.descriptiveMsg.jzrybh}</jzrybh><asjxgrybh>${this.descriptiveMsg.asjxgrybh}</asjxgrybh><zzhwkbh>${this.descriptiveMsg.zzhwkbh}</zzhwkbh><hjdz_xzqhdm>${this.descriptiveMsg.hjdz_xzqhdm}</hjdz_xzqhdm><hjdz_dzmc>${this.descriptiveMsg.hjdz_dzmc}</hjdz_dzmc><xzz_xzqhdm>${this.descriptiveMsg.xzz_xzqhdm}</xzz_xzqhdm><xzz_dzmc>${this.descriptiveMsg.xzz_dzmc}</xzz_dzmc><xm>${this.descriptiveMsg.xm}</xm><bmch>${this.descriptiveMsg.bmch}</bmch><xbdm>${this.descriptiveMsg.xbdm}</xbdm><csrq>${this.descriptiveMsg.csrq}</csrq><gjdm>${this.descriptiveMsg.gjdm}</gjdm><mzdm>${this.descriptiveMsg.mzdm}</mzdm><cyzjdm>${this.descriptiveMsg.cyzjdm}</cyzjdm><zjhm>${this.descriptiveMsg.zjhm}</zjhm><bz>${this.descriptiveMsg.bz}</bz></descriptiveMsg><collectInfoMsg><zwbdxtlxms>${this.collectInfoMsg.zwbdxtlxms}</zwbdxtlxms><nydw_gajgjgdm>${this.collectInfoMsg.nydw_gajgjgdm}</nydw_gajgjgdm><nydw_gajgmc>${this.collectInfoMsg.nydw_gajgmc}</nydw_gajgmc><nyry_xm>${this.collectInfoMsg.nyry_xm}</nyry_xm><nyry_gmsfhm>${this.collectInfoMsg.nyry_gmsfhm}</nyry_gmsfhm><nyry_lxdh>${this.collectInfoMsg.nyry_lxdh}</nyry_lxdh><nysj>${this.collectInfoMsg.nysj}</nysj></collectInfoMsg><fingers>${self.str}</fingers></fingerprintPackage></package>` <package><packageHead><version>${this.packageHeader.version}</version><createTime>${this.packageHeader.createTime}</createTime><originSystem>${this.packageHeader.originSystem}</originSystem><fsdw_gajgjgdm>${this.packageHeader.fsdw_gajgjgdm}</fsdw_gajgjgdm><fsdw_gajgmc>${this.packageHeader.fsdw_gajgmc}</fsdw_gajgmc><fsdw_xtlx>${this.packageHeader.fsdw_xtlx}</fsdw_xtlx><fsr_xm>${this.packageHeader.fsr_xm}</fsr_xm><fsr_gmsfhm>${this.packageHeader.fsr_gmsfhm}</fsr_gmsfhm><fsr_lxdh>${this.packageHeader.fsr_lxdh}</fsr_lxdh></packageHead><fingerprintPackage><descriptiveMsg><collectingReasonSet><cjxxyydm>${this.descriptiveMsg.cjxxyydm}</cjxxyydm></collectingReasonSet><ysxt_asjxgrybh>${this.descriptiveMsg.ysxt_asjxgrybh}</ysxt_asjxgrybh><jzrybh>${this.descriptiveMsg.jzrybh}</jzrybh><asjxgrybh>${this.descriptiveMsg.asjxgrybh}</asjxgrybh><zzhwkbh>${this.descriptiveMsg.zzhwkbh}</zzhwkbh><hjdz_xzqhdm>${this.descriptiveMsg.hjdz_xzqhdm}</hjdz_xzqhdm><hjdz_dzmc>${this.descriptiveMsg.hjdz_dzmc}</hjdz_dzmc><xzz_xzqhdm>${this.descriptiveMsg.xzz_xzqhdm}</xzz_xzqhdm><xzz_dzmc>${this.descriptiveMsg.xzz_dzmc}</xzz_dzmc><xm>${this.descriptiveMsg.xm}</xm><bmch>${this.descriptiveMsg.bmch}</bmch><xbdm>${this.descriptiveMsg.xbdm}</xbdm><csrq>${this.descriptiveMsg.csrq}</csrq><gjdm>${this.descriptiveMsg.gjdm}</gjdm><mzdm>${this.descriptiveMsg.mzdm}</mzdm><cyzjdm>${this.descriptiveMsg.cyzjdm}</cyzjdm><zjhm>${this.descriptiveMsg.zjhm}</zjhm><bz>${this.descriptiveMsg.bz}</bz></descriptiveMsg><collectInfoMsg><zwbdxtlxms>${this.collectInfoMsg.zwbdxtlxms}</zwbdxtlxms><nydw_gajgjgdm>${this.collectInfoMsg.nydw_gajgjgdm}</nydw_gajgjgdm><nydw_gajgmc>${this.collectInfoMsg.nydw_gajgmc}</nydw_gajgmc><nyry_xm>${this.collectInfoMsg.nyry_xm}</nyry_xm><nyry_gmsfhm>${this.collectInfoMsg.nyry_gmsfhm}</nyry_gmsfhm><nyry_lxdh>${this.collectInfoMsg.nyry_lxdh}</nyry_lxdh><nysj>${this.collectInfoMsg.nysj}</nysj></collectInfoMsg><fingers>${self.str}</fingers></fingerprintPackage></package>`
} }
// 导出文件到本地 // 导出文件到本地 --- 前端导出文件到本地
let filenameexport = self.$route.params.rybh // let filenameexport = self.$route.params.rybh
this.exportRaw(`${filenameexport}.fptx`, this.xmlStr) // this.exportRaw(`${filenameexport}.fptx`, this.xmlStr)
// NProgress.done(); // NProgress.done();
let fingerImageMsgStr = [] let fingerImageMsgStr = []
...@@ -8161,16 +8178,16 @@ export default { ...@@ -8161,16 +8178,16 @@ export default {
// 开始上传 // 开始上传
this.uploadingStart = true this.uploadingStart = true
let timePercentage = setInterval(() => { let timePercentage = setInterval(() => {
this.percentage++
if (this.percentage == 90) { if (this.percentage == 90) {
clearInterval(timePercentage) clearInterval(timePercentage)
} }
this.percentage++
}, 20); }, 20);
let timePercentage2 = setInterval(() => { let timePercentage2 = setInterval(() => {
this.percentage++
if (this.percentage == 99) { if (this.percentage == 99) {
clearInterval(timePercentage2) clearInterval(timePercentage2)
} }
this.percentage++
}, 1000); }, 1000);
var params = new URLSearchParams(); var params = new URLSearchParams();
...@@ -8185,8 +8202,8 @@ export default { ...@@ -8185,8 +8202,8 @@ export default {
method: 'post', method: 'post',
data: params data: params
}) })
//console.log(fingerRes); // console.log(fingerRes);
if (fingerRes.data == 'fptx文件校验失败！未生成fptx文件！') { if (fingerRes.data == '该人员编号查询人像数据发生未知异常,fptx文件校验失败！未生成fptx文件！' || fingerRes.data == 'fptx文件校验失败！未生成fptx文件！') {
self.uploadingColor = '#E82510' self.uploadingColor = '#E82510'
self.isUploadingError = true self.isUploadingError = true
self.isShowUploadingTxt = false self.isShowUploadingTxt = false
...@@ -8205,7 +8222,30 @@ export default { ...@@ -8205,7 +8222,30 @@ export default {
} }
}, 3000); }, 3000);
}, 1500); }, 1500);
} else {
self.isUploadingFinish = true
self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传完成'
self.uploadingTip = '页面将在3秒后自动关闭'
setTimeout(() => {
document.getElementsByTagName('body')[0].style.setProperty('--uploadingBorder', '2px');
}, 300);
setTimeout(() => {
self.uploadingClose = 'uploadingFinish'
setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
} }
}, 3000);
}, 1500);
}
if(self.cj_type === 1) {
// 返回数据给后台 // 返回数据给后台
// 滚动 // 滚动
...@@ -8278,61 +8318,51 @@ export default { ...@@ -8278,61 +8318,51 @@ export default {
//console.log(res); //console.log(res);
// 上传完成 // 上传完成
// self.percentage = 100 // self.percentage = 100
self.isUploadingFinish = true // self.isUploadingFinish = true
self.isShowUploadingTxt = false // self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传完成' // self.uploadingTitle = '指纹上传完成'
self.uploadingTip = '页面将在3秒后自动关闭' // self.uploadingTip = '页面将在3秒后自动关闭'
setTimeout(() => { // setTimeout(() => {
document.getElementsByTagName('body')[0].style.setProperty('--uploadingBorder', '2px'); // document.getElementsByTagName('body')[0].style.setProperty('--uploadingBorder', '2px');
}, 300); // }, 300);
setTimeout(() => { // setTimeout(() => {
self.uploadingClose = 'uploadingFinish' // self.uploadingClose = 'uploadingFinish'
setTimeout(() => { // // setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) { // // if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank"; // // window.location.href = "about:blank";
window.close(); // // window.close();
} else { // // } else {
window.opener = null; // // window.opener = null;
window.open("", "_self"); // // window.open("", "_self");
window.close(); // // window.close();
} // // }
}, 3000); // // }, 3000);
}, 1500); // }, 1500);
}).catch(err => { }).catch(err => {
//console.log(err); //console.log(err);
self.uploadingColor = '#E82510' // self.uploadingColor = '#E82510'
self.isUploadingError = true // self.isUploadingError = true
self.isShowUploadingTxt = false // self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传失败' // self.uploadingTitle = '指纹上传失败'
self.uploadingTip = '页面将在3秒后自动关闭' // self.uploadingTip = '页面将在3秒后自动关闭'
setTimeout(() => { // setTimeout(() => {
self.uploadingClose = 'uploadingError' // self.uploadingClose = 'uploadingError'
setTimeout(() => { // // setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) { // // if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank"; // // window.location.href = "about:blank";
window.close(); // // window.close();
} else { // // } else {
window.opener = null; // // window.opener = null;
window.open("", "_self"); // // window.open("", "_self");
window.close(); // // window.close();
} // // }
}, 3000); // // }, 3000);
}, 1500); // }, 1500);
}) })
}
NProgress.done(); NProgress.done();
// this.$message.success(fingerRes.data)
// let result = true
// if (result) {
// this.$message({
// type: 'success',
// message: '上传成功!',
// duration: 2000
// });
// NProgress.done();
// // this.fingerPic = ''
// }
}, },
/** /**
* @description: 处理图片，得到返回的图片 * @description: 处理图片，得到返回的图片
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-25 16:15:21 * @LastEditTime: 2021-12-27 20:51:59
* @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
...@@ -99,8 +99,8 @@ module.exports = { ...@@ -99,8 +99,8 @@ module.exports = {
// } // }
// }, // },
"/apiDelImg": { "/apiDelImg": {
target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效 // target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.108:8091/", //新系统 target: "http://192.168.128.100:8099/", //新系统
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -118,7 +118,7 @@ module.exports = { ...@@ -118,7 +118,7 @@ module.exports = {
// 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.102:8099", // 江 // target: "http://192.168.128.100:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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