Skip to content

F
founder_vue
Commit 7ac3f5c7 by 李姝悦
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev

parents e397d8ad 0217ef38
Showing with 818 additions and 639 deletions
src/components/ImageEd.scss
...@@ -8,11 +8,11 @@ $arrow_rotate: var(--arrow_rotate, url("../assets/img/zcedit/arrow.png")); ...@@ -8,11 +8,11 @@ $arrow_rotate: var(--arrow_rotate, url("../assets/img/zcedit/arrow.png"));
$BJDcolor: var(--BJDcolor, #e60012); // #e60012 $BJDcolor: var(--BJDcolor, #e60012); // #e60012
// canvas的宽度 // canvas的宽度
$canvasHeight_source: var(--canvasHeight_source, 540px); $canvasHeight_source: var(--canvasHeight_source, 556px);
$canvasWidth_source: var(--canvasWidth_source, 540px); $canvasWidth_source: var(--canvasWidth_source, 556px);
$canvasHeight_target: var(--canvasHeight_target, 540px); $canvasHeight_target: var(--canvasHeight_target, 556px);
$canvasWidth_target: var(--canvasWidth_target, 540px); $canvasWidth_target: var(--canvasWidth_target, 556px);
// 预览框的宽高 // 预览框的宽高
$previewWidth_source: var(--previewWidth_source, 100%); $previewWidth_source: var(--previewWidth_source, 100%);
...@@ -42,7 +42,7 @@ div { ...@@ -42,7 +42,7 @@ div {
// background-color: #ffffff; // background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
padding: 0 24px 24px 24px; // padding: 0 20px 24px 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -89,7 +89,7 @@ div { ...@@ -89,7 +89,7 @@ div {
.icon { .icon {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -155,7 +155,7 @@ div { ...@@ -155,7 +155,7 @@ div {
.icon_line { .icon_line {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -369,7 +369,7 @@ div { ...@@ -369,7 +369,7 @@ div {
.icon_history { .icon_history {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -504,8 +504,8 @@ div { ...@@ -504,8 +504,8 @@ div {
padding-left: 16px; padding-left: 16px;
padding-top: 9px; padding-top: 9px;
} }
&::before{ &::before {
content: ''; content: "";
width: 0; width: 0;
height: 0; height: 0;
border-top: 10px solid transparent; border-top: 10px solid transparent;
...@@ -519,8 +519,8 @@ div { ...@@ -519,8 +519,8 @@ div {
top: 20px; top: 20px;
} }
// 覆盖第一个三角形，形成边框 // 覆盖第一个三角形，形成边框
&::after{ &::after {
content: ''; content: "";
width: 0; width: 0;
height: 0; height: 0;
border-top: 9px solid transparent; border-top: 9px solid transparent;
...@@ -537,20 +537,20 @@ div { ...@@ -537,20 +537,20 @@ div {
margin-bottom: 10px; margin-bottom: 10px;
} }
/deep/.tui-colorpicker-palette-button.tui-colorpicker-selected { /deep/.tui-colorpicker-palette-button.tui-colorpicker-selected {
border: 1px solid rgba($color: #055FE7, $alpha: 0.5); border: 1px solid rgba($color: #055fe7, $alpha: 0.5);
color: transparent !important; color: transparent !important;
box-shadow: inset 0px 0px 0px 2px #fff; box-shadow: inset 0px 0px 0px 2px #fff;
} }
} }
.circle_mix { .circle_mix {
margin-right: 8px; margin-right: 40px;
position: relative; position: relative;
width: 64px; width: 64px;
height: 32px; height: 32px;
.icon_circle { .icon_circle {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -724,7 +724,7 @@ div { ...@@ -724,7 +724,7 @@ div {
margin-bottom: 10px; margin-bottom: 10px;
} }
/deep/.tui-colorpicker-palette-button.tui-colorpicker-selected { /deep/.tui-colorpicker-palette-button.tui-colorpicker-selected {
border: 1px solid rgba($color: #055FE7, $alpha: 0.5); border: 1px solid rgba($color: #055fe7, $alpha: 0.5);
color: transparent !important; color: transparent !important;
box-shadow: inset 0px 0px 0px 2px #fff; box-shadow: inset 0px 0px 0px 2px #fff;
} }
...@@ -735,7 +735,7 @@ div { ...@@ -735,7 +735,7 @@ div {
.icon_size { .icon_size {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -824,7 +824,7 @@ div { ...@@ -824,7 +824,7 @@ div {
.icon_rotate { .icon_rotate {
width: 64px; width: 64px;
height: 32px; height: 32px;
background: rgba(5, 95, 231, 0.05); background: rgba(5, 95, 231, 0.1);
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1206,6 +1206,7 @@ div { ...@@ -1206,6 +1206,7 @@ div {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 99;
} }
.lt_main_left { .lt_main_left {
width: 352px; width: 352px;
...@@ -1219,13 +1220,13 @@ div { ...@@ -1219,13 +1220,13 @@ div {
} }
.lt_main_middle .lt_main_header { .lt_main_middle .lt_main_header {
height: 60px; height: 60px;
width: 1120px; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.features { .features {
cursor: pointer; cursor: pointer;
margin-right: 20px; margin: 10px;
width: 40px; width: 40px;
height: 40px; height: 40px;
background: #ffffff; background: #ffffff;
...@@ -1282,9 +1283,10 @@ div { ...@@ -1282,9 +1283,10 @@ div {
.lt_main_middle .lt_main_footer { .lt_main_middle .lt_main_footer {
position: relative; position: relative;
margin-top: 10px; margin-top: 10px;
height: 70px; width: 1135px;
width: 1105px; height: 104px;
background: #f6f8fa; background: #ebeff4;
box-shadow: inset 0px 1px 4px 0px rgba(5, 95, 231, 0.3);
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1297,7 +1299,7 @@ div { ...@@ -1297,7 +1299,7 @@ div {
-4px -4px 4px 0px #ffffff; -4px -4px 4px 0px #ffffff;
border-radius: 4px; border-radius: 4px;
// padding: 9px 12px; // padding: 9px 12px;
width: 64px; width: 72px;
padding: 9px 0; padding: 9px 0;
margin-right: 16px; margin-right: 16px;
text-align: center; text-align: center;
...@@ -1315,6 +1317,9 @@ div { ...@@ -1315,6 +1317,9 @@ div {
color: #ffffff; color: #ffffff;
} }
} }
.fx {
margin-right: 0;
}
.light_dbd { .light_dbd {
width: 128px; width: 128px;
height: 40px; height: 40px;
...@@ -1324,7 +1329,7 @@ div { ...@@ -1324,7 +1329,7 @@ div {
width: 1px; width: 1px;
height: 40px; height: 40px;
background: #d8d8d8; background: #d8d8d8;
margin: 0 30px; margin: 0 40px;
} }
.grayActive, .grayActive,
.vintageActive, .vintageActive,
...@@ -1352,7 +1357,7 @@ div { ...@@ -1352,7 +1357,7 @@ div {
z-index: 9; z-index: 9;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: -84px; top: -64px;
right: 59px; right: 59px;
width: 240px; width: 240px;
height: 82px; height: 82px;
...@@ -1403,7 +1408,7 @@ div { ...@@ -1403,7 +1408,7 @@ div {
width: 137px !important; width: 137px !important;
height: 64px; height: 64px;
padding: 0; padding: 0;
top: -60px; top: -40px;
right: 290px !important; right: 290px !important;
/deep/.tui-colorpicker-container { /deep/.tui-colorpicker-container {
width: 137px; width: 137px;
...@@ -1419,7 +1424,7 @@ div { ...@@ -1419,7 +1424,7 @@ div {
margin-bottom: 10px; margin-bottom: 10px;
} }
/deep/.tui-colorpicker-palette-button.tui-colorpicker-selected { /deep/.tui-colorpicker-palette-button.tui-colorpicker-selected {
border: 1px solid rgba($color: #055FE7, $alpha: 0.5); border: 1px solid rgba($color: #055fe7, $alpha: 0.5);
color: transparent !important; color: transparent !important;
box-shadow: inset 0px 0px 0px 2px #fff; box-shadow: inset 0px 0px 0px 2px #fff;
} }
...@@ -1428,7 +1433,7 @@ div { ...@@ -1428,7 +1433,7 @@ div {
width: 137px !important; width: 137px !important;
height: 64px; height: 64px;
padding: 0; padding: 0;
top: -60px; top: -40px;
right: 200px !important; right: 200px !important;
/deep/.tui-colorpicker-container { /deep/.tui-colorpicker-container {
width: 137px; width: 137px;
...@@ -1444,7 +1449,7 @@ div { ...@@ -1444,7 +1449,7 @@ div {
margin-bottom: 10px; margin-bottom: 10px;
} }
/deep/.tui-colorpicker-palette-button.tui-colorpicker-selected { /deep/.tui-colorpicker-palette-button.tui-colorpicker-selected {
border: 1px solid rgba($color: #055FE7, $alpha: 0.5); border: 1px solid rgba($color: #055fe7, $alpha: 0.5);
color: transparent !important; color: transparent !important;
box-shadow: inset 0px 0px 0px 2px #fff; box-shadow: inset 0px 0px 0px 2px #fff;
//margin: 0px 6px 0px -2px; //margin: 0px 6px 0px -2px;
...@@ -1460,7 +1465,7 @@ div { ...@@ -1460,7 +1465,7 @@ div {
.brightness { .brightness {
width: 240px; width: 240px;
height: 135px; height: 135px;
top: -140px; top: -120px;
} }
.color-filter { .color-filter {
right: 315px; right: 315px;
...@@ -1494,14 +1499,15 @@ div { ...@@ -1494,14 +1499,15 @@ div {
} }
.lt_main_middle .lt_middle_main { .lt_main_middle .lt_middle_main {
width: 100%; width: 100%;
height: 740px; height: 682px;
display: flex; display: flex;
margin-top: 20px;
.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: 740px; height: 682px;
margin-right: 16px; margin-right: 16px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
...@@ -1598,6 +1604,11 @@ div { ...@@ -1598,6 +1604,11 @@ div {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.txt {
font-size: 18px;
font-family: HarmonyOS_Sans_SC_Medium;
color: #333333;
}
} }
.delDesc { .delDesc {
display: flex; display: flex;
...@@ -1633,14 +1644,14 @@ div { ...@@ -1633,14 +1644,14 @@ div {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
margin: 40px 0 0 235px; margin: 20px 0 0 244px;
} }
.drawing { .drawing {
width: 540px; width: 556px;
height: 540px; height: 556px;
// background: rgba(0, 0, 0, 0.2); // background: rgba(0, 0, 0, 0.2);
// margin-left: 14px; // margin-left: 14px;
margin-top: 60px; margin-top: 10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1649,16 +1660,16 @@ div { ...@@ -1649,16 +1660,16 @@ div {
.body-container { .body-container {
position: relative; position: relative;
z-index: 99; z-index: 99;
width: 540px; width: 556px;
height: 540px; height: 556px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
.tui-image-editor { .tui-image-editor {
box-sizing: content-box; box-sizing: content-box;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
box-sizing: content-box; box-sizing: content-box;
...@@ -1668,14 +1679,14 @@ div { ...@@ -1668,14 +1679,14 @@ div {
} }
.tui-image-editor2 { .tui-image-editor2 {
box-sizing: content-box; box-sizing: content-box;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
/deep/.tui-image-editor-canvas-container { /deep/.tui-image-editor-canvas-container {
max-height: 540px !important; max-height: 556px !important;
max-width: 540px !important; max-width: 556px !important;
} }
/deep/.lower-canvas, /deep/.lower-canvas,
/deep/.upper-canvas { /deep/.upper-canvas {
...@@ -1685,8 +1696,8 @@ div { ...@@ -1685,8 +1696,8 @@ div {
bottom: 0; bottom: 0;
top: 0; top: 0;
margin: auto; margin: auto;
max-height: 540px !important; max-height: 556px !important;
max-width: 540px !important; max-width: 556px !important;
height: $canvasHeight_source !important; height: $canvasHeight_source !important;
width: $canvasWidth_source !important; width: $canvasWidth_source !important;
// display: flex !important; // display: flex !important;
...@@ -1696,8 +1707,8 @@ div { ...@@ -1696,8 +1707,8 @@ div {
} }
.tzdDrawing_source { .tzdDrawing_source {
z-index: 100; z-index: 100;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: absolute; position: absolute;
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
...@@ -1724,8 +1735,8 @@ div { ...@@ -1724,8 +1735,8 @@ div {
} }
.tzdDrawing_2_source { .tzdDrawing_2_source {
z-index: 9; z-index: 9;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: absolute; position: absolute;
background: transparent; background: transparent;
transform-origin: center center; transform-origin: center center;
...@@ -1733,8 +1744,8 @@ div { ...@@ -1733,8 +1744,8 @@ div {
} }
} }
#canvasInput_source_2 { #canvasInput_source_2 {
width: 540px; width: 556px;
height: 540px; height: 556px;
position: absolute; position: absolute;
background: transparent; background: transparent;
transform-origin: center center; transform-origin: center center;
...@@ -1745,8 +1756,8 @@ div { ...@@ -1745,8 +1756,8 @@ div {
.target { .target {
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
// width: 560px; width: 560px;
height: 740px; height: 682px;
background: #ffffff; background: #ffffff;
border-radius: 8px; border-radius: 8px;
z-index: 0; z-index: 0;
...@@ -1865,6 +1876,11 @@ div { ...@@ -1865,6 +1876,11 @@ div {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.txt {
font-size: 18px;
font-family: HarmonyOS_Sans_SC_Medium;
color: #333333;
}
} }
.edit { .edit {
width: 72px; width: 72px;
...@@ -1878,14 +1894,14 @@ div { ...@@ -1878,14 +1894,14 @@ div {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
margin: 40px 0 0 235px; margin: 20px 0 0 244px;
} }
.drawing { .drawing {
width: 540px; width: 556px;
height: 540px; height: 556px;
// background: rgba(0, 0, 0, 0.2); // background: rgba(0, 0, 0, 0.2);
// margin-left: 14px; // margin-left: 14px;
margin-top: 60px; margin-top: 10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1893,30 +1909,30 @@ div { ...@@ -1893,30 +1909,30 @@ div {
position: relative; position: relative;
.body-container { .body-container {
z-index: 99; z-index: 99;
width: 540px; width: 556px;
height: 540px; height: 556px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
.tui-image-editor { .tui-image-editor {
box-sizing: content-box; box-sizing: content-box;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: relative; position: relative;
} }
.tui-image-editor2 { .tui-image-editor2 {
box-sizing: content-box; box-sizing: content-box;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
/deep/.tui-image-editor-canvas-container { /deep/.tui-image-editor-canvas-container {
max-height: 540px !important; max-height: 556px !important;
max-width: 540px !important; max-width: 556px !important;
} }
/deep/.lower-canvas, /deep/.lower-canvas,
/deep/.upper-canvas { /deep/.upper-canvas {
...@@ -1926,8 +1942,8 @@ div { ...@@ -1926,8 +1942,8 @@ div {
bottom: 0; bottom: 0;
top: 0; top: 0;
margin: auto; margin: auto;
max-height: 540px !important; max-height: 556px !important;
max-width: 540px !important; max-width: 556px !important;
height: $canvasHeight_target !important; height: $canvasHeight_target !important;
width: $canvasWidth_target !important; width: $canvasWidth_target !important;
display: flex !important; display: flex !important;
...@@ -1937,8 +1953,8 @@ div { ...@@ -1937,8 +1953,8 @@ div {
} }
.tzdDrawing_target { .tzdDrawing_target {
z-index: 99; z-index: 99;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: absolute; position: absolute;
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
...@@ -1956,8 +1972,8 @@ div { ...@@ -1956,8 +1972,8 @@ div {
} }
.tzdDrawing_2_target { .tzdDrawing_2_target {
z-index: 9; z-index: 9;
width: 540px; width: 556px;
height: 540px; height: 556px;
position: absolute; position: absolute;
background: transparent; background: transparent;
transform-origin: center center; transform-origin: center center;
...@@ -1976,7 +1992,6 @@ div { ...@@ -1976,7 +1992,6 @@ div {
border-radius: 50%; border-radius: 50%;
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
// 修改多选框样式 // 修改多选框样式
...@@ -2066,7 +2081,6 @@ div { ...@@ -2066,7 +2081,6 @@ div {
// border-style: solid; // border-style: solid;
// border-color: #fff; // border-color: #fff;
} }
} }
} }
img { img {
......
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-01-08 10:46:56 * @LastEditTime: 2022-01-08 17:08:42
* @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
--> -->
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<div class="del-name">图像已删除</div> <div class="del-name">图像已删除</div>
</div> </div>
<div class="title"> <div class="title">
<span>源数据</span> <span class="txt">源数据</span>
<div class="delDesc" v-if="isDelete"> <div class="delDesc" v-if="isDelete">
<img class="del-icon" src="@/assets/img/del-time.png" alt=""> <img class="del-icon" src="@/assets/img/del-time.png" alt="">
<span class="scsj">删除时间：</span> <span class="scsj">删除时间：</span>
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
<div class="del-name">暂无图像</div> <div class="del-name">暂无图像</div>
</dir> </dir>
<div class="title"> <div class="title">
<span>目标数据</span> <span class="txt">目标数据</span>
<div class="delDesc" v-if="!isDelete && targetIsDelete"> <div class="delDesc" v-if="!isDelete && targetIsDelete">
<img class="del-icon" src="@/assets/img/del-time.png" alt=""> <img class="del-icon" src="@/assets/img/del-time.png" alt="">
<span class="scsj">删除时间：</span> <span class="scsj">删除时间：</span>
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
</div> </div>
</div> </div>
<div class="lt_main_footer"> <div class="lt_main_footer">
<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}" @click.stop="changeHorseshoeMirror">
马蹄镜 马蹄镜
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
<div class="btn" :class="{equalizationActive: isEqualizationActive}" @click.stop="changeEqualization">均衡化</div> <div class="btn" :class="{equalizationActive: isEqualizationActive}" @click.stop="changeEqualization">均衡化</div>
<div class="btn" :class="{sharpenActive: isSharpenActive}" @click.stop="changeSharpen">锐化</div> <div class="btn" :class="{sharpenActive: isSharpenActive}" @click.stop="changeSharpen">锐化</div>
<div class="btn" :class="{embossActive: isEmbossActive}" @click.stop="changeEmboss">浮雕</div> <div class="btn" :class="{embossActive: isEmbossActive}" @click.stop="changeEmboss">浮雕</div>
<div class="btn" :class="{invertActive: isInvertActive}" @click.stop="changeInvert">反相</div> <div class="btn fx" :class="{invertActive: isInvertActive}" @click.stop="changeInvert">反相</div>
<div class="line"></div> <div class="line"></div>
<div class="btn" :class="{colorFilterActive: isColorFilterActive}" @click.stop="changeColorFilter">滤色器</div> <div class="btn" :class="{colorFilterActive: isColorFilterActive}" @click.stop="changeColorFilter">滤色器</div>
<div class="btn" :class="{blendActive: isBlendActive}" @click.stop="changeBlend">差异化</div> <div class="btn" :class="{blendActive: isBlendActive}" @click.stop="changeBlend">差异化</div>
...@@ -501,11 +501,11 @@ export default { ...@@ -501,11 +501,11 @@ export default {
// 判断是否是复核页面 // 判断是否是复核页面
isFHxx: false, isFHxx: false,
// 记录导入图片的宽度和高度 // 记录导入图片的宽度和高度
newWidth_source: 540, newWidth_source: 556,
newHeight_source: 540, newHeight_source: 556,
// 记录导入图片的宽度和高度 // 记录导入图片的宽度和高度
newWidth_target: 540, newWidth_target: 556,
newHeight_target: 540, newHeight_target: 556,
// 特征 // 特征
features1: false, features1: false,
features2: false, features2: false,
...@@ -519,8 +519,8 @@ export default { ...@@ -519,8 +519,8 @@ export default {
go_active: false, go_active: false,
// 是否点击了撤销 // 是否点击了撤销
back_active: false, back_active: false,
canvasWidth: 540, canvasWidth: 556,
canvasHeight: 540, canvasHeight: 556,
sourceImage: null, sourceImage: null,
targetImage: null, targetImage: null,
mouseEnlarge: false, mouseEnlarge: false,
...@@ -2186,10 +2186,10 @@ export default { ...@@ -2186,10 +2186,10 @@ export default {
// console.log(self.newWidth_target); // console.log(self.newWidth_target);
// console.log(self.newHeight_target); // console.log(self.newHeight_target);
$(".tui-image-editor2").css('width', '33.75rem') // $(".tui-image-editor2").css('width', '33.75rem')
$(".tui-image-editor2").css('height', '33.75rem') // $(".tui-image-editor2").css('height', '33.75rem')
$(".tui-image-editor2 .tui-image-editor-canvas-container").css('width', '33.75rem') // $(".tui-image-editor2 .tui-image-editor-canvas-container").css('width', '33.75rem')
$(".tui-image-editor2 .tui-image-editor-canvas-container").css('height', '33.75rem') // $(".tui-image-editor2 .tui-image-editor-canvas-container").css('height', '33.75rem')
// 更改canvas图层的宽高样式适配 // 更改canvas图层的宽高样式适配
if (self.newWidth_target >= self.newHeight_target) { if (self.newWidth_target >= self.newHeight_target) {
document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight_target', 'auto'); document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight_target', 'auto');
...@@ -2244,7 +2244,7 @@ export default { ...@@ -2244,7 +2244,7 @@ export default {
//console.log('documentElement'); //console.log('documentElement');
// 原尺寸显示下拉框 // 原尺寸显示下拉框
self.isActive = false self.isActive = false
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 旋转下拉框 // 旋转下拉框
// console.log(e); // console.log(e);
// 证明是在图像上进行手动旋转 // 证明是在图像上进行手动旋转
...@@ -2253,12 +2253,12 @@ export default { ...@@ -2253,12 +2253,12 @@ export default {
} else { } else {
self.isRotateOptions = false self.isRotateOptions = false
self.isActive_rotate = false self.isActive_rotate = false
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
} }
// 历史记录 // 历史记录
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.1)");
// 滤色器 // 滤色器
self.optionsColorFilter = false self.optionsColorFilter = false
// 差异化 // 差异化
...@@ -3301,13 +3301,13 @@ export default { ...@@ -3301,13 +3301,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -3393,7 +3393,7 @@ export default { ...@@ -3393,7 +3393,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
// this.isActive_history = false; // this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.sizeMr = false; this.sizeMr = false;
this.sizeX = false; this.sizeX = false;
this.sizeZ = false; this.sizeZ = false;
...@@ -3409,7 +3409,7 @@ export default { ...@@ -3409,7 +3409,7 @@ export default {
if (this.isActive_history) { if (this.isActive_history) {
$(".icon_history").css("background", "#055FE7"); $(".icon_history").css("background", "#055FE7");
} else { } else {
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
} }
if (this.type === "source") { if (this.type === "source") {
//console.log(this.historys); //console.log(this.historys);
...@@ -3897,7 +3897,7 @@ export default { ...@@ -3897,7 +3897,7 @@ export default {
*/ */
cancelPic () { cancelPic () {
this.isActive_clear = false; this.isActive_clear = false;
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
this.isShowClearDialog = false; this.isShowClearDialog = false;
}, },
/** /**
...@@ -3908,7 +3908,7 @@ export default { ...@@ -3908,7 +3908,7 @@ export default {
delPic () { delPic () {
let self = this; let self = this;
this.isActive_clear = false; this.isActive_clear = false;
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
this.isShowClearDialog = false; this.isShowClearDialog = false;
if (this.type == "source") { if (this.type == "source") {
this.imageEditor.clearObjects(); this.imageEditor.clearObjects();
...@@ -3930,13 +3930,13 @@ export default { ...@@ -3930,13 +3930,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -4071,13 +4071,13 @@ export default { ...@@ -4071,13 +4071,13 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.isActive_clear = !this.isActive_clear; this.isActive_clear = !this.isActive_clear;
if (this.isActive_clear) { if (this.isActive_clear) {
$(".clear").css("background", "#055FE7"); $(".clear").css("background", "#055FE7");
this.isShowClearDialog = true; this.isShowClearDialog = true;
} else { } else {
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
this.isShowClearDialog = false; this.isShowClearDialog = false;
} }
}, },
...@@ -4157,13 +4157,13 @@ export default { ...@@ -4157,13 +4157,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -4283,7 +4283,7 @@ export default { ...@@ -4283,7 +4283,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
// 取消划线操作 // 取消划线操作
this.imageEditor.stopDrawingMode(); this.imageEditor.stopDrawingMode();
...@@ -4304,7 +4304,7 @@ export default { ...@@ -4304,7 +4304,7 @@ export default {
} else { } else {
// $(".tzdDrawing_source").css('pointer-evnets', 'auto') // $(".tzdDrawing_source").css('pointer-evnets', 'auto')
// $(".tzdDrawing_target").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.1)");
// this.isMrSizeActive = false; // this.isMrSizeActive = false;
// $(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
} }
...@@ -4526,13 +4526,13 @@ export default { ...@@ -4526,13 +4526,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -4652,7 +4652,7 @@ export default { ...@@ -4652,7 +4652,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.isLineOptions = !this.isLineOptions; this.isLineOptions = !this.isLineOptions;
this.isActive_line = !this.isActive_line; this.isActive_line = !this.isActive_line;
...@@ -4678,7 +4678,7 @@ export default { ...@@ -4678,7 +4678,7 @@ export default {
// $(".tzdDrawing_source").css('pointer-events', 'none') // $(".tzdDrawing_source").css('pointer-events', 'none')
// $(".tzdDrawing_target").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.1)");
// $(".tzdDrawing_source").css('pointer-events', 'auto') // $(".tzdDrawing_source").css('pointer-events', 'auto')
// $(".tzdDrawing_target").css('pointer-events', 'auto') // $(".tzdDrawing_target").css('pointer-events', 'auto')
// $(".body-container").css('z-index', 99) // $(".body-container").css('z-index', 99)
...@@ -4873,13 +4873,13 @@ export default { ...@@ -4873,13 +4873,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -4996,7 +4996,7 @@ export default { ...@@ -4996,7 +4996,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是X轴翻转 // 是否是X轴翻转
this.isX = false; this.isX = false;
// 是否是Y轴翻转 // 是否是Y轴翻转
...@@ -5012,7 +5012,7 @@ export default { ...@@ -5012,7 +5012,7 @@ export default {
if (this.isActive_rotate) { if (this.isActive_rotate) {
$(".icon_rotate").css("background", "#055FE7"); $(".icon_rotate").css("background", "#055FE7");
} else { } else {
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
} }
}, },
/** /**
...@@ -5027,13 +5027,13 @@ export default { ...@@ -5027,13 +5027,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -5150,7 +5150,7 @@ export default { ...@@ -5150,7 +5150,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.isOptions = !this.isOptions; this.isOptions = !this.isOptions;
this.isActive = !this.isActive; this.isActive = !this.isActive;
if (this.isActive) { if (this.isActive) {
...@@ -5199,7 +5199,7 @@ export default { ...@@ -5199,7 +5199,7 @@ export default {
}, 200); }, 200);
} }
} else { } else {
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否原尺寸同步 // 是否原尺寸同步
this.isSizeSynchro = false; this.isSizeSynchro = false;
// 是否展示原尺寸同步下拉框 // 是否展示原尺寸同步下拉框
...@@ -5217,13 +5217,13 @@ export default { ...@@ -5217,13 +5217,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -5341,7 +5341,7 @@ export default { ...@@ -5341,7 +5341,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
if (this.type == "source") { if (this.type == "source") {
if (opt == "tong") { if (opt == "tong") {
if ($(".tong").hasClass("active")) { if ($(".tong").hasClass("active")) {
...@@ -5355,15 +5355,15 @@ export default { ...@@ -5355,15 +5355,15 @@ export default {
if ($(".yuan").hasClass("active")) { if ($(".yuan").hasClass("active")) {
$(".yuan").removeClass("active"); $(".yuan").removeClass("active");
this.isEnlarge = false; this.isEnlarge = false;
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
} else { } else {
$(".yuan").addClass("active"); $(".yuan").addClass("active");
this.imageEditor.resetZoom(); this.imageEditor.resetZoom();
this.imageEditor.changeCursor("auto"); this.imageEditor.changeCursor("auto");
this.isEnlarge = false; this.isEnlarge = false;
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
if (this.sourceTong) { if (this.sourceTong) {
this.imageEditor2.resetZoom(); this.imageEditor2.resetZoom();
this.imageEditor2.changeCursor("auto"); this.imageEditor2.changeCursor("auto");
...@@ -5385,16 +5385,16 @@ export default { ...@@ -5385,16 +5385,16 @@ export default {
$(".yuan").removeClass("active"); $(".yuan").removeClass("active");
this.isEnlarge = false; this.isEnlarge = false;
this.isEnlarge2 = false; this.isEnlarge2 = false;
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
} else { } else {
$(".yuan").addClass("active"); $(".yuan").addClass("active");
this.imageEditor2.resetZoom(); this.imageEditor2.resetZoom();
this.imageEditor2.changeCursor("auto"); this.imageEditor2.changeCursor("auto");
this.isEnlarge = false; this.isEnlarge = false;
this.isEnlarge2 = false; this.isEnlarge2 = false;
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
if (this.targetTong) { if (this.targetTong) {
this.imageEditor.resetZoom(); this.imageEditor.resetZoom();
this.imageEditor.changeCursor("auto"); this.imageEditor.changeCursor("auto");
...@@ -5415,13 +5415,13 @@ export default { ...@@ -5415,13 +5415,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
// this.isHand = false // this.isHand = false
// 是否放大 // 是否放大
...@@ -5539,7 +5539,7 @@ export default { ...@@ -5539,7 +5539,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
//console.log(this.imageEditor); //console.log(this.imageEditor);
//console.log(555); //console.log(555);
this.imageEditor.stopDrawingMode(); this.imageEditor.stopDrawingMode();
...@@ -5564,7 +5564,7 @@ export default { ...@@ -5564,7 +5564,7 @@ export default {
// $(".body-container").css('z-index', 100) // $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99) // $(".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.1)");
// $(".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)
...@@ -5589,7 +5589,7 @@ export default { ...@@ -5589,7 +5589,7 @@ export default {
// $(".body-container").css('z-index', 100) // $(".body-container").css('z-index', 100)
// $(".tzdDrawing_target").css('z-index', 99) // $(".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.1)");
// 停止拖拽 // 停止拖拽
// $(".tzdDrawing_target").css('pointer-events', 'auto') // $(".tzdDrawing_target").css('pointer-events', 'auto')
// this.imageEditor2._graphics._attachZoomEvents3(); // this.imageEditor2._graphics._attachZoomEvents3();
...@@ -5611,13 +5611,13 @@ export default { ...@@ -5611,13 +5611,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
this.startHand = false; this.startHand = false;
...@@ -5736,7 +5736,7 @@ export default { ...@@ -5736,7 +5736,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
//console.log("放大"); //console.log("放大");
if (this.type == "source") { if (this.type == "source") {
this.isEnlarge = !this.isEnlarge; this.isEnlarge = !this.isEnlarge;
...@@ -5750,7 +5750,7 @@ export default { ...@@ -5750,7 +5750,7 @@ export default {
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.1)");
// 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)
...@@ -5769,7 +5769,7 @@ export default { ...@@ -5769,7 +5769,7 @@ export default {
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.1)");
// this.imageEditor2.changeCursor("auto"); // this.imageEditor2.changeCursor("auto");
$(".tzdDrawing_target").css('z-index', 1) $(".tzdDrawing_target").css('z-index', 1)
$(".body-container").css('z-index', 99) $(".body-container").css('z-index', 99)
...@@ -5848,7 +5848,7 @@ export default { ...@@ -5848,7 +5848,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
// 标记点保留 // 标记点保留
// 如果之前开启了标记点 // 如果之前开启了标记点
...@@ -5954,7 +5954,7 @@ export default { ...@@ -5954,7 +5954,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
// 标记点保留 // 标记点保留
// 如果之前开启了标记点 // 如果之前开启了标记点
...@@ -6214,13 +6214,13 @@ export default { ...@@ -6214,13 +6214,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -6302,7 +6302,7 @@ export default { ...@@ -6302,7 +6302,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.sizeD = false; this.sizeD = false;
this.sizeZ = false; this.sizeZ = false;
this.sizeX = false; this.sizeX = false;
...@@ -6322,13 +6322,13 @@ export default { ...@@ -6322,13 +6322,13 @@ export default {
// 原尺寸下拉框 // 原尺寸下拉框
this.isShowSizeSynchro = false; this.isShowSizeSynchro = false;
this.isShowCircleColor = false; this.isShowCircleColor = false;
$(".icon_line").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_line").css("background", "rgba(5, 95, 231, 0.1)");
$(".clear").css("background", "rgba(5, 95, 231, 0.05)"); $(".clear").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_circle").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_circle").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_rotate").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_rotate").css("background", "rgba(5, 95, 231, 0.1)");
$(".enlarge").css("background", "rgba(5, 95, 231, 0.05)"); $(".enlarge").css("background", "rgba(5, 95, 231, 0.1)");
$(".drag").css("background", "rgba(5, 95, 231, 0.05)"); $(".drag").css("background", "rgba(5, 95, 231, 0.1)");
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.1)");
// 是否是小手 // 是否是小手
this.isHand = false; this.isHand = false;
// 是否放大 // 是否放大
...@@ -6453,7 +6453,7 @@ export default { ...@@ -6453,7 +6453,7 @@ export default {
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
// 历史记录背景色 // 历史记录背景色
$(".icon_history").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_history").css("background", "rgba(5, 95, 231, 0.1)");
this.sizeD = false; this.sizeD = false;
this.sizeZ = false; this.sizeZ = false;
this.sizeX = false; this.sizeX = false;
......
src/icons/gongjvlan.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="1920px" height="133px" viewBox="0 0 1920 133" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状结合备份</title>
<defs>
<path d="M0,0 L1920,0 L1920,60 L1191,60 C1185.47715,60 1181,64.4771525 1181,70 L1181,108 C1181,116.284271 1174.28427,123 1166,123 L952,123 L952,123 L756,123 C747.715729,123 741,116.284271 741,108 L741,70 C741,64.4771525 736.522847,60 731,60 L0,60 L0,60 L0,0 Z" id="path-1"></path>
<filter x="-0.6%" y="-5.7%" width="101.1%" height="117.9%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="3" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0.0196078431 0 0 0 0 0.37254902 0 0 0 0 0.905882353 0 0 0 0.08 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="形状结合备份">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</svg>
\ No newline at end of file
src/main.js
...@@ -11,6 +11,7 @@ import './utils/CrashHandle' ...@@ -11,6 +11,7 @@ import './utils/CrashHandle'
import './plugins/axios' import './plugins/axios'
import fHttp from './request/http.js' import fHttp from './request/http.js'
import NetUtil from './netmgr/NetUtil' import NetUtil from './netmgr/NetUtil'
import VerifyDataType from './utils/verify-data/VerifyDataType.js'
import App from './App.vue' import App from './App.vue'
import router from './router' import router from './router'
import store from './store' import store from './store'
...@@ -42,7 +43,8 @@ Vue.prototype.$moment = moment ...@@ -42,7 +43,8 @@ Vue.prototype.$moment = moment
import uploader from 'vue-simple-uploader' import uploader from 'vue-simple-uploader'
Vue.use(uploader) Vue.use(uploader)
import md5 from "js-md5"; import md5 from 'js-md5'
Vue.prototype.$md5 = md5 Vue.prototype.$md5 = md5
Vue.prototype.$driver = new Driver({ Vue.prototype.$driver = new Driver({
...@@ -71,6 +73,7 @@ window.util = Util ...@@ -71,6 +73,7 @@ window.util = Util
window.logger = LoggerUtil window.logger = LoggerUtil
window.user = UserUtil window.user = UserUtil
window.fHttp = fHttp window.fHttp = fHttp
window.verifyData = VerifyDataType
window.NetUtil = NetUtil window.NetUtil = NetUtil
Vue.use(VueWechatTitle) Vue.use(VueWechatTitle)
Vue.use(VueClipboard) Vue.use(VueClipboard)
......
src/utils/verify-data/VerifyDataType.js 0 → 100644
export default {
/**
* Description: 逻辑分库名称正则
* @author: li_hongchao
* @date: 2022/1/9 19:47
*/
_LJFKM: /(([\u4E00-\u9FA5·]{2,})|([a-zA-Z]{4,}))/,
_NUMBER: /^(0|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$/,
/**
* Description: 自然数
* @author: li_hongchao
* @date: 2022/1/9 19:06
* ^(0|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$"
*/
_NATURAL_NUMBER: /^\\+?[1-9][0-9]*$/,
/**
* Description: 校验中文姓名和英文姓名
* @author: li_hongchao
* @date: 2022/1/9 19:07
*/
_NAME: /(([\u4E00-\u9FA5·]{1,17})|([a-zA-Z]{1,17}))/,
/**
* Description: 18位身份证号
* @author: li_hongchao
* @date: 2022/1/9 19:41
*/
_18_IDCard: /^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9]|X|x)$/,
/**
* Description:15位身份证号
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_15_IDCard: /^[1-9]\\d{7}((0\\[1-9])|(1[0-2]))(([0\\[1-9]|1\\d|2\\d])|3[0-1])\\d{2}([0-9]|x|X){1}$/,
/**
* Description: URL
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_URL: /(http|https):\/\/([\w.]+\/?)\S*/,
/**
* Description: QQ号
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_QQ: /^[1-9]\\d{4,10}$/,
/**
* Description: 一个或多个汉字
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_CHINESE: /^[\\u0391-\\uFFE5]+$/,
/**
* Description: 手机号码
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_MOBILE_PHONE: /^1[3|4|5|8][0-9]\\d{8}$/,
/**
* Description: 所有电话格式校验
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_ALL_PHONE: /^((1[0,1,2,3,4,5,6,7,8,9]))\\d{9}|((\\d{4})?(\\-)?\\d{7})$/,
/**
* Description: 邮箱验证
* @author: li_hongchao
* @date: 2022/1/9 19:43
*/
_MAIL: /^[A-Za-z0-9\\u4e00-\\u9fa5]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"/,
/**
* Description: 邮政编码
* @author: li_hongchao
* @date: 2022/1/9 19:43
*/
_POST_CODE: /^[1-9]\\d{5}$/,
}
src/views/cxyrd/LT.scss
...@@ -307,8 +307,11 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -307,8 +307,11 @@ $phone: var(--phone, #606266); //#ff4242;
left: 0; left: 0;
width: 1920px; width: 1920px;
height: 123px; height: 123px;
img { .gongjvlan {
width: 1920px; width: 100%;
height: 123px; height: 123px;
} }
} }
.header {
z-index: 99;
}
src/views/cxyrd/LT.vue
<template> <template>
<div class="ltDiv"> <div class="ltDiv">
<div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }"> <div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<!-- <div class="top-head"> <div class="top-head">
<img src="@/assets/img/rgrd/gongjvlan.svg" alt=""> <img src="@/assets/img/rgrd/gongjvlan.png" alt="">
</div> --> </div>
<div class="header"> <div class="header">
<div class="label">正查</div> <div class="label">
<img src="@/assets/img/rgrd/zhengcha.png" alt="">
<span>正查</span>
</div>
<div class="btns"> <div class="btns">
<div class="bz-btn" @click="Bz">比中</div> <div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<div class="header_line"></div> <!-- <div class="header_line"></div> -->
<div class="lt_main"> <div class="lt_main">
<div class="lt_main_left"> <div class="lt_main_left">
<l-t-src :src-data="qid"></l-t-src> <l-t-src :src-data="qid"></l-t-src>
...@@ -595,6 +598,7 @@ export default { ...@@ -595,6 +598,7 @@ export default {
height: 100%; height: 100%;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
font-family: HarmonyOS_Sans_SC;
} }
div { div {
margin: 0; margin: 0;
...@@ -604,8 +608,8 @@ div { ...@@ -604,8 +608,8 @@ div {
} }
.lt-dom { .lt-dom {
width: 100%; width: 100%;
// background-color: rgba(5, 95, 231, 0.08); background-color: #F6F8FA;
background-color: #fff; // background-color: #fff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
display: flex; display: flex;
...@@ -625,12 +629,18 @@ div { ...@@ -625,12 +629,18 @@ div {
padding: 0 25px; padding: 0 25px;
.label { .label {
align-self: flex-start; align-self: flex-start;
height: 22px; font-size: 20px;
font-size: 16px; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #FFFFFF;
color: #00b47a;
line-height: 22px;
margin-top: 14px; margin-top: 14px;
img {
width: 120px;
}
span {
position: absolute;
left: 52px;
line-height: 35px;
}
} }
} }
...@@ -689,10 +699,10 @@ div { ...@@ -689,10 +699,10 @@ div {
// width: 1124px; // width: 1124px;
display: flex; display: flex;
// flex-direction: row; // flex-direction: row;
justify-content: space-between; // justify-content: space-between;
} }
.lt_main_left { .lt_main_left {
width: 352px; width: 376px;
border: none; border: none;
/* margin-right: 16px; */ /* margin-right: 16px; */
margin-top: 18px; margin-top: 18px;
...@@ -701,11 +711,12 @@ div { ...@@ -701,11 +711,12 @@ div {
overflow: hidden; overflow: hidden;
} }
.lt_main_middle { .lt_main_middle {
width: 1120px; width: 1135px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; // margin-top: -65px;
margin-left: -16px; // margin-left: -16px;
margin: -65px 20px 24px 20px;
} }
.lt_main_middle .lt_main_header { .lt_main_middle .lt_main_header {
height: 70px; height: 70px;
...@@ -721,8 +732,7 @@ div { ...@@ -721,8 +732,7 @@ div {
} }
.lt_main_right { .lt_main_right {
margin-top: 20px; margin-top: 20px;
margin-left: 16px; width: 376px;
width: 380px;
border: none; border: none;
border-radius: 20px 0px 0px 0px; border-radius: 20px 0px 0px 0px;
overflow: hidden; overflow: hidden;
......
src/views/cxyrd/TL.scss
...@@ -301,3 +301,17 @@ $phone: var(--phone, #606266); //#ff4242; ...@@ -301,3 +301,17 @@ $phone: var(--phone, #606266); //#ff4242;
} }
} }
} }
.top-head {
position: fixed;
top: 0;
left: 0;
width: 1920px;
height: 123px;
.gongjvlan {
width: 100%;
height: 123px;
}
}
.header {
z-index: 99;
}
src/views/cxyrd/TL.vue
<template> <template>
<div class="tlDiv"> <div class="tlDiv">
<div class="tl" :class="{ bzActive: isShowbzDialogBg || loading_sd}"> <div class="tl" :class="{ bzActive: isShowbzDialogBg || loading_sd}">
<div class="top-head">
<img src="@/assets/img/rgrd/gongjvlan.png" alt="">
</div>
<div class="header"> <div class="header">
<div class="label">倒查</div> <div class="label">
<img src="@/assets/img/rgrd/daocha.png" alt="">
<span>倒查</span>
</div>
<div class="btns"> <div class="btns">
<div class="bz-btn" @click="Bz">比中</div> <div class="bz-btn" @click="Bz">比中</div>
<div class="rd-btn" @click="Rdwc">认定完成</div> <div class="rd-btn" @click="Rdwc">认定完成</div>
</div> </div>
</div> </div>
<div class="header_line"></div> <!-- <div class="header_line"></div> -->
<div class="main"> <div class="main">
<div class="main-left"> <div class="main-left">
<t-l-src></t-l-src> <t-l-src></t-l-src>
...@@ -176,7 +182,7 @@ export default { ...@@ -176,7 +182,7 @@ export default {
mounted () { mounted () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo')) this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo); console.log(this.userInfo);
if(this.userInfo) { if (this.userInfo) {
this.bzr = this.userInfo.name this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode this.dwdm = this.userInfo.unitCode
...@@ -365,11 +371,11 @@ export default { ...@@ -365,11 +371,11 @@ export default {
* @return {*} * @return {*}
*/ */
async Bz () { async Bz () {
if(this.bzData == null) { if (this.bzData == null) {
this.$message.error("信息不全无法比中！"); this.$message.error("信息不全无法比中！");
return return
}; };
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') { if (this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
this.$message.error("已经比中过的数据无法再次比中！"); this.$message.error("已经比中过的数据无法再次比中！");
return return
} }
...@@ -570,6 +576,7 @@ div { ...@@ -570,6 +576,7 @@ div {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
font-family: HarmonyOS_Sans_SC;
.tl-search { .tl-search {
width: 100%; width: 100%;
} }
...@@ -579,7 +586,7 @@ div { ...@@ -579,7 +586,7 @@ div {
// background-color: #ffffff; // background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
padding: 0 24px 24px 24px; // padding: 0 24px 24px 24px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -590,14 +597,21 @@ div { ...@@ -590,14 +597,21 @@ div {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 25px;
.label { .label {
align-self: flex-start; align-self: flex-start;
height: 22px; font-size: 20px;
font-size: 16px; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #FFFFFF;
color: #e60012;
line-height: 22px;
margin-top: 14px; margin-top: 14px;
img {
width: 120px;
}
span {
position: absolute;
left: 52px;
line-height: 35px;
}
} }
} }
.header_line { .header_line {
...@@ -639,24 +653,29 @@ div { ...@@ -639,24 +653,29 @@ div {
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
.main-left { .main-left {
width: 352px; width: 376px;
border: none; border: none;
/* margin-right: 16px; */ /* margin-right: 16px; */
margin-top: 18px; margin-top: 18px;
//border: none; box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
border-radius: 0px 20px 0px 0px;
overflow: hidden;
} }
.main-middle { .main-middle {
width: 1120px; width: 1135px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; // margin-top: -65px;
margin-left: -10px; // margin-left: -16px;
margin: -65px 20px 24px 20px;
} }
.main-right { .main-right {
margin-top: 50px; margin-top: 20px;
margin-left: 20px; width: 376px;
width: 380px;
border: none; border: none;
border-radius: 20px 0px 0px 0px;
overflow: hidden;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
} }
} }
/deep/.el-dialog { /deep/.el-dialog {
...@@ -665,7 +684,7 @@ div { ...@@ -665,7 +684,7 @@ div {
.bz-dialog { .bz-dialog {
.tl { .tl {
width: 100%; width: 100%;
height: 634px; height: 100%;
.type { .type {
display: flex; display: flex;
width: 100%; width: 100%;
......
src/views/cxyrd/modules/LTCandidate.vue
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
<span>{{ searchType }}</span> <span>{{ searchType }}</span>
</div> </div>
<transition name="slide-fade"> <transition name="slide-fade">
<div <div class="dropdown-options" v-show="isFingerDropdown" @click="changefingershowType($event)">
class="dropdown-options"
v-show="isFingerDropdown"
@click="changefingershowType($event)"
>
<div class="option-item"> <div class="option-item">
<div class="selected"> <div class="selected">
<span v-if="fingershowType === '指纹'">√</span> <span v-if="fingershowType === '指纹'">√</span>
...@@ -26,12 +22,7 @@ ...@@ -26,12 +22,7 @@
</div> </div>
</transition> </transition>
</div> </div>
<el-input <el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
class="input"
v-model="input3"
placeholder="请输入条码号/指位"
@keydown.enter="search"
></el-input>
<div class="btn" @click="search"> <div class="btn" @click="search">
<img src="@/assets/img/rgrd/fangdajing.png" alt=""> <img src="@/assets/img/rgrd/fangdajing.png" alt="">
</div> </div>
...@@ -40,15 +31,7 @@ ...@@ -40,15 +31,7 @@
</div> </div>
</div> </div>
<div class="lt_candidate_number"> <div class="lt_candidate_number">
<el-table <el-table height="44rem" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" ref="singleTable" :row-class-name="tableRowClassName">
height="44rem"
highlight-current-row
@current-change="handleCurrentChange"
class="lt_candidate_table"
:data="tableData"
ref="singleTable"
:row-class-name="tableRowClassName"
>
<el-table-column label="排名" type="index" :width="width1"> <el-table-column label="排名" type="index" :width="width1">
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" :width="width2"> <el-table-column prop="score" label="得分" :width="width2">
...@@ -62,13 +45,7 @@ ...@@ -62,13 +45,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-if="searchType == '指纹'" prop="destseqno" label="指位" :width="!roleArr.includes('C-1-7') ? 'auto' : width3" :render-header="icons">
v-if="searchType == '指纹'"
prop="destseqno"
label="指位"
:width="!roleArr.includes('C-1-7') ? 'auto' : width3"
:render-header="icons"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ <del>{{
...@@ -158,13 +135,7 @@ ...@@ -158,13 +135,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-else-if="searchType == '掌纹'" prop="destseqno" label="掌位" :width="!roleArr.includes('C-1-7') ? 'auto' : width3" :render-header="icons">
v-else-if="searchType == '掌纹'"
prop="destseqno"
label="掌位"
:width="!roleArr.includes('C-1-7') ? 'auto' : width3"
:render-header="icons"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
<del>{{ <del>{{
...@@ -190,12 +161,7 @@ ...@@ -190,12 +161,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
prop="destbarcode"
label="目标条码号"
width="auto"
v-if="roleArr.includes('C-1-7')"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 被删除 --> <!-- 被删除 -->
<span v-if="scope.row.removeFlag === 1"> <span v-if="scope.row.removeFlag === 1">
...@@ -208,9 +174,7 @@ ...@@ -208,9 +174,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="lt_candidate_bottom"> <div class="lt_candidate_bottom">
<span <span>共计&nbsp;<span>{{ total }}条</span>&nbsp;数据</span>
>共计&nbsp;<span>{{ total }}条</span>&nbsp;数据</span
>
</div> </div>
</div> </div>
<transition name="slide-fade"> <transition name="slide-fade">
...@@ -309,7 +273,7 @@ ...@@ -309,7 +273,7 @@
<script> <script>
export default { export default {
name: "LTCandidate", name: "LTCandidate",
data() { data () {
return { return {
width3: 70, width3: 70,
width2: 60, width2: 60,
...@@ -365,7 +329,7 @@ export default { ...@@ -365,7 +329,7 @@ export default {
tableIndex: null tableIndex: null
}; };
}, },
mounted() { mounted () {
let self = this; let self = this;
// 监听指掌纹类型 // 监听指掌纹类型
this.$bus.on('searchTypeLT', (type) => { this.$bus.on('searchTypeLT', (type) => {
...@@ -376,7 +340,7 @@ export default { ...@@ -376,7 +340,7 @@ export default {
}) })
this.keyDown() this.keyDown()
}, },
created() { created () {
let self = this; let self = this;
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
...@@ -413,7 +377,7 @@ export default { ...@@ -413,7 +377,7 @@ export default {
} }
}); });
}, },
beforeDestroy() { beforeDestroy () {
this.$bus.off("deleteMessage"); this.$bus.off("deleteMessage");
this.$bus.off("initCandidate"); this.$bus.off("initCandidate");
}, },
...@@ -422,14 +386,14 @@ export default { ...@@ -422,14 +386,14 @@ export default {
* 选择指纹类型 * 选择指纹类型
* @param e * @param e
*/ */
changefingershowType(e) { changefingershowType (e) {
this.fingershowType = e.target.innerHTML; this.fingershowType = e.target.innerHTML;
this.isFingerDropdown = false; this.isFingerDropdown = false;
}, },
/** /**
* 指纹下拉框 * 指纹下拉框
*/ */
fingerDropdownChange() { fingerDropdownChange () {
this.isFingerDropdown = !this.isFingerDropdown; this.isFingerDropdown = !this.isFingerDropdown;
}, },
/** /**
...@@ -440,7 +404,7 @@ export default { ...@@ -440,7 +404,7 @@ export default {
* @param {*} columnIndex * @param {*} columnIndex
* @return {*} * @return {*}
*/ */
tableRowClassName({ row, column, rowIndex, columnIndex }) { tableRowClassName ({ row, column, rowIndex, columnIndex }) {
// //console.log(row); // //console.log(row);
// 比中的行 // 比中的行
if (row.affirmstatus == 2 || row.affirmstatus == 3) { if (row.affirmstatus == 2 || row.affirmstatus == 3) {
...@@ -461,7 +425,7 @@ export default { ...@@ -461,7 +425,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
switchOptions() { switchOptions () {
this.isShowOptions = !this.isShowOptions; this.isShowOptions = !this.isShowOptions;
// if(!this.isShowOptions) { // if(!this.isShowOptions) {
// this.tableData = this.sourceTableData // this.tableData = this.sourceTableData
...@@ -472,7 +436,7 @@ export default { ...@@ -472,7 +436,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightPX() { changeRightPX () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 15; return item.destseqno == 15;
}); });
...@@ -509,7 +473,7 @@ export default { ...@@ -509,7 +473,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightPH() { changeRightPH () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 14; return item.destseqno == 14;
}); });
...@@ -546,7 +510,7 @@ export default { ...@@ -546,7 +510,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightPZ() { changeRightPZ () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 13; return item.destseqno == 13;
}); });
...@@ -583,7 +547,7 @@ export default { ...@@ -583,7 +547,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightPS() { changeRightPS () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 12; return item.destseqno == 12;
}); });
...@@ -620,7 +584,7 @@ export default { ...@@ -620,7 +584,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightPM() { changeRightPM () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 11; return item.destseqno == 11;
}); });
...@@ -657,7 +621,7 @@ export default { ...@@ -657,7 +621,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightRX() { changeRightRX () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 5; return item.destseqno == 5;
}); });
...@@ -694,7 +658,7 @@ export default { ...@@ -694,7 +658,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightRH() { changeRightRH () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 4; return item.destseqno == 4;
}); });
...@@ -731,7 +695,7 @@ export default { ...@@ -731,7 +695,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightRZ() { changeRightRZ () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 3; return item.destseqno == 3;
}); });
...@@ -768,7 +732,7 @@ export default { ...@@ -768,7 +732,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightRS() { changeRightRS () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 2; return item.destseqno == 2;
}); });
...@@ -805,7 +769,7 @@ export default { ...@@ -805,7 +769,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeRightRM() { changeRightRM () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 1; return item.destseqno == 1;
}); });
...@@ -842,7 +806,7 @@ export default { ...@@ -842,7 +806,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftPX() { changeLeftPX () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 20; return item.destseqno == 20;
}); });
...@@ -879,7 +843,7 @@ export default { ...@@ -879,7 +843,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftPH() { changeLeftPH () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 19; return item.destseqno == 19;
}); });
...@@ -916,7 +880,7 @@ export default { ...@@ -916,7 +880,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftPZ() { changeLeftPZ () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 18; return item.destseqno == 18;
}); });
...@@ -953,7 +917,7 @@ export default { ...@@ -953,7 +917,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftPS() { changeLeftPS () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 17; return item.destseqno == 17;
}); });
...@@ -990,7 +954,7 @@ export default { ...@@ -990,7 +954,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftPM() { changeLeftPM () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 16; return item.destseqno == 16;
}); });
...@@ -1027,7 +991,7 @@ export default { ...@@ -1027,7 +991,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftRX() { changeLeftRX () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 10; return item.destseqno == 10;
}); });
...@@ -1064,7 +1028,7 @@ export default { ...@@ -1064,7 +1028,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftRH() { changeLeftRH () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 9; return item.destseqno == 9;
}); });
...@@ -1101,7 +1065,7 @@ export default { ...@@ -1101,7 +1065,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftRZ() { changeLeftRZ () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 8; return item.destseqno == 8;
}); });
...@@ -1138,7 +1102,7 @@ export default { ...@@ -1138,7 +1102,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftRS() { changeLeftRS () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 7; return item.destseqno == 7;
}); });
...@@ -1175,7 +1139,7 @@ export default { ...@@ -1175,7 +1139,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
changeLeftRM() { changeLeftRM () {
this.tableData = this.sourceTableData.filter((item) => { this.tableData = this.sourceTableData.filter((item) => {
return item.destseqno == 6; return item.destseqno == 6;
}); });
...@@ -1213,7 +1177,7 @@ export default { ...@@ -1213,7 +1177,7 @@ export default {
* @param {*} column * @param {*} column
* @return {*} * @return {*}
*/ */
icons(h, { column }) { icons (h, { column }) {
let self = this; let self = this;
if (this.searchType == "指纹") { if (this.searchType == "指纹") {
return h("div", [ return h("div", [
...@@ -1238,7 +1202,7 @@ export default { ...@@ -1238,7 +1202,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
search() { search () {
let self = this; let self = this;
if (self.isDelete) return; if (self.isDelete) return;
...@@ -1353,7 +1317,7 @@ export default { ...@@ -1353,7 +1317,7 @@ export default {
* @param {*} old * @param {*} old
* @return {*} * @return {*}
*/ */
handleCurrentChange(val, old) { handleCurrentChange (val, old) {
let self = this; let self = this;
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中 // 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit("bzJudge", val); this.$bus.emit("bzJudge", val);
...@@ -1487,12 +1451,12 @@ export default { ...@@ -1487,12 +1451,12 @@ export default {
} }
} }
}, },
choose(val) { choose (val) {
//console.info(val); //console.info(val);
}, },
}, },
watch: { watch: {
checked(newValue, oldValue) { checked (newValue, oldValue) {
if (newValue) { if (newValue) {
this.tableData = this.sourceTableData; this.tableData = this.sourceTableData;
} else { } else {
...@@ -1505,7 +1469,7 @@ export default { ...@@ -1505,7 +1469,7 @@ export default {
}, },
}, },
computed: { computed: {
roleArr() { roleArr () {
return this.$store.state.layout.Menu; return this.$store.state.layout.Menu;
}, },
}, },
...@@ -1586,16 +1550,21 @@ const candidates = [ ...@@ -1586,16 +1550,21 @@ const candidates = [
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 44px; width: 32px;
height: 34px; height: 32px;
background: #006aff; background: #006AFF;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 34px; line-height: 32px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #ffffff; color: #ffffff;
img {
width: 14px;
height: 14px;
cursor: pointer;
}
} }
.checked { .checked {
...@@ -1674,14 +1643,17 @@ const candidates = [ ...@@ -1674,14 +1643,17 @@ const candidates = [
.lt_candidate_number { .lt_candidate_number {
width: 100%; width: 100%;
height: 883px;
background: #ffffff;
position: relative;
} }
.lt_candidate_bottom { .lt_candidate_bottom {
position: absolute;
bottom: 12px;
left: 20px;
text-align: center; text-align: center;
width: 352px; width: 376px;
height: 58px;
line-height: 58px;
background: #FFFFFF;
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999999; color: #999999;
...@@ -1708,7 +1680,7 @@ const candidates = [ ...@@ -1708,7 +1680,7 @@ const candidates = [
.selectFinger { .selectFinger {
z-index: 10; z-index: 10;
position: absolute; position: absolute;
top: 110px; top: 145px;
right: 60px; right: 60px;
width: 236px; width: 236px;
height: 194px; height: 194px;
......
src/views/cxyrd/modules/LTSrc.vue
...@@ -688,6 +688,7 @@ const datas = [ ...@@ -688,6 +688,7 @@ const datas = [
.lt_src { .lt_src {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff;
div { div {
display: inline-block; display: inline-block;
...@@ -706,6 +707,7 @@ const datas = [ ...@@ -706,6 +707,7 @@ const datas = [
} }
.lt_top { .lt_top {
font-family: HarmonyOS_Sans_SC-Bold;
width: 100%; width: 100%;
border-radius: 0px 20px 0px 0px; border-radius: 0px 20px 0px 0px;
background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%); background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%);
...@@ -717,7 +719,7 @@ const datas = [ ...@@ -717,7 +719,7 @@ const datas = [
justify-content: space-between; justify-content: space-between;
.rwh { .rwh {
font-size: 16px; font-size: 16px;
font-family: HarmonyOS_Sans_SC_Bold; font-family: HarmonyOS_Sans_SC-Bold;
color: #ffffff; color: #ffffff;
} }
.el-checkbox { .el-checkbox {
...@@ -768,7 +770,7 @@ const datas = [ ...@@ -768,7 +770,7 @@ const datas = [
} }
.lt_middle_finger_print { .lt_middle_finger_print {
background-color: #f6f8fa; background-color: #ffffff;
width: 100%; width: 100%;
.btns-switch { .btns-switch {
...@@ -778,7 +780,7 @@ const datas = [ ...@@ -778,7 +780,7 @@ const datas = [
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
background-color: #f6f8fa; background-color: #fff;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 129px; width: 129px;
...@@ -807,11 +809,12 @@ const datas = [ ...@@ -807,11 +809,12 @@ const datas = [
} }
.lt_middle_finger_prints { .lt_middle_finger_prints {
background: #f6f8fa; background: #F6F8FA;
margin-top: 12px; margin-top: 12px;
overflow-y: auto; overflow-y: auto;
width: 100%; width: 354px;
height: 340px; height: 340px;
margin-left: 10px;
.finger_print_number_active { .finger_print_number_active {
background: #055fe7; background: #055fe7;
} }
...@@ -822,13 +825,14 @@ const datas = [ ...@@ -822,13 +825,14 @@ const datas = [
.lt_middle_bottom { .lt_middle_bottom {
text-align: center; text-align: center;
background: #fff; background: #fff;
height: 40px !important; height: 40px;
line-height: 40px; line-height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999; color: #999;
span { span {
span { span {
color: #666; color: #666;
...@@ -1303,6 +1307,14 @@ const datas = [ ...@@ -1303,6 +1307,14 @@ const datas = [
border: 1px solid #999; border: 1px solid #999;
} }
} }
.lt_middle_finger_print {
.lt_middle_bottom {
width: 376px;
height: 100%;
background: #FFFFFF;
line-height: 58px;
}
}
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -3,12 +3,14 @@ ...@@ -3,12 +3,14 @@
<div class="tl-search"> <div class="tl-search">
<div class="label">{{searchType}}</div> <div class="label">{{searchType}}</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input> <el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div> <div class="btn" @click="search">
<img src="@/assets/img/rgrd/fangdajing.png" alt="">
</div>
</div> </div>
<div class="checked"> <div class="checked">
<el-checkbox v-model="checked">显示已比中候选</el-checkbox> <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div> </div>
<el-table height="46rem" ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName"> <el-table height="44rem" ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"> <el-table-column label="排名" type="index" :width="width1">
</el-table-column> </el-table-column>
<el-table-column prop="score" label="得分" :width="width1"> <el-table-column prop="score" label="得分" :width="width1">
...@@ -374,11 +376,11 @@ export default { ...@@ -374,11 +376,11 @@ export default {
<style lang="scss"> <style lang="scss">
.tl-candidate { .tl-candidate {
position: relative;
box-sizing: border-box;
width: 100%; width: 100%;
height: calc(100% - 40px); height: calc(100% - 25px);
background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
position: relative;
//div { //div {
// display: inline-block; // display: inline-block;
...@@ -391,52 +393,60 @@ export default { ...@@ -391,52 +393,60 @@ export default {
background: #ffffff; background: #ffffff;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 20px 20px 15px 20px;
.label { .label {
width: 32px; width: 32px;
height: 24px; height: 24px;
font-size: 16px; font-size: 16px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #1A1A1A; color: #1a1a1a;
line-height: 24px; line-height: 24px;
margin-right: 15px;
i {
margin: 0;
}
} }
.input { .input {
width: 292px; width: 246px;
height: 34px; height: 32px;
background: #ffffff; background: #ffffff;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border: 1px solid #e6e6e8; border: 1px solid #e6e6e8;
margin-left: 10px;
} }
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 44px; width: 32px;
height: 34px; height: 32px;
background: #006aff; background: #006AFF;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
line-height: 32px; line-height: 32px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #FFFFFF; color: #ffffff;
img {
width: 14px;
height: 14px;
cursor: pointer;
}
} }
} }
.checked { .checked {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
background-color: #FFFFFF; margin-right: 20px;
padding: 5px 0;
} }
.lt_candidate_bottom { .lt_candidate_bottom {
position: absolute;
bottom: 12px;
left: 20px;
text-align: center; text-align: center;
width: 352px; width: 23.5rem;
font-size: 12px; height: 3.625rem;
line-height: 3.625rem;
background: #FFFFFF;
font-size: 0.75rem;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #999999; color: #999999;
span { span {
...@@ -447,11 +457,10 @@ export default { ...@@ -447,11 +457,10 @@ export default {
} }
} }
.el-input__inner { /deep/ .el-input__inner {
width: 260px; border: none;
height: 32px; height: 32px !important;
background: #ffffff; line-height: 32px !important;
//border: #0e0eff 1px solid;
} }
.Bizhong { .Bizhong {
...@@ -476,9 +485,11 @@ export default { ...@@ -476,9 +485,11 @@ export default {
.el-input { .el-input {
/deep/ .el-input__inner { /deep/ .el-input__inner {
border: none; border: none;
height: 30px !important;
line-height: 30px !important;
} }
width: 296px; width: 246px;
height: 32px; height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
......
src/views/cxyrd/modules/TLSrc.vue
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
<div class="finger-print" v-show="isShowPrint"> <div class="finger-print" v-show="isShowPrint">
<div class="btns"> <div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div> <div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="line"></div> <!-- <div class="line"></div> -->
<div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div> <div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div>
<div class="btn isDelete" v-show="isDelete">平面</div> <div class="btn isDelete" v-show="isDelete">平面</div>
<div class="line"></div> <!-- <div class="line"></div> -->
<div class="btn" v-show="!isDelete" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹</div> <div class="btn" v-show="!isDelete" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹</div>
<div v-show="isDelete" class="btn isDelete">掌纹</div> <div v-show="isDelete" class="btn isDelete">掌纹</div>
</div> </div>
...@@ -1631,7 +1631,7 @@ div { ...@@ -1631,7 +1631,7 @@ div {
} }
label { label {
margin-right: 67px; // margin-right: 67px;
} }
.lt_candidate_table { .lt_candidate_table {
...@@ -1645,14 +1645,29 @@ label { ...@@ -1645,14 +1645,29 @@ label {
height: 100%; height: 100%;
.top { .top {
font-family: HarmonyOS_Sans_SC-Bold;
width: 100%; width: 100%;
margin: 0 0 10px 0; border-radius: 0px 20px 0px 0px;
background: linear-gradient(270deg, #3eb2ff 0%, #055fe7 100%);
display: flex;
align-items: center;
box-sizing: border-box;
padding: 0 20px;
height: 50px;
justify-content: space-between;
.rwh { .rwh {
font-size: 14px; font-size: 16px;
font-family: HarmonyOS_Sans_SC-Bold, HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC-Bold;
font-weight: bold; color: #ffffff;
color: #282F3C; }
/deep/.el-checkbox {
.el-checkbox__inner.is-checked {
background: #fff !important;
}
.el-checkbox__label {
font-family: HarmonyOS_Sans_SC;
color: #ffffff !important;
}
} }
} }
...@@ -1670,7 +1685,7 @@ label { ...@@ -1670,7 +1685,7 @@ label {
.lt_middle_bottom { .lt_middle_bottom {
text-align: center; text-align: center;
background: #f6f8fa; background: #fff;
height: 40px !important; height: 40px !important;
line-height: 40px; line-height: 40px;
width: 100%; width: 100%;
...@@ -1686,6 +1701,7 @@ label { ...@@ -1686,6 +1701,7 @@ label {
} }
.lt_middle_src_data { .lt_middle_src_data {
background: #fff;
.lt_middle_bottom { .lt_middle_bottom {
margin-top: -10px; margin-top: -10px;
display: flex; display: flex;
...@@ -1723,25 +1739,30 @@ label { ...@@ -1723,25 +1739,30 @@ label {
.finger-print { .finger-print {
width: 352px; width: 352px;
height: 600px; height: 700px;
background: #f6f8fa; margin-left: 10px;
background: #fff;
.btns { .btns {
width: 272px; width: 300px;
height: 32px; height: 32px;
margin: 12px 0 12px 41px; margin: 12px 0 12px 40px;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
.btn { .btn {
cursor: pointer; cursor: pointer;
width: 90px;
height: 32px;
line-height: 32px;
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align: center;
width: 80px;
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #055FE7;
color: #055FE7;
margin-right: 10px;
&:active { &:active {
background: #055fe7; background: #055fe7;
...@@ -2230,7 +2251,7 @@ label { ...@@ -2230,7 +2251,7 @@ label {
.bottom { .bottom {
text-align: center; text-align: center;
background: #f6f8fa; background: #fff;
//height: 40px; //height: 40px;
width: 100%; width: 100%;
font-size: 12px; font-size: 12px;
...@@ -2287,10 +2308,13 @@ label { ...@@ -2287,10 +2308,13 @@ label {
.el-checkbox__input.is-checked { .el-checkbox__input.is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background: #055fe7; border-color: none;
background-color: #fff;
&::after {
border-color: #055fe7; border-color: #055fe7;
} }
} }
}
} }
/deep/ .el-checkbox { /deep/ .el-checkbox {
......
src/views/login/modules/AccountsLogin.vue
...@@ -223,3 +223,15 @@ export default { ...@@ -223,3 +223,15 @@ export default {
background-color: #1689db; background-color: #1689db;
} }
</style> </style>
<style>
input:-webkit-autofill , textarea:-webkit-autofill, select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color:transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
input {
background-color:transparent;
}
</style>
src/views/xtfkgl/RyXtljfkView.vue
...@@ -53,9 +53,7 @@ ...@@ -53,9 +53,7 @@
<div <div
v-for="item in scope.row.groups" v-for="item in scope.row.groups"
:class="{divtext:item.type === 1}" :class="{divtext:item.type === 1}"
:title="item.name" :title="item.name">
:key="item.id"
>
<div v-if="item.type === 1 && item.user && item.user.length >0"> <div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip <el-tooltip
class="item" class="item"
......
src/views/xtfkgl/SjkyhSelect.vue
...@@ -18,27 +18,36 @@ ...@@ -18,27 +18,36 @@
<el-dropdown-menu slot="dropdown" class="select-list-content"> <el-dropdown-menu slot="dropdown" class="select-list-content">
<div class="select-list-content-left"> <div class="select-list-content-left">
<div :class="{'list-item':true,'list-item-focus':isYh}" @click="toggleYh(true)">用户</div> <div :class="{'list-item':true,'list-item-focus':isYh}" @click="toggleYh(true)">
<div :class="{'list-item':true,'list-item-focus':!isYh}" @click="toggleYh(false)">用户组</div> 用户
<div v-if="userSelectSet.size > 0" style="position: absolute; right:4px;">
{{userSelectSet.size}}
</div>
</div>
<div :class="{'list-item':true,'list-item-focus':!isYh}" @click="toggleYh(false)">
用户组
<div v-if="userGroupSelectSet.size > 0" style="position: absolute; right:4px;">
{{userGroupSelectSet.size}}
</div>
</div>
</div> </div>
<div class="select-list-content-right"> <div class="select-list-content-right">
<div class="top-div"> <div class="top-div">
<div v-for="(item,index) in getItemArr()" class="top-item" @click="selectItem(item)" <div v-for="(item,index) in getItemArr()" class="top-item" @click.stop="selectItem(item)"
:key="index"> :key="index">
<span v-if='item.name.length > 6'> <!-- <span v-if='item.name.length > 7'>-->
<el-tooltip effect="dark" :content="item.name" placement="top"> <!-- <el-tooltip effect="dark" :content="item.name" placement="right">-->
<div class="span-name"> <!-- <div class="span-name">-->
{{ item.name.slice(0,6) + '...'}} <!-- {{ item.name.slice(0,7) + '...'}}-->
</div> <!-- </div>-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-else> <!-- <span v-else>{{ item.name}}</span>-->
{{ item.name}} <span style="margin-right: 36px;">{{ item.name}}</span>
</span> <div v-show="isSelect(item)" class="look"
style="position: absolute; top:0px; right:16px;">
<div v-show="isSelect(item)" class="look" style="float: right;margin-right: 17px;"> <i class=" iconfont icon-duihao"></i>
<i class="iconfont icon-duihao"></i>
</div> </div>
</div> </div>
...@@ -182,6 +191,29 @@ export default { ...@@ -182,6 +191,29 @@ export default {
}) })
} }
}, },
getAllUsers() {
let result = []
if (this.userArr.length > 0) {
this.userArr.forEach(item => {
result.push({
id: item.id,
name: item.name,
type: 0
})
})
}
if (this.userGroupArr.length > 0) {
this.userGroupArr.forEach(item => {
result.push({
id: item.id,
name: item.name,
type: 1
})
})
}
return result
},
cancel() { cancel() {
if (this.$refs.dropdown) { if (this.$refs.dropdown) {
this.$refs.dropdown.visible = false this.$refs.dropdown.visible = false
...@@ -331,20 +363,21 @@ export default { ...@@ -331,20 +363,21 @@ export default {
color: #333333; color: #333333;
line-height: 19px; line-height: 19px;
padding: 0px 0px 0px 13px; padding: 0px 0px 0px 8px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: left; justify-content: left;
border: 2px none white; border-left: 2px solid white;
border-left-style: solid;
position: relative;
} }
.list-item-focus { .list-item-focus {
border: 2px none #055FE7; border-left: 2px solid #055FE7;
border-left-style: solid;
color: #055FE7; color: #055FE7;
} }
...@@ -363,14 +396,16 @@ export default { ...@@ -363,14 +396,16 @@ export default {
.top-item { .top-item {
width: 100%; width: 100%;
height: 40px; height: 40px;
background: #FFFFFF; /*background: #FFFFFF;*/
background: transparent;
font-size: 14px; font-size: 14px;
font-family: HarmonyOS_Sans_SC; font-family: HarmonyOS_Sans_SC;
color: #333333; color: #333333;
line-height: 40px; line-height: 40px;
padding-left: 16px; padding-left: 16px;
position: relative;
} }
.top-item:hover { .top-item:hover {
...@@ -378,8 +413,8 @@ export default { ...@@ -378,8 +413,8 @@ export default {
} }
.span-name { .span-name {
overflow: hidden; /*overflow: hidden;*/
float: left; /*float: left;*/
} }
} }
......
src/views/xtfkgl/XtfkAndGzlView.vue
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
<div class="info"> <div class="info">
<el-form <el-form
label-position="left" label-position="left"
:inline="true"
:rules="rules"
:model="ljfkRuleForm"
class="demo-form-inline"
ref="ruleForm"> ref="ruleForm">
<div class="fix-height"> <div class="fix-height">
...@@ -30,7 +34,7 @@ ...@@ -30,7 +34,7 @@
<el-row style="margin-top: 20px"> <el-row style="margin-top: 20px">
<el-col :span="12"> <el-col :span="12">
<el-form-item class="info-item" label="逻辑分库名称："> <el-form-item class="info-item" label="逻辑分库名称：" prop="name">
<el-input <el-input
class="input-info" class="input-info"
v-model.trim="ljfkRuleForm.name" v-model.trim="ljfkRuleForm.name"
...@@ -40,7 +44,7 @@ ...@@ -40,7 +44,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="info-item" label="数据库用户："> <el-form-item class="info-item" label="数据库用户：">
<sjkyh-select :params='ljfkRuleForm.usersOrUserGroups' <sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups'
@select="selectYh"></sjkyh-select> @select="selectYh"></sjkyh-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -81,7 +85,8 @@ ...@@ -81,7 +85,8 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider v-if="isShowTitle()" /> <div v-if="isShowTitle()" class="divider-line" />
<span v-show="isShowTitle()" class="title" @click="toggleGzl()" style="margin-left: 28px;"> <span v-show="isShowTitle()" class="title" @click="toggleGzl()" style="margin-left: 28px;">
<div class="colorDiv"></div> <div class="colorDiv"></div>
...@@ -91,7 +96,6 @@ ...@@ -91,7 +96,6 @@
</div> </div>
<div v-show="isShowGzl()" style="margin-top: 20px;"> <div v-show="isShowGzl()" style="margin-top: 20px;">
<el-row> <el-row>
<el-col> <el-col>
<el-form-item class="info-item" style=" margin-bottom: 15px;" label="工作模式:" <el-form-item class="info-item" style=" margin-bottom: 15px;" label="工作模式:"
...@@ -107,7 +111,7 @@ ...@@ -107,7 +111,7 @@
<div style="background: #F7F9FB; padding: 30px 0px;"> <div style="background: #F7F9FB; padding: 30px 0px;">
<el-row style="margin-bottom: 20px;"> <el-row style="margin-bottom: 20px;">
<el-col :span="24"> <el-col :span="24">
<el-form-item class="dui-lie-ming-cheng-layout" label="队列名称:" prop="pattern"> <el-form-item label="队列名称:" prop="pattern">
<div style="margin-left: 40px;"> <div style="margin-left: 40px;">
<div v-for="(item,gindex) in getDlmcArr()" <div v-for="(item,gindex) in getDlmcArr()"
:class="{'dui-lie-ming-cheng':true,'dui-lie-ming-cheng-bx':isBxCxdl(item.type)}" :class="{'dui-lie-ming-cheng':true,'dui-lie-ming-cheng-bx':isBxCxdl(item.type)}"
...@@ -129,46 +133,40 @@ ...@@ -129,46 +133,40 @@
</div> </div>
</div> </div>
</div> </div>
<div v-show="!getDlmcArr() || getDlmcArr().length <= 0"
v-for="item in getDlCount()" class="kong" />
</div> </div>
<div
v-show="!getDlmcArr() || getDlmcArr().length <= 0"
v-for="(item, index) in getDlCount()"
:key="index"
class="kong"
></div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--工作队列-->
<el-row> <el-row>
<el-col> <el-col>
<el-form-item class="gong-zuo-dui-lie-layout" label="工作队列:" prop="gzdl"> <el-form-item class="gong-zuo-dui-lie-layout" label="工作队列:" prop="gzdl">
<div v-if="getGzdlArr() && getGzdlArr().length > 1"> <div v-if="getGzdlArr() && getGzdlArr().length > 0">
<!-- 串行模式;--> <!-- 串行模式;-->
<div v-if="gzlRuleForm.pattern === 0" <div v-if="gzlRuleForm.pattern === 0"
v-for="(item,gindex) in getGzdlArr()" v-for="(item,gindex) in getGzdlArr()"
class="GongZuoDuiLieChuanXing"
style="float:left;"> style="float:left;">
<div class="gong-zuo-dui-lie-chuanxing"
:key="item.type" <div :key="item.type"
:style="{marginLeft: gindex===0?'24px':'0px'}"> class="itemBox"
<div v-if="gindex === 0" class="chu-li-dui-lie" :style="{marginLeft: gindex===0?'40px':'0px'}">
style="margin-left: 0px;">
<!-- <span style="position: absolute;float:left;top:-4px;left: 10px;color: white">--> <div>
<!-- <img src="../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg" />--> <img class="dlIndexBg"
<!-- <span style="position: absolute;">{{index+1}}</span>--> src="../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg" />
<!-- </span>--> <div class="dlIndex">{{gindex+1}}</div>
处理队列
</div> </div>
<i v-if="gindex !== 0" class="el-icon-remove icon"
style="color: #055fe7"
@click="updateGzdl(item,gindex)" />
<div v-if="gindex !== 0">
{{ item.name || '-'}}
<div v-if="item.type === CXDL_TYPE">
<span class="gzdl-line" />
<div :class="{dlNoSelect: isFirstItem(gindex)}"
style="margin-left: 28px;">
{{ item.name ||'-'}}
<div v-if="item.type === CXDL_TYPE" style="float: right">
<span class="gzdl-line" />
<span v-for="(child,cindex) in getGzdlCxdlArr()"> <span v-for="(child,cindex) in getGzdlCxdlArr()">
<span <span
:key="child.type" :key="child.type"
...@@ -180,21 +178,23 @@ ...@@ -180,21 +178,23 @@
@click="updateCxdl(item,gindex,child,cindex)"> @click="updateCxdl(item,gindex,child,cindex)">
{{ child.name }} {{ child.name }}
</span> </span>
</span> </span>
</div> </div>
</div> </div>
<i v-if="gindex !== 0" class="el-icon-remove iconChuanXing"
@click="updateGzdl(item,gindex)" />
</div> </div>
<img v-if='gindex !== getGzdlArr().length - 1' <img v-if='gindex !== getGzdlArr().length - 1'
src="../../assets/img/ljfkgl/ljfk_gzl_arrow.svg" src="../../assets/img/ljfkgl/ljfk_gzl_arrow.svg"
style="display: inline-flex; margin-left: 8px;margin-right: 8px;" /> class="jiantou" />
</div> </div>
<!-- 并行模式;--> <!-- 并行模式;-->
<div <div v-if="gzlRuleForm.pattern === 1"
v-if="gzlRuleForm.pattern === 1"
v-for="(item,gindex) in getGzdlArr()" v-for="(item,gindex) in getGzdlArr()"
:class="{'gong-zuo-dui-lie-bingxing-item':true, kk:gindex !== 0}"> :class="{'gong-zuo-dui-lie-bingxing-item':true, kk:gindex !== 0}">
<div class="gong-zuo-dui-lie-bingxing-item-left"> <div class="gong-zuo-dui-lie-bingxing-item-left">
...@@ -202,22 +202,16 @@ ...@@ -202,22 +202,16 @@
<div :class="{verLine:true,verLineTrans: gindex === getGzdlArr().length -1}" /> <div :class="{verLine:true,verLineTrans: gindex === getGzdlArr().length -1}" />
</div> </div>
<div class="gong-zuo-dui-lie-bingxing-item-right"> <div class="gong-zuo-dui-lie-bingxing-item-right">
<span class="mid-line" /> <span :class="{'mid-line':true,'mid-line-hide': getGzdlArr().length ===1}" />
<span class="mid-circle" /> <span :class="{'mid-circle':true,'mid-circle-hide': getGzdlArr().length ===1}" />
<div v-if="gindex === 0" class="chu-li-dui-lie"
style="margin-left: 8px;">处理队列
</div>
<div v-else class="gong-zuo-dui-lie-bingxing"> <div class="gong-zuo-dui-lie-bingxing">
<i class="el-icon-remove icon" <i v-if="gindex !== 0" class="el-icon-remove icon"
@click="updateGzdl(item,gindex)" @click="updateGzdl(item,gindex)" />
style="color: #055fe7" /> <div :class="{dlNoSelect: isFirstItem(gindex)}">
<div>
{{ item.name || '-'}} {{ item.name || '-'}}
<div v-if="item.type === CXDL_TYPE"> <div v-if="item.type === CXDL_TYPE">
<span class="gzdl-line" /> <span class="gzdl-line" />
<span v-for="(child,cindex) in getGzdlCxdlArr()"> <span v-for="(child,cindex) in getGzdlCxdlArr()">
<span <span
:key="child.type" :key="child.type"
...@@ -229,7 +223,6 @@ ...@@ -229,7 +223,6 @@
@click="updateCxdl(item,gindex,child,cindex)"> @click="updateCxdl(item,gindex,child,cindex)">
{{ child.name }} {{ child.name }}
</span> </span>
</span> </span>
</div> </div>
</div> </div>
...@@ -237,10 +230,6 @@ ...@@ -237,10 +230,6 @@
</div> </div>
</div> </div>
</div> </div>
<!--没有队列-->
<div v-else>
<div class="chu-li-dui-lie">处理队列</div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -261,11 +250,7 @@ ...@@ -261,11 +250,7 @@
</div> </div>
<el-form-item class="addbtns"> <el-form-item class="addbtns">
<el-button <el-button class="add" type="primary" @click="submitForm()">提交</el-button>
class="add"
type="primary"
@click="submitForm()">提交
</el-button>
<el-button class="cancel" @click="canceladd()">取消</el-button> <el-button class="cancel" @click="canceladd()">取消</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -320,7 +305,7 @@ export default { ...@@ -320,7 +305,7 @@ export default {
}, },
gzlRuleForm: {// 工作流数据 gzlRuleForm: {// 工作流数据
logicId: '',// 逻辑库id logicId: '',// 逻辑库id
pattern: 1,// 0 代表串行模式，1 代表并行模式 pattern: 0,// 0 代表串行模式，1 代表并行模式
ququeIds: '',// 队列id值，例：1,2，代表第一个队列为1，第二个队列为2 ququeIds: '',// 队列id值，例：1,2，代表第一个队列为1，第二个队列为2
status: 0,// 启用状态，0 代表启用，1 代表禁用 status: 0,// 启用状态，0 代表启用，1 代表禁用
type: '',// 0 代表案件，1 代表人员 type: '',// 0 代表案件，1 代表人员
...@@ -334,12 +319,25 @@ export default { ...@@ -334,12 +319,25 @@ export default {
CXDL_TYPE: Gzlzz._CXDL_TYPE, CXDL_TYPE: Gzlzz._CXDL_TYPE,
cxGzl: new Gzlzz(), // 串行工作流 cxGzl: new Gzlzz(), // 串行工作流
bxGzl: new Gzlzz(), // 并行工作流 bxGzl: new Gzlzz(), // 并行工作流
rules: {
name: [
{required: true, message: '请输入逻辑库名称', trigger: 'change'},
{
pattern: verifyData._LJFKM,
message: '名称必须至少两个汉字或四个字母！',
trigger: 'change'
}
]
},
} }
}, },
mounted() { mounted() {
}, },
methods: { methods: {
isFirstItem(index) {
return index === 0
},
isBxCxdl(type) { isBxCxdl(type) {
return type === this.CXDL_TYPE && this.gzlRuleForm.pattern === 1 return type === this.CXDL_TYPE && this.gzlRuleForm.pattern === 1
}, },
...@@ -463,6 +461,13 @@ export default { ...@@ -463,6 +461,13 @@ export default {
} }
}, },
saveLjfkxx() { saveLjfkxx() {
let hasYh = true
this.$refs.ruleForm.validate((valid) => {
if (valid) {
if (this.ljfkRuleForm.usersOrUserGroups && this.ljfkRuleForm.usersOrUserGroups.length === 0) {
hasYh = false
this.ljfkRuleForm.usersOrUserGroups = this.$refs.sjkyhSelect.getAllUsers()
}
NetUtil.xtfkgl NetUtil.xtfkgl
.updateLjfkxx(this.ljfkRuleForm, this.isRy) .updateLjfkxx(this.ljfkRuleForm, this.isRy)
.then(res => { .then(res => {
...@@ -479,8 +484,13 @@ export default { ...@@ -479,8 +484,13 @@ export default {
} else { } else {
this.$store.dispatch('ljk/_ljkAj') // 获取用户逻辑库 this.$store.dispatch('ljk/_ljkAj') // 获取用户逻辑库
} }
}) })
} else {
this.$message.error('信息填写错误！')
}
})
}, },
saveGzl() { saveGzl() {
this.gzlRuleForm.ququeIds = this.getCurGzl().result() this.gzlRuleForm.ququeIds = this.getCurGzl().result()
......
src/views/xtfkgl/scss/dialog_table.scss
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//margin-bottom: 40px; //margin-bottom: 40px;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-40%, -50%); transform: translate(-50%, -50%);
z-index: 1000; z-index: 1000;
width: 892px; width: 892px;
//height: 830px; //height: 830px;
...@@ -92,11 +92,6 @@ ...@@ -92,11 +92,6 @@
max-height: 600px; max-height: 600px;
overflow: scroll; overflow: scroll;
} }
.addbtns {
.el-form-item__content {
}
}
} }
.info-item { .info-item {
...@@ -159,7 +154,60 @@ ...@@ -159,7 +154,60 @@
} }
} }
.dui-lie-ming-cheng-layout {
.GongZuoDuiLieChuanXing { // 串行
display: inline-flex;
align-items: center;
justify-content: center;
position: relative;
float: left;
.itemBox {
min-width: 96px;
height: 32px;
display: inline-block;
float: left;
position: relative;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
color: #333333;
font-size: 14px;
font-family: MicrosoftYaHei;
line-height: 32px;
.dlIndexBg { // 序号背景
position: absolute;
width: 16px;
height: 19px;
}
.dlIndex { // 序号
position: absolute;
width: 16px;
height: 14px;
font-size: 12px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #FFFFFF;
line-height: 14px;
text-align: center;
}
.iconChuanXing {
position: absolute;
color: #055fe7;
top: -6px;
right: -6px;
cursor: pointer;
}
}
}
.dlNoSelect {
color: #999999;
} }
...@@ -168,17 +216,14 @@ ...@@ -168,17 +216,14 @@
height: 32px; height: 32px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #AEB5C2; border: 1px solid #AEB5C2;
//margin-right: 4px; margin-right: 4px;
margin-left: 20px; margin-left: 20px;
display: inline-block; display: inline-block;
background: #f6f8fa; background: #f6f8fa;
//box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
position: relative; position: relative;
text-align: center; text-align: center;
margin-right: 5px;
//margin-top: 7px;
> div { > div {
line-height: 32px; line-height: 32px;
...@@ -236,7 +281,7 @@ ...@@ -236,7 +281,7 @@
border: 1px dashed #aeb5c2 !important; border: 1px dashed #aeb5c2 !important;
position: relative !important; position: relative !important;
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 4px;
margin-left: 20px; margin-left: 20px;
border-radius: 4px; border-radius: 4px;
} }
...@@ -262,145 +307,14 @@ ...@@ -262,145 +307,14 @@
line-height: 22px; line-height: 22px;
} }
.chu-li-dui-lie { .jiantou {
width: 96px; width: 14px;
height: 32px; height: 8px;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #999999;
line-height: 22px;
//-webkit-background-clip: text;
//-webkit-text-fill-color: transparent;
margin-left: 30px;
display: inline-flex; display: inline-flex;
align-items: center; margin-left: 10px;
justify-content: center; margin-right: 10px;
}
//.gong-zuo-dui-lie-chuanxing { // 串行
// min-width: 96px;
// height: 32px;
// margin-right: 25px;
// display: inline-block;
//
// background: #F6F8FA;
// border: 1px solid #AEB5C2;
// box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
// border-radius: 4px;
// position: relative;
// text-align: center;
//
// > div {
// line-height: 32px;
// width: 100%;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
// box-sizing: border-box;
// padding: 0 10px;
//
// display: flex;
// align-items: center;
// justify-content: center;
//
// .line {
// margin-right: 14px;
// margin-left: 14px;
//
// width: 1px;
// height: 16px;
// background: #D8D8D8;
// border: 1px solid #979797;
// }
//
// //.gztl-tag {
// // width: 32px;
// // height: 20px;
// // background: #D8D8D8;
// // border-radius: 2px;
// //
// // margin-right: 8px;
// // font-size: 12px;
// // font-family: HarmonyOS_Sans_SC;
// // color: #FFFFFF;
// // line-height: 16px;
// //
// // display: inline-flex;
// // align-items: center;
// // justify-content: center;
// //
// //}
// //
// //.zhengcha { /* 案件 正查*/
// // background: #08BD9E;
// //}
// //
// //.chuancha { /* 案件 串查*/
// // background: #055FE7;
// //}
// //
// //.chachong { /* 人员 查重*/
// // background: #FFA219;
// //}
// //
// //.daocha { /* 人员 倒查*/
// // background: #FE0000;
// //}
//
// }
//
// > .icon {
// position: absolute;
// top: -6px;
// right: -6px;
// cursor: pointer;
// }
//}
.gong-zuo-dui-lie-chuanxing { // 串行
min-width: 96px;
height: 32px;
margin-right: 0px;
display: inline-block;
background: #F6F8FA;
border: 1px solid #AEB5C2;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
position: relative;
text-align: center;
margin-left: 8px;
> div {
line-height: 32px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
box-sizing: border-box;
padding: 0 10px;
display: flex;
align-items: center;
justify-content: center;
} }
> .icon {
position: absolute;
top: -6px;
right: -6px;
cursor: pointer;
}
}
.kk { .kk {
margin-left: 73px; margin-left: 73px;
...@@ -408,11 +322,8 @@ ...@@ -408,11 +322,8 @@
.gong-zuo-dui-lie-bingxing-item { .gong-zuo-dui-lie-bingxing-item {
height: 52px; height: 52px;
display: flex; display: flex;
vertical-align: middle; vertical-align: middle;
//align-items: center;
//justify-content: center; DialogBg
.gong-zuo-dui-lie-bingxing-item-left { .gong-zuo-dui-lie-bingxing-item-left {
width: 1px; width: 1px;
...@@ -428,39 +339,49 @@ ...@@ -428,39 +339,49 @@
background: transparent; background: transparent;
} }
.mid-line { .mid-line {
width: 14px; width: 14px;
height: 2px; height: 2px;
background: linear-gradient(90deg, #7CD5FF 0%, #49AFFF 100%); background: linear-gradient(90deg, #7CD5FF 0%, #49AFFF 100%);
} }
.mid-line-hide {
background: transparent;
}
.mid-circle { .mid-circle {
width: 7px; width: 7px;
height: 7px; height: 7px;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #49AFFF; border: 1px solid #49AFFF;
border-radius: 100px;
}
.mid-circle-hide {
border: 1px solid transparent;
background: transparent;
} }
.gong-zuo-dui-lie-bingxing-item-right { .gong-zuo-dui-lie-bingxing-item-right {
width: auto; width: auto;
height: 52px; height: 52px;
/*background: black;*/
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.gong-zuo-dui-lie-bingxing { // 并行 .gong-zuo-dui-lie-bingxing { // 并行
min-width: 96px; min-width: 96px;
height: 32px; height: 32px;
margin-left: 12px; margin-left: 12px;
display: inline-block; display: inline-block;
background: #F6F8FA; background: #F6F8FA;
border: 1px solid #AEB5C2;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF; box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px; border-radius: 4px;
//border: 1px solid #AEB5C2;
border-radius: 4px;
position: relative; position: relative;
text-align: center; text-align: center;
...@@ -480,6 +401,7 @@ ...@@ -480,6 +401,7 @@
> .icon { > .icon {
position: absolute; position: absolute;
color: #055fe7;
top: -6px; top: -6px;
right: -6px; right: -6px;
cursor: pointer; cursor: pointer;
...@@ -491,8 +413,8 @@ ...@@ -491,8 +413,8 @@
.gzdl-line { .gzdl-line {
margin-right: 14px; margin-right: 12px;
margin-left: 14px; margin-left: 12px;
width: 1px; width: 1px;
height: 16px; height: 16px;
...@@ -568,6 +490,11 @@ ...@@ -568,6 +490,11 @@
} }
} }
.divider-line {
margin: 0px 31px 0px 32px;
height: 2px;
border: 1px solid #E6E6E8;
}
.slide-fade-leave-active, .slide-fade-leave-active,
.slide-fade-enter-active { .slide-fade-enter-active {
...@@ -590,15 +517,15 @@ ...@@ -590,15 +517,15 @@
} }
} }
.el-form-item__error { //.el-form-item__error {
left: 100%; // left: 0%;
width: 100%; // width: 100%;
top: 50%; // top: 100%;
box-sizing: border-box; // box-sizing: border-box;
transform: translateY(-50%); // transform: translateY(-50%);
padding-left: 10px; // padding-left: 10px;
padding-top: 0 !important; // padding-top: 0 !important;
} //}
.el-form-item__label { .el-form-item__label {
position: relative; position: relative;
......
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-01-08 10:49:55 * @LastEditTime: 2022-01-09 00:12:44
* @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,12 +113,12 @@ module.exports = { ...@@ -113,12 +113,12 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定 // target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马 // target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.114:8099", // 湖南-张呈光 // target: "http://192.168.128.114: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.101:8099", // 江 // target: "http://192.168.128.101:8099", // 江
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