Skip to content

F
founder_vue
Commit c12b3a8c by 张超军
Options

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

parent 76d062d4
Showing with 327 additions and 110 deletions
src/components/ImageEd.scss
......@@ -183,7 +183,7 @@ div {
top: 35px;
left: 0;
width: 240px;
height: 195px;
height: 175px;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
......@@ -482,12 +482,31 @@ div {
.tui-brush-color-picker {
z-index: 100;
background: #ffffff;
padding: 5px;
// padding: 5px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
position: absolute;
right: 370px;
right: 400px;
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 {
margin-right: 8px;
......@@ -528,7 +547,7 @@ div {
top: 35px;
left: 0;
width: 240px;
height: 224px;
height: 200px;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
......@@ -657,6 +676,13 @@ div {
position: absolute;
right: 472px;
top: 173px;
/deep/.tui-colorpicker-container {
width: 137px;
height: 64px;
box-sizing: border-box;
padding-left: 16px;
padding-top: 9px;
}
}
.size_mix {
margin-right: 8px;
......@@ -783,7 +809,7 @@ div {
top: 35px;
left: 0;
width: 240px;
height: 200px;
height: 190px;
background: #ffffff;
border-radius: 4px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
......@@ -952,6 +978,7 @@ div {
}
}
.desc {
margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-between;
......@@ -962,6 +989,7 @@ div {
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
text-align: center;
}
}
}
......@@ -1243,7 +1271,7 @@ div {
.multiply,
.blend,
.brightness {
z-index: 9999999;
z-index: 9;
box-sizing: border-box;
position: absolute;
top: -84px;
......@@ -1289,8 +1317,38 @@ div {
background: #ffffff;
border-radius: 2px;
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 {
width: 240px;
......@@ -1329,14 +1387,14 @@ div {
}
.lt_main_middle .lt_middle_main {
width: 100%;
height: 750px;
height: 740px;
display: flex;
.source {
z-index: 0;
position: relative;
box-sizing: border-box;
// width: 560px;
height: 750px;
height: 740px;
margin-right: 16px;
background: #ffffff;
border-radius: 8px;
......@@ -1530,7 +1588,7 @@ div {
}
}
.tzdDrawing_source {
z-index: 99;
z-index: 100;
width: 540px;
height: 540px;
position: absolute;
......@@ -1561,7 +1619,7 @@ div {
position: relative;
box-sizing: border-box;
// width: 560px;
height: 750px;
height: 740px;
background: #ffffff;
border-radius: 8px;
z-index: 0;
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @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
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -410,7 +410,7 @@
<div class="btn light_dbd" :class="{brightnessActive: isBrightnessActive}" @click.stop="changeBrightness">亮度/对比度
</div>
<!-- 去白弹框 -->
<div class="remove-white" v-show="optionsRemoveWhite">
<div class="remove-white number-range" v-show="optionsRemoveWhite">
<div class="title">去白</div>
<div class="content">
<el-slider class="range-narrow" id="input-range-remove-white-distance" v-model="inputRemoveWhiteRange" :min="0" :max="255"></el-slider>
......@@ -418,7 +418,7 @@
</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="content">
<el-slider class="range-narrow" id="input-range-color-filter-value" v-model="inputColorFilterRange" :min="0" :max="255"></el-slider>
......@@ -426,19 +426,19 @@
</div>
</div>
<!-- 正片叠底弹框 -->
<div class="multiply" v-show="optionsMultiply">
<div class="multiply" v-show="optionsMultiply" @click.stop>
<div class="content">
<div id="tui-multiply-color-picker"></div>
</div>
</div>
<!-- 差异化弹框 -->
<div class="blend" v-show="optionsBlend">
<div class="blend" v-show="optionsBlend" @click.stop>
<div class="content">
<div id="tui-blend-color-picker"></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="content">
<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 {
*/
imageEditor._graphics.canvasImage.canvas.on("mouse:down", e => {
// 开启拖拽
if (self.zoomLevel > 1) {
if (self.zoomLevel > 1 && self.isHand) {
self.startHand = true
}
})
......@@ -1201,7 +1201,7 @@ export default {
* 目标图像
*/
imageEditor2._graphics.canvasImage.canvas.on("mouse:down", e => {
if (self.zoomLevel2 > 1) {
if (self.zoomLevel2 > 1 && self.isHand) {
// 开启拖拽
self.startHand = true
}
......@@ -2067,7 +2067,7 @@ export default {
// 更改canvas图层的宽高样式适配
let lower_canvas_width = $('.tui-image-editor .lower-canvas').width()
let lower_canvas_height = $('.tui-image-editor .lower-canvas').height()
$(".tzdDrawing_source").css('height', lower_canvas_height + 'px')
$(".tzdDrawing_source").css('width', lower_canvas_width + 'px')
$(".tzdDrawing_2_source").css('height', lower_canvas_height + 'px')
......@@ -2176,6 +2176,16 @@ export default {
self.isHistoryOptions = false
self.isActive_history = false
$(".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) {
......@@ -4214,11 +4224,15 @@ export default {
this.isCircleOptions = !this.isCircleOptions;
if (this.isActive_circle) {
$(".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 {
$(".tzdDrawing_source").css('pointer-evnets', 'auto')
$(".tzdDrawing_target").css('pointer-evnets', 'auto')
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)");
this.isMrSizeActive = false;
$(".body-container").css('z-index', 99)
// $(".body-container").css('z-index', 99)
}
if (this.type == "source") {
if (this.isActive_circle) {
......@@ -4587,10 +4601,14 @@ export default {
}
if (this.isActive_line) {
$(".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 {
$(".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;
}
},
......@@ -5513,14 +5531,17 @@ export default {
// 开启拖拽
// this.imageEditor._graphics._attachZoomEvents2();
// this.imageEditor._graphics.startHandMode()
$(".tzdDrawing_source").css('z-index', 99)
$(".body-container").css('z-index', 100)
$(".tzdDrawing_target").css('z-index', 99)
// $(".tzdDrawing_source").css('z-index', 99)
$(".tzdDrawing_source").css('pointer-events', 'none')
// $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99)
} else {
$(".drag").css("background", "rgba(5, 95, 231, 0.05)");
$(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 100)
// $(".drag").css("background", "rgba(5, 95, 231, 0.05)");
// $(".tzdDrawing_source").css('z-index', 100)
// $(".body-container").css('z-index', 99)
// $(".tzdDrawing_target").css('z-index', 100)
$(".tzdDrawing_source").css('pointer-events', 'auto')
// this.imageEditor.changeCursor('auto');
// this.imageEditor2.changeCursor('auto');
// 停止拖拽
......@@ -5536,16 +5557,18 @@ export default {
// this.imageEditor2._graphics._attachZoomEvents2();
this.imageEditor.changeCursor('grab');
this.imageEditor2.changeCursor('grab');
$(".tzdDrawing_source").css('z-index', 99)
$(".body-container").css('z-index', 100)
$(".tzdDrawing_target").css('z-index', 99)
$(".tzdDrawing_target").css('pointer-events', 'none')
// $(".tzdDrawing_source").css('z-index', 99)
// $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99)
} else {
$(".drag").css("background", "rgba(5, 95, 231, 0.05)");
// 停止拖拽
$(".tzdDrawing_target").css('pointer-events', 'auto')
// this.imageEditor2._graphics._attachZoomEvents3();
$(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 99)
$(".tzdDrawing_target").css('z-index', 100)
// $(".tzdDrawing_source").css('z-index', 100)
// $(".body-container").css('z-index', 99)
// $(".tzdDrawing_target").css('z-index', 100)
}
}
......@@ -5570,6 +5593,7 @@ export default {
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)");
// 是否是小手
this.isHand = false;
this.startHand = false;
// 是否放大
// this.isEnlarge = false
// 目标是否放大
......@@ -5705,15 +5729,17 @@ export default {
if (this.isEnlarge) {
$(".enlarge").css("background", "#055FE7");
// this.imageEditor.changeCursor("zoom-in");
$(".tzdDrawing_source").css('z-index', 100)
$(".body-container").css('z-index', 1)
// $(".tzdDrawing_source").css('z-index', 100)
// $(".body-container").css('z-index', 1)
$(".tzdDrawing_source").css('pointer-events', 'auto')
this.isShowEnlargeSynchro = true;
this.isEnlargeSynchro = false;
} else {
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)");
// this.imageEditor.changeCursor("auto");
$(".tzdDrawing_source").css('z-index', 1)
$(".body-container").css('z-index', 99)
// $(".tzdDrawing_source").css('z-index', 1)
// $(".body-container").css('z-index', 99)
$(".tzdDrawing_source").css('pointer-events', 'none')
this.isShowEnlargeSynchro = false;
this.isEnlargeSynchro = false;
}
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -590,7 +590,12 @@ export default {
if (response.data.code === 0) {
this.$message.success("新增成功");
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 {
this.$message.error("新增失败");
}
......
src/views/Editor/modules/ajdaxx.vue
......@@ -29,7 +29,7 @@
label-position="left"
:rules="rules"
ref="ruleForm"
label-width="10.125rem"
label-width="10.325rem"
class="demo-ruleForm"
:status-icon="true"
>
......@@ -603,7 +603,24 @@ export default {
SelectCode,
Cascader,
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>
......
src/views/Editor/modules/ajzwbjLeft.scss
......@@ -86,11 +86,11 @@
}
}
.left-right-hand {
margin-top: 5px;
margin-top: 16px;
.lr-hand {
// width: 100%;
width: 268px;
height: 640px;
height: 624px;
overflow: auto;
:nth-child(even) {
margin-left: 8px;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -1176,6 +1176,7 @@ $previewHeight: var(--previewHeight, 100%);
flex-wrap: wrap;
padding: 16px 14px;
.hand-item {
margin-bottom: 9px;
/deep/.el-checkbox__label {
padding-left: 5px;
}
......
src/views/Editor/modules/rydaxx.scss
......@@ -7,21 +7,21 @@
}
.header {
border-bottom: 1px solid #eeeeee;
position: fixed;
background: #FFFFFF;
background: #ffffff;
height: 50px;
width: 943px;
width: 955px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 32px;
border-bottom: 1px solid #EEEEEE;
z-index: 999;
.header-title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282F3C;
color: #282f3c;
}
.header-close {
......@@ -48,17 +48,17 @@
.ayzzwjbxx {
padding: 24px 32px;
/deep/.el-input.is-disabled .el-input__inner {
background-color: #ECEDF1;
color: #AEAFB4;
background-color: #ecedf1;
color: #aeafb4;
cursor: not-allowed;
}
/deep/ .el-form-item.is-error .el-input__inner {
width: 264px;
height: 40px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #E6E6E8;
border: 1px solid #e6e6e8;
}
/deep/ .el-input {
......@@ -66,9 +66,10 @@
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;
border: 1px solid #E6E6E8 !important;
border: 1px solid #e6e6e8 !important;
border-radius: 4px;
}
......@@ -80,7 +81,7 @@
.line {
width: 4px;
height: 16px;
background: #055FE7;
background: #055fe7;
border-radius: 2px;
margin-right: 10px;
}
......@@ -88,7 +89,7 @@
.name {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282F3C;
color: #282f3c;
}
}
......@@ -105,7 +106,7 @@
width: 410px;
}
/deep/.el-form-item__label {
width: 50px !important;
width: 155px !important;
}
/deep/.el-radio {
margin-right: 10px;
......@@ -143,14 +144,14 @@
right: 0;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #FF3745;
color: #ff3745;
}
/deep/ .el-input__icon.el-input__validateIcon.el-icon-circle-close {
width: 16px;
height: 16px;
&::before {
content: " ";
width: 16px;
height: 16px;
......@@ -173,7 +174,7 @@
/deep/ .el-form-item.el-form-item--feedback.is-error.is-required {
input {
color: #FF3745;
color: #ff3745;
}
}
}
......@@ -188,9 +189,9 @@
/deep/ .el-form-item.is-error .el-input__inner {
width: 164px;
height: 40px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #E6E6E8;
border: 1px solid #e6e6e8;
}
}
......@@ -215,20 +216,22 @@
/deep/ .el-form-item.is-error .el-input__inner {
width: 408px;
height: 40px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #E6E6E8;
border: 1px solid #e6e6e8;
}
}
.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;
height: 76px;
background: #F6F8FA;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
background: #f6f8fa;
box-shadow: inset 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
border: 1px solid #EEEEEE;
// border: 1px solid #eeeeee;
.el-input__count {
background: transparent;
}
......@@ -243,7 +246,7 @@
.horizontal-line {
width: 100%;
height: 1px;
background: #E6E6E8;
background: #e6e6e8;
margin-bottom: 20px;
}
......@@ -275,21 +278,24 @@
.horizontal-line {
width: 100%;
height: 1px;
background: #E6E6E8;
background: #e6e6e8;
margin-bottom: 20px;
}
.form-footer {
box-shadow: 0px -2px 20px 0px rgba(0, 0, 0, 0.06);
z-index: 999;
position: fixed;
bottom: 0;
right: 0;
background: #FFFFFF;
background: #ffffff;
height: 100px;
width: 943px;
width: 958px;
display: flex;
align-items: center;
justify-content: center;
.save, .cancel, .export {
.save,
.cancel,
.export {
display: flex;
align-items: center;
justify-content: center;
......@@ -298,54 +304,54 @@
.save {
width: 72px;
height: 40px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #AEB5C2;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2E3846;
color: #2e3846;
&:hover {
border: 1px solid #055fe7;
color: #055fe7;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
border: 1px solid #044cb9;
color: #044cb9;
}
}
.cancel {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
color: #ffffff;
width: 72px;
height: 40px;
background: #055FE7;
background: #055fe7;
border-radius: 4px;
margin: 0 16px;
&:hover {
background: #377FEC;
color: #FFFFFF;
background: #377fec;
color: #ffffff;
}
&:active {
background: #044CB9;
color: #FFFFFF;
background: #044cb9;
color: #ffffff;
}
}
.export {
width: 96px;
height: 40px;
background: #DDEBFF;
background: #ddebff;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055FE7;
color: #055fe7;
&:hover {
background: #EDF4FF;
color: #055FE7;
background: #edf4ff;
color: #055fe7;
}
&:active {
background: #CCE0FF;
color: #055FE7;
background: #cce0ff;
color: #055fe7;
}
}
}
......@@ -359,7 +365,7 @@
bottom: 130px;
width: 40px;
height: 40px;
background: #FFFFFF;
background: #ffffff;
box-shadow: 0px 0px 5px 0px rgba(5, 95, 231, 0.4);
border-radius: 20px;
display: flex;
......@@ -373,11 +379,40 @@
&:hover {
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 {
width: 6px; // 横向滚动条
width: 12px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
......@@ -388,7 +423,7 @@
}
/deep/ .el-drawer__container ::-webkit-scrollbar {
display: none;
// display: none;
}
// 修改多选框样式
......@@ -422,3 +457,32 @@
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/ryzwbjLeft.scss
......@@ -308,7 +308,7 @@
}
.face-image {
width: 120px;
height: 161px;
height: 160px;
border-radius: 4px;
border: 1px solid #cccccc;
display: flex;
......@@ -316,9 +316,12 @@
align-items: center;
justify-content: center;
img {
width: 100%;
height: auto;
object-fit: contain;
}
// .face-pic {
// width: 100%;
// height: 100%;
// }
.zwtx {
font-size: 12px;
color: #999999;
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -156,11 +156,11 @@
</el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
<span>共计&nbsp;<span>{{ total }}条</span>&nbsp;数据</span>
</div>
</div>
<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="line" :class="{ active: leftRoll }">
<div class="selected">
......@@ -316,6 +316,9 @@ export default {
this.$bus.on('searchTypeLT', (type) => {
self.searchType = type
})
document.body.addEventListener('click', (e) => {
self.isShowOptions = false
})
},
created () {
let self = this;
......@@ -1154,6 +1157,7 @@ export default {
* @return {*}
*/
icons (h, { column }) {
let self = this
if (this.searchType == '指纹') {
return h("div", [
h("span", column.label),
......@@ -1161,7 +1165,10 @@ export default {
class: "el-icon-arrow-down",
style: "color:#B1B6C2;margin-left:5px;cursor:pointer;",
on: {
click: this.switchOptions
click: (e) => {
e.stopPropagation()
self.switchOptions()
}
}
})
]);
......@@ -1201,6 +1208,34 @@ export default {
self.tableData = []
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 = [
position: relative;
box-sizing: border-box;
width: 100%;
height: calc(100% - 40px);
height: calc(100% - 25px);
background: #f6f8fa;
border-radius: 8px;
......@@ -1582,6 +1617,7 @@ const candidates = [
font-family: MicrosoftYaHei;
color: #999999;
margin-right: 16px;
cursor: pointer;
&.active {
color: #006aff;
......@@ -1621,6 +1657,11 @@ const candidates = [
/deep/ .el-table__body {
width: 100% !important;
}
/deep/ .el-table {
&::before {
display: none;
}
}
/deep/ .el-input__inner {
border: none;
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -33,7 +33,7 @@
</el-table-column>
</el-table>
<div class="lt_middle_bottom">
<span>该任务共计<span>{{ total }}条</span>查询</span>
<span>该任务共计&nbsp;<span>{{ total }}条</span>&nbsp;查询</span>
<div class="btn" @click="changeTableHeight">
<span>{{ options }}</span>
<div class="ico"><img src="@/assets/img/bottom.png" alt=""></div>
......@@ -128,8 +128,8 @@
</div>
<!--指纹个数提示-->
<div class="lt_middle_bottom">
<span v-show="fingerShowType=='指纹'">该查询ID共计<span>{{ fingerTotal }}枚</span>{{fingerShowType}}</span>
<span v-show="fingerShowType=='掌纹'">该查询ID共计<span>{{ handTotal }}枚</span>{{fingerShowType}}</span>
<span v-show="fingerShowType=='指纹'">该查询ID共计&nbsp;<span>{{ fingerTotal }}枚</span>&nbsp;{{fingerShowType}}</span>
<span v-show="fingerShowType=='掌纹'">该查询ID共计&nbsp;<span>{{ handTotal }}枚</span>&nbsp;{{fingerShowType}}</span>
</div>
</div>
</div>
......@@ -631,7 +631,7 @@ const datas = [
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 320px;
height: 360px;
.Bizhong {
.cell {
......@@ -725,9 +725,10 @@ const datas = [
.lt_middle_src_data {
.lt_middle_bottom {
margin-top: -10px;
margin-top: -4px;
display: flex;
justify-content: center;
border-top: 1px solid #cccccc;
.btn {
margin-left: 32px;
......
vue.config.js
/*
* @Author: your name
* @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
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -99,8 +99,8 @@ module.exports = {
// }
// },
"/apiDelImg": {
target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.108:8091/", //新系统
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://192.168.128.100:8099/", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -118,7 +118,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.102:8099", // 江
// target: "http://192.168.128.100:8099", // 江
ws: true,
changeOrigin: true,
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