Skip to content

F
founder_vue
Commit 5849a3f7 by li_hongchao
Options

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

parents 8931e2c2 8add86eb
Showing with 129 additions and 70 deletions
src/views/AllPersonnelBase/gzlb.vue
......@@ -1023,7 +1023,7 @@ export default {
//console.log('案件案件')
}
console.log('添加到队列', this.rowData)
// this.isShowTjddl = true;
this.isShowTjddl = true;
}
}
},
......
src/views/AllPersonnelBase/modules/ajxxk.vue
......@@ -247,7 +247,8 @@ export default {
CasePlamNum: null, // 掌纹图像个数
bs: 0
bs: 0,
Palmcount: 0
};
},
mounted () {
......@@ -257,16 +258,20 @@ export default {
isShowAjxxk (newVal, oldVal) {
this.drawer = newVal;
},
drawer (val) {
this.$emit("closeAjxxk", this.drawer);
},
rowData (val) {
this.ysajjbxx.ysxtAsjbh = val.ysxtAsjbh;
this.ysajjbxx.xckybh = val.xckybh;
this.ysajjbxx.id = val.id;
if (this.drawer == true) {
console.log('打开信息卡')
// debugger
// if (this.drawer == true) {
// console.log('打开信息卡')
// this.getfileinfo();
// this.getCaseBybarcode();
// }
},
drawer (val) {
this.$emit("closeAjxxk", this.drawer);
if(val && this.ysajjbxx.ysxtAsjbh) {
this.getfileinfo();
this.getCaseBybarcode();
}
......@@ -291,7 +296,8 @@ export default {
getCasePalmBybarcode () {
// 案件掌纹原图
let self = this;
if(self.Palmcount > 0) return;
self.Palmcount++
NetUtil.ajxxk.getCasePalmBybarcode({ barcode: this.ysajjbxx.ysxtAsjbh },).then(response => {
if (response.code == 0) { //请求成功 代码为0
self.CasePlamNum = response.ret.length;
......@@ -461,6 +467,7 @@ export default {
this.radio1 = 1;
this.bs = 0
fHttp.cancel()
this.Palmcount = 0
},
closeDrawer () {
this.drawer = false;
......@@ -474,6 +481,7 @@ export default {
this.radio1 = 1;
this.bs = 0
fHttp.cancel()
this.Palmcount = 0
}
}
};
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -298,6 +298,33 @@ export default {
targtOptions.push(arr[i].hpseqno)
}
//console.info("指位返回列表===>", arr);
this.getPalmHpseqno()
} else {
this.$message.error(response.data.message);
this.getPalmHpseqno()
}
});
},
// 案件发查询掌位信息
getPalmHpseqno () {
let reqParam = {
ysxtAsjbhs: '', // 条码号
};
let barcodeArr = []
for (let i = 0; i < this.rowData.length; i++) {
barcodeArr.push(this.rowData[i].ysxtAsjbh || this.rowData[i].barcode)
}
reqParam.ysxtAsjbhs = barcodeArr
this.$axios
.post("/api/casestore/getPalmHpseqno", reqParam)
.then(response => {
if (response.data.code === 0) {
// this.palmNum = response.data.ret.length// 单条掌纹个数
let arr = response.data.ret
for (let i = 0; i < arr.length; i++) {
targtOptions.push(arr[i].hpseqno)
}
console.log("掌位位返回列表===>", arr);
} else {
this.$message.error(response.data.message);
}
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -498,7 +498,7 @@
</el-collapse>
</div>
</div>
<el-divider/>
<el-divider />
<span
slot="footer"
......@@ -652,7 +652,7 @@ export default {
// fingerprintCount 案件指纹个数 palmCount 案件掌纹个数
if (this.rowData.length == 1) {
this.getHpseqno() // 现场指位
this.getPalmHpseqno() // 现场掌位
} else if (this.rowData.length > 1) {
this.getCaseCount()// 多条现场指位个数
......@@ -1124,8 +1124,10 @@ export default {
this.isIndeterminate = true
}
console.info("指位返回列表===>", arr);
this.getPalmHpseqno() // 现场掌位
} else {
this.$message.error(response.data.message);
this.getPalmHpseqno() // 现场掌位
}
});
},
......@@ -1188,12 +1190,11 @@ export default {
</script>
<style lang="scss" scoped>
.fix-height {
.fix-height {
/*min-height: 430px;*/
max-height: 690px;
overflow: scroll;
}
}
.tip {
margin-left: 24px;
......@@ -1225,7 +1226,7 @@ export default {
transform: translate(-50%, -54%);
}
/deep/.el-dialog__body{
/deep/.el-dialog__body {
padding: 1.875rem 0rem;
}
......@@ -1522,7 +1523,7 @@ export default {
padding-left: 10px;
margin-left: 16px;
}
.qx-cb{
.qx-cb {
float: right;
}
.el-checkbox {
......@@ -1606,7 +1607,7 @@ export default {
padding-bottom: 14px;
/deep/.el-checkbox {
margin-right: 30px;
height:30px;
height: 30px;
}
/deep/.el-form-item__content {
display: flex;
......@@ -1665,18 +1666,16 @@ export default {
color: #333333;
}
// 滚动条的宽度
/deep/ .fix-height::-webkit-scrollbar {
// 滚动条的宽度
/deep/ .fix-height::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
display:none;
}
display: none;
}
// 滚动条的滑块
/deep/ .fix-height::-webkit-scrollbar-thumb {
// 滚动条的滑块
/deep/ .fix-height::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
}
</style>
src/views/AllPersonnelBase/modules/ryxxk.vue
......@@ -459,6 +459,8 @@ export default {
PlainImgfingerLoading: true, // 平面加载
PlamLoading: true, // 掌纹加载
FaceLoading: true, // 人像加载
PalmCount: 0,
FaceCount: 0
};
},
mounted () { },
......@@ -469,9 +471,6 @@ export default {
isShowRyxxk (newVal, oldVal) {
this.drawer = newVal;
},
drawer (val) {
this.$emit("closeRyxxk", this.drawer);
},
rowData (val) {
// console.log(val, '人员信息')
this.ysryjbxx.ysxtAsjxgrybh = val.ysxtAsjxgrybh;
......@@ -479,7 +478,15 @@ export default {
this.ysryjbxx.xbdm = val.xbdm;
this.ysryjbxx.id = val.id;
if (this.drawer == true) {
// if (this.drawer == true) {
// this.getfileinfo();
// this.getRollByBarcode();
// this.getPlainByBarcode();
// }
},
drawer (val) {
this.$emit("closeRyxxk", this.drawer);
if(val && this.ysryjbxx.ysxtAsjxgrybh) {
this.getfileinfo();
this.getRollByBarcode();
this.getPlainByBarcode();
......@@ -487,10 +494,10 @@ export default {
},
radio1 (val) {
if (val == 2) {
this.PalmImgNum = 0;
// this.PalmImgNum = 0;
this.getPalmByBarcode();
} else if (val == 3) {
this.FaceImgNum = 0;
// this.FaceImgNum = 0;
this.getFaceByBarcode();
}
},
......@@ -499,6 +506,9 @@ export default {
getFaceByBarcode () {
// 获取人像
let self = this;
if(self.FaceCount > 0) return;
self.FaceCount++
this.FaceImgNum = 0;
this.$axios
.post(
"/api/org/face/barcode",
......@@ -530,6 +540,9 @@ export default {
getPalmByBarcode () {
// 获取掌纹
let self = this;
if(self.PalmCount > 0) return;
self.PalmCount++
this.PalmImgNum = 0;
this.$axios
.post(
"/api/png/palm/barcode",
......@@ -650,6 +663,10 @@ export default {
// })
// .catch(_ => { });
this.FaceImgNum = 0;
this.PalmImgNum = 0;
this.PalmCount = 0
this.FaceCount = 0
this.drawer = false;
this.$emit("closeRyxxk", this.drawer);
this.RollImgfingerLoading = true;
......@@ -701,6 +718,10 @@ export default {
];
},
closeDrawer () {
this.FaceImgNum = 0;
this.PalmImgNum = 0;
this.PalmCount = 0
this.FaceCount = 0
this.drawer = false;
this.$emit("closeRyxxk", this.drawer);
this.RollImgfingerLoading = true;
......@@ -891,7 +912,7 @@ export default {
display: flex;
justify-content: center;
img {
height: 300px;
height: 298px;
}
.noImg {
img {
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -552,10 +552,10 @@ export default {
.post('/api/casestore/allcase', this.reqParam)
.then(response => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.caseBases
this.reqParam.page.total = response.data.ret.total
this.size = response.data.ret.size
console.info('案件库返回列表===>', this.tableDate)
this.tableDate = response.data.ret.caseBases;
this.reqParam.page.total = response.data.ret.total;
this.size = response.data.ret.pages
console.info("案件库返回列表===>", this.tableDate);
} else {
this.$message.error(response.data.message)
}
......@@ -587,9 +587,8 @@ export default {
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id)
}
this.doDelete(ids.toString())
})
.catch(_ => {
this.doDelete(ids.toString());
this.multipleSelection = []
})
}
},
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-02-14 15:02:30
* @LastEditTime: 2022-02-18 10:02:55
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -318,7 +318,7 @@ export default {
self.FingersChange(1, self.fingers[0])
}
} else {
self.$message.error(res.data.message)
// self.$message.error(res.data.message)
}
}).catch(err => {
console.log(err);
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-02-17 16:48:04
* @LastEditTime: 2022-02-18 10:09:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -5205,6 +5205,8 @@ export default {
} else {
if (Number(this.tjxh) < 101) {
this.tjxh = 101
} else if(Number(this.tjxh) > 999) {
this.tjxh = 999
}
if (this.handsNumber.indexOf(Number(this.tjxh)) != -1) {
this.$message.error('掌纹序号重复！')
......@@ -8901,7 +8903,7 @@ export default {
this.is_tjxh_legal = true
}
} else {
if(newValue < 101) {
if(newValue < 101 || newValue > 999) {
this.$message.warning('推荐序号超出限制！')
this.is_tjxh_legal = false
} else {
......
src/views/tjbb/tjbb.vue
......@@ -98,7 +98,7 @@
<div class='cz'>
<el-button
v-if="tpl==1"
v-show="queryParams.sj!=null||queryParams.unitcode!=''||queryParams.code!=[]"
v-show="queryParams.sj!=null||queryParams.unitcode!=''||queryParams.code!=''"
type="text"
class='qk'
@click="onChange(1,1)"
......@@ -203,12 +203,12 @@
<div
@click="exportReport('pdf')"
class="ejan"
>当前页</div>
>导出当前页</div>
<div
@click="exportReport('pdf',total)"
v-show="tpl!=1"
class="ejan"
>全部页</div>
>导出全部页</div>
<el-button
slot="reference"
class="yjan"
......@@ -234,12 +234,12 @@
<div
@click="exportReport('excel')"
class="ejan"
>当前页</div>
>导出当前页</div>
<div
@click="exportReport('excel',total)"
v-show="tpl!=1"
class="ejan"
>全部页</div>
>导出全部页</div>
<el-button
slot="reference"
class="yjan"
......@@ -265,12 +265,12 @@
<div
@click="exportReport('word')"
class="ejan"
>当前页</div>
>导出当前页</div>
<div
@click="exportReport('word',total)"
v-show="tpl!=1"
class="ejan"
>全部页</div>
>导出全部页</div>
<el-button
slot="reference"
class="yjan"
......@@ -343,7 +343,7 @@ export default {
queryParams: {
sj: null,
unitcode: "",
code: [],
code: '',
},
checked: false,
codeOptions: [
......@@ -529,7 +529,7 @@ export default {
} else if (this.tpl == 2) {
this.hqaj()
// 案件信息统计模板
let url2 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=aj.cpt`
let url2 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=count%252Faj.cpt`
console.log(this.queryParams, 'this.queryParamsthis.queryParamsthis.queryParams')
if (this.queryParams.asjbh) {
......@@ -562,7 +562,7 @@ export default {
} else if (this.tpl == 3) {
this.hqbz()
// 城市比中明细复核统计
let url3 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=lt.cpt&`
let url3 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=count%252Flt.cpt&`
// http://localhost:8075/webroot/decision/view/report?viewlet=lt.cpt&srcbarcode=%27%27&destbarcode=%27%27#/report&op=read
if (this.queryParams.cxlx) {
......@@ -604,7 +604,7 @@ export default {
this.queryParams = {
sj: null,
unitcode: "",
code: [],
code: '',
}
document.getElementsByTagName('body')[0].style.setProperty('--height', '37.5rem');
} else if (val == 2) {
......@@ -632,11 +632,12 @@ export default {
document.getElementsByTagName('body')[0].style.setProperty('--height', '33.125rem');
}
console.log(val);
this.$forceUpdate()
if (type = 0) {
this.rz()
}
this.handleQuery()
console.log(this.queryParams, 'queryParamsqueryParamsqueryParams')
},
handleQuery (page = 1) {
this.currPage = page
......@@ -670,10 +671,12 @@ export default {
url1 += `#/report`
this.fr_cpt_url = url1;
$('td').css('font-size', '16px')
} else if (this.tpl == 2) {
this.hqaj()
// 案件信息统计模板
let url2 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=aj.cpt`
let url2 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=count%252Faj.cpt`
console.log(this.queryParams, 'this.queryParamsthis.queryParamsthis.queryParams')
if (this.queryParams.asjbh) {
......@@ -703,8 +706,7 @@ export default {
} else if (this.tpl == 3) {
this.hqbz()
// 城市比中明细复核统计
let url3 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=lt.cpt&`
// http://localhost:8075/webroot/decision/view/report?viewlet=lt.cpt&srcbarcode=%27%27&destbarcode=%27%27#/report&op=read
let url3 = `${process.env.VUE_APP_BB_IP}webroot/decision/view/report?viewlet=count%252Flt.cpt&`
if (this.queryParams.cxlx) {
url3 += `&querytype=${this.queryParams.cxlx}`
......@@ -889,16 +891,17 @@ $height: var(--height, 37.5rem);
border: none;
}
}
.el-popover {
//min-width: 20px !important;
}
.ejan {
width: 48px;
width: 120px;
text-align: center;
height: 32px;
line-height: 32px;
font-family: HarmonyOS_Sans_SC;
color: #333;
font-size: 14px;
&:hover {
color: #377fec;
}
}
.tjbb {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-17 17:06:05
* @LastEditTime: 2022-02-18 09:47:56
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -75,7 +75,7 @@ module.exports = {
.use("sass-resources-loader")
.loader("sass-resources-loader")
.options({
resources: "./src/assets/styles/main.scss"
resources: "./src../assets/styles/main.scss"
})
.end();
});
......@@ -113,13 +113,13 @@ module.exports = {
// target: "http://192.168.128.110:8099/", // 张 认定
// target: "http://192.168.128.112:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.109:8099", // 湖南-张呈光
// target: "http://192.168.128.109: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://zwpt.xzclub.top:9333/",
target: "http://192.168.128.105:8099", // 江
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.105:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -129,9 +129,9 @@ module.exports = {
"/security": {
// target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.109:8765/", // 张 认定
// target: "http://192.168.128.109:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765",
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