Skip to content

F
founder_vue
Commit c9bca3ef by maxiaohan
Options

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

parents 7ce0e784 c3dc8c56
Showing with 757 additions and 236 deletions
public/index.html
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-12 17:43:47
* @LastEditTime: 2021-11-13 00:22:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\public\index.html
......@@ -56,6 +56,7 @@
<script src="<%= BASE_URL %>image-edit/js/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>image-edit/js/tui-image-editor.js"></script>
<script src="<%= BASE_URL %>image-edit/js/fabric-irregular.js"></script>
<script src="<%= BASE_URL %>js/rotate_matrix.js"></script>
<!-- <script src="<%= BASE_URL %>image-edit/js/ui.js"></script>
<script src="<%= BASE_URL %>image-edit/js/action.js"></script> -->
<!-- <script src="<%= BASE_URL %>image-edit/js/service-basic.js"></script> -->
......
public/js/rotate_matrix.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-13 00:21:03
* @LastEditTime: 2021-11-13 00:21:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\rotate_matrix.js
*/
class Matrix {
constructor() {
this.arr = [1, 0, 0, 0, 1, 0, 0, 0, 1];
}
translate(x, y) {
this.arr = this._mult(this.arr, [1, 0, 0, 0, 1, 0, x, y, 1]);
}
rotate(angle) {
const cos = Math.cos(angle);
const sin = Math.sin(angle);
this.arr = this._mult(this.arr, [cos, -sin, 0, sin, cos, 0, 0, 0, 1]);
}
_mult(a, b) {
const ret = [];
for (let y = 0; y < 3; y++) {
for (let x = 0; x < 3; x++) {
let sum = 0;
for (let i = 0; i < 3; i++) {
sum += b[i + y * 3] * a[x + i * 3];
}
ret[x + y * 3] = sum;
}
}
return ret;
}
}
const reverse = (x, y, cx, cy, angle) => {
const matrix = new Matrix();
matrix.translate(cx, cy);
matrix.rotate(angle);
const m = matrix.arr;
x = x - cx;
y = y - cy;
const x1 = x * m[0] + y * m[3] + m[6];
const y1 = x * m[1] + y * m[4] + m[7];
return [x1, y1];
};
\ No newline at end of file
src/components/ImageEd.scss
......@@ -182,16 +182,7 @@ div {
box-sizing: border-box;
width: 30px;
height: 16px;
/deep/.el-switch__core {
box-sizing: border-box;
width: 30px !important;
height: 16px;
&::after {
width: 16px;
height: 16px;
top: -1px;
}
}
}
}
.line_right {
......@@ -501,7 +492,7 @@ div {
top: 35px;
left: 0;
width: 240px;
height: 194px;
height: 224px;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
......@@ -525,16 +516,7 @@ div {
box-sizing: border-box;
width: 30px;
height: 16px;
/deep/.el-switch__core {
box-sizing: border-box;
width: 30px !important;
height: 16px;
&::after {
width: 16px;
height: 16px;
top: -1px;
}
}
}
}
.circle_right {
......@@ -1211,13 +1193,13 @@ div {
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055FE7;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #FFFFFF;
border: 2px solid #055FE7;
background: #ffffff;
border: 2px solid #055fe7;
}
.qb_v {
width: 34px;
......@@ -1333,19 +1315,29 @@ div {
justify-content: center;
align-items: center;
.tui-image-editor {
width: 520px;
width: 520px !important;
height: 520px !important;
display: flex;
align-items: center;
justify-content: center;
}
.tui-image-editor2 {
width: 520px;
height: 520px;
width: 520px !important;
height: 520px !important;
display: flex;
justify-content: center;
align-items: center;
}
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 520px !important;
max-width: 520px !important;
height: 100%;
width: auto !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
}
}
}
}
......@@ -1498,3 +1490,34 @@ div {
// left: 10px;
// background: #edc;
// }
.circleOptions /deep/{
.circle_size{
margin-top: 16px!important;
}
.circle_color{
margin-top: 16px!important;
margin-bottom: 16px!important;
}
.mr_size_active{
.item_top{
border: 1px solid #055FE7!important;
}
}
}
.el-switch /deep/{
width: 40px!important;
.el-switch__core{
width: 100%!important;
border-radius: 5px!important;
&::after{
border-radius: 4px!important;
width: 16px;
background-color: #DCDFE9;
border-left: 7px;
border-right: 7px;
box-sizing: border-box;
border-style: solid;
border-color: #fff;
}
}
}
\ No newline at end of file
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-12 21:00:12
* @LastEditTime: 2021-11-13 13:05:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -406,7 +406,8 @@
<div class="remove-white" v-show="optionsRemoveWhite">
<div class="title">去白</div>
<div class="content">
<input class="range-narrow" id="input-range-remove-white-distance" type="range" min="0" :value="inputRemoveWhiteRange" max="255" />
<el-slider class="range-narrow" id="input-range-remove-white-distance" v-model="inputRemoveWhiteRange" :min="0" :max="255"></el-slider>
<!-- <input class="range-narrow" id="input-range-remove-white-distance" type="range" min="0" :value="inputRemoveWhiteRange" max="255" /> -->
<input class="qb_v" type="text" v-model="inputRemoveWhiteRange">
</div>
</div>
......@@ -435,12 +436,14 @@
<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" />
<el-slider class="range-narrow" id="input-range-brightness-value" v-model="inputBrightnessRange" :min="-255" :max="255"></el-slider>
<!-- <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" />
<el-slider class="range-narrow" id="input-range-contrast-value" v-model="inputContrastRange" :min="0" :max="255"></el-slider>
<!-- <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>
......
src/store/modules/layout.js
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-11 17:54:45
* @LastEditTime: 2021-11-13 15:10:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -104,7 +104,7 @@
>导 出</el-button>
<el-button
@click="dialogVisible = false"
class="confirmBtn"
class="cancelBtn"
type="primary"
>取 消</el-button>
</span>
......@@ -332,8 +332,16 @@ export default {
display: none;
}
}
.confirmBtn {
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
.cancelBtn {
background-color: #055fe7;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -322,7 +322,7 @@
>导 出</el-button>
<el-button
@click="dialogVisible = false"
class="confirmBtn"
class="cancelBtn"
type="primary"
>取 消</el-button>
<!-- <el-button
......@@ -904,8 +904,16 @@ export default {
// padding-left: 5px;
// }
}
.confirmBtn {
.confirmBtn,
.cancelBtn {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
.cancelBtn {
background-color: #055fe7;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -513,10 +513,10 @@ export default {
return {
radio: 'true',
byzsArr: '', // 本月总数(5个等级数组)
byzs: '1000',// 该类型下本月总数
sytsArr: '',// 剩余条数
syts: '300', //该类型下剩余条数
bcxh: '1', //本次消耗
byzs: null,// 该类型下本月总数
sytsArr: null,// 剩余条数
syts: null, //该类型下剩余条数
bcxh: null, //本次消耗
checkAll_mbljk: false, // 目标逻辑库全选
checkedTargets: [], // 选定目标逻辑库
targets_ry: targetOptions_ry, // 目标逻辑库（人员）
......@@ -988,7 +988,7 @@ export default {
let failInfo = response.data.ret.failInfo
this.$message({
dangerouslyUseHTMLString: true,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div>`,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div><div style='color:red'>${failInfo}</div> `,
type: 'success'
});
cityOptions = []
......@@ -1050,7 +1050,7 @@ export default {
console.info("555发查询剩余条数返回列表===>", response);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
this.$message.error('555获取发查询剩余条数失败');
}
});
......@@ -1060,6 +1060,9 @@ export default {
</script>
<style lang="scss" scoped>
/deep/.el-form-item__error {
top: 24px;
}
/deep/.el-collapse-item__arrow {
margin-left: 5px;
}
......@@ -1484,4 +1487,8 @@ export default {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -33,11 +33,12 @@
prop='barcode'
>
<el-input
class="inputBh"
v-model.trim="ruleForm.barcode"
placeholder="请增加条码号"
maxlength='23'
maxlength='22'
show-word-limit
></el-input>
><template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
</el-form-item>
</el-form>
<div class='tip1'>提示：</div>
......@@ -125,14 +126,14 @@ export default {
reqUrl = '/api/personstore/copy'
Object.assign(this.reqParam, this.rowData);
delete this.reqParam.id;
this.reqParam.ysxtAsjxgrybh = this.ruleForm.barcode;
this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
console.log(this.reqParam, '人员复制数据')
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/copyBarcode'
let caseBase = {}
Object.assign(caseBase, this.rowData);
delete caseBase.id;
caseBase.ysxtAsjbh = this.ruleForm.barcode
caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
this.reqParam.caseBase = caseBase
console.log(this.reqParam, '案件复制数据')
}
......@@ -166,6 +167,16 @@ export default {
</script>
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
/deep/.el-dialog {
border-radius: 6px;
font-family: MicrosoftYaHei;
......@@ -222,4 +233,8 @@ export default {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -39,11 +39,12 @@
prop='barcode'
>
<el-input
class="inputBh"
v-model.trim="reqParam.barcode"
placeholder="请修改条码号"
maxlength='23'
maxlength='22'
show-word-limit
></el-input>
><template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
</el-form-item>
</el-form>
<div class='tip1'>提示：</div>
......@@ -130,12 +131,12 @@ export default {
if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.ysxtAsjxgrybh = this.reqParam.barcode
newReqParams.ysxtAsjxgrybh = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') {
reqUrl = 'api/casestore/updateBarcode'
let caseBase = {}
caseBase.id = this.rowData.id
caseBase.ysxtAsjbh = this.reqParam.barcode
caseBase.ysxtAsjbh = 'A' + this.reqParam.barcode
newReqParams.caseBase = caseBase
}
......@@ -171,6 +172,16 @@ export default {
</script>
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
/deep/.el-dialog {
border-radius: 6px;
}
......@@ -230,4 +241,8 @@ export default {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/gz.vue
......@@ -105,7 +105,7 @@
>确 定</el-button>
<el-button
class="cancelBtn"
@click="dialogVisible = false"
@click="handleClose"
type="primary"
>取 消</el-button>
......@@ -235,6 +235,7 @@ export default {
return showProp;
},
handleClose (done) {
this.comments = '';
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
......@@ -301,4 +302,8 @@ export default {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -319,4 +319,8 @@ export default {
width: 72px;
height: 40px;
}
.confirmBtn {
background-color: #fff;
color: #333333;
}
</style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -44,12 +44,13 @@
prop="xckybh"
>
<el-input
class="inputBh"
v-model.trim="ruleForm.xckybh"
placeholder="请输入现场勘验编号"
maxlength="23"
maxlength="22"
show-word-limit
clearable
></el-input>
><template slot="prepend">K</template></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -376,14 +377,15 @@ export default {
caseBase: ""
}
reqParam.caseBase = this.ruleForm
let defaultArr = 'A'
reqParam.personDo.ysxtAsjbh = defaultArr.concat(this.ruleForm.ysxtAsjbh)
reqParam.caseBase.ysxtAsjbh = 'A' + this.ruleForm.ysxtAsjbh
reqParam.caseBase.xckybh = 'K' + this.ruleForm.xckybh
this.$axios
.post("/api/casestore/caseadd", reqParam)
.then(response => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
this.$router.push('/ajzwbj/' + 'xz' + '/' + this.ruleForm.ysxtAsjbh)
} else {
this.$message.error("新增失败");
}
......@@ -481,6 +483,7 @@ export default {
/deep/.el-button {
width: 142px;
height: 40px;
color: #333333;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
......@@ -488,6 +491,7 @@ export default {
/deep/.el-button--primary {
border-color: #055fe7;
background: #055fe7;
color: #fff;
width: 72px;
height: 40px;
}
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -112,11 +112,10 @@
tooltip-effect="dark"
style="width: 100%;"
@selection-change="handleSelectionChange"
:class="{delSelection: !selectBoo}"
>
<el-table-column
type="selection"
width="auto"
v-if="isSelected"
:reserve-selection="true"
>
</el-table-column>
......@@ -172,7 +171,7 @@
width="auto"
>
<template slot-scope="scope">
<div class="ops">
<div class="ops" @click="closeSelected">
<el-tooltip
class="item"
effect="dark"
......@@ -460,7 +459,7 @@ export default {
}
},
ysxtAsjbh: null,
isSelected: false, // 是否批量操作
selectBoo: false, // 是否批量操作
tableDate: [],
rowData: {}, // 单行数据
// tableDate: datas1,
......@@ -469,6 +468,10 @@ export default {
};
},
methods: {
closeSelected() {
this.selectBoo = false;
this.toggleSelection();
},
// 获取案件数据
search () {
// console.info("案件请求===>", this.reqParam);
......@@ -498,15 +501,20 @@ export default {
// 检查table选择的数据 如果没有选择则不可以删除
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！");
this.isSelected = true
this.selectBoo = true
return;
} else {
this.$confirm('是否确认删除？', '提示')
.then(_ => {
// 封装删除的psns为数组
let ids = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id);
}
this.doDelete(ids.toString());
})
.catch(_ => { });
}
// 封装删除的psns为数组
let ids = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id);
}
this.doDelete(ids.toString());
},
// 单选删除
delOne (val) {
......@@ -561,7 +569,7 @@ export default {
this.ysxtAsjbh = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
this.isSelected = true
this.selectBoo = true
} else {
self.multipleSelection.forEach(item => {
self.ysxtAsjbh.push(item.ysxtAsjbh);
......@@ -578,7 +586,7 @@ export default {
dcFptx () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
this.isSelected = true
this.selectBoo = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcfptx = true;
......@@ -592,22 +600,26 @@ export default {
},
// 复制成功时的回调函数
onCopy (e) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjbh + "成功！"
message: "已复制到剪切板"
});
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
this.$message.error("抱歉，复制条码号失败！");
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 添加到队列
isShowTjddlBtn () {
console.log('添加到队列')
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true
this.selectBoo = true
} else {
this.rowData = this.multipleSelection
this.isShowTjddl = true;
......@@ -623,7 +635,7 @@ export default {
let newarr = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
this.isSelected = true
this.selectBoo = true
} else {
let arr = this.multipleSelection
for (var i = 0; i < arr.length; i++) {
......@@ -694,7 +706,7 @@ export default {
isShowFcxBtn () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
this.isSelected = true
this.selectBoo = true
} else {
this.rowData = this.multipleSelection
this.isShowFcx = true;
......@@ -728,7 +740,7 @@ export default {
*/
batch () {
this.disabled = !this.disabled
this.isSelected = !this.isSelected;
this.selectBoo = !this.selectBoo;
this.toggleSelection()
},
/**
......@@ -820,6 +832,79 @@ const datas1 = [
},
];
</script>
<style lang='scss'>
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
</style>
<style scoped lang="scss">
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
......@@ -831,6 +916,11 @@ const datas1 = [
background-color: #dadde0;
border-radius: 3px;
}
.delSelection /deep/ .el-table-column--selection .cell{
display: none;
}
.delSelection /deep/ .el-table-column--selection{
}
.AllPersonnelBase {
height: 100%;
box-sizing: border-box;
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-12 20:17:17
* @LastEditTime: 2021-11-13 11:21:59
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -177,12 +177,9 @@ export default {
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', element.image)
self.$bus.emit('ajzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', res.data.ret.image)
self.$bus.emit('ajzwbjTDZ')
}
}
})
......
src/views/Editor/modules/imageEd.scss
......@@ -954,6 +954,13 @@ $transOrigin: var(--transOrigin, 0px, 0px);
// transform-origin: $transOrigin;
// background-color: #999;
}
.tzdDrawing_2 {
width: 640px;
height: 640px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
}
}
.preview-source {
z-index: 9999;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -823,6 +823,7 @@ $directionRotate: var(--directionRotate, 0deg);
height: 512px;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
z-index: 999;
background-color: transparent;
.blc_outter {
width: 100%;
height: 100%;
......@@ -854,6 +855,13 @@ $directionRotate: var(--directionRotate, 0deg);
// transform-origin: $transOrigin;
// background-color: #999;
}
.tzdDrawing_2 {
width: 640px;
height: 640px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
}
.irregular {
width: 640px;
height: 640px;
......@@ -1167,6 +1175,86 @@ $directionRotate: var(--directionRotate, 0deg);
font-size: 20px;
}
}
.blcbtn-content {
padding: 24px;
.kd-mix {
display: flex;
align-items: center;
.kd {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.kd-select {
width: 188px;
height: 40px;
background: #ffffff;
border-radius: 4px;
}
}
.sz-mix {
margin-top: 24px;
display: flex;
align-items: center;
.sz {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.sznum {
width: 188px;
height: 40px;
}
}
}
.blc-btns {
display: flex;
align-items: center;
justify-content: space-between;
width: 168px;
margin-left: 60px;
.confirm {
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
&:hover {
border: 1px solid #055FE7;
}
&:active {
border: 1px solid #044CB9;
}
}
.cancel {
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377fec;
color: #ffffff;
}
&:active {
background: #044cb9;
color: #ffffff;
}
}
}
}
.txblyz {
cursor: pointer;
......@@ -2157,3 +2245,6 @@ $directionRotate: var(--directionRotate, 0deg);
transform: scale(1.6);
}
}
// /deep/.el-select-dropdown__item {
// padding-left: 20px !important;
// }
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-12 19:48:54
* @LastEditTime: 2021-11-13 11:21:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -257,20 +257,22 @@ export default {
// ip:port/api/org/roll/{id}/{seq}
let self = this
this.$axios({
method: 'get',
url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
method: 'post',
// url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
url: '/api/org/rollByBarcode/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
},
loading: false
// url: `/api/org/roll/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', element.image)
self.$bus.emit('ryzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
}
}
})
......@@ -285,20 +287,22 @@ export default {
// ip:port/api/org/plain/{id}/{seq}
let self = this
this.$axios({
method: 'get',
url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
method: 'post',
// url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
url: '/api/org/plainByBarcode/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
},
loading: false
// url: `/api/org/plain/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
if (Object.hasOwnProperty.call(res.data.ret, key)) {
const element = res.data.ret[key];
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', element.image)
self.$bus.emit('ryzwbjTDZ')
}
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ryzwbjImage', res.data.ret.image)
self.$bus.emit('ryzwbjTDZ')
}
}
})
......@@ -477,7 +481,7 @@ export default {
* @return {*}
*/
zzwChange (event) {
if(!this.PainFingerFlag && event.target.innerText == '平面指纹') {
if (!this.PainFingerFlag && event.target.innerText == '平面指纹') {
return
}
this.zwSelect = event.target.innerText
......
src/views/Home.vue
......@@ -3,19 +3,47 @@
<el-container class="layout-container">
<transition name="slide">
<el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside">
<div class="logo" :class="{ minLogo: isCollapse }" @click="$router.push('/Home/Home')">
<div
class="logo"
:class="{ minLogo: isCollapse }"
@click="$router.push('/Home/Home')"
>
<img class="jh" src="../assets/img/Home/jh.png" alt="" />
<img v-show="!isCollapse" class="title" src="../assets/img/Home/title.png" alt="" />
<img
v-show="!isCollapse"
class="title"
src="../assets/img/Home/title.png"
alt=""
/>
</div>
<!-- <div class="search">
<el-input v-if="!isCollapse" @keyup.enter.native="goSearch()" class="searchTxt" prefix-icon="el-icon-search" v-model="searchTxt" placeholder="搜索"></el-input>
<i class="search-icon el-icon-search" v-else></i>
</div> -->
<el-menu :collapse-transition="false" ref="menu" :default-active="menuActive" text-color="#CCCCCC" active-text-color="#ffffff" background-color="#1F2D45" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" :collapse="isCollapse" @select="selectPath">
<el-menu
:collapse-transition="false"
ref="menu"
:default-active="menuActive"
text-color="#CCCCCC"
active-text-color="#ffffff"
background-color="#1F2D45"
class="el-menu-vertical-demo"
@open="handleOpen"
@close="handleClose"
:collapse="isCollapse"
@select="selectPath"
>
<div v-for="(menu, i) in routes" :key="i">
<el-submenu :index="menu.name" v-if="menu.children && !menu.hidden">
<el-submenu
:index="menu.name"
v-if="menu.children && !menu.hidden"
>
<template slot="title">
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" />
<img
v-if="$route.path != menu.path"
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<span v-show="!isCollapse">{{ menu.meta.title }}</span>
</template>
......@@ -25,8 +53,15 @@
}}</el-menu-item>
</div>
</el-submenu>
<el-menu-item :index="menu.name" v-else-if="!menu.children && !menu.hidden">
<img v-if="$route.path != menu.path" :src="menu.icon_d" alt="" />
<el-menu-item
:index="menu.name"
v-else-if="!menu.children && !menu.hidden"
>
<img
v-if="$route.path != menu.path"
:src="menu.icon_d"
alt=""
/>
<img v-else :src="menu.icon_a" alt="" />
<span slot="title">{{ menu.meta.title }}</span>
</el-menu-item>
......@@ -53,8 +88,18 @@
</div>
<div class="quit" @click="$router.push('/Home/Home')"></div>
<div class="logout" @click="logout">
<svg-icon v-show="!isHoverLogout" icon-class="logout_d" class="icon" @mouseover="isHoverLogout = true" @mouseleave="isHoverLogout = false" />
<svg-icon v-show="isHoverLogout" icon-class="logout_a" class="icon" />
<svg-icon
v-show="!isHoverLogout"
icon-class="logout_d"
class="icon"
@mouseover="isHoverLogout = true"
@mouseleave="isHoverLogout = false"
/>
<svg-icon
v-show="isHoverLogout"
icon-class="logout_a"
class="icon"
/>
</div>
</div>
</el-header>
......@@ -68,7 +113,7 @@
>
<el-tab-pane
:label="item.name"
:name="item.path"
:name="item.routeName"
v-for="item in paths"
:key="item.routeName"
></el-tab-pane>
......@@ -99,7 +144,7 @@ import indexRoutes from "@/router/modules/index";
import { mapGetters } from "vuex";
export default {
name: "Home",
data () {
data() {
return {
searchTxt: "",
routes: this.$store.getters["layout/leftMenuData"],
......@@ -112,7 +157,7 @@ export default {
routePath: "",
};
},
mounted () {
mounted() {
this.menuActive = this.$route.name;
// console.log(this.$route);
// zoom('home')
......@@ -120,7 +165,7 @@ export default {
// zoom('home')
// })
},
updated () {
updated() {
this.menuActive = this.$route.name;
},
computed: {
......@@ -136,7 +181,7 @@ export default {
* @return {*}
*/
logout () {
logout() {
// console.log('退出登录');
// this.$router.replace('/login1')
this.$axios
......@@ -159,22 +204,22 @@ export default {
* @return {*}
*/
goSearch () {
goSearch() {
this.searchTxt = "";
console.log(this.searchTxt);
},
handleClick ({ name }) {
handleClick({ name }) {
if (name == "/Home/htzwcj") {
this.$router.push(name);
this.menuActive = "";
} else {
this.$router.push(name);
let routerObj = this.paths.find((i) => i.path == name);
let routerObj = this.paths.find((i) => i.routeName == name);
this.$router.push(routerObj.path);
this.menuActive = routerObj.routeName;
}
},
tabRemove (name) {
let routerObj = this.paths.find((i) => i.path == name);
tabRemove(name) {
let routerObj = this.paths.find((i) => i.routeName == name);
if (routerObj) {
let pathName = routerObj.name;
let res = this.paths.filter((item) => {
......@@ -185,7 +230,7 @@ export default {
if (pathName == this.$route.meta.title) {
if (this.paths.length > 0) {
this.$router.push(this.paths[0].path);
this.routePath = this.paths[0].path;
this.routePath = this.paths[0].routeName;
}
}
}
......@@ -202,13 +247,17 @@ export default {
cachePageName = "";
}
this.$store.commit("layout/resetcachePageName", cachePageName);
this.$store.commit("layout/delcachePageName", 'ryzwbj');
this.$store.commit("layout/delcachePageName", 'ajzwbj');
console.log(1111222222211111,this.$store.state.layout.cachePageName)
},
/**
* @description: 调回任务管理
* @param {*}
* @return {*}
*/
goManager () {
goManager() {
this.$router.push("/Home/htzwcj");
this.menuActive = "";
},
......@@ -218,7 +267,7 @@ export default {
* @param {*} path
* @return {*}
*/
selectPath (index, path) {
selectPath(index, path) {
this.$router.push({ name: index });
},
/**
......@@ -226,7 +275,7 @@ export default {
* @param {*}
* @return {*}
*/
closePaths (pathName) {
closePaths(pathName) {
let res = this.paths.filter((item) => {
return item.name != pathName;
});
......@@ -242,7 +291,7 @@ export default {
* @param {*}
* @return {*}
*/
changeRouter (route) {
changeRouter(route) {
this.$router.push(route.path);
this.menuActive = route.routeName;
},
......@@ -251,20 +300,22 @@ export default {
* @param {*}
* @return {*}
*/
switchCollapse () {
switchCollapse() {
this.isCollapse = !this.isCollapse;
},
handleOpen (key, keyPath) {
handleOpen(key, keyPath) {
console.log(key, keyPath);
},
handleClose (key, keyPath) {
handleClose(key, keyPath) {
console.log(key, keyPath);
},
},
watch: {
$route: {
handler (newValue, oldValue) {
this.routePath = newValue.path;
handler(newValue, oldValue) {
console.log(this.routePath,11111111111)
console.log(newValue,11111111111)
this.routePath = newValue.name;
setTimeout(() => {
console.log(1);
if (newValue.path != "/Home/htzwcj") {
......@@ -281,7 +332,7 @@ export default {
routeName: newValue.name,
};
if (
JSON.stringify(this.paths).indexOf(JSON.stringify(obj)) === -1
this.paths.findIndex((i) => i.routeName == newValue.name) === -1
) {
this.paths.push(obj);
}
......@@ -445,8 +496,8 @@ export default {
background-color: #006aff;
display: none;
}
.el-tabs__nav-wrap::after{
height: 1px!important;
.el-tabs__nav-wrap::after {
height: 1px !important;
}
.el-tabs__item {
position: relative;
......
src/views/cxyrd/TL.vue
......@@ -8,6 +8,7 @@
<div class="rd-btn" @click="Rdwc">认定完成</div>
</div>
</div>
<div class="header_line"></div>
<div class="main">
<div class="main-left">
<t-l-src></t-l-src>
......@@ -547,10 +548,15 @@ div {
margin-top: 14px;
}
}
.header_line {
width: 1872px;
height: 2px;
background: #eee;
position: absolute;
top: 52px;
}
.btns {
align-self: flex-end;
margin-right: 50px;
margin-bottom: 13px;
color: #ffffff;
font-size: 14px;
......@@ -581,6 +587,9 @@ div {
flex-direction: row;
.main-left {
width: 352px;
border: none;
/* margin-right: 16px; */
margin-top: 18px;
//border: none;
}
.main-middle {
......@@ -590,8 +599,10 @@ div {
margin-top: -65px;
}
.main-right {
margin-left: 16px;
width: 360px;
margin-top: 50px;
margin-left: 16px;
width: 380px;
border: none;
}
}
/deep/.el-dialog {
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -157,7 +157,7 @@ export default {
line-height: 24px;
}
.input {
width: 260px;
width: 292px;
height: 34px;
background: #ffffff;
border-top-left-radius: 4px;
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -6,17 +6,18 @@
</div>
<div class="main">
<!-- 数据 -->
<div class="data">
<div class="data lt_middle_src_data">
<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="width1"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto"></el-table-column>
<el-table-column prop="fingerCount" label="枚数" :width="width1"></el-table-column>
</el-table>
<div class="bottom">
<span>该任务共计<b>{{ total }}</b>条查询</span>
<el-button class="expend" type="text" @click="changeTableHeight">{{
options
}}</el-button>
<div class="lt_middle_bottom">
<span>该任务共计<span>{{total}}条</span>查询</span>
<div class="btn" @click="changeTableHeight">
<span>{{options}}</span>
<div class="ico"><img src="~@/assets/img/bottom.png" alt=""></div>
</div>
</div>
</div>
<!-- 指纹图 -->
......@@ -654,13 +655,15 @@ export default {
changeTableHeight () {
this.isShowPrint = !this.isShowPrint;
if (!this.isShowPrint) {
// this.tableHeight = 810;
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '48.75rem');
this.options = "收缩";
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '48.75rem');
// this.tableHeight = 810
this.options = '折叠'
$('.ico').css('transform', 'rotate(180deg)')
} else {
// this.tableHeight = 253;
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '11.25rem');
this.options = "展开";
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '180px');
// this.tableHeight = 368
this.options = '展开'
$('.ico').css('transform', 'rotate(0deg)')
}
},
/**
......@@ -843,6 +846,49 @@ label {
}
}
}
.lt_middle_bottom {
text-align: center;
background: #f6f8fa;
height: 40px !important;
line-height: 40px;
width: 100%;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999;
span {
span {
color: #666;
}
}
}
.lt_middle_src_data {
.lt_middle_bottom {
margin-top: -10px;
display: flex;
justify-content: center;
.btn {
margin-left: 32px;
cursor: pointer;
display: flex;
align-items: center;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #055FE7;
.ico {
transform: rotate(0deg);
margin-left: 5px;
width: 10px;
height: 6px;
display: flex;
img {
object-fit: cover;
width: 100%;
height: 100%;
}
}
}
}
}
.finger-print {
width: 352px;
height: 621px;
......
src/views/drFPTX/Index.vue
......@@ -522,6 +522,12 @@ export default {
// 导入成功,跳转详情
goList () {
if (this.drlx == 3 || this.drlx == 6) {
this.dialogVisible = false
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.$router.push({
path: '/RAList',
query: {
......@@ -529,6 +535,12 @@ export default {
}
})
} else if (this.drlx == 9) {
this.dialogVisible = false
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.$router.push({
path: '/RAList',
query: {
......@@ -666,70 +678,65 @@ export default {
},
// 上传
submitUpload () {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面；
this.nowSelectRightData.forEach((file) => {
formData.append('file', file.raw)
})
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
// formData.append('uploadType', '备料单')
// formData.append('versions', 'v4.0')
if (this.nowSelectRightData.length == 0) {
this.$message.error('请选择要上传的文件')
} else {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面；
this.nowSelectRightData.forEach((file) => {
formData.append('file', file.raw)
})
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
this.dialogVisible = true;
this.$axios({
method: 'post',
url: this.action,
data: formData,
loading: false
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
if (this.drlx == 3 || this.drlx == 6) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
// 自定义上传
// axios
// .post(this.upload.url, formData, { headers: { 'Content-Type': 'multipart/form-data', Authorization: getToken() } })
// .then(response => {
// if (response.code == 200) {
// this.upload.open = false;
// this.upload.isUploading = false;
// this.$refs.upload.clearFiles();
// this.msgSuccess('上传成功！');
// } else {
// this.$message.error(response.msg);
// }
// })
// .catch(error => {
// this.$message.error('上传失败！');
// });
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
// this.$axios
// .post(this.action, formData, { headers: { 'Content-Type': 'multipart/form-data' }, loading: false })
this.dialogVisible = true;
this.$axios({
method: 'post',
url: this.action,
data: formData,
loading: false
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
if (this.drlx == 3 || this.drlx == 6) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
}
});
});
}
},
// 删除文件
......@@ -817,10 +824,32 @@ export default {
},
// 选中
handelSelect () {
// let self = this
// console.log('重复文件过滤1', this.nowSelectData)
// console.log('重复文件过滤2', this.selectArr)
// if (this.selectArr.length > 0) {
// for (var i = 0; i <= this.selectArr.length; i++) {
// // console.log(this.selectArr[i].name);
// // console.log(9999, this.nowSelectData[i].name);
// // 重复文件过滤
// console.log(this.nowSelectData);
// console.log(this.nowSelectData.slice(0, self.nowSelectData.length));
// let existFile = this.nowSelectData.slice(0, self.nowSelectData.length).find(f => f.name === self.selectArr[i].name)
// console.log('existFile', existFile)
// if (existFile) {
// this.$message.error('请去除重复文件!');
// this.nowSelectData.pop()
// }
// }
// }
// this.checkRightAll(this.nowSelectData)
// this.nowSelectRightData.push(this.nowSelectData)
this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
this.nowSelectRightData = this.selectArr
// this.nowSelectRightData = this.selectArr
this.handleRemoveTabList(this.nowSelectData, this.datas);
this.nowSelectData = [];
},
......
src/views/drFPTX/RAList.vue
......@@ -12,8 +12,14 @@
v-model="dataType"
class="chooseType"
>
<el-radio :label="1">人员</el-radio>
<el-radio :label="2">案件</el-radio>
<el-radio
:label="1"
@click.native.prevent="clickitemdataType(1)"
>人员</el-radio>
<el-radio
:label="2"
@click.native.prevent="clickitemdataType(2)"
>案件</el-radio>
</el-radio-group>
<div class='search barcode'>
<div class='item'> 条码号：</div>
......@@ -74,6 +80,9 @@
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="{
disabledDate: disabledDate,
}"
>
</el-date-picker>
</div>
......@@ -170,6 +179,7 @@
</el-radio-group>
</div>
<div class="right">
<el-button @click="clear">清空</el-button>
<el-button @click="search">筛选</el-button>
</div>
</div>
......@@ -227,7 +237,7 @@
<!-- 五 -->
<div v-if="showType == 1">
<el-table
max-height="700"
max-height="500"
ref="multipleTable"
:data="tableDate1"
tooltip-effect="dark"
......@@ -241,26 +251,27 @@
>
<el-table-column
type="selection"
width="70"
width="auto"
v-if="isSelected"
>
</el-table-column>
<el-table-column
prop="taskNumber"
label="任务号"
width="350"
width="220"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="400"
width="300"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
width="300"
>
</el-table-column>
<el-table-column
......@@ -348,7 +359,7 @@
<el-table
v-if="showType == 2"
max-height="700"
max-height="500"
ref="multipleTable"
:data="tableDate2"
tooltip-effect="dark"
......@@ -369,13 +380,14 @@
<el-table-column
prop="taskNumber"
label="任务号"
width="350"
width="220"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="400"
width="300"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
......@@ -387,7 +399,7 @@
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
width="300"
>
<template slot-scope="scope">
<div>{{ scope.row.srcBarcode }}</div>
......@@ -543,7 +555,7 @@ export default {
},
data () {
return {
dataType: 1, // 导入类型
dataType: null, // 导入类型
barcode: "", // 条码号
logicDatabaseoptions: [
{
......@@ -629,8 +641,13 @@ export default {
// ...
console.log(newNum, 123);
this.search();
this.clear()
},
},
mounted () {
this.search();
},
methods: {
// 获取全部人员列表请求
search () {
......@@ -698,6 +715,15 @@ export default {
}
});
},
clear () {
this.taskNumber = ""; // 任务号
this.dataType = null; // 人员or案件
this.status = null; // 状态
this.barcode = ""; // 条码号
this.logicDatabase = "";// 逻辑分库
this.queryType = "";// 类型
this.search()
},
// 格式化参数
getParam () {
if (this.startEndDate !== null) {
......@@ -732,15 +758,19 @@ export default {
},
// 复制成功时的回调函数
onCopy (e) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
this.$message.error("抱歉，复制条码号失败！");
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 添加到队列
isShowTjddlBtn () {
......@@ -878,6 +908,16 @@ export default {
}
console.log(this.multipleSelection);
},
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
clickitemdataType (e) {
e === this.dataType ? this.dataType = '' : this.dataType = e
},
},
computed: {
/**
......@@ -886,6 +926,7 @@ export default {
* @return {*}
*/
Tpage1 () {
console.log(this.total1, this.pageSize, 1112223333)
return (
Math.floor(this.total1 / this.pageSize) + 1
);
......@@ -898,11 +939,16 @@ export default {
},
mounted () {
this.search();
console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1";
},
};
</script>
<style scoped lang="scss">
/deep/.el-table--scrollable-x .el-table__body-wrapper {
height: 500px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-12 20:42:26
* @LastEditTime: 2021-11-13 11:09:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,13 +91,13 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
target: "http://192.168.128.110:8099", // 湖南-张
// target: "http://192.168.128.110:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390/", // 湖南-线上
target: "http://www.meetfood.cn:2390/", // 湖南-线上
ws: 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