Skip to content

F
founder_vue
Commit 6a500648 by li_hongchao
Options

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

parents 37bac73d 94a83975
Showing with 134 additions and 38 deletions
.env.production
VUE_APP_AUTO_WRITE = pro
VUE_APP_BB_IP = http://192.168.128.101:8075/
\ No newline at end of file
VUE_APP_BB_IP = http://zwpt.xzclub.top:8075/
\ No newline at end of file
src/views/cxyrd/QueryConfirm.vue
......@@ -25,11 +25,13 @@
class="el_select"
v-model="reqParam.contrastCustomSearchReq.userid"
@change="selectUserInfo"
clearable
@clear="clearUser"
>
<el-option
v-for="(item, index) in userOption"
:key="index"
:label="item.userdesc"
:label="item.userid"
:value="item.userid"
>
</el-option>
......@@ -749,7 +751,7 @@ export default {
this.list = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
this.size = response.data.ret.pages
//console.info("查询结果===>", this.list);
// console.info("查询结果===>", this.list);
// this.userInfo = this.getUserInfo(this.list);
} else {
// 请求成功无返回值
......@@ -801,6 +803,7 @@ export default {
});
}
});
console.log(userInfo);
// this.userOption = this.unique(userInfo);
// //console.info("用户信息==>", this.userOption);
},
......@@ -1316,7 +1319,7 @@ const setQueryClass = [
}
/deep/.el-pager {
.number {
background-color: transparent;
background-color: transparent !important;
}
.number.active {
background-color: #055fe7 !important;
......@@ -1418,6 +1421,44 @@ const setQueryClass = [
color: #333333;
}
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
}
div {
margin: 0;
padding: 0;
......
src/views/tjbb/tjbb.vue
......@@ -86,14 +86,17 @@
</div>
<div class="btns">
<div class="label">
<span>采集信息统计模版</span>
<span v-if="tpl==1">采集信息统计模版</span>
<span v-else-if="tpl==2">案件信息统计模板</span>
<span v-else-if="tpl==3">城市比中明细复核统计模板</span>
</div>
<div
class="btnBox"
v-if="tpl==1"
>
<div @click='ksh'>可视化切换</div>
<div>打印</div>
<div @click='doFRPrint'>打印</div>
<!-- <div @click="send('_g().writeReport()')">打印</div> -->
<div>导出</div>
</div>
</div>
......@@ -131,7 +134,7 @@ export default {
queryParams: {
sj: '',
unitcode: "",
type: [],
code: [],
},
checked: false,
codeOptions: [
......@@ -151,14 +154,31 @@ export default {
//筛选条件模板
formTemplate: cjxxmb,
tpl: "1",
fr_cpt_url:
`${process.env.VUE_APP_BB_IP}/webroot/decision/view/report?viewlet=count%252Fcj.cpt&status=1&unitcode=%27540000000000%27&sj=%272022-01%27#/report`,
fr_cpt_url: ``,
};
},
mounted () {
this.handleQuery()
},
methods: {
doFRPrint () { //点击打印按钮时触发
// document.getElementById('reportFrame').contentWindow.contentPane.pdfPrint()
document.getElementById('reportFrame').contentWindow.postMessage('_g().exportReportToPDF()', '*')
console.log(111111111111111111111111)
// document.getElementById('reportFrame').contentWindow._g().exportReportToPDF()
//flash打印：.contentWindow.contentPane.flashPrint();
//applet打印：.contentWindow.contentPane.appletPrint();
//服务器端打印：.contentWindow.contentPane.printReportServer();
},
onChange (val) {
if (val == 1) {
this.formTemplate = cjxxmb;
this.queryParams = {
sj: '',
unitcode: "",
code: [],
}
} else if (val == 2) {
this.formTemplate = ajxxmb;
this.queryParams = {
......@@ -173,13 +193,14 @@ export default {
this.formTemplate = dsbzmb;
this.queryParams = {
qzsj: "",
cxlx: "",
cxlx: "1",
ytmh: '',
mbtmh: '',
rddw: '',
}
}
console.log(val);
this.rz()
this.handleQuery()
console.log(this.queryParams, 'queryParamsqueryParamsqueryParams')
},
......@@ -202,9 +223,17 @@ export default {
var month = now.getMonth(); //得到月份
var defaultDate = `${year}-${month}`;
url1 += `&sj=%27${defaultDate}%27`
this.queryParams.sj = defaultDate
// this.queryParams.sj = defaultDate
}
if (this.queryParams.code) {
url1 += `&type=${this.queryParams.code}`
} else {
url1 += `&type=0`
}
url1 += `#/report`
this.fr_cpt_url = url1;
} else if (this.tpl == 2) {
// 案件信息统计模板
......@@ -213,6 +242,8 @@ export default {
if (this.queryParams.asjbh) {
url2 += `&asjbh=%27${this.queryParams.asjbh}%27`
} else {
url2 += `&asjbh=%27%27`
}
if (this.queryParams.tqsj) {
......@@ -230,6 +261,8 @@ export default {
if (this.queryParams.kybh) {
url2 += `&xckybh=%27${this.queryParams.kybh}%27`
}
url2 += `&page=1&limit=10`
this.fr_cpt_url = url2;
} else if (this.tpl == 3) {
// 城市比中明细复核统计
......@@ -268,11 +301,27 @@ export default {
this.status == 1 ? this.status = 2 : this.status = 1
this.handleQuery()
},
rz () {
let reqParams = ''
if (this.tpl == 1) {
reqParams = '采集信息统计模板'
} else if (this.tpl == 2) {
reqParams = '案件信息统计模板'
} else if (this.tpl == 3) {
reqParams = '城市比中信息复核统计模板'
}
this.$axios
.get('/api/count/count/' + reqParams)
.then(res => {
}).catch(err => {
})
}
},
computed: {
params () {
let obj = {};
for (let key in this.queryParams) {
console.log(key);
if (key == "type") {
if (!this.queryParams[key] || this.queryParams[key].length == 0) {
obj[key] = "0";
......@@ -339,7 +388,7 @@ export default {
}
.content {
width: 100%;
height: 100%;
height: 530px;
}
}
.widthAuto /deep/ .el-form-item__content {
......
src/views/zzwlr/htcj.vue
......@@ -197,6 +197,8 @@
total: 0, //表格条数
size: 0,
completeness: "",
// 新加 --- 逻辑库
personLogicIds: ljkUtil.getRyLjkIds().personLogicIds
},
// page: {
// pageSize: 10, //当前选择要显示的条数
......
src/views/zzwlr/xzry.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-01-19 17:02:55
* @LastEditTime: 2022-02-08 10:44:40
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
......@@ -296,7 +296,7 @@
{ required: true, message: "请输入掌指纹卡编号", trigger: "blur" },
],
cjxxyydm: [
{ required: true, message: "请选择采集信息原因", trigger: "blur" },
{ required: true, message: "请选择采集信息原因", trigger: "change" },
],
xm: [
......@@ -308,7 +308,7 @@
trigger: "blur"
},
],
xbdm: [{ required: true, message: "请选择性别", trigger: "blur" }],
xbdm: [{ required: true, message: "请选择性别", trigger: "change" }],
csrq: [
{
required: true,
......@@ -316,10 +316,10 @@
trigger: "change",
},
],
gjdm: [{ required: true, message: "请选择国籍", trigger: "blur" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "blur" }],
gjdm: [{ required: true, message: "请选择国籍", trigger: "change" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "change" }],
cyzjdm: [
{ required: true, message: "请选择证件类型", trigger: "blur" },
{ required: true, message: "请选择证件类型", trigger: "change" },
],
zjhm: [
{ required: true, message: "请输入证件号码", trigger: "blur" },
......@@ -331,22 +331,22 @@
},
],
hjdzXzqhdm: [
{ required: true, message: "请选择户籍地行政区", trigger: "blur" },
{ required: true, message: "请选择户籍地行政区", trigger: "change" },
],
hjdzDzmc: [
{ required: true, message: "请输入户籍地址", trigger: "blur" },
],
xzzXzqhdm: [
{ required: true, message: "请选现住地行政区", trigger: "blur" },
{ required: true, message: "请选择现住地行政区", trigger: "change" },
],
xzzDzmc: [
{ required: true, message: "请输入现住地址", trigger: "blur" },
],
nydwGajgjgdm: [
{ required: true, message: "请输入捺印单位", trigger: "change" },
{ required: true, message: "请选择捺印单位", trigger: "change" },
],
nyryXm: [
{ required: true, message: "请输入捺印人员姓名", trigger: "change" },
{ required: true, message: "请输入捺印人员姓名", trigger: "blur" },
],
nysj: [
{
......
src/views/zzwlr/xzryedit.vue
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-01-18 11:48:27
* @LastEditTime: 2022-02-08 16:03:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
......@@ -291,11 +291,11 @@
{ required: true, message: "请输入掌指纹卡编号", trigger: "blur" },
],
cjxxyydm: [
{ required: true, message: "请选择采集信息原因", trigger: "blur" },
{ required: true, message: "请选择采集信息原因", trigger: "change" },
],
xm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
xbdm: [{ required: true, message: "请选择性别", trigger: "blur" }],
xbdm: [{ required: true, message: "请选择性别", trigger: "change" }],
csrq: [
{
required: true,
......@@ -303,10 +303,10 @@
trigger: "change",
},
],
gjdm: [{ required: true, message: "请选择国籍", trigger: "blur" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "blur" }],
gjdm: [{ required: true, message: "请选择国籍", trigger: "change" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "change" }],
cyzjdm: [
{ required: true, message: "请选择证件类型", trigger: "blur" },
{ required: true, message: "请选择证件类型", trigger: "change" },
],
zjhm: [
{ required: true, message: "请输入证件号码", trigger: "blur" },
......@@ -318,22 +318,22 @@
},
],
hjdzXzqhdm: [
{ required: true, message: "请选择户籍地行政区", trigger: "blur" },
{ required: true, message: "请选择户籍地行政区", trigger: "change" },
],
hjdzDzmc: [
{ required: true, message: "请输入户籍地址", trigger: "blur" },
{ required: true, message: "请选择户籍地址", trigger: "change" },
],
xzzXzqhdm: [
{ required: true, message: "请选现住地行政区", trigger: "blur" },
{ required: true, message: "请选择现住地行政区", trigger: "change" },
],
xzzDzmc: [
{ required: true, message: "请输入现住地址", trigger: "blur" },
],
nydwGajgjgdm: [
{ required: true, message: "请输入捺印单位", trigger: "change" },
{ required: true, message: "请选择捺印单位", trigger: "change" },
],
nyryXm: [
{ required: true, message: "请输入捺印人员姓名", trigger: "change" },
{ required: true, message: "请输入捺印人员姓名", trigger: "blur" },
],
nysj: [
{
......@@ -473,11 +473,16 @@
// delete this.ruleForm.cjxxyydm
reqParam.personDo = this.ruleForm;
reqParam.cjxxyyList = this.ruleForm.cjxxyydm;
console.log(this.ruleForm);
// reqParam.personDo.ysxtAsjxgrybh = this.ruleForm.ysxtAsjxgrybh
reqParam.personDo.ysxtAsjxgrybh = "R" + this.ruleForm.ysxtAsjxgrybh;
console.log(reqParam.personDo.ysxtAsjxgrybh);
reqParam.logicList = this.logicList;
console.log(reqParam.personDo.ysxtAsjxgrybh);
delete reqParam.personDo.cjxxyydm;
console.log(reqParam.personDo.ysxtAsjxgrybh);
console.log(reqParam);
this.$axios
.post("/api/personstore/person/file", reqParam)
.then((res) => {
......@@ -499,7 +504,6 @@
} else {
self.$message.error("修改失败！");
this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
}
});
self.$bus.emit("isBlur", false);
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-02-07 10:40:32
* @LastEditTime: 2022-02-09 16:11:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -113,7 +113,7 @@ module.exports = {
// target: "http://192.168.128.103:8099/", // 张 认定
// target: "http://192.168.128.108:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.122:8099", // 湖南-张呈光
// target: "http://192.168.128.111: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",
......
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