Skip to content

F
founder_vue
Commit 5a984921 by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents f42f6812 d7f6472a
Showing with 275 additions and 46 deletions
src/assets/css/globalBase.scss
......@@ -61,6 +61,10 @@
}
}
/deep/.el-table th > .cell {
font-family: HarmonyOS_Sans_SC_Medium;
}
/deep/.el-table .el-table__cell {
padding: 0 !important;
}
......@@ -82,6 +86,38 @@
}
}
// 批量操作
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
margin-bottom: 16px;
display: flex;
align-items: center;
}
/deep/.el-link--inner {
color: rgb(5, 95, 231);
}
.icon-tanhao1 {
display: flex;
justify-content: center;
align-items: center;
}
// 表格高度 -- 展示下面的border
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
}
// 复选框
/deep/.el-checkbox__inner {
cursor: pointer;
}
// 分页
/deep/.el-pager {
.number {
......
src/router/modules/leftMenu.js
......@@ -242,6 +242,18 @@ export default [
},
},
{
path: '/tjbb',
name: 'tjbb',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '统计报表',
auth: 'H'
},
component: () => import('@/views/tjbb/tjbb.vue')
},
{
path: '/SystemManage',
name: 'SystemManage',
icon_d: '/img/manage_d.png',
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -896,7 +896,8 @@ export default {
//console.log("导出FPTX");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
// this.selectBoo = true;
this.selectBoo = true;
this.isShowTip = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcftpx = true;
......@@ -921,6 +922,7 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
this.selectBoo = true
this.isShowTip = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
console.log(this.rowData, 1122333)
......@@ -939,6 +941,7 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.selectBoo = true;
this.isShowTip = true
} else {
if (this.showType == 1) {
this.type = "ry"
......@@ -963,6 +966,7 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！");
this.selectBoo = true;
this.isShowTip = true
return;
} else {
// this.$bus.emit('isBlur', true)
......@@ -1047,6 +1051,7 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
this.selectBoo = true;
this.isShowTip = true
} else {
if (this.showType == 1) {
this.type = "ry"
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -155,6 +155,9 @@
title="高级配置"
name="1"
>
<template slot="title">
高级配置 <div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
</template>
<el-form
:label-position='labelPosition'
align="left"
......@@ -383,6 +386,9 @@
title="高级配置"
name="1"
>
<template slot="title">
高级配置 <div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
</template>
<el-form
:label-position='labelPosition'
align="left"
......@@ -1157,6 +1163,16 @@ export default {
</script>
<style lang="scss" scoped>
.tip {
margin-left: 24px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 13px;
span {
font-size: 13px;
margin-right: 5px;
}
}
/deep/.el-form-item__error {
top: 24px;
}
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -186,6 +186,7 @@
<el-row class="title">
<div class="colorDiv"></div>
<div>案件逻辑分库</div>
<div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
</el-row>
<el-row class="flexBox">
<div style="margin: 15px 0"></div>
......@@ -558,6 +559,16 @@ export default {
margin-right: 10px;
margin-top: 5px;
}
.tip {
margin-left: 24px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 13px;
span {
font-size: 13px;
margin-right: 5px;
}
}
}
/deep/.el-button {
width: 142px;
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -308,6 +308,7 @@
<el-row class="title">
<div class="colorDiv"></div>
<div>人员逻辑分库</div>
<div class="tip"><span class="iconfont">&#xe649;</span>提示：当选择多个逻辑库时，工作流以最小ID逻辑库为准！</div>
</el-row>
<el-row class="flexBox">
<div style="margin: 15px 0"></div>
......@@ -741,6 +742,16 @@ export default {
margin-right: 10px;
margin-top: 5px;
}
.tip {
margin-left: 24px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 13px;
span {
font-size: 13px;
margin-right: 5px;
}
}
}
/deep/.el-button {
width: 72px;
......
src/views/Home.vue
......@@ -1348,5 +1348,15 @@ export default {
}
}
}
/deep/.el-menu-item {
span, img {
cursor: pointer;
}
}
/deep/.el-submenu__title {
span, img {
cursor: pointer;
}
}
@import "@/assets/css/globalBase.scss";
</style>
\ No newline at end of file
src/views/drFPTX/RAList.vue
......@@ -320,8 +320,6 @@
:underline="false"
:style="{
marginLeft: '1.25rem',
color: '#055FE7',
transform: 'translateY(-2px)',
}"
@click="toggleSelection()"
>清除</el-link>
......
src/views/tjbb/tjbb.vue 0 → 100644
<template>
<div class="tjbb">
<div class="head">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="100px"
>
<el-form-item label="查询模板：">
<el-select
v-model="queryParams.code"
placeholder="请选择参数2"
clearable
size="small"
>
<el-option
v-for="dict in codeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="采集时间：">
<el-date-picker
v-model="queryParams.value1"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item
label="采集单位："
prop="orgLevel"
>
<el-select
v-model="queryParams.code"
placeholder="请选择参数2"
clearable
size="small"
>
<el-option
v-for="dict in codeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label='采集方式：'>
<el-checkbox-group
v-model="queryParams.checkboxGroup1"
size="small"
>
<el-checkbox
label="1"
border
>捺印指掌纹</el-checkbox>
<el-checkbox
label="2"
border
>现场指掌纹</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item>
<el-checkbox v-model="queryParams.checked">上报全国指掌纹</el-checkbox>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>清空</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
export default {
name: "WarnModel",
data () {
return {
queryParams: {
value1: '',
code: '',
checkboxGroup1: ['1'],
checked: false
},
codeOptions: [
{
dictValue: 1,
dictLabel: 1,
dictValue: 1
}
]
}
}
};
</script>
<style lang="scss" scoped>
.tjbb {
width: 100%;
height: 100%;
padding: 24px;
.head {
background: #f6f8fa;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
padding: 24px;
box-sizing: border-box;
}
}
</style>
\ No newline at end of file
src/views/zljc/Index.vue
......@@ -114,15 +114,18 @@
<span v-html="'&nbsp;&nbsp;'"></span>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
<span
class="clearCheck"
<el-link
type="primary"
:underline="false"
:style="{
marginLeft: '1.25rem',
}"
@click="toggleSelection()"
>清空</span>
>清除</el-link>
</el-tag>
<el-table
......@@ -230,6 +233,12 @@
<div class='czBtn cg'>/</div>
</div>
<div
v-else-if="scope.row.inspectionFlag==3"
class='czBtn shBtn'
>
补采
</div>
<div
v-else
@click="goShenHe(scope.row)"
>
......
src/views/zzwlr/htcj.vue
......@@ -348,18 +348,18 @@ export default {
},
clear() {
//清空按钮
(this.liveCollectionTo.name = ""),
(this.liveCollectionTo.barcode = ""),
(this.liveCollectionTo.idCard = ""),
(this.liveCollectionTo.collectionName = ""),
// this.liveCollectionTo.collectionDw = '',
(this.ruleForm.sex = ""),
(this.ruleForm.collectionDw = ""),
// this.liveCollectionTo.sex= '',
(this.liveCollectionTo.printingTimeStart = "");
this.liveCollectionTo.printingTimeEnd = "";
this.startEndDate = "";
// this.search()
this.liveCollectionTo.name = ""
this.liveCollectionTo.barcode = ""
this.liveCollectionTo.idCard = ""
this.liveCollectionTo.collectionName = ""
// this.liveCollectionTo.collectionDw = ''
this.ruleForm.sex = ""
this.ruleForm.collectionDw = ""
// this.liveCollectionTo.sex= ''
this.liveCollectionTo.printingTimeStart = ""
this.liveCollectionTo.printingTimeEnd = ""
this.startEndDate = null
this.search()
},
batch() {
//批量操作弹出
......@@ -387,7 +387,7 @@ export default {
this.liveCollectionTo.sex = this.ruleForm.sex;
this.liveCollectionTo.collectionDw = this.ruleForm.collectionDw;
this.getParam();
delete this.liveCollectionTo.total;
// delete this.liveCollectionTo.total;
delete this.liveCollectionTo.completeness;
// console.log(this.liveCollectionTo);
this.$axios
......@@ -567,7 +567,7 @@ export default {
return this.$store.state.layout.Menu;
},
Tpage() {
return Math.round(
return Math.ceil(
this.liveCollectionTo.total / this.liveCollectionTo.pageSize
);
},
......
src/views/zzwlr/xzry.vue
......@@ -14,13 +14,13 @@
<span>人员信息 </span>
<div class="dashed"></div>
</div>
<div class="unactive">
<!-- <div class="unactive">
<div class="cir">2</div>
<span>人像采集</span>
<div class="solid"></div>
</div>
</div> -->
<div class="unactive">
<div class="cir">3</div>
<div class="cir">2</div>
<span>指掌纹采集</span>
</div>
</div>
......@@ -52,21 +52,10 @@
<!-- 三 -->
<el-row>
<el-col :span="12">
<el-form-item
label="采集信息原因："
prop="cjxxyydm"
>
<SelectCode
codeUrl="/api/code/cjxxyydm"
width="16.5"
:clearable="true"
:form="ruleForm"
id="cjxxyydm"
ref="cjxxyydm"
multiple
:multipleLimit="5"
></SelectCode>
</el-form-item>
<el-form-item label="采集信息原因：" prop="cjxxyydm">
<SelectCode codeUrl="/api/code/cjxxyydm" width="16.5" :clearable="true" :form="ruleForm" id="cjxxyydm"
ref="cjxxyydm" multiple :multipleLimit="5"></SelectCode>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指掌纹卡编号：">
......@@ -418,7 +407,6 @@
},
tijiao(e) {
let tjType = this.$route.params.type
console.log(tjType);
if (tjType === 'edit') {
this.editForm(e)
} else {
......@@ -428,7 +416,7 @@
editForm(formName) {
let self = this
// debugger
console.log(self.ruleForm);
// console.log(self.ruleForm);
// console.log(formName);
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -446,12 +434,12 @@
// this.ruleForm.cjxxyydm.forEach(item => {
// item = Number(item)
// })
// console.log(reqParam.cjxxyyList);
// delete this.ruleForm.cjxxyydm
reqParam.personDo = this.ruleForm;
reqParam.cjxxyyList = this.ruleForm.cjxxyydm;
// reqParam.personDo.ysxtAsjxgrybh = this.ruleForm.ysxtAsjxgrybh
// reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
reqParam.logicList = this.logicList
......@@ -459,12 +447,18 @@
this.$axios
.post("/api/personstore/person/file", reqParam)
.then(res => {
console.log(res.data);
// console.log(res.data);
if (res.data.code === 0) {
self.$message.success('修改成功！')
// 清除全部案件库缓存
self.$store.commit('layout/delcachePageName', 'htcj')
self.$router.push('/htcj')
this.$router.pushToTab({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: {
type: 0
}
})
} else {
self.$message.error('修改失败！')
}
......
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