Skip to content

F
founder_vue
Commit d58281a8 by maxiaohan
Options

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

parents 5fa6c0ad a1b2c23b
Showing with 507 additions and 334 deletions
public/image-edit/js/tui-image-editor.js
......@@ -19033,6 +19033,7 @@ var ImageEditor = function () {
}, {
key: 'applyFilter',
value: function applyFilter(type, options, isSilent) {
// debugger
var executeMethodName = isSilent ? 'executeSilent' : 'execute';
return this[executeMethodName](_consts.commandNames.APPLY_FILTER, type, options);
......
src/components/ImageEd.scss
......@@ -1105,7 +1105,7 @@ div {
flex-direction: column;
}
.lt_main_middle .lt_main_header {
height: 70px;
height: 60px;
display: flex;
align-items: center;
justify-content: center;
......@@ -1118,7 +1118,7 @@ div {
}
.lt_main_middle .lt_main_footer {
position: relative;
margin-top: 24px;
margin-top: 10px;
height: 70px;
width: 100%;
background: #f6f8fa;
......@@ -1148,7 +1148,7 @@ div {
width: 1px;
height: 40px;
background: #d8d8d8;
margin: 0 46px;
margin: 0 30px;
}
.grayActive,
.vintageActive,
......@@ -1172,6 +1172,7 @@ div {
.multiply,
.blend,
.brightness {
z-index: 9999999;
box-sizing: border-box;
position: absolute;
top: -84px;
......@@ -1204,6 +1205,11 @@ div {
}
}
}
.brightness {
width: 240px;
height: 135px;
top: -140px;
}
.color-filter {
right: 315px;
}
......@@ -1300,9 +1306,14 @@ div {
width: 520px;
height: 520px;
display: flex;
justify-content: center;
align-items: center;
.tui-image-editor2 {
width: 520px;
height: 520px;
display: flex;
justify-content: center;
align-items: center;
}
}
}
......@@ -1362,15 +1373,20 @@ div {
width: 520px;
height: 520px;
// background: rgba(0, 0, 0, 0.2);
margin-left: 14px;
// margin-left: 14px;
margin-top: 60px;
.body-container {
width: 520px;
height: 520px;
display: flex;
justify-content: center;
align-items: center;
.tui-image-editor2 {
width: 520px;
height: 520px;
display: flex;
justify-content: center;
align-items: center;
}
}
}
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-10-27 14:47:11
* @LastEditTime: 2021-10-30 13:41:22
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -401,7 +401,7 @@
<div class="btn" :class="{blendActive: isBlendActive}" @click="changeBlend">差异化</div>
<div class="btn" :class="{multiplyActive: isMultiplyActive}" @click="changeMultiply">正片叠底</div>
<div class="btn" :class="{removeWhiteActive: isRemoveWhiteActive}" @click="changeRemoveWhite">去白</div>
<div class="btn" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度</div>
<div class="btn" :class="{brightnessActive: isBrightnessActive}" @click="changeBrightness">亮度/对比度</div>
<!-- 去白弹框 -->
<div class="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div>
......@@ -430,13 +430,18 @@
<div id="tui-blend-color-picker"></div>
</div>
</div>
<!-- 亮度弹框 -->
<!-- 亮度/对比度弹框 -->
<div class="brightness" v-show="optionsBrightness">
<div class="title">亮度</div>
<div class="content">
<input class="range-narrow" id="input-range-brightness-value" type="range" min="-255" :value="inputBrightnessRange" max="255" />
<input class="qb_v" type="text" v-model="inputBrightnessRange">
</div>
<div class="title">对比度</div>
<div class="content">
<input class="range-narrow" id="input-range-contrast-value" type="range" min="0" :value="inputContrastRange" max="255" />
<input class="qb_v" type="text" v-model="inputContrastRange">
</div>
</div>
</div>
</div>
......@@ -641,7 +646,9 @@ export default {
isEnlargeSynchro: false,
// 是否展示放大同步下拉框
isShowEnlargeSynchro: false,
curveArr: []
curveArr: [],
// 对比度
inputContrastRange: 0
};
},
components: {
......@@ -680,7 +687,7 @@ export default {
var $inputRangeBrightnessValue = $('#input-range-brightness-value');
var $inputCheckBlend = $('#input-check-blend');
var $inputRangeColorFilterValue = $('#input-range-color-filter-value');
var $inputRangeContrastValue = $('#input-range-contrast-value')
var $imageFilterSubMenu = $('#image-filter-sub-menu');
// Select line type
......@@ -1735,6 +1742,22 @@ export default {
}
});
// 对比度
$inputRangeContrastValue.on('change', function () {
if (self.type == 'source') {
self.inputContrastRange = this.value
applyOrRemoveFilter(true, 'contrast', {
contrast: this.value / 255,
});
} else {
self.inputContrastRange = this.value
applyOrRemoveFilter2(true, 'contrast', {
contrast: this.value / 255,
});
}
})
// Etc..
......@@ -4899,6 +4922,14 @@ export default {
}
}
},
// 对比度
inputContrastRange (newValue, oldValue) {
this.imageEditor.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
},
isHideMarkPoint (newValue, oldValue) {
let self = this
if (self.type == 'source') {
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -107,7 +107,7 @@
ref="multipleTable"
:data="tableDate"
tooltip-effect="dark"
style="width: 100%"
style="width: 100%;"
@selection-change="handleSelectionChange"
>
<el-table-column
......@@ -125,7 +125,7 @@
<el-table-column
prop="name"
label="姓名"
width="150"
width="100"
>
</el-table-column>
<el-table-column
......@@ -601,21 +601,22 @@ export default {
// 导出FPTX
isShowDcftpxBtn () { // 多行
console.log('导出FPTX')
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
this.isSelected = true
} else {
this.$message.error("请选择需要导出FPTX的数据！");
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection
this.isShowDcftpx = true;
} else {
this.$message.error("只能导出单条数据的FPTX！");
}
// this.$message("该功能正在调试");
},
isShowDcftpxBtn1 (val) { // 单行
console.log(val, 123)
let rowVal = [];
rowVal.push(val)
this.rowData = rowVal
this.isShowDcftpx = true;
// if (this.multipleSelection.length === 0) {
// this.$message.error("请选择需要导出的数据！");
// this.isSelected = true
// } else {
// this.rowData = this.multipleSelection
// this.isShowDcftpx = true;
// }
},
closeDcftpx (val) {
console.log('导出FPTX关闭', val)
......@@ -789,7 +790,7 @@ export default {
*/
handleClick (row) {
console.log(row);
this.$router.push('/zwbj/ryzwbj/'+row.pid)
this.$router.push('/zwbj/ryzwbj/' + row.pid)
},
/**
* @description: 单选事件
......@@ -867,7 +868,7 @@ export default {
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #DADDE0;
background-color: #dadde0;
border-radius: 3px;
}
.AllPersonnelBase {
......@@ -893,7 +894,7 @@ export default {
border: none;
}
width: 296px;
height: 40px;
height: 42px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
......@@ -929,6 +930,7 @@ export default {
}
/deep/.el-radio {
color: #666;
margin-right: 32px;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
......@@ -959,6 +961,7 @@ export default {
}
/deep/.el-checkbox {
color: #666;
margin-right: 32px;
}
.options {
height: 72px;
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -2,7 +2,7 @@
<el-dialog
title="导出FPTX"
:visible.sync="dialogVisible"
width="875px"
width="54.6875rem"
append-to-body
:before-close="handleClose"
>
......@@ -245,7 +245,7 @@
</div>
<el-form
label-width="100px"
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item label="数据类型：">
......@@ -306,6 +306,7 @@
type="primary"
>取 消</el-button> -->
<el-button
class="confirmBtn"
@click="focus"
type="primary"
>导出</el-button>
......@@ -335,6 +336,7 @@ export default {
},
data () {
return {
filenameexport: '文件',
dialogVisible: false, // 弹窗状态
wzChecked: true, // 文字单选
// 滚动指纹
......@@ -523,6 +525,23 @@ export default {
},
methods: {
focus () {
// 创建隐藏的可下载链接
let eleLink = document.createElement('a')
let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
eleLink.download = this.filenameexport
eleLink.style.display = 'none'
eleLink.href = url
// 触发点击
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
this.dialogVisible = false;
},
handleClose (done) {
this.dialogVisible = false;
},
// 滚动指纹全选
gdzwAll (val) {
this.gdzwyscheckAll = val
......@@ -616,58 +635,6 @@ export default {
this.rxcheckAll = checkedCount === this.rxs.length;
this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length;
},
focus () {
// this.$ajax
// .post(
// downloadExcelTemplateProte, //接口
// data, //参数
// { responseType: "blob" } //数据返回类型
// )
// .then((res) => {
// let url = window.URL.createObjectURL(new Blob([res.data]));
// let link = document.createElement("a");
// link.style.display = "none";
// link.href = url;
// link.setAttribute("download", "all_sample_fa_kegg_blast_bst.xls"); //指定下载后的文件名，防跳转
// document.body.appendChild(link);
// link.click();
// })
// .catch(function (error) {
// console.log(error);
// });
// // 确认提示
// this.$confirm("是否确定提交数据?", "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "info"
// })
// .then(() => {
// this.$axios
// .post("/api/api/mypsn/add", { myPerson: '' })
// .then(response => {
// if (response.data.code === 0) {
// this.$message.success("导出成功");
// } else {
// this.$message.error("导出失败");
// }
// });
// })
// .catch(() => {
// this.$message({
// type: "info",
// message: "已取消提交"
// });
// });
},
handleClose (done) {
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
</script>
......@@ -684,6 +651,9 @@ export default {
/deep/.el-dialog__title {
font-size: 16px;
}
/deep/ .el-radio {
margin-right: 24px;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
}
......@@ -896,4 +866,8 @@ export default {
// padding-left: 5px;
// }
}
.confirmBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -2,7 +2,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="892px"
width="55.75rem"
append-to-body
:before-close="handleClose"
>
......@@ -62,7 +62,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item
......@@ -144,7 +144,7 @@
align="left"
:model="ruleForm"
ref="ruleForm"
label-width="100px"
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item
......@@ -261,7 +261,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item
......@@ -327,7 +327,7 @@
<el-form
:label-position='labelPosition'
align="left"
label-width="100px"
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item
......@@ -405,8 +405,9 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="search">确 定</el-button>
<el-button class="confirmBtn" @click="search">确 定</el-button>
<el-button
class="cancelBtn"
@click="handleClose"
type="primary"
>取 消</el-button>
......@@ -966,6 +967,12 @@ export default {
/deep/.el-dialog__title {
font-size: 16px;
}
/deep/ .el-radio {
margin-right: 24px;
}
/deep/ .el-checkbox {
margin-right: 24px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
......@@ -1350,4 +1357,8 @@ export default {
margin-left: 100px;
}
}
.confirmBtn, .cancelBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -2,13 +2,13 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="418px"
width="26.125rem"
append-to-body
:before-close="handleClose"
>
<el-form
:label-position="labelPosition"
label-width="120px"
label-width="7.5rem"
:model="ruleForm"
:rules="rules"
ref="ruleForm"
......@@ -43,8 +43,9 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="updata('ruleForm')">确 定</el-button>
<el-button class="confirmBtn" @click="updata('ruleForm')">确 定</el-button>
<el-button
class="cancelBtn"
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
......@@ -201,4 +202,8 @@ export default {
line-height: 20px;
margin-bottom: 10px;
}
.confirmBtn, .cancelBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -2,13 +2,13 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="418px"
width="26.125rem"
append-to-body
:before-close="handleClose"
>
<el-form
:label-position="labelPosition"
label-width="120px"
label-width="7.5rem"
:model="reqParam"
:rules="rules"
ref="reqParam"
......@@ -43,8 +43,9 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="updata('reqParam')">确 定</el-button>
<el-button class="confirmBtn" @click="updata('reqParam')">确 定</el-button>
<el-button
class="cancelBtn"
@click="resetForm('reqParam')"
type="primary"
>取 消</el-button>
......@@ -204,4 +205,8 @@ export default {
/deep/.el-button + .el-button {
margin-left: 24px;
}
.confirmBtn, .cancelBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/gz.vue
......@@ -98,8 +98,9 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="focus">确 定</el-button>
<el-button class="confirmBtn" @click="focus">确 定</el-button>
<el-button
class="cancelBtn"
@click="dialogVisible = false"
type="primary"
>取 消</el-button>
......@@ -283,4 +284,8 @@ export default {
font-family: MicrosoftYaHei;
color: #333333;
}
.confirmBtn, .cancelBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -2,7 +2,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="418px"
width="26.125rem"
append-to-body
:before-close="handleClose"
>
......@@ -10,7 +10,7 @@
:model="ruleForm"
:rules="rules"
:label-position="labelPosition"
label-width="80px"
label-width="6rem"
ref="ruleForm"
>
<el-form-item
......@@ -92,8 +92,9 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="addList('ruleForm')">确 定</el-button>
<el-button class="confirmBtn" @click="addList('ruleForm')">确 定</el-button>
<el-button
class="cancelBtn"
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
......@@ -300,10 +301,17 @@ export default {
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
}
/deep/ .el-radio {
margin-right: 40px;
}
.el-select-dropdown__item.selected {
/* color: #409EFF; */
/* font-weight: 700; */
color: #333;
font-weight: normal;
}
.confirmBtn, .cancelBtn {
width: 72px;
height: 40px;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/qbalk.vue
......@@ -59,7 +59,10 @@
v-clipboard:success="onCopy"
v-clipboard:error="onError"
>复制条码</div>
<div class="btn">导出FPTX</div>
<div
class="btn"
@click="dcFtpx"
>导出FPTX</div>
<div
class="btn"
@click="isShowGzBtn"
......@@ -80,12 +83,12 @@
</div>
<!--四 -->
<el-tag
style="width:100%;color:#666666;margin-bottom:16px"
style="width:100%;color:#666666;margin-bottom:1rem"
v-show="isShowTip"
>
<i
class="el-icon-info"
style="color:#055FE7;font-size:15px"
style="color:#055FE7;font-size:.9375rem"
></i>
已选择<span style="color:#055FE7">{{multipleSelection.length}}</span>项​
<span v-html="'&nbsp;&nbsp;'"></span>
......@@ -93,7 +96,7 @@
<el-link
type="primary"
:underline="false"
style="margin-left:20px;"
style="margin-left:1.25rem;"
@click="toggleSelection()"
>清除</el-link>
</el-tag>
......@@ -103,7 +106,7 @@
ref="multipleTable"
:data="tableDate"
tooltip-effect="dark"
style="width: 100%"
style="width: 100%;"
@selection-change="handleSelectionChange"
>
<el-table-column
......@@ -551,6 +554,28 @@ export default {
this.$message.error("只能复制单条数据的条码号！");
}
},
// 导出
dcFtpx () {
this.barcode = null;
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
} else if (this.multipleSelection.length === 1) {
this.barcode = this.multipleSelection[0].barcode;
// 创建隐藏的可下载链接
let eleLink = document.createElement('a')
let url = 'http://192.168.128.112:8099/api/export/case/' + this.barcode
eleLink.download = this.filenameexport
eleLink.style.display = 'none'
eleLink.href = url
// 触发点击
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
} else {
this.$message.error("只能复制单条数据的条码号！");
}
},
// 复制成功时的回调函数
onCopy (e) {
this.$message({
......@@ -788,7 +813,7 @@ const datas1 = [
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #DADDE0;
background-color: #dadde0;
border-radius: 3px;
}
.AllPersonnelBase {
......@@ -814,7 +839,7 @@ const datas1 = [
border: none;
}
width: 296px;
height: 40px;
height: 42px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
......@@ -850,6 +875,7 @@ const datas1 = [
}
/deep/.el-radio {
color: #666;
margin-right: 32px;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
......@@ -880,6 +906,7 @@ const datas1 = [
}
/deep/.el-checkbox {
color: #666;
margin-right: 32px;
}
.options {
height: 72px;
......@@ -1036,4 +1063,12 @@ const datas1 = [
font-family: MicrosoftYaHei;
color: #333333;
}
// /deep/.el-table__fixed-right {
// width: 234px !important;
// height: 387px !important;
// .el-table__fixed-body-wrapper {
// top: 51px !important;
// }
// }
</style>
src/views/Editor/modules/imageEd.scss
......@@ -1301,7 +1301,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
margin-right: 16px;
margin-right: 12px;
margin-bottom: 16px;
&:active {
background: #055fe7;
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-10-28 17:34:54
* @LastEditTime: 2021-10-29 15:47:32
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -267,12 +267,12 @@
<input class="qb_v" type="text" v-model="inputBrightnessRange">
</div>
</div>
<!-- 亮度 -->
<!-- 对比度 -->
<div class="contrast-ratio">
<div class="title">对比度</div>
<div class="content">
<input class="range-narrow" id="input-range-color-filter-value" type="range" min="0" :value="inputColorFilterRange" max="255" />
<input class="qb_v" type="text" v-model="inputColorFilterRange">
<input class="range-narrow" id="input-range-contrast-value" type="range" min="0" :value="inputContrastRange" max="255" />
<input class="qb_v" type="text" v-model="inputContrastRange">
</div>
</div>
</div>
......@@ -288,6 +288,8 @@ import "@/icons/direction.svg";
export default {
data () {
return {
// 对比度
inputContrastRange: 0,
// 特征点id
tzdId: 0,
// 特征点开启
......@@ -532,6 +534,7 @@ export default {
var $inputRangeBrightnessValue = $('#input-range-brightness-value');
var $inputCheckBlend = $('#input-check-blend');
var $inputRangeColorFilterValue = $('#input-range-color-filter-value');
var $inputRangeContrastValue = $('#input-range-contrast-value')
var $imageFilterSubMenu = $('#image-filter-sub-menu');
......@@ -551,7 +554,7 @@ export default {
});
this.imageEditor = imageEditor
imageEditor.loadImageFromURL('img/finger.bmp', 'SampleImage').then(function (sizeValue) {
imageEditor.loadImageFromURL('img/dogsleep.jpg', 'SampleImage').then(function (sizeValue) {
console.log(sizeValue);
imageEditor.clearUndoStack();
});
......@@ -1087,6 +1090,14 @@ export default {
});
});
// 对比度
$inputRangeContrastValue.on('change', function () {
self.inputContrastRange = this.value
applyOrRemoveFilter(true, 'contrast', {
contrast: this.value / 255,
});
})
this.$bus.on('ryzwbjImage', (sourceImage) => {
self.sourceImage = sourceImage
imageEditor.loadImageFromURL('data:image/jpeg;base64,' + sourceImage, 'SampleImage').then(function (sizeValue) {
......@@ -2873,6 +2884,14 @@ export default {
console.log(result);
});
},
// 对比度
inputContrastRange (newValue, oldValue) {
this.imageEditor.applyFilter('Contrast', {
contrast: parseInt(newValue, 10) / 255,
}).then(function (result) {
console.log(result);
});
},
inputColorFilterRange (newValue, oldValue) {
this.imageEditor.applyFilter('removeColor', {
distance: parseInt(newValue, 10) / 255,
......
src/views/SystemManage/GroupManage.vue
......@@ -64,17 +64,17 @@
<div class="btn1">删除</div>
<div class="add" @click="open">
<svg-icon
style="width: 13px;height: 13px;margin-bottom: -1px;margin-right: 4px "
style="width: .8125rem;height: .8125rem;margin-bottom: -0.0625rem;margin-right: .25rem"
icon-class="ic_add"
/>新增用户组
</div>
</div>
</div>
<el-tag
style="width:100%;color:#666666;margin-bottom:16px"
style="width:100%;color:#666666;margin-bottom:1rem"
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:15px"></i>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
已选择
<span style="color:#055FE7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
......@@ -82,7 +82,7 @@
<el-link
type="primary"
:underline="false"
style="margin-left:20px;"
style="margin-left: 1.25rem"
@click="toggleSelection()"
>清除</el-link
>
......
src/views/SystemManage/RoleManage.vue
......@@ -5,7 +5,7 @@
<div class="btns">
<div class="add" @click="add">
<svg-icon
style="width: 13px;height: 13px;margin-bottom: -1px;margin-right: 4px "
style="width: .8125rem;height: .8125rem;margin-bottom: -0.0625rem;margin-right: .25rem "
icon-class="ic_add"
/>
新增角色
......@@ -13,13 +13,13 @@
<div class="img-btn" @click="copy">
<img
src="../../assets/img/role/copy.png"
style="height: 15px;width: 15px;margin-left:1px ;margin-top: 4px"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
/>
</div>
<div class="img-btn" @click="del">
<img
src="../../assets/img/role/delete.png"
style="height: 15px;width: 15px;margin-left:1px ;margin-top: 4px"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
/>
</div>
</div>
......@@ -27,6 +27,7 @@
<div
class="default-role-item"
v-for="(item, index) in defaultRoleBtns"
:key="index"
:class="{ active: item.flag }"
>
{{ item.name }}
......
src/views/SystemManage/UserManage.vue
......@@ -87,17 +87,17 @@
<div class="btn1">删除</div>
<div class="add" @click="open">
<svg-icon
style="width: 13px;height: 13px;margin-bottom: -1px;margin-right: 4px "
style="width: .8125rem;height: .8125rem;margin-bottom: -.0625rem;margin-right: .25rem"
icon-class="ic_add"
/>新增用户
</div>
</div>
</div>
<el-tag
style="width:100%;color:#666666;margin-bottom:16px"
style="width:100%;color:#666666;margin-bottom:1rem"
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:15px"></i>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
已选择
<span style="color:#055FE7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
......@@ -105,7 +105,7 @@
<el-link
type="primary"
:underline="false"
style="margin-left:20px;"
style="margin-left:1.25rem;"
@click="toggleSelection()"
>清除</el-link
>
......
src/views/SystemManage/scss/group.scss
......@@ -80,6 +80,7 @@
flex-direction: row;
justify-content: space-between;
margin-top: 20px;
margin-bottom: 16px;
padding-top: 16px;
border-top: 1px #eeeeee solid;
.btn1 {
......
src/views/SystemManage/scss/role.scss
......@@ -7,20 +7,21 @@
div {
display: inline-block;
}
.sider{
.sider {
//border: #03A9F4 1px solid;
//width: 240px;
height: 780px;
// height: 780px;
height: 100%;
//margin-right: 10px;
text-align: center;
.btns{
.btns {
width: 200px;
height: 45px;
display: flex;
flex-direction: row;
padding-top: 10px;
border-bottom: 1px solid #EEEEEE;
.add{
border-bottom: 1px solid #eeeeee;
.add {
width: 110px;
height: 32px;
line-height: 32px;
......@@ -38,61 +39,62 @@
color: #055fe7;
}
}
.img-btn{
.img-btn {
width: 32px;
height: 32px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
border: 1px solid #AEB5C2;
border: 1px solid #aeb5c2;
margin-left: 5px;
cursor: pointer;
}
}
.default-role{
.default-role {
width: 215px;
height: 366px;
display: flex;
flex-direction: column;
border-bottom: 1px solid #EEEEEE;
.default-role-item{
border-bottom: 1px solid #eeeeee;
.default-role-item {
width: 190px;
height: 40px;
line-height: 40px;
color: #666666;
font-size: 14px;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
background: #f6f8fa;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
margin-top: 10px;
cursor: pointer;
&:hover{
background: #055FE7;
color: #FFFFFF;
&:hover {
background: #055fe7;
color: #ffffff;
}
&.active{
background: #055FE7;
color: #FFFFFF;
&.active {
background: #055fe7;
color: #ffffff;
}
}
}
}
.main{
.main {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
.header{
height:55px;
margin:0 auto;
.header {
height: 55px;
margin: 0 auto;
//margin-bottom: 3px;
.btns{
.btns {
width: 224px;
height: 48px;
background: #F6F8FA;
background: #f6f8fa;
border-radius: 8px;
text-align: center;
.btn{
.btn {
margin-top: 8px;
width: 104px;
height: 32px;
......@@ -105,63 +107,64 @@
// box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
// border-radius: 6px;
//}
&.active{
background: #FFFFFF;
color: #055FE7;
&.active {
background: #ffffff;
color: #055fe7;
box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
border-radius: 6px;
}
}
}
.save{
.btn{
.save {
.btn {
position: absolute;
right: 30px ;
right: 30px;
top: 85px;
width: 72px;
height: 32px;
background: #055FE7;
background: #055fe7;
border-radius: 4px;
line-height: 32px;
color: #FFFFFF;
color: #ffffff;
text-align: center;
}
}
}
.role-info{
.role-info {
width: 100%;
height: 725px;
background: #FFFFFF;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3), -1px 1px 3px 0px rgba(5, 95, 231, 0.24);
height: 690px;
background: #ffffff;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3),
-1px 1px 3px 0px rgba(5, 95, 231, 0.24);
border-radius: 10px;
display: flex;
flex-direction: row;
.menus{
width: 155px ;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #EEEEEE;
.div3{
border-right: 1px solid #eeeeee;
.div3 {
width: 100%;
height: 145px;
border-bottom: 1px solid #EEEEEE;
.el-checkbox{
margin:20px 20px 0 25px
height: 130px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
}
}
.div2{
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #EEEEEE;
.el-checkbox{
margin:25px 20px 0 25px
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
.div1{
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #EEEEEE;
.el-checkbox{
margin:25px 20px 0 25px
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
// 未选中字体颜色
......@@ -171,49 +174,49 @@
font-weight: 400;
}
/deep/ .el-checkbox__input .el-checkbox__inner:hover {
border-color:#055FE7;
border-color: #055fe7;
}
// 选中样式
/deep/.el-checkbox__input.is-checked+.el-checkbox__label{
/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055FE7;
border-color:#055FE7;
background: #055fe7;
border-color: #055fe7;
}
}
.content{
width: 100% ;
.content {
width: 100%;
height: 725px;
.div3{
.div3 {
width: 100%;
height: 137px;
border-bottom: 1px solid #EEEEEE;
height: 130px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line{
height: 50px;
.line {
height: 40px;
}
}
.div2{
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #EEEEEE;
.el-checkbox{
margin:10px 20px 0 25px
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
}
.line{
height: 50px;
.line {
height: 35px;
}
}
.div1{
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #EEEEEE;
.el-checkbox{
margin:25px 20px 0 25px
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
......@@ -227,21 +230,19 @@
margin-right: 50px;
}
/deep/ .el-checkbox__input .el-checkbox__inner:hover {
border-color:#055FE7;
border-color: #055fe7;
}
// 选中样式
/deep/.el-checkbox__input.is-checked+.el-checkbox__label{
/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055FE7;
border-color:#055FE7;
background: #055fe7;
border-color: #055fe7;
}
}
}
}
}
src/views/SystemManage/scss/user.scss
......@@ -81,6 +81,7 @@
justify-content: space-between;
margin-top: 20px;
padding-top: 16px;
margin-bottom: 16px;
border-top: 1px #eeeeee solid;
.btn1 {
width: 96px;
......
src/views/cxyrd/LT.vue
......@@ -461,6 +461,9 @@ export default {
<style scoped lang="scss">
.ltDiv {
width: 100%;
height: 100%;
height: 100vh;
overflow: hidden;
}
div {
margin: 0;
......@@ -483,6 +486,7 @@ div {
flex-grow: 1;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
.label {
align-self: flex-start;
......@@ -497,6 +501,7 @@ div {
}
.btns {
margin-top: 14px;
align-self: flex-end;
margin-right: 50px;
margin-bottom: 13px;
......@@ -552,7 +557,7 @@ div {
width: 1120px;
display: flex;
flex-direction: column;
margin-top: -59px;
margin-top: -65px;
}
.lt_main_middle .lt_main_header {
height: 70px;
......
src/views/cxyrd/TL.vue
......@@ -513,6 +513,8 @@ div {
}
.tlDiv {
width: 100%;
height: 100vh;
overflow: hidden;
.tl-search {
width: 100%;
}
......@@ -531,6 +533,7 @@ div {
flex-grow: 1;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
.label {
align-self: flex-start;
......@@ -583,7 +586,7 @@ div {
width: 1120px;
display: flex;
flex-direction: column;
margin-top: -59px;
margin-top: -65px;
}
.main-right {
margin-left: 16px;
......
src/views/cxyrd/TT.vue
......@@ -19,7 +19,7 @@
<div class="count">
<img
src="../../assets/img/TT/ttcount.png"
style="width: 14px;height: 14px;margin:0 5px 3px 0"
style="width: .875rem;height: .875rem;margin:0 .3125rem .1875rem 0"
/>已认定：{{ rdcount }}条
<!-- />已认定：{{ qid }}条-->
</div>
......@@ -152,7 +152,7 @@
<el-table-column
prop="destbarcode"
label="目标条码号"
width="190"
width="auto"
></el-table-column>
</el-table>
</div>
......@@ -192,7 +192,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<div v-else>暂无数据</div>
</div>
......@@ -219,7 +218,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<div v-else>暂无数据</div>
</div>
......@@ -248,7 +246,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
......@@ -275,7 +272,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
......@@ -314,7 +310,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<div v-else>暂无数据</div>
</div>
......@@ -341,7 +336,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
......@@ -371,7 +365,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
......@@ -398,7 +391,6 @@
<img
v-if="item.img"
:src="'data:image/jpeg;base64,' + item.img"
style="width: 234px;height: 314px;"
/>
<!-- 无指纹图片 -->
<div v-else>暂无数据</div>
......@@ -429,7 +421,7 @@
<img
v-if="sourceImgdetail"
:src="'data:image/jpeg;base64,' + sourceImgdetail"
style="width: 448px;height: 448px;"
style="width: 28rem;height: 28rem;"
/>
<div v-else>没有指纹详情</div>
</div>
......@@ -437,7 +429,7 @@
<img
v-if="destImgdetail"
:src="'data:image/jpeg;base64,' + destImgdetail"
style="width: 448px;height: 448px;"
style="width: 28rem;height: 28rem;"
/>
<div v-else>没有指纹详情</div>
</div>
......@@ -1306,11 +1298,12 @@ div {
}
.tt {
width: 100%;
height: 100%;
height: 100vh;
background-color: #ffffff;
padding: 0 24px 24px 24px;
display: flex;
flex-direction: column;
overflow: hidden;
}
.header {
border-bottom: 2px solid #eeeeee;
......@@ -1468,6 +1461,7 @@ div {
.btns {
position: relative;
top: 0px;
// left: 180px;
height: 100px;
text-align: center;
.btn {
......@@ -1524,7 +1518,7 @@ div {
}
.imgs {
width: inherit;
height: 720px;
height: 700px;
display: flex;
flex-direction: row;
.fingers {
......@@ -1532,10 +1526,10 @@ div {
flex-direction: row;
margin-top: -40px;
width: auto;
height: 750px;
height: 700px;
.data-label {
margin: 0 16px 0 24px;
height: 710px;
height: 700px;
.source-label {
width: 40px;
height: 320px;
......@@ -1568,8 +1562,8 @@ div {
}
}
.finger-data {
margin-top: -40xp;
height: 750px;
margin-top: -10px;
height: 700px;
//overflow: scroll;
overflow: hidden;
.hands {
......@@ -1583,16 +1577,17 @@ div {
}
.outside {
width: 100%;
height: 360px;
height: 320px;
padding-top: 3px;
.finger-img {
width: 320px;
height: 320px;
width: 300px;
height: 300px;
background: #ffffff;
border-radius: 8px;
border: 1px solid #cccccc;
cursor: pointer;
.img {
object-fit: contain;
margin-top: 35%;
}
}
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -4,7 +4,7 @@
<el-dropdown trigger="click" @command="choose">
<span class="el-dropdown-link">
指纹
<i style=" width: 16px; height: 16px" class="el-icon-caret-bottom"></i>
<i style=" width: 1rem; height: 1rem" class="el-icon-caret-bottom"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">指纹</el-dropdown-item>
......@@ -32,12 +32,12 @@
<!-- </el-input>-->
</div>
<div class="lt_candidate_number">
<el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData" ref="singleTable" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" width="50">
<el-table 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="60">
</el-table-column>
<!-- <el-table-column label="排名" width="50"></el-table-column>-->
<el-table-column prop="score" label="得分" width="50"></el-table-column>
<el-table-column prop="destseqno" label="指位" width="70" :render-header="icons">
<el-table-column prop="score" label="得分" width="70"></el-table-column>
<el-table-column prop="destseqno" label="指位" width="90" :render-header="icons">
<template slot-scope="scope">
{{
scope.row.destseqno == "1"
......@@ -82,7 +82,7 @@
}}
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="190"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto"></el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<b>{{ total }}条</b>数据</span>
......@@ -1054,7 +1054,7 @@ export default {
.then(response => {
console.log(response);
self.tableData = response.data.ret
self.total = self.tableData.total
self.total = self.tableData.length
})
},
/**
......@@ -1159,8 +1159,9 @@ const candidates = [
<style lang="scss">
.lt_candidate {
box-sizing: border-box;
width: 100%;
height: 100%;
height: calc(100% - 20px);
background: #f6f8fa;
border-radius: 8px;
div {
......@@ -1169,7 +1170,7 @@ const candidates = [
.lt_cnadidate_search {
// width: 352px;
width: 100%;
height: 60px;
// height: 60px;
background: #ffffff;
.label {
width: 60px;
......@@ -1192,11 +1193,12 @@ const candidates = [
margin-left: 10px;
}
.btn {
cursor: pointer;
width: 44px;
height: 32px;
height: 34px;
background: #006aff;
border-radius: 0px 4px 4px 0px;
line-height: 32px;
line-height: 34px;
color: #ffffff;
text-align: center;
}
......@@ -1208,6 +1210,7 @@ const candidates = [
}
.lt_candidate_table {
width: 100%;
height: 100%;
}
.lt_candidate_number {
width: 100%;
......@@ -1308,13 +1311,21 @@ const candidates = [
}
</style>
<style scoped lang="scss">
/deep/.el-table__body {
width: 100% !important;
}
/deep/ .el-input__inner {
border: none;
height: 32px !important;
line-height: 32px !important;
}
.lt_candidate .lt_cnadidate_search .input {
box-sizing: border-box;
}
/deep/.el-input {
box-sizing: border-box !important;
width: 296px;
height: 32px !important;
height: 0.34rem !important;
background: #ffffff;
border-radius: 4px;
border: 1px solid #e6e6e8;
......@@ -1336,4 +1347,10 @@ const candidates = [
/deep/.el-checkbox {
color: #666;
}
/deep/ .el-dropdown-menu {
width: 100px !important;
}
/deep/ #dropdown-menu-2149 {
width: 100px !important;
}
</style>
src/views/cxyrd/modules/LTSrc.vue
......@@ -8,10 +8,10 @@
<div class="lt_middle">
<!-- 源数据区 -->
<div class="lt_middle_src_data">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" width="80"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="190"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" width="80"></el-table-column>
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius tableHeight" @row-click="getFirgerPrintDetail" :row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" width="90"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" width="70"></el-table-column>
</el-table>
<div class="lt_middle_bottom">
<span>该任务共计<b>{{total}}</b>条查询</span>
......@@ -27,7 +27,7 @@
{{ Number(index+1) &lt; 9 ? ('0'+Number(index+1)) : Number(index+1) }}
</div>
<br />
<img :src="'data:image/jpeg;base64,'+item.image" style="width: 106px;height: 106px;" />
<img :src="'data:image/jpeg;base64,'+item.image" style="width: 6.625rem;height: 6.625rem;" />
<div class="finger-tips">
<!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1">
......@@ -243,10 +243,12 @@ export default {
changeTableHeight () {
this.isShowPrint = !this.isShowPrint
if (!this.isShowPrint) {
this.tableHeight = 810
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '48.75rem');
// this.tableHeight = 810
this.options = '收缩'
} else {
this.tableHeight = 368
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '20.625rem');
// this.tableHeight = 368
this.options = '展开'
}
}
......@@ -348,14 +350,14 @@ const datas = [
}
.lt_middle {
width: 100%;
height: 100%;
// height: 100%;
background: #ffffff;
border-radius: 8px;
}
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 416px;
height: 320px;
.Bizhong {
.cell {
color: #FF0039;
......@@ -390,7 +392,8 @@ const datas = [
.lt_middle_bottom {
text-align: center;
background: #f6f8fa;
height: 40px;
height: 40px !important;
line-height: 40px;
width: 100%;
font-size: 12px;
font-family: MicrosoftYaHei;
......@@ -580,6 +583,10 @@ const datas = [
}
</style>
<style lang="scss" scoped>
$tableHeight: var(--tableHeight, 330px);
.tableHeight {
height: $tableHeight;
}
/* 设置滚动条的样式 */
::-webkit-scrollbar {
width:6px;
......@@ -624,4 +631,7 @@ const datas = [
/deep/.el-checkbox {
color: #666;
}
/deep/ .el-dropdown-menu__item {
padding: 0 1.25rem !important;
}
</style>
\ No newline at end of file
src/views/cxyrd/modules/TLCandidate.vue
......@@ -151,7 +151,7 @@ export default {
}
.input {
width: 260px;
height: 32px;
height: 34px;
background: #ffffff;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
......@@ -159,6 +159,7 @@ export default {
margin-left: 10px;
}
.btn {
cursor: pointer;
width: 44px;
height: 32px;
background: #006aff;
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -7,9 +7,9 @@
<div class="main">
<!-- 数据 -->
<div class="data">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" :row-class-name="tableRowClassName">
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius tableHeight" :row-class-name="tableRowClassName">
<el-table-column prop="qqid" label="查询ID" width="80"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="190"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" width="80"></el-table-column>
</el-table>
<div class="bottom">
......@@ -560,7 +560,7 @@ export default {
NProgress.start();
console.info(this.dataList);
let self = this
if(self.type == 'father') {
if (self.type == 'father') {
await this.$axios
.post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } })
.then(response => {
......@@ -647,10 +647,12 @@ export default {
changeTableHeight () {
this.isShowPrint = !this.isShowPrint;
if (!this.isShowPrint) {
this.tableHeight = 810;
// this.tableHeight = 810;
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '48.75rem');
this.options = "收缩";
} else {
this.tableHeight = 253;
// this.tableHeight = 253;
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '11.25rem');
this.options = "展开";
}
},
......@@ -797,12 +799,20 @@ export default {
</script>
<style scoped lang="scss">
$tableHeight: var(--tableHeight, 180px);
.tableHeight {
height: $tableHeight;
}
div {
display: inline-block;
}
label {
margin-right: 67px;
}
.lt_candidate_table {
// height: 13.75rem;
width: 100%;
}
.tl-src {
width: 100%;
height: 100%;
......
src/views/cxyrd/modules/TTFace.vue
......@@ -88,14 +88,14 @@ div {
.tt_face .tt_face_src {
/*border: 1px solid darkred;*/
/*border: 1px solid darkred;*/
height: 360px;
height: 340px;
width: 100%;
display: flex;
flex-direction: row;
}
/*目标数据外层*/
.tt_face .tt_face_dest {
height: 360px;
height: 340px;
width: 100%;
display: flex;
flex-direction: row;
......
src/views/cxyrd/modules/TTPlam.vue
<!--
* @Author: your name
* @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-10-29 21:05:13
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
-->
<template>
<div class="tt_plam">
<div class="outside">
......@@ -38,7 +46,7 @@ div {
margin-top: 20%;
}
.tt_plam {
height: 780px;
height: 760px;
width: 100%;
overflow-y: scroll;
margin-top: -15px;
......@@ -49,8 +57,8 @@ div {
margin-right: 24px;
}
.palm {
width: 660px;
height: 660px;
width: 600px;
height: 600px;
background: #ffffff;
border-radius: 8px;
border: 1px solid #cccccc;
......
src/views/drFPTX/BDList.vue
......@@ -997,9 +997,6 @@ const setQueryClass = [
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
.paging {
float: right;
}
......@@ -1188,8 +1185,6 @@ b {
font-family: MicrosoftYaHei;
color: #ffffff;
line-height: 22px;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.el-button--info {
width: 96px;
......
src/views/drFPTX/RAList.vue
......@@ -53,7 +53,7 @@
</el-tag>
<!-- 五 -->
<el-table
max-height="500"
max-height="650"
ref="multipleTable"
:data="tableDate"
tooltip-effect="dark"
......@@ -424,7 +424,7 @@ export default {
</script>
<style scoped lang="scss">
.RAList {
height: 100%;
height: 700px;
box-sizing: border-box;
padding: 0 24px;
font-family: MicrosoftYaHei;
......@@ -555,6 +555,9 @@ export default {
/deep/.el-form-item__label {
color: #333333;
}
/deep/.el-table {
height: 100%;
}
/deep/.el-table th > .cell {
font-size: 14px;
font-family: MicrosoftYaHei;
......
src/views/login/Login1.vue
......@@ -174,7 +174,7 @@ export default {
<style scoped>
.homepage_hero_module {
width: 100%;
width: 100vw;
height: 100vh;
overflow: hidden;
}
......
src/views/login/modules/AccountsLogin.vue
......@@ -9,7 +9,7 @@
>
<i slot="prefix" style="display: flex;align-items: center;">
<img
style="margin:21px 21px 21px 19px;width:16px;height:16px"
style="margin:1.3125rem 1.3125rem 1.3125rem 1.1875rem;width:1rem;height:1rem"
:src="usernameUrl"
alt
/>
......@@ -23,7 +23,7 @@
>
<i slot="prefix">
<img
style="margin:21px 21px 21px 19px;width:15px;height:15px"
style="margin:1.3125rem 1.3125rem 1.3125rem 1.1875rem;width:.9375rem;height:.9375rem"
:src="passwordUrl"
alt
/>
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-10-29 09:51:35
* @LastEditTime: 2021-10-30 10:21:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......
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