Commit 47c507b5 by 李姝悦

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

parents 1259ed8e c79f4827
......@@ -375,7 +375,7 @@
<el-tooltip
class="item"
effect="dark"
content="删除"
content="取消关注"
placement="top"
:open-delay="500"
>
......
......@@ -6,6 +6,7 @@
ref="queryForm"
:inline="true"
class="queryForm"
label-width="100px"
>
<div class="headLeft">
<el-form-item label="查询单位:">
......
/*
* @Author: your name
* @Date: 2022-01-14 17:54:48
* @LastEditTime: 2022-01-14 18:40:52
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\tjbb\tjbb.js
*/
const cjxxmb = [
{
label: "采集时间:",
type: "date",
fomat: "yyyy-MM",
id: "sj",
placeholder: "选择日期",
},
{
label: "采集单位:",
type: "cascader",
id: "unitcode",
placeholder: "选择日期",
},
{
label: "采集方式:",
type: "select",
selectList: [
{
name: "捺印指纹",
value: "1",
},
{
name: "现场指纹",
value: "2",
},
],
id: "code",
}
]
const ajxxmb = [
{
label: "提取时间:",
type: "dateValue",
fomat: "yyyy-MM",
id: "tqsj",
placeholder: "选择日期",
},
{
label: "入库时间:",
type: "dateValue",
fomat: "yyyy-MM",
id: "rksj",
placeholder: "选择日期",
},
{
label: "采集单位:",
type: "cascader",
id: "unitcode",
placeholder: "选择日期",
},
{
label: "采集方式:",
type: "input",
id: "cjfs",
placeholder: "请输入采集方式",
},
{
label: "案事件编号:",
type: "input",
id: "asjbh",
placeholder: "请输入案事件编号",
},
{
label: "勘验编号:",
type: "input",
id: "kybh",
placeholder: "请输入勘验编号",
},
]
const dsbzmb = [
{
label: "起止时间:",
type: "dateValue",
fomat: "yyyy-MM",
id: "qzsj",
},
{
label: "查询类型:",
type: "select",
col: '10',
selectList: [
{
name: "捺印指纹",
value: "1",
},
{
name: "现场指纹",
value: "2",
},
],
id: "cxlx",
},
{
label: "源条码号:",
type: "input",
id: "ytmh",
placeholder: "请输入源条码号",
},
{
label: "目标条码号:",
type: "input",
id: "mbtmh",
placeholder: "请输入目标条码号",
},
{
label: "认定单位:",
type: "cascader",
id: "rddw",
},
]
export {
cjxxmb,
ajxxmb,
dsbzmb
}
\ No newline at end of file
<template>
<div class="tjbb">
<div class="searchHeader">
<span>查询模版:</span>
<el-select
v-model="tpl"
placeholder="请选择模板"
size="small"
@change="onChange"
>
<el-option
v-for="dict in codeOptions"
:key="dict.value"
:label="dict.name"
:value="dict.value"
/>
</el-select>
</div>
<div class="head">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="100px"
label-width="120px"
>
<el-form-item label="查询模板:">
<el-form-item
:label="item.label"
v-for="item in formTemplate"
:key="item.id"
:class="['col' + item.col]"
>
<el-date-picker
v-if="item.type == 'date'"
:format="item.fomat"
:value-format="item.fomat"
v-model="queryParams[item.id]"
type="date"
:placeholder="item.placeholder"
>
</el-date-picker>
<el-date-picker
v-else-if="item.type == 'dateValue'"
:format="item.fomat"
:value-format="item.fomat"
v-model="queryParams[item.id]"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
type="daterange"
>
</el-date-picker>
<Cascader
:form="queryParams"
:id="item.id"
width="18.125"
v-else-if="item.type == 'cascader'"
></Cascader>
<el-input
v-model="queryParams[item.id]"
:placeholder="item.placeholder"
v-else-if="item.type == 'input'"
></el-input>
<el-select
v-model="queryParams.code"
placeholder="请选择模板"
v-else-if="item.type == 'select'"
v-model="queryParams[item.id]"
:placeholder="item.placeholder"
clearable
size="small"
>
<el-option
v-for="dict in codeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
v-for="dict in item.selectList"
:key="dict.value"
:label="dict.name"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="采集时间:">
<el-date-picker
format="yyyy-MM"
value-format="yyyy-MM"
v-model="queryParams.sj"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="采集单位:" prop="orgLevel">
<Cascader :form="queryParams" id="unitcode" width="11.25"></Cascader>
</el-form-item>
<el-form-item label="采集方式:" class="widthAuto">
<el-checkbox-group v-model="queryParams.type" 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 class="widthAuto">
<el-checkbox v-model="checked">上报全国指掌纹</el-checkbox>
</el-form-item>
<el-form-item class="right widthAuto">
<el-button type="primary" size="mini" @click="clearData"
>清空</el-button
>
<el-button type="primary" size="mini" @click="handleQuery"
>查询</el-button
>
</el-form-item>
</el-form>
<el-button type="primary" size="mini" @click="handleQuery"
>查询</el-button
>
</div>
<div class="btns">
<div></div>
<div class="label">
<span>采集信息统计模版</span>
</div>
<div class="btnBox">
<div>可视化切换</div>
<div>导出excel</div>
<div>打印</div>
<div>导出</div>
</div>
</div>
<div class="content">
......@@ -77,6 +106,7 @@
</template>
<script>
import Cascader from "@/components/Cascader.vue";
import { cjxxmb, ajxxmb, dsbzmb } from "./tjbb";
export default {
name: "WarnModel",
components: {
......@@ -92,17 +122,36 @@ export default {
checked: false,
codeOptions: [
{
dictValue: 1,
dictLabel: 1,
dictValue: 1,
name: "采集信息统计模版",
value: "1",
},
{
name: "案件信息统计模版",
value: "2",
},
{
name: "地市比中明细复核统计模版",
value: "3",
},
],
//筛选条件模板
formTemplate: cjxxmb,
tpl: "1",
fr_cpt_url:
" http://192.168.128.119:8075/webroot/decision/view/report?viewlet=test.cpt&op=h5&status=1&unitcode=%27540000000000%27&sj=%272022-01%27#/report",
};
},
methods: {
clearData() {},
onChange(val) {
if (val == 1) {
this.formTemplate = cjxxmb;
} else if (val == 2) {
this.formTemplate = ajxxmb;
} else if (val == 3) {
this.formTemplate = dsbzmb;
}
console.log(val);
},
handleQuery() {
console.log(this.params, this.checked);
},
......@@ -129,6 +178,27 @@ export default {
};
</script>
<style lang="scss" scoped>
@mixin labelStyle {
font-size: 16px;
font-family: HarmonyOS_Sans_SC_Medium;
color: #333333;
padding-left: 10px;
position: relative;
margin-left: 10px;
&::before {
content: "";
display: inline-block;
position: absolute;
left: 0;
top: 50%;
transform: translateY(-50%);
width: 4px;
height: 16px;
background: #055fe7;
border-radius: 2px;
}
}
.tjbb {
width: 100%;
height: 100%;
......@@ -139,6 +209,20 @@ export default {
border-radius: 10px;
padding: 24px;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
.el-form {
width: 1300px;
}
.el-button {
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
border: none;
align-self: flex-end;
}
}
.content {
width: 100%;
......@@ -146,7 +230,7 @@ export default {
}
}
.widthAuto /deep/ .el-form-item__content {
width: auto;
width: auto !important;
}
.right {
float: right;
......@@ -162,15 +246,6 @@ export default {
height: 32px;
width: 72px;
border: none;
&:first-of-type {
width: auto;
cursor: pointer;
margin-right: 10px;
background-color: transparent;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #055fe7;
}
}
}
.btns {
......@@ -178,18 +253,32 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
.label {
@include labelStyle();
}
.btnBox {
display: flex;
justify-content: flex-start;
align-items: center;
> div {
cursor: pointer;
margin-left: 15px;
&:first-of-type {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #055fe7;
}
&:nth-of-type(2) {
width: 72px;
height: 32px;
border: 1px solid #aeb5c2;
border-radius: 4px;
color: #2e3846;
font-family: HarmonyOS_Sans_SC;
font-size: 14px;
text-align: center;
line-height: 32px;
margin: 0 20px;
}
&:last-of-type {
border: 1px solid #055fe7;
border-radius: 4px;
......@@ -204,30 +293,99 @@ export default {
}
}
}
.searchHeader {
margin-bottom: 20px;
.el-select {
width: 290px !important;
/deep/ .el-input__inner {
&::-webkit-input-placeholder {
color: #055fe7;
}
border: 1px solid #055fe7;
color: #055fe7;
}
/deep/ .el-select__caret {
color: #055fe7;
}
}
> span {
@include labelStyle();
}
}
/deep/ {
.col10 {
margin-right: 290px !important;
}
.el-form-item {
height: 32px;
margin: 5px 0;
}
.el-form-item__label {
color: #333333;
height: 32px;
line-height: 32px;
}
.el-input__icon {
line-height: 32px;
}
.el-form-item__content {
width: 180px;
> .el-input {
width: 100%;
width: 290px !important;
height: 32px;
line-height: 32px;
align-items: center;
.el-select {
width: 100% !important;
.el-input__inner {
height: 32px;
}
.el-input__suffix {
line-height: 32px;
}
}
.el-input {
width: 100% !important;
.el-input__inner {
height: 32px;
}
}
.el-tooltip {
height: 32px;
}
.el-cascader {
height: 40px;
height: 32px;
line-height: 32px;
.el-input {
height: 32px;
}
.el-input__inner {
height: 32px;
}
}
.el-range__close-icon {
height: 32px;
}
.el-range-editor {
.el-range-input {
width: calc(44% - 25px);
}
}
.el-date-editor {
height: 40px;
height: 32px;
width: 100% !important;
.el-range-separator {
width: 30px;
}
.el-range-input {
height: 32px;
}
.el-input__inner {
box-sizing: border-box;
height: 32px;
padding-right: 60px;
}
.el-input__prefix {
left: 150px;
left: unset;
right: 10px;
}
.el-input__suffix {
right: 30px;
......
......@@ -51,7 +51,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.rollImg==1?'btnhg btnhgPlus':'btnhg']"
@click="zsgd1(index)"
......@@ -87,7 +87,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.plainImg==1?'btnhg btnhgPlus':'btnhg']"
@click="zspm1(index)"
......@@ -132,7 +132,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.rollImg==1?'btnhg btnhgPlus':'btnhg']"
@click="ysgd1(index)"
......@@ -168,7 +168,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.plainImg==1?'btnhg btnhgPlus':'btnhg']"
@click="yspm1(index)"
......@@ -198,6 +198,9 @@ export default {
radio1: {
default: false
},
rowClick: {
default: false
}
},
created () {
console.log(this.nyzwData, '跳转参数人员信息')
......@@ -539,6 +542,7 @@ export default {
},
// 左手滚动
zsgd1 (val) {
if(this.rowClick) return;
console.log(val)
if (val == 0) {
this.arrLeft[val].roll1Status = 1
......@@ -556,6 +560,7 @@ export default {
console.log(this.arrLeft, '左手滚动')
},
zsgd0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrLeft[val].roll1Status = 0
} else if (val == 1) {
......@@ -573,6 +578,7 @@ export default {
},
// 左手平面
zspm1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrLeft[val].plain1Status = 1
} else if (val == 1) {
......@@ -589,6 +595,7 @@ export default {
console.log(this.arrLeft, '左手平面')
},
zspm0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrLeft[val].plain1Status = 0
} else if (val == 1) {
......@@ -606,6 +613,7 @@ export default {
},
// 右手滚动
ysgd1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrRight[val].roll6Status = 1
} else if (val == 1) {
......@@ -621,6 +629,7 @@ export default {
this.ystjjg()
},
ysgd0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrRight[val].roll6Status = 0
} else if (val == 1) {
......@@ -637,6 +646,7 @@ export default {
},
// 右手平面,
yspm1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrRight[val].plain6Status = 1
} else if (val == 1) {
......@@ -652,6 +662,7 @@ export default {
this.ystjjg()
},
yspm0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arrRight[val].plain6Status = 0
} else if (val == 1) {
......@@ -955,4 +966,10 @@ export default {
}
}
}
.noClick{
cursor: not-allowed;
div {
cursor: not-allowed;
}
}
</style>
\ No newline at end of file
......@@ -52,7 +52,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.leftImg==1?'btnhg btnhgPlus':'btnhg']"
@click="rxLeft1(index)"
......@@ -90,7 +90,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.rightImg==1?'btnhg btnhgPlus':'btnhg']"
@click="rxRight1(index)"
......@@ -116,6 +116,9 @@ export default {
rowData: {
default: false
},
rowClick: {
default: false
}
},
created () {
console.log(this.rowData, '跳转参数人员信息')
......@@ -204,6 +207,7 @@ export default {
},
// 人像左边
rxLeft1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].face1Status = 1
} else if (val == 1) {
......@@ -213,6 +217,7 @@ export default {
this.rxtjjg()
},
rxLeft0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].face1Status = 0
} else if (val == 1) {
......@@ -223,6 +228,7 @@ export default {
},
// 人像右边
rxRight1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].face2Status = 1
} else if (val == 1) {
......@@ -232,6 +238,7 @@ export default {
this.rxtjjg()
},
rxRight0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].face2Status = 0
} else if (val == 1) {
......@@ -611,4 +618,10 @@ export default {
}
}
}
.noClick{
cursor: not-allowed;
div {
cursor: not-allowed;
}
}
</style>
\ No newline at end of file
......@@ -50,7 +50,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.leftImg==1?'btnhg btnhgPlus':'btnhg']"
@click="zwLeft1(index)"
......@@ -86,7 +86,7 @@
>
</div>
</div>
<div class='btns'>
<div class='btns' :class="{ noClick: rowClick }">
<div
:class="[item.rightImg==1?'btnhg btnhgPlus':'btnhg']"
@click="zwRight1(index)"
......@@ -112,6 +112,9 @@ export default {
rowData: {
default: false
},
rowClick: {
default: false
}
},
created () {
console.log(this.rowData, '跳转参数人员信息')
......@@ -229,6 +232,7 @@ export default {
},
// 掌纹左边
zwLeft1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].palm1Status = 1
} else if (val == 1) {
......@@ -238,6 +242,7 @@ export default {
this.zwtjjg()
},
zwLeft0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].palm1Status = 0
} else if (val == 1) {
......@@ -248,6 +253,7 @@ export default {
},
// 掌纹右边
zwRight1 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].palm2Status = 1
} else if (val == 1) {
......@@ -257,6 +263,7 @@ export default {
this.zwtjjg()
},
zwRight0 (val) {
if(this.rowClick) return;
if (val == 0) {
this.arr[val].palm2Status = 0
} else if (val == 1) {
......@@ -564,4 +571,10 @@ export default {
}
}
}
.noClick{
cursor: not-allowed;
div {
cursor: not-allowed;
}
}
</style>
\ No newline at end of file
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