Skip to content

F
founder_vue
Commit d9f7ff42 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents dd8dc570 70409290
Showing with 225 additions and 61 deletions
src/components/ImageEd.scss
......@@ -1140,8 +1140,9 @@ div {
margin-right: 20px;
width: 40px;
height: 40px;
background: #FFFFFF;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3), 0px 0px 4px 0px rgba(5, 95, 231, 0.15);
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
align-items: center;
......@@ -1153,7 +1154,7 @@ div {
.featuresActive {
width: 40px;
height: 40px;
background: #E9F3FD;
background: #e9f3fd;
box-shadow: 1px 1px 3px 0px rgba(5, 95, 231, 0.5) inset;
border-radius: 4px;
}
......@@ -1347,7 +1348,7 @@ div {
margin-top: 60px;
font-size: 24px;
font-family: MicrosoftYaHei;
color: #CCCCCC;
color: #cccccc;
}
}
.shade_source {
......@@ -1393,13 +1394,13 @@ div {
.scsj {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
color: #e60012;
opacity: 0.5;
}
.scsj-content {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
color: #e60012;
margin-right: 24px;
}
}
......@@ -1420,28 +1421,34 @@ div {
.drawing {
width: 540px;
height: 540px;
// background: rgba(0, 0, 0, 0.8);
// background: rgba(0, 0, 0, 0.2);
// margin-left: 14px;
margin-top: 60px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
.body-container {
z-index: 99;
width: 540px;
height: 540px;
display: flex;
justify-content: center;
align-items: center;
.tui-image-editor {
box-sizing: content-box;
width: 540px !important;
height: 540px !important;
display: flex;
align-items: center;
justify-content: center;
position: relative;
overflow: hidden;
}
.tui-image-editor2 {
box-sizing: content-box;
width: 540px !important;
height: 540px !important;
display: flex;
justify-content: center;
align-items: center;
position: relative;
overflow: hidden;
}
/deep/.tui-image-editor-canvas-container {
max-height: 540px !important;
......@@ -1458,6 +1465,21 @@ div {
// align-items: center !important;
}
}
.tzdDrawing {
width: 540px;
height: 540px;
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 270px 270px;
}
.tzdDrawing_2 {
width: 540px;
height: 540px;
position: absolute;
background: transparent;
transform-origin: 270px 270px;
}
}
}
.target {
......@@ -1491,7 +1513,7 @@ div {
margin-top: 60px;
font-size: 24px;
font-family: MicrosoftYaHei;
color: #CCCCCC;
color: #cccccc;
}
}
.delDesc {
......@@ -1506,13 +1528,13 @@ div {
.scsj {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
color: #e60012;
opacity: 0.5;
}
.scsj-content {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #E60012;
color: #e60012;
margin-right: 24px;
}
}
......@@ -1567,25 +1589,29 @@ div {
// background: rgba(0, 0, 0, 0.2);
// margin-left: 14px;
margin-top: 60px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
.body-container {
z-index: 99;
width: 540px;
height: 540px;
display: flex;
justify-content: center;
align-items: center;
.tui-image-editor {
width: 540px;
box-sizing: content-box;
width: 540px !important;
height: 540px !important;
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.tui-image-editor2 {
width: 540px;
height: 540px;
display: flex;
justify-content: center;
align-items: center;
box-sizing: content-box;
width: 540px !important;
height: 540px !important;
position: relative;
}
/deep/.tui-image-editor-canvas-container {
max-height: 540px !important;
......@@ -1602,6 +1628,22 @@ div {
// align-items: center !important;
}
}
.tzdDrawing {
width: 540px;
height: 540px;
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 270px 270px;
z-index: 99;
}
.tzdDrawing_2 {
width: 540px;
height: 540px;
position: absolute;
background: transparent;
transform-origin: 270px 270px;
}
}
}
}
......
src/components/InputSearch.vue
<!--
* @Author: your name
* @Date: 2021-12-06 19:34:14
* @LastEditTime: 2021-12-07 20:04:36
* @LastEditTime: 2021-12-14 10:36:21
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\components\InputSearch.vue
-->
<template>
<div class="InputSearch">
<el-autocomplete class="inline-input" v-model="newForm[id]" :fetch-suggestions="querySearch" placeholder="请输入内容" :trigger-on-focus="false" @select="handleSelect"></el-autocomplete>
<el-autocomplete class="inline-input" v-model.trim="newForm[id]" :fetch-suggestions="querySearch" placeholder="请输入内容" :trigger-on-focus="false" @select="handleSelect"></el-autocomplete>
</div>
</template>
......
src/utils/rem.js
/*
* @Author: your name
* @Date: 2021-10-29 09:15:57
* @LastEditTime: 2021-10-29 09:15:57
* @LastEditTime: 2021-12-14 00:21:44
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\utils\rem.js
......@@ -9,6 +9,7 @@
const baseSize = 16
// 设置 rem 函数
function setRem () {
console.log(document.documentElement.clientWidth);
// 当前页面宽度相对于 1920宽的缩放比例，可根据自己需要修改。
const scale = document.documentElement.clientWidth / 1920
// 设置页面根节点字体大小（“Math.min(scale, 2)” 指最高放大比例为2，可根据实际业务需求调整）
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-11 14:39:23
* @LastEditTime: 2021-12-13 21:33:22
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -329,6 +329,9 @@ export default {
if(this.hands && this.hands.length>0) {
this.activeHand = this.hands[0].seq
}
this.$bus.emit('ajzwbjType', '掌纹')
} else {
this.$bus.emit('ajzwbjType', '指纹')
}
},
},
......
src/views/Editor/modules/imageEd.scss
......@@ -11,6 +11,9 @@ $BJDcolor: var(--BJDcolor, #e60012); // #e60012
$directionRotate: var(--directionRotate, 0deg);
$transOrigin: var(--transOrigin, 0px, 0px);
// canvas的宽度
$canvasHeight: var(--canvasHeight, 670px);
$canvasWidth: var(--canvasWidth, 670px);
.imageBox {
display: flex;
......@@ -986,10 +989,10 @@ $transOrigin: var(--transOrigin, 0px, 0px);
margin: auto;
max-height: 670px !important;
max-width: 670px !important;
height: 670px !important;
width: 670px !important;
// height: auto !important;
// width: auto !important;
height: $canvasHeight !important;
width: $canvasWidth !important;
// height: 670px !important;
// width: 670px !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
......@@ -1053,7 +1056,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 335px 335px;
// transform-origin: 335px 335px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
......@@ -1063,7 +1066,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
height: 670px;
position: absolute;
background: transparent;
transform-origin: 335px 335px;
// transform-origin: 335px 335px;
}
}
.preview-source {
......@@ -1077,7 +1080,14 @@ $transOrigin: var(--transOrigin, 0px, 0px);
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
overflow: hidden;
img {
object-fit: contain;
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
width: $canvasWidth;
height: $canvasHeight;
}
.block_small {
width: 100%;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -1061,7 +1061,7 @@ $canvasWidth: var(--canvasWidth, 670px);
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 335px 335px;
// transform-origin: 335px 335px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
......@@ -1072,7 +1072,7 @@ $canvasWidth: var(--canvasWidth, 670px);
height: 670px;
position: absolute;
background: transparent;
transform-origin: 335px 335px;
// transform-origin: 335px 335px;
}
.irregular {
......@@ -1081,7 +1081,7 @@ $canvasWidth: var(--canvasWidth, 670px);
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 335px 335px;
transform-origin: 50% 50%;
}
.rule_line {
......@@ -1230,17 +1230,27 @@ $canvasWidth: var(--canvasWidth, 670px);
}
.preview-source {
z-index: 9999;
z-index: 99999;
position: absolute;
left: 25px;
top: 55px;
left: 0;
top: 0;
border: 1px solid #ccc;
width: 80px;
height: 80px;
width: 144px;
height: 144px;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
overflow: hidden;
img {
object-fit: contain;
}
.block_small {
width: 100%;
height: 100%;
border: 1px solid #055fe7;
position: absolute;
top: 0;
left: 0;
}
}
}
}
......
src/views/Editor/modules/imageEdAJ.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-13 16:50:22
* @LastEditTime: 2021-12-14 10:43:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
......@@ -20,10 +20,10 @@
</el-select>
</el-form-item>
<el-form-item label="源条码号：" prop="ytmh" class="ytmh">
<el-input placeholder="请输入源条码号" v-model="ruleForm.ytmh" maxlength="23" clearable></el-input>
<el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable></el-input>
</el-form-item>
<el-form-item label="目标条码号：" prop="mbtmh" class="mbtmh">
<el-input placeholder="请输入目标条码号" v-model="ruleForm.mbtmh" maxlength="23" clearable></el-input>
<el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable></el-input>
</el-form-item>
</div>
<div class="line1 line2">
......@@ -58,7 +58,7 @@
</el-select>
</el-form-item>
<el-form-item label="数据为最近：" prop="zjsj" class="sjzjw">
<el-radio-group v-model="ruleForm.zjsj">
<el-radio-group v-model="ruleForm.zjsj" @change="daysChange">
<el-radio label="1">1天</el-radio>
<el-radio label="3">3天</el-radio>
<el-radio label="5">5天</el-radio>
......@@ -246,6 +246,12 @@ export default {
},
methods: {
/**
* 天数改变--自动查询列表
*/
daysChange() {
this.getData()
},
/**
* 取消解除比中关系
*/
cancelJcbzgx () {
......@@ -426,6 +432,11 @@ export default {
*/
confirmCxfh () {
let self = this
// 撤销复核原因必填
if(this.textarea == '') {
this.$message.error('请输入原因！')
return;
}
this.$axios({
method: 'post',
url: '/api/hit/update',
......
src/views/bzxxgl/scss/fhxxLT.scss
......@@ -3,10 +3,84 @@
height: 100vh;
overflow: hidden;
display: flex;
.fhxxLTDom {
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
}
.relieveDialog {
position: absolute;
left: calc(50% - 221px);
top: calc(50% - 84.5px);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 442px;
height: 169px;
background: #ffffff;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08);
border-radius: 6px;
.close {
display: flex;
justify-content: end;
width: 100%;
margin-bottom: 15px;
.icon-danchuangguanbianniu {
font-size: 13px;
color: #b1b6c2;
cursor: pointer;
margin-right: 14px;
}
}
.btns {
margin-top: 26px;
display: flex;
align-items: center;
.btn {
width: 72px;
height: 40px;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
.confirmBtn {
border: 1px solid #aeb5c2;
background: #ffffff;
color: #2e3846;
margin-right: 24px;
&:hover {
border: 1px solid #377FEC;
color: #377FEC;;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
}
}
.cancelBtn {
background: #055fe7;
border-radius: 4px;
color: #ffffff;
&:hover {
background: #377FEC;
}
&:active {
background: #044CB9;
}
}
}
}
.drawing {
width: 100px;
}
.drawing {
width: 100px;
}
/* 设置滚动条的样式 */
::-webkit-scrollbar {
......@@ -29,8 +103,8 @@
position: relative;
.line-imageEd {
position: absolute;
top: 55px;
left: 25px;
top: 55px;
left: 25px;
width: 1090px;
height: 2px;
background: #eeeeee;
......@@ -92,6 +166,18 @@
color: #282f3c;
}
}
.content-area2 {
margin-top: 16px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
height: 70px;
background: #ffffff;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
}
}
}
}
.fhxx-top-top-right {
margin-left: 55px;
......@@ -151,7 +237,7 @@
}
}
.content-area {
margin-top: 51px;
margin-top: 49px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -231,13 +231,14 @@ export default {
self.$axios({
method: 'post',
url: '/api/org/caseBybarcode/barcode',
// url: '/api/org/case/barcode',
data: {
querytype: "2",
barcode: val.barcode,
qqid: self.qqid
},
}).then(response => {
//console.log(response);
console.log(response);
let imageInfo = response.data.ret[0]
// 默认选中第一个指纹预览图片
if (imageInfo && imageInfo.seq) {
......@@ -278,6 +279,7 @@ export default {
//console.log(barcode);
self.$axios({
method: 'post',
// url: '/api/org/case/barcode',
url: '/api/org/caseBybarcode/barcode',
data: {
querytype: "2",
......@@ -285,6 +287,7 @@ export default {
qqid: self.qqid,
},
}).then(response => {
console.log(response);
if (response.data.code === 0) {
self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length;
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -113,7 +113,6 @@ export default {
* @param old
*/
handleCurrentChange (val, old) {
debugger
let self = this;
console.log(val);
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-13 14:51:11
* @LastEditTime: 2021-12-14 13:56:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,7 +92,7 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.124:8099/", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......@@ -100,8 +100,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.115:8099", // 江
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment