Skip to content

F
founder_vue
Commit 0afe8c62 by 米嘉伟
Options

接口调整

parent 3cb17c57
Showing with 180 additions and 32 deletions
src/assets/img/qbryk/fz.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>ic_自定义测试备份</title>
<desc>Created with Sketch.</desc>
<defs>
<rect id="path-1" x="0" y="0" width="16" height="16"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="FPTX导入任务-比中关系" transform="translate(-1753.000000, -534.000000)">
<g id="ic_自定义测试备份" transform="translate(1752.000000, 533.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="矩形" fill="#055FE7" opacity="0" xlink:href="#path-1"></use>
<path d="M13,3 L13,15 L1,15 L1,3 L13,3 Z M12,4 L2,4 L2,14 L12,14 L12,4 Z M15,1 L15,13 L14,13 L14,2 L3,2 L3,1 L15,1 Z" id="形状结合" fill="#055FE7" fill-rule="nonzero" mask="url(#mask-2)"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/qbryk/rgrd.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="15px" viewBox="0 0 14 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>wancheng</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="FPTX导入任务-比中关系" transform="translate(-1816.000000, -534.000000)" fill="#055FE7" fill-rule="nonzero">
<g id="编组-3" transform="translate(1723.000000, 533.000000)">
<g id="wancheng" transform="translate(93.000000, 1.000000)">
<path d="M7.19235688,6.55969381 C8.71381699,6.55969381 9.95864799,5.33485472 9.95864799,3.83782916 C9.95864799,2.3408036 8.71381699,1.11596451 7.19235688,1.11596451 C5.67089677,1.11596451 4.42606577,2.3408036 4.42606577,3.83782916 C4.42606577,5.33485472 5.64323386,6.55969381 7.19235688,6.55969381 Z M10.1522884,13.6637605 L13.0292311,10.2886484 C13.2228715,10.0708992 13.5824893,10.0164619 13.8037926,10.2342111 C14.0250959,10.4519603 14.0804217,10.778584 13.8591184,10.9963332 L10.6778837,14.7525064 L10.6502208,14.7797251 C10.6502208,14.7797251 10.6502208,14.8069437 10.6225579,14.8069437 C10.4289175,15.0246929 10.0692996,15.0791302 9.84799634,14.861381 L8.16055877,13.47323 C7.93925548,13.2826995 7.88392966,12.9288571 8.10523294,12.7111079 C8.32653623,12.4933587 8.65849117,12.4389215 8.87979445,12.6566706 L10.1522884,13.6637605 L10.1522884,13.6637605 Z M11.9227147,8.02950072 C12.0610292,8.13837531 12.1716809,8.30168719 12.1716809,8.46499907 C12.1716809,8.76440418 11.9227147,9.009372 11.6184227,9.009372 C11.4801081,9.009372 11.3694565,8.9549347 11.2588048,8.87327876 C10.2906029,8.08393801 9.07343483,7.62122102 7.7456151,7.62122102 L6.63909866,7.62122102 C3.59617844,7.62122102 1.10651644,10.0708992 1.10651644,13.0649503 C1.10651644,13.3643554 1.35548264,13.6093233 1.65977466,13.6093233 L6.08584044,13.6093233 C6.39013246,13.6093233 6.63909866,13.8542911 6.63909866,14.1536962 C6.63909866,14.4531013 6.39013246,14.6980691 6.08584044,14.6980691 L1.65977466,14.6980691 C0.746898599,14.6980691 0,13.9631657 0,13.0649503 C0,10.0981179 2.01939251,7.59400238 4.78568362,6.80466163 C3.90047046,6.09697682 3.31954933,5.0354496 3.31954933,3.81061051 C3.31954933,1.71477473 5.06231273,0 7.19235688,0 C9.32240103,0 11.0651644,1.71477473 11.0651644,3.81061051 C11.0651644,5.00823096 10.4842433,6.09697682 9.59903014,6.80466163 C10.4565804,7.07684809 11.2311419,7.48512779 11.9227147,8.02950072 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -539,8 +539,8 @@ export default {
// 单击行抽屉
handle (row, event, column) {
console.log(row, event, column)
this.drawer = true
this.$bus.emit('isBlur', true)
// this.drawer = true
// this.$bus.emit('isBlur', true)
},
handleClose (done) {
this.$confirm('确认关闭？')
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -223,6 +223,7 @@
label="性别"
width="200"
show-overflow-tooltip
:formatter="xbdmFormat"
>
</el-table-column>
<el-table-column
......@@ -297,10 +298,7 @@
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<div class="icon bz">
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
......@@ -453,10 +451,7 @@
placement="top"
:open-delay="500"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<div class="icon bz">
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
......@@ -647,10 +642,6 @@ export default {
isShowDcftpx: false, // 导出FPTX
isShowDcfptx1: false,// 导出FPTX
isSelected: false, // 是否批量操作
isShowTjddl: false, // 添加到队列
isShowFztm: false, //复制条码
......@@ -919,6 +910,13 @@ export default {
this.$message.error("请选择需要发查询的数据！");
this.isSelected = true;
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = this.multipleSelection;
this.isShowFcx = true;
}
......@@ -927,6 +925,13 @@ export default {
console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
}
this.rowData = rowVal;
this.isShowFcx = true;
},
......@@ -935,6 +940,23 @@ export default {
this.isShowFcx = val;
this.search();
},
// 性别格式化
xbdmFormat (row, colnum) {
let xbdm = row.followPerson.sex;
let showProp = null;
if (xbdm == 0) {
showProp = "未知";
} else if (xbdm == 1) {
showProp = "男";
} else if (xbdm == 2) {
showProp = "女";
} else if (xbdm == 9) {
showProp = "未说明";
} else {
showProp = "---";
}
return showProp;
},
/**
* @description: 是否是批量操作
* @param {*}
......@@ -1062,6 +1084,76 @@ export default {
},
};
</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--scrollable-x .el-table__body-wrapper {
height: 500px;
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -709,7 +709,7 @@ export default {
};
let barcodeArr = []
for (let i = 0; i < this.rowData.length; i++) {
barcodeArr.push(this.rowData[i].ysxtAsjbh)
barcodeArr.push(this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode)
}
reqParam.ysxtAsjbhs = barcodeArr
this.$axios
......@@ -906,8 +906,8 @@ export default {
barcode: '', // 条码号
selectedSeqnos: null // 指位(选择)(页面获取)
}; //发查询源数据
SrcQueryData.id = this.rowData[i].id
SrcQueryData.barcode = this.rowData[i].ysxtAsjxgrybh
SrcQueryData.id = this.rowData[i].id || this.rowData[i].followPerson.id
SrcQueryData.barcode = this.rowData[i].ysxtAsjxgrybh || this.rowData[i].barcode || this.rowData[i].followPerson.barcode
SrcQueryData.selectedSeqnos = selectedSeqnos;
queryRequest.srcQueryDataList.push(SrcQueryData)
}
......@@ -969,8 +969,8 @@ export default {
barcode: '', // 条码号
selectedSeqnos: '' // 现场指纹序号
}; //发查询源数据
SrcQueryData.id = this.rowData[i].id
SrcQueryData.barcode = this.rowData[i].ysxtAsjbh
SrcQueryData.id = this.rowData[i].id || this.rowData[i].followCase.id
SrcQueryData.barcode = this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode
if (this.rowData.length == 1) {
SrcQueryData.selectedSeqnos = this.checkedCities
} else {
......@@ -994,15 +994,19 @@ export default {
let failInfo = response.data.ret.failInfo
this.$message({
dangerouslyUseHTMLString: true,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div><div style='color:red'>${failInfo}</div> `,
message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div> `, // <div style='color:red'>${failInfo}</div>
type: 'success'
});
cityOptions = []
this.dialogVisible = false;
this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => {
this.$router.push('/cxyrd')
}, 20);
if (successBarcode.length > 0) {
cityOptions = []
this.dialogVisible = false;
this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => {
this.$router.push('/cxyrd')
}, 20);
} else {
}
} else {
this.$message.error(response.data.message);
}
......
src/views/drFPTX/RAList.vue
......@@ -198,8 +198,8 @@
class="btn"
@click="isShowTjddlBtn"
>添加到队列</div>
<div class="btn">复制入库失败编号</div>
<div class="btn">复制入库成功编号</div>
<!-- <div class="btn">复制入库失败编号</div>
<div class="btn">复制入库成功编号</div> -->
<div
class="btn"
v-clipboard:copy="copyNum"
......@@ -533,16 +533,17 @@
<el-tooltip
class="item"
effect="dark"
content="复制数据"
content="复制"
placement="top"
:open-delay="500"
@click="handleClick(scope.row)"
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
src="../../assets/img/qbryk/fz.svg"
alt=""
/>
</div>
......@@ -564,6 +565,20 @@
/>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="人工认定"
placement="top"
:open-delay="500"
>
<div class="icon look">
<img
src="../../assets/img/qbryk/rgrd.svg"
alt=""
/>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
......
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