Skip to content

F
founder_vue
Commit e3f4ca8a by 张超军
Options

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

parents 83c3c09b f7a8b2fb
Showing with 298 additions and 63 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -605,7 +605,10 @@ export default {
// this.search();
},
// 人员信息卡操作
isShowRyxxkBtn () {
isShowRyxxkBtn (row) {
// console.log("row", row)
this.rowData = row
console.log("row", row)
this.isShowRyxxk = true;
},
closeRyxxk (val) {
......
src/views/AllPersonnelBase/modules/ryxxk.vue
......@@ -29,16 +29,16 @@
<div class='jbxxLeft'>
<div class='sjx l1'>
<span class="span1">人员编号：</span>
<span class="span2">R111111111111</span>
<span class="span2">{{ysryjbxx.ysxtAsjxgrybh}}</span>
<span class="span3">比中</span>
</div>
<div class='sjx l2'>
<span class="span1">姓名：</span>
<span class="span2">张三李四</span>
<span class="span2">{{ysryjbxx.xm}}</span>
</div>
<div class='sjx l3'>
<span class="span1">性别：</span>
<span class="span2">男</span>
<span class="span2">{{ysryjbxx.xbdm | xbdmFormat}}</span>
</div>
</div>
<div class='jbxxCenter'>
......@@ -53,7 +53,7 @@
</div>
<div class='sjxRight'>
<div>
<span>2</span>/次
<span>{{fcxInfo.queryCount?fcxInfo.queryCount:'暂无发查询记录'}}</span>/次
</div>
<div>
发查询历史次数
......@@ -71,7 +71,7 @@
</div>
<div class='sjxRight'>
<div>
<span>2021-02-21</span>
<span>{{fcxInfo.lastQueryTime?fcxInfo.lastQueryTime:'暂无发查询记录'}}</span>
</div>
<div>
最后一次发查询时间
......@@ -81,7 +81,18 @@
</div>
<div class='jbxxRight'>
<div class='sjlxImg'>
<img
v-if="fcxInfo.queryType==1"
src="../../../assets/img/xxk/TL.png"
alt=""
>
<img
v-if="fcxInfo.queryType==0"
src="../../../assets/img/xxk/TT.png"
alt=""
>
</div>
</div>
</div>
......@@ -113,11 +124,28 @@
</div>
<div class='zwDivBody'>
<div class='zw'>
<div class='zwImg'></div>
<div class='zwImg'>
<img src="" alt="">
<!-- <img
v-if="RollImg[0].image!=null"
:src="'data:image/jpeg;base64,' + RollImg[0].image"
alt=""
>
<img
src=""
alt=""
> -->
</div>
<div class='zwName'>右拇</div>
</div>
<div class='zw'>
<div class='zwImg'></div>
<div class='zwImg'>
<!-- <img
v-if="RollImg[1].image"
:src="'data:image/jpeg;base64,' + RollImg[1].image"
alt=""
> -->
</div>
<div class='zwName'>右食</div>
</div>
<div class='zw'>
......@@ -301,11 +329,23 @@ export default {
drawer: false, // 抽屉开关
direction: 'rtl', // 抽屉类型
radio1: 1, // 指纹，掌纹，人像
ysryjbxx: { // 人员基本信息(人员库获取)
ysxtAsjxgrybh: '', //人员编号
xm: "",// 姓名
xbdm: "",// 性别代码
id: '', // 人员id
},
fcxInfo: { // 发查询信息
lastQueryTime: '',
queryCount: '',
queryType: '',
},
RollImg: [], // 滚动
};
},
mounted () {
this.drawer = this.isShowRyxxk;
},
watch: {
isShowRyxxk (newVal, oldVal) {
......@@ -313,11 +353,49 @@ export default {
},
drawer (val) {
this.$emit('closeRyxxk', this.drawer);
},
rowData (val) {
// console.log(val, '人员信息')
this.ysryjbxx.ysxtAsjxgrybh = val.ysxtAsjxgrybh
this.ysryjbxx.xm = val.xm
this.ysryjbxx.xbdm = val.xbdm
this.ysryjbxx.id = val.id
this.getfileinfo()
this.getRollByBarcode()
}
},
methods: {
getRollByBarcode () { // 人员滚动压缩图
this.$axios
.post("/api/png/rollByBarcode/barcode", { 'barcode': this.ysryjbxx.ysxtAsjxgrybh })
.then((response) => {
if (response.data.code === 0) {
console.log(response.data)
this.RollImg = response.data.ret
} else {
this.$message.error(response.data.message);
}
});
},
getfileinfo () { // 获取发查询信息
this.$axios
.get("api/fileinfo/queryque/" + this.ysryjbxx.ysxtAsjxgrybh)
.then((response) => {
if (response.data.code === 0) {
console.log(response.data)
this.fcxInfo.lastQueryTime = response.data.ret.lastQueryTime
this.fcxInfo.queryCount = response.data.ret.queryCount
this.fcxInfo.queryType = response.data.ret.queryType
//console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
}
});
},
handleClose (done) {
console.log(1111111111111111)
// console.log(1111111111111111)
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
......@@ -330,6 +408,23 @@ export default {
closeDrawer () {
this.drawer = false
this.$emit('closeRyxxk', this.drawer);
},
},
filters: {
xbdmFormat: function (val) {
let showProp = null;
if (val == 0) {
showProp = "未知";
} else if (val == 1) {
showProp = "男";
} else if (val == 2) {
showProp = "女";
} else if (val == 9) {
showProp = "未说明";
} else {
showProp = "---";
}
return showProp;
}
}
};
......@@ -487,7 +582,8 @@ export default {
height: 110px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #00b88d;
// border: 1px solid #00b88d;
border: 1px solid #cccccc;
}
.zwName {
width: 110px;
......@@ -499,7 +595,8 @@ export default {
}
}
.cz {
height: 86px;
height: 55px;
// 86px UI
display: flex;
align-items: center;
justify-content: space-between;
......@@ -522,7 +619,7 @@ export default {
display: flex;
background: #f6f8fa;
.jbxxLeft {
width: 50%;
width: 60%;
height: 100%;
padding-top: 21px;
padding-left: 32px;
......@@ -563,7 +660,7 @@ export default {
}
}
.jbxxCenter {
width: 30%;
width: 28%;
height: 100%;
padding-top: 21px;
box-sizing: border-box;
......@@ -608,11 +705,20 @@ export default {
}
}
.jbxxRight {
width: 20%;
width: 12%;
height: 100%;
padding-top: 21px;
box-sizing: border-box;
background-color: #ccc;
// background-color: #ccc;
// display: flex;
// // justify-content: center;
// align-items: center;
.sjlxImg {
width: 45px;
height: 66px;
margin-top: 10px;
// background-color: #fff;
}
}
}
.ryxxkDrawer {
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -60,11 +60,11 @@
<el-col :span="12">
<el-form-item
label="案事件发生地点："
prop="asjfsddDzmc"
prop="asjfsddXzqhdm"
>
<Cascader
:form="ruleForm"
id="asjfsddDzmc"
id="asjfsddXzqhdm"
codeName="CODE_XZQH"
></Cascader>
</el-form-item>
......@@ -141,11 +141,11 @@
<div>案件逻辑分库</div>
</el-row>
<el-row class="flexBox">
<el-checkbox
<!-- <el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
>全选</el-checkbox> -->
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedTargets"
......@@ -303,6 +303,7 @@ export default {
checkedTargets: [], // 选定的目标逻辑库
targets: targetOptions, // 目标逻辑库
isIndeterminate: false, // 目标逻辑库不确定状态
logicDatabaseCode: [],// 逻辑库代码
ruleForm: {
ysxtAsjbh: "", // 案事件编号
xckybh: "", // 现场勘验编号
......@@ -321,6 +322,10 @@ export default {
zwbdxtlxms: "默认", //
tqdwGajgmc: "默认", //
barcode: "1",
// logicDatabaseCode: [],// 逻辑库代码
// logicDatabaseName: [],//逻辑库名称
},
rules: {
ysxtAsjbh: [
......@@ -329,7 +334,7 @@ export default {
xckybh: [
{ required: true, message: "请输入现场勘验编号", trigger: "blur" },
],
asjfsddDzmc: [
asjfsddXzqhdm: [
{ required: true, message: "请输入案事件发生地", trigger: "blur" },
],
sfmaPdbz: [
......@@ -377,25 +382,53 @@ export default {
submitForm (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let reqParam = {
caseBase: "",
};
reqParam.caseBase = this.ruleForm;
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("新增失败");
if (this.checkedTargets.length == 0) {
this.$message.error('请选择逻辑库')
} else {
for (var i = 0; i <= this.checkedTargets.length; i++) {
if (this.checkedTargets[i] == '本地案件库') {
this.logicDatabaseCode.push('1')
} else if (this.checkedTargets[i] == '比中案件库') {
this.logicDatabaseCode.push('2')
} else if (this.checkedTargets[i] == '已破案件库') {
this.logicDatabaseCode.push('3')
} else if (this.checkedTargets[i] == '重大案件库') {
this.logicDatabaseCode.push('4')
} else if (this.checkedTargets[i] == 'B类案件库') {
this.logicDatabaseCode.push('5')
} else if (this.checkedTargets[i] == 'C类案件库') {
this.logicDatabaseCode.push('6')
} else if (this.checkedTargets[i] == '勘查案件库') {
this.logicDatabaseCode.push('7')
} else if (this.checkedTargets[i] == '协查案件库') {
this.logicDatabaseCode.push('8')
}
});
}
let reqParam = {
caseBase: "",
logicList: [] // 逻辑库
};
reqParam.caseBase = this.ruleForm;
reqParam.caseBase.ysxtAsjbh = "A" + this.ruleForm.ysxtAsjbh;
reqParam.caseBase.xckybh = "K" + this.ruleForm.xckybh;
// reqParam.caseBase.logicDatabaseCode = this.logicDatabaseCode;
// reqParam.caseBase.logicDatabaseName = this.checkedTargets;
reqParam.logicList = this.logicDatabaseCode;
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("新增失败");
}
});
}
} else {
return false;
}
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -310,11 +310,11 @@
<div>人员逻辑分库</div>
</el-row>
<el-row class="flexBox">
<el-checkbox
<!-- <el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
>全选</el-checkbox> -->
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedTargets"
......@@ -465,6 +465,7 @@ export default {
checkedTargets: [], // 选定的目标逻辑库
targets: targetOptions, // 目标逻辑库
isIndeterminate: false, // 目标逻辑库不确定状态
logicDatabaseCode: [],// 逻辑库代码
ruleForm: {
ysxtAsjxgrybh: "", // 人员编号
jzrybh: "", // 警综人员编号
......@@ -486,6 +487,9 @@ export default {
xzzDzmc: "", // 现住址
bz: "", // 备注
// logicDatabaseCode: [],// 逻辑库代码
// logicDatabaseName: [],//逻辑库名称
nydwGajgmc: "", // 捺印单位
nyryXm: "", // 捺印人姓名
nysj: "", // 捺印时间
......@@ -584,24 +588,49 @@ export default {
}
},
submitForm (formName) {
console.log(this.checkedTargets)
this.$refs[formName].validate((valid) => {
if (valid) {
let reqParam = {
personDo: "",
};
reqParam.personDo = this.ruleForm;
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
this.$axios
.post("/api/personstore/personadd", reqParam)
.then((response) => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
if (this.checkedTargets.length == 0) {
this.$message.error('请选择逻辑库')
} else {
// for (var i = 0; i <= this.checkedTargets.length; i++) {
// if (this.checkedTargets[i] == '基本人员库') {
// this.logicDatabaseCode.push('1')
// } else if (this.checkedTargets[i] == '高危人员库') {
// this.logicDatabaseCode.push('2')
// } else if (this.checkedTargets[i] == '非法人员库') {
// this.logicDatabaseCode.push('3')
// } else if (this.checkedTargets[i] == '在逃人员库') {
// this.logicDatabaseCode.push('4')
// } else if (this.checkedTargets[i] == '布控人员库') {
// this.logicDatabaseCode.push('5')
// } else if (this.checkedTargets[i] == '前科人员库') {
// this.logicDatabaseCode.push('6')
// } else if (this.checkedTargets[i] == '协查人员库') {
// this.logicDatabaseCode.push('7')
// }
// }
// console.log(this.logicDatabaseCode)
let reqParam = {
personDo: "",
};
reqParam.personDo = this.ruleForm;
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
// reqParam.personDo.logicDatabaseCode = this.logicDatabaseCode
// reqParam.personDo.logicDatabaseName = this.checkedTargets
// this.$axios
// .post("/api/personstore/personadd", reqParam)
// .then((response) => {
// if (response.data.code === 0) {
// this.$message.success("新增成功");
// this.dialogVisible = false;
} else {
this.$message.error("新增失败");
}
});
// } else {
// this.$message.error("新增失败");
// }
// });
}
} else {
return false;
}
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -112,6 +112,7 @@
tooltip-effect="dark"
style="width: 100%;"
@selection-change="handleSelectionChange"
@row-click="isShowAjxxkBtn"
:class="{delSelection: !selectBoo}"
>
<el-table-column
......@@ -397,6 +398,12 @@
@closeXzaj="closeXzaj"
>
</xzaj>
<!-- 案件信息卡 -->
<ajxxk
:isShowAjxxk="isShowAjxxk"
:rowData="rowData"
@closeAjxxk="closeAjxxk"
> </ajxxk>
</div>
</el-container>
......@@ -411,6 +418,7 @@ import dcftpx from "./modules/dcftpx.vue" //导出FTPX弹窗
import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗
import xzaj from "./modules/xzaj.vue"// 新增案件
import ajxxk from "./modules/ajxxk.vue"// 案件信息卡
export default {
name: "qbalk",
components: {
......@@ -421,7 +429,8 @@ export default {
dcftpx,
ggrytm,
fcx,
xzaj
xzaj,
ajxxk
},
created () {
let w1 = 1920
......@@ -440,6 +449,7 @@ export default {
width2: 180,
width1: 220,
height: 550,
isShowAjxxk: false,// 案件信息卡
disabled: false, // 新增案件按钮状态
isShowTjddl: false,// 添加到队列
isShowGz: false,// 关注
......@@ -541,6 +551,17 @@ export default {
}
});
},
// 案件信息卡操作
isShowAjxxkBtn () {
this.isShowAjxxk = true;
},
closeAjxxk (val) {
//console.log("新增人员关闭", val);
// 增加毛玻璃
this.$bus.emit('isBlur', val)
this.isShowAjxxk = val;
// this.search();
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
......
src/views/drFPTX/Index.vue
......@@ -476,7 +476,10 @@ export default {
newArr: [],
logicList: [] // 目标逻辑库数组
logicList: [], // 目标逻辑库数组
logicPsnList: [],// 比中关系人员逻辑库数组
logicCaseList: [], //比中关系案件逻辑库数组
};
},
......@@ -721,7 +724,7 @@ export default {
this.$message.error('请选择逻辑分库')
} else {
if (this.drlx == 3) {
for (var i = 0; i < this.checkedTargets.length; i++) {
for (var i = 0; i <= this.checkedTargets.length; i++) {
if (this.checkedTargets[i] == '基本人员库') {
this.logicList.push('1')
} else if (this.checkedTargets[i] == '高危人员库') {
......@@ -739,7 +742,7 @@ export default {
}
}
} else if (this.drlx == 6) { // ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '', '协查案件库'];
for (var i = 0; i < this.checkedTargets.length; i++) {
for (var i = 0; i <= this.checkedTargets.length; i++) {
if (this.checkedTargets[i] == '本地案件库') {
this.logicList.push('1')
} else if (this.checkedTargets[i] == '比中案件库') {
......@@ -765,6 +768,42 @@ export default {
if (this.targetsLeft.length == 0 || this.targetsRight.length == 0) {
this.$message.error('请选择逻辑分库')
} else {
for (var i = 0; i <= this.checkedTargetsLeft.length; i++) {
if (this.checkedTargetsLeft[i] == '基本人员库') {
this.logicPsnList.push('1')
} else if (this.checkedTargetsLeft[i] == '高危人员库') {
this.logicPsnList.push('2')
} else if (this.checkedTargetsLeft[i] == '非法人员库') {
this.logicPsnList.push('3')
} else if (this.checkedTargetsLeft[i] == '在逃人员库') {
this.logicPsnList.push('4')
} else if (this.checkedTargetsLeft[i] == '布控人员库') {
this.logicPsnList.push('5')
} else if (this.checkedTargetsLeft[i] == '前科人员库') {
this.logicPsnList.push('6')
} else if (this.checkedTargetsLeft[i] == '协查人员库') {
this.logicPsnList.push('7')
}
}
for (var i = 0; i <= this.checkedTargetsRight.length; i++) {
if (this.checkedTargetsRight[i] == '本地案件库') {
this.logicCaseList.push('1')
} else if (this.checkedTargetsRight[i] == '比中案件库') {
this.logicCaseList.push('2')
} else if (this.checkedTargetsRight[i] == '已破案件库') {
this.logicCaseList.push('3')
} else if (this.checkedTargetsRight[i] == '重大案件库') {
this.logicCaseList.push('4')
} else if (this.checkedTargetsRight[i] == 'B类案件库') {
this.logicCaseList.push('5')
} else if (this.checkedTargetsRight[i] == 'C类案件库') {
this.logicCaseList.push('6')
} else if (this.checkedTargetsRight[i] == '勘查案件库') {
this.logicCaseList.push('7')
} else if (this.checkedTargetsRight[i] == '协查案件库') {
this.logicCaseList.push('8')
}
}
this.upload()
}
}
......@@ -788,8 +827,12 @@ export default {
formData.append('file', file.raw)
})
// 添加自定义参数，不传可删除
formData.append('logicList', this.logicList)
if (this.drlx == 3 || this.drlx == 6) {
formData.append('logicList', this.logicList)
} else if (this.drlx == 9) {
formData.append('logicPsnList', this.logicPsnList)
formData.append('logicCaseList', this.logicCaseList)
}
//console.log('formData', formData)
// //console.log('this.selectArr', this.selectArr)
// //console.log('this.nowSelectRightData', this.nowSelectRightData)
......
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