Skip to content

F
founder_vue
Commit 7c3ad644 by 米嘉伟
Options

进度条 UI调整

parent 2acfecdf
Showing with 334 additions and 95 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -11,9 +11,15 @@
clear="search-input"
placeholder="请输入条码，*支持模糊搜索"
v-model="reqParam.personStoreCustomSearch.barcode"
@keyup.enter.native="search"
maxlength="23"
show-word-limit
></el-input>
>
</el-input>
<i
class="el-icon-error"
v-if="reqParam.personStoreCustomSearch.barcode.length>0"
@click='empty'
></i>
<div
class="search-icon el-icon-search"
@click="search"
......@@ -59,7 +65,7 @@
<div
class="btn"
@click="isShowDcftpxBtn"
>导出FTPX</div>
>导出FPTX</div>
<div
class="btn"
@click="isShowGzBtn"
......@@ -118,6 +124,7 @@
>
</el-table-column>
<el-table-column
:formatter="idNumberFormat"
prop="idnumber"
label="身份证号"
width="180"
......@@ -172,6 +179,7 @@
prop="collectunitname"
label="捺印单位"
width="180"
:formatter="collectunitnameFormat"
>
</el-table-column>
......@@ -343,7 +351,7 @@
:type="type"
@closeGz="closeGz"
></gz>
<!-- 导出FTPX弹窗 -->
<!-- 导出FPTX弹窗 -->
<dcftpx
:isShowDcftpx="isShowDcftpx"
:rowData="rowData"
......@@ -380,7 +388,7 @@ import moment from "moment";
import tjddl from "./modules/tjddl.vue" // 添加到队列弹窗
import gz from "./modules/gz.vue" // 关注
import fztm from "./modules/fztm.vue" // 复制数据弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FTPX弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FPTX弹窗
import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗
export default {
......@@ -398,7 +406,7 @@ export default {
isSelected: false,// 是否批量操作
isShowTjddl: false,// 添加到队列
isShowGz: false,// 关注
isShowDcftpx: false, // 导出FTPX
isShowDcftpx: false, // 导出FPTX
isShowGgrytm: false,// 更改人员条码
isShowFztm: false, //复制条码
isShowFcx: false, //发查询
......@@ -455,11 +463,27 @@ export default {
}
});
},
// 清空输入框
empty () {
this.reqParam.personStoreCustomSearch.barcode = ''
this.search()
},
// 身份证格式化
idNumberFormat (row) {
let showProp = null
row.idnumber ? showProp = row.idnumber : showProp = '---'
return showProp
},
//捺印单位格式化
collectunitnameFormat (row) {
let showProp = null
row.collectunitname ? showProp = row.collectunitname : showProp = '---'
return showProp
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
},
// 性别格式化
sexFormat (row, colnum) {
......@@ -473,6 +497,8 @@ export default {
showProp = '女'
} else if (sex == 9) {
showProp = '未说明的性别'
} else {
showProp = '---'
}
return showProp;
},
......@@ -538,9 +564,9 @@ export default {
console.log('添加到队列关闭', val)
this.isShowTjddl = val
},
// 导出FTPX
// 导出FPTX
isShowDcftpxBtn () { // 多行
console.log('导出FTPX')
console.log('导出FPTX')
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
} else {
......@@ -556,7 +582,7 @@ export default {
this.isShowDcftpx = true;
},
closeDcftpx (val) {
console.log('导出FTPX关闭', val)
console.log('导出FPTX关闭', val)
this.isShowDcftpx = val
},
// 关注
......@@ -789,6 +815,13 @@ export default {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.el-icon-error {
position: absolute;
left: 300px;
width: 14px;
height: 14px;
color: rgba(177, 182, 194, 0.8);
}
.search-icon {
border: 1px solid #006aff;
width: 40px;
......@@ -881,18 +914,16 @@ export default {
.right {
display: flex;
.send {
border: none;
background: #055fe7;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377fec;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
&:active {
background: #044cb9;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
}
}
......@@ -949,6 +980,9 @@ export default {
// margin-right: 120px;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
}
/deep/.el-popover {
padding: 15px 20px !important;
}
......
src/views/AllPersonnelBase/modules/dcftpx.vue
<template>
<el-dialog
title="导出FTPX"
title="导出FPTX"
:visible.sync="dialogVisible"
width="875px"
append-to-body
......@@ -246,7 +246,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="保存路径：">
<el-input></el-input>
<el-input placeholder="请选择保存路径"></el-input>
<el-button type="text">浏览</el-button>
</el-form-item>
<el-form-item label="条码补值：">
......@@ -265,11 +265,15 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="focus">确 定</el-button>
<!-- <el-button @click="focus">确 定</el-button>
<el-button
@click="dialogVisible = false"
type="primary"
>取 消</el-button>
>取 消</el-button> -->
<el-button
@click="focus"
type="primary"
>导出</el-button>
</span>
</el-dialog>
......@@ -349,12 +353,13 @@ export default {
// });
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -19,15 +19,6 @@
</div>
<div class="right">
<div class="rightTop">
<!-- <div
class='bgc_A0E7DB'
:style="{width: bgc_A0E7DB + '%', height:'100%',background:'#A0E7DB'}"
>
<div
class='bgc_02C89A'
:style="{width: bgc_02C89A + '%', height:'100%',background:'#02C89A'}"
></div>
</div> -->
<div
class='box'
:style="{width: 100 + '%'}"
......@@ -36,8 +27,13 @@
>
<div class="borderLeft"></div>
<div class="colorDiv">
<div :class='[item <= 29 ? item<=28?"color_02C89A": "color_a0e7db":""]'>
<div :class='[item < Math.floor(byzs/10)+1 ? item< Math.floor(syts/10)+1? item < Math.floor((syts-bcxh)/10)+1? "color_02C89A":"color_half":"color_a0e7db":""]'>
</div>
<!--
color_half 一半
color_02C89A 深
color_a0e7db 浅
-->
</div>
<div class="borderRight"></div>
</div>
......@@ -101,7 +97,10 @@
<el-radio-group v-model="ruleForm.destPsnDataType">
<el-radio label="1">滚动指纹</el-radio>
<el-radio label="2">平面指纹</el-radio>
<el-radio label="3">掌纹</el-radio>
<el-radio
label="3"
v-if="radio"
>掌纹</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
......@@ -435,12 +434,11 @@ export default {
},
data () {
return {
bgc_A0E7DB: 99,
bgc_02C89A: 99,
radio: 'true',
byzsArr: '', // 本月总数(5个等级数组)
byzs: '300',// 该类型下本月总数
byzs: '1000',// 该类型下本月总数
sytsArr: '',// 剩余条数
syts: '300', //该类型下剩余条数
syts: '1000', //该类型下剩余条数
color: 'color_a0e7db', // 进度条颜色
bcxh: '1', //本次消耗
checkAll_mbljk: false, // 目标逻辑库全选
......@@ -498,7 +496,7 @@ export default {
cxtype: ["无图像，不发送查询", "已比中，不发送查询"],
querytype: '', // 查询类型
},
destPsnDataType: '',// 目标数据类型
destPsnDataType: '1',// 目标数据类型
queryClass: '3', // 优先级
matchCount: '10',// 候选个数
},
......@@ -531,14 +529,154 @@ export default {
if (newVal == true) {
this.searchZTS()
this.searchsytsArr()
this.getHpseqno()
this.bcxh = this.rowData.length;
}
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
this.$emit('closeFcx', this.dialogVisible);
},
'ruleForm.cxlx.querytype' (val) {
if (val == 0) {
this.radio = false;
} else {
this.radio = true;
}
},
"ruleForm.queryClass" (val) {
console.log('优先级', val);
console.log('youxianji', this.sytsArr)
if (this.ruleForm.cxlx.querytype == 0) {
if (val == 1) {
this.byzs = this.byzsArr[0].level1
this.syts = this.sytsArr[0].level1
} else if (val == 2) {
this.byzs = this.byzsArr[0].level2
this.syts = this.sytsArr[0].level2
} else if (val == 3) {
this.byzs = this.byzsArr[0].level3
this.syts = this.sytsArr[0].level3
} else if (val == 4) {
this.byzs = this.byzsArr[0].level4
this.syts = this.sytsArr[0].level4
} else if (val == 5) {
this.byzs = this.byzsArr[0].level5
this.syts = this.sytsArr[0].level5
}
} else if (this.ruleForm.cxlx.querytype == 1) {
if (val == 1) {
this.byzs = this.byzsArr[1].level1
this.syts = this.sytsArr[1].level1
} else if (val == 2) {
this.byzs = this.byzsArr[1].level2
this.syts = this.sytsArr[1].level2
} else if (val == 3) {
this.byzs = this.byzsArr[1].level3
this.syts = this.sytsArr[1].level3
} else if (val == 4) {
this.byzs = this.byzsArr[1].level4
this.syts = this.sytsArr[1].level4
} else if (val == 5) {
this.byzs = this.byzsArr[1].level5
this.syts = this.sytsArr[1].level5
}
} else if (this.ruleForm.cxlx.querytype == 2) {
if (val == 1) {
this.byzs = this.byzsArr[2].level1
this.syts = this.sytsArr[2].level1
} else if (val == 2) {
this.byzs = this.byzsArr[2].level2
this.syts = this.sytsArr[2].level2
} else if (val == 3) {
this.byzs = this.byzsArr[2].level3
this.syts = this.sytsArr[2].level3
} else if (val == 4) {
this.byzs = this.byzsArr[2].level4
this.syts = this.sytsArr[2].level4
} else if (val == 5) {
this.byzs = this.byzsArr[2].level5
this.syts = this.sytsArr[2].level5
}
} else if (this.ruleForm.cxlx.querytype == 3) {
if (val == 1) {
this.byzs = this.byzsArr[3].level1
this.syts = this.sytsArr[3].level1
} else if (val == 2) {
this.byzs = this.byzsArr[3].level2
this.syts = this.sytsArr[3].level2
} else if (val == 3) {
this.byzs = this.byzsArr[3].level3
this.syts = this.sytsArr[3].level3
} else if (val == 4) {
this.byzs = this.byzsArr[3].level4
this.syts = this.sytsArr[3].level4
} else if (val == 5) {
this.byzs = this.byzsArr[3].level5
this.syts = this.sytsArr[3].level5
}
} else if (this.ruleForm.cxlx.querytype == 4) {
if (val == 1) {
this.byzs = this.byzsArr[4].level1
this.syts = this.sytsArr[4].level1
} else if (val == 2) {
this.byzs = this.byzsArr[4].level2
this.syts = this.sytsArr[4].level2
} else if (val == 3) {
this.byzs = this.byzsArr[4].level3
this.syts = this.sytsArr[4].level3
} else if (val == 4) {
this.byzs = this.byzsArr[4].level4
this.syts = this.sytsArr[4].level4
} else if (val == 5) {
this.byzs = this.byzsArr[4].level5
this.syts = this.sytsArr[4].level5
}
} else if (this.ruleForm.cxlx.querytype == 5) {
if (val == 1) {
this.byzs = this.byzsArr[5].level1
this.syts = this.sytsArr[5].level1
} else if (val == 2) {
this.byzs = this.byzsArr[5].level2
this.syts = this.sytsArr[5].level2
} else if (val == 3) {
this.byzs = this.byzsArr[5].level3
this.syts = this.sytsArr[5].level3
} else if (val == 4) {
this.byzs = this.byzsArr[5].level4
this.syts = this.sytsArr[5].level4
} else if (val == 5) {
this.byzs = this.byzsArr[5].level5
this.syts = this.sytsArr[5].level5
}
}
}
},
methods: {
// 发查询指位信息
getHpseqno () {
let reqParam = {
barcodes: '', // 条码号
};
let barcodeArr = []
for (let i = 0; i < this.rowData.length; i++) {
barcodeArr.push(this.rowData[i].barcode)
}
reqParam.barcodes = barcodeArr
this.$axios
.post("/api/casestore/getHpseqno", reqParam)
.then(response => {
if (response.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
// console.info("案件库返回列表===>", this.tableDate);
console.info("指位返回列表===>", response.data.ret.list);
} else {
this.$message.error(response.data.message);
}
});
},
// 动态添加条码段(定向查询)
addDxcx () {
if (this.dxcx.domains.length > 0) {
......@@ -604,8 +742,6 @@ export default {
this.isIndeterminate_mbljk = false;
},
handleCheckedTargetsChange_aj (value, key) {
console.log(2222222222, value, key)
console.log('选定目标逻辑库', this.checkedTargets)
let checkedCount = value.length;
this.checkAll_mbljk = checkedCount === this.targets_aj.length;
this.isIndeterminate_mbljk = checkedCount > 0 && checkedCount < this.targets_aj.length;
......@@ -624,17 +760,16 @@ export default {
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
},
//发查询
search () {
console.log('hahahahahhahaha', this.rowData.length)
console.log('11111111111', this.rowData[0])
let reqUrl = '';
if (this.type == 'ry') {
reqUrl = '/api/query'
......@@ -730,7 +865,10 @@ export default {
.then(response => {
if (response.data.code === 0) {
// console.info("发查询条数返回列表===>", this.byzsArr);
alert('成功')
this.$message({
dangerouslyUseHTMLString: true,
message: '<strong>这是 <i>HTML</i> 片段</strong>'
});
} else {
this.$message.error(response.data.message);
}
......@@ -743,7 +881,7 @@ export default {
.get("/api/querylimit/select", { params: { userId: 1234 } })
.then(response => {
if (response.data.code === 0) {
this.byzsArr = response.data.ret[0]
this.byzsArr = response.data.ret
// console.info("发查询条数返回列表===>", this.byzsArr);
// this.colorDiv()
} else {
......@@ -758,7 +896,7 @@ export default {
.get("/api/querylimit/surplus", { params: { account: 22 } })
.then(response => {
if (response.data.code === 0) {
this.sytsArr = response.data.ret[0]
this.sytsArr = response.data.ret
console.info("发查询剩余条数返回列表===>", this.sytsArr);
} else {
this.$message.error(response.data.message);
......@@ -851,7 +989,6 @@ export default {
box-shadow: 0px 1px 3px 0px rgba(5, 95, 231, 0.3);
border-radius: 4px;
display: flex;
// justify-content: space-between;
padding: 6px 5px;
box-sizing: border-box;
.box {
......@@ -866,14 +1003,32 @@ export default {
width: 80%;
height: 12px;
background-color: #eeeeee;
div {
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.1);
border-radius: 2px;
}
.color_a0e7db {
background-color: #a0e7db;
height: 12px;
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.2);
}
.color_02C89A {
background-color: #02c89a;
height: 12px;
box-shadow: 0px 1px 2px 0px rgba(255, 255, 255, 0.85);
border-radius: 2px;
}
.color_half {
height: 12px;
box-shadow: 0px 1px 2px 0px rgba(255, 255, 255, 0.85);
border-radius: 2px;
background: linear-gradient(
to right,
#02c89a 0%,
#02c89a 50%,
#a0e7db 50%,
#a0e7db 100%
);
}
}
.borderRight {
......@@ -887,7 +1042,7 @@ export default {
display: flex;
margin-top: 10px;
.msg1 {
flex: 1;
flex: 2;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #666666;
......@@ -907,7 +1062,7 @@ export default {
}
}
.msg2 {
flex: 2;
flex: 3;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #666666;
......@@ -928,7 +1083,7 @@ export default {
}
}
.msg3 {
flex: 1;
flex: 2;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #666666;
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -125,12 +125,13 @@ export default {
});
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -147,29 +147,46 @@ export default {
focus () {
let reqUrl = '';
if (this.type == 'ry') {
reqUrl = "/api/mypsn/add"
let newReqParams = { // 请求参数
pid: '',// 关注ID
barcode: '',//条码号
myPerson: {
comments: '',//备注
pid: '',// 关注ID
barcode: '',//条码号
// reqUrl = "/api/mypsn/add"
// let newReqParams = { // 请求参数
// pid: '',// 关注ID
// barcode: '',//条码号
// myPerson: {
// comments: '',//备注
// pid: '',// 关注ID
// barcode: '',//条码号
// }
// };
// let barCode = [];
// let myPerson = [];
// for (let i = 0; i < this.rowData.length; i++) {
// myPerson.push(this.rowData[i].pid);
// barCode.push(this.rowData[i].barcode);
// }
// newReqParams.pid = myPerson[0];
// newReqParams.myPerson.pid = myPerson;
// newReqParams.barcode = barCode[0];
// newReqParams.myPerson.barcode = barCode;
// newReqParams.myPerson.comments = this.comments;
// this.reqParam = newReqParams
// console.log('关注人员ID', myPerson);
reqUrl = '/api/mypsn/mypsnAdd'
let newReqParams = {
personDoList: [],
comments: ''
}
};
let barCode = [];
let myPerson = [];
newReqParams.comments = this.comments;
for (let i = 0; i < this.rowData.length; i++) {
myPerson.push(this.rowData[i].pid);
barCode.push(this.rowData[i].barcode);
let personDo = {
barcode: '',
pid: ''
}
newReqParams.pid = myPerson[0];
newReqParams.myPerson.pid = myPerson;
newReqParams.barcode = barCode[0];
newReqParams.myPerson.barcode = barCode;
newReqParams.myPerson.comments = this.comments;
personDo.barcode = this.rowData[i].barcode
personDo.pid = this.rowData[i].pid
newReqParams.personDoList.push(personDo)
}
console.log('关注人员ID', newReqParams);
this.reqParam = newReqParams
console.log('关注人员ID', myPerson);
} else if (this.type == 'aj') {
reqUrl = "/api/mycase/add"
let newReqParams = {
......@@ -245,12 +262,13 @@ export default {
return showProp;
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -213,12 +213,13 @@ export default {
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -11,9 +11,14 @@
clear="search-input"
placeholder="请输入条码，*支持模糊搜索"
v-model="reqParam.caseStoreCustomSearchReq.barcode"
@keyup.enter.native="search"
maxlength="23"
show-word-limit
></el-input>
<i
class="el-icon-error"
v-if="reqParam.caseStoreCustomSearchReq.barcode.length>0"
@click='empty'
></i>
<div
class="search-icon el-icon-search"
@click="search"
......@@ -109,6 +114,7 @@
prop="caseTypeNames"
label="案件类型"
width="220"
:formatter="caseTypeNamesFormat"
>
</el-table-column>
<el-table-column
......@@ -402,6 +408,11 @@ export default {
}
});
},
// 清空输入框
empty () {
this.reqParam.caseStoreCustomSearchReq.barcode = ''
this.search()
},
// 多选删除
delMore () {
// 检查table选择的数据 如果没有选择则不可以删除
......@@ -458,6 +469,12 @@ export default {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
},
// 案件类型格式化
caseTypeNamesFormat (row) {
let showProp = null
row.caseTypeNames ? showProp = row.caseTypeNames : showProp = '---'
return showProp
},
// 是否命案 格式化
killFlagFormat (row, colnum) {
let prop = colnum.property;
......@@ -708,6 +725,13 @@ const datas1 = [
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.el-icon-error {
position: absolute;
left: 300px;
width: 14px;
height: 14px;
color: rgba(177, 182, 194, 0.8);
}
.search-icon {
border: 1px solid #006aff;
width: 40px;
......@@ -800,18 +824,16 @@ const datas1 = [
.right {
display: flex;
.send {
border: none;
background: #055fe7;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377fec;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
&:active {
background: #044cb9;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
}
}
......@@ -868,6 +890,9 @@ const datas1 = [
// margin-right: 120px;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
}
/deep/.el-popover {
padding: 15px 20px !important;
}
......
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