Skip to content

F
founder_vue
Commit b0f2e915 by 张超军
Options

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

parents ac49907a 398e0ef6
Showing with 255 additions and 40 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -1223,6 +1223,7 @@ export default {
justify-content: space-between;
align-items: center;
.btn {
font-size: 14px;
height: 32px;
padding: 8px 20px;
border-radius: 4px;
......
src/views/AllPersonnelBase/dclb.vue
......@@ -779,7 +779,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
/**
......@@ -958,6 +958,7 @@ export default {
justify-content: space-between;
align-items: center;
.btn {
font-size: 14px;
height: 32px;
padding: 8px 20px;
border-radius: 4px;
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -1197,7 +1197,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
/**
......@@ -1382,6 +1382,7 @@ export default {
justify-content: space-between;
align-items: center;
.btn {
font-size: 14px;
height: 32px;
padding: 8px 20px;
border-radius: 4px;
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -110,7 +110,7 @@
</el-form-item>
<el-form-item
label="数据类型:"
prop="srcDataType "
prop="srcDataType"
>
<el-checkbox-group v-model="ruleForm.srcDataType ">
<el-checkbox label="1">滚动</el-checkbox>
......@@ -602,6 +602,7 @@ export default {
},
created () {
this.dialogVisible = this.isShowFcx;
this.$forceUpdate()
},
watch: {
isShowFcx (newVal, oldVal) {
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -347,6 +347,7 @@ export default {
},
rules: {
ysxtAsjbh: [
{ min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
{ required: true, message: "请输入案事件编号", trigger: "blur" },
],
xckybh: [
......@@ -377,6 +378,11 @@ export default {
],
tqryGmsfhm: [
{ required: true, message: "请输入提取人身份证号", trigger: "blur" },
{
pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
message: '证件号码格式有误！',
trigger: 'blur'
}
],
},
};
......@@ -431,6 +437,29 @@ export default {
id: response.data.ret.id
}
})
this.ruleForm = {
ysxtAsjbh: "", // 案事件编号
xckybh: "", // 现场勘验编号
asjfsddXzqhdm: "", // 行政区代码
asjfsddDzmc: "", // 案事件发生地
ssjzrmby: "", // 损失价值
xczzhwkbh: "", // 现场掌指纹卡编号
ajlbdm: "", // 案件类别
asjbh: '', // 警综案事件编号
sfmaPdbz: "0", // 命案
jyaq: "", // 简要案情
tqdwGajgjgdm: "", // 提取单位代码
tqryXm: "", // 提取人姓名
tqsj: "", // 提取时间
tqryGmsfhm: "", // 提取人身份证号
tqryLxdh: "", // 提取人联系电话
zwbdxtlxms: "默认", //
tqdwGajgmc: "默认", //
barcode: "1",
occurdate: '',// 发案日期
}
this.checkedTargets = ['1'] // 选定的目标逻辑库
} else {
this.$message.error("新增失败");
}
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -443,7 +443,6 @@ export default {
labelPosition: "left", // 数据项对齐方式
checkedTargets: ['1'], // 选定的目标逻辑库
targets: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库
logicDatabaseCode: [],// 逻辑库代码
ruleForm: {
ysxtAsjxgrybh: "", // 人员编号
jzrybh: "", // 警综人员编号
......@@ -477,6 +476,7 @@ export default {
logicList: [],// 逻辑库代码
rules: {
ysxtAsjxgrybh: [
{ min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
{ required: true, message: "请输入人员条码号", trigger: "blur" },
],
jzrybh: [
......@@ -536,6 +536,11 @@ export default {
],
nyryGmsfhm: [
{ required: true, message: "请输入捺印人身份证号", trigger: "blur" },
{
pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/,
message: '证件号码格式有误！',
trigger: 'blur'
}
],
nyryLxdh: [
{ required: true, message: "请输入捺印人联系电话", trigger: "blur" },
......@@ -563,11 +568,6 @@ export default {
}
},
submitForm (formName) {
console.log(this.ruleForm.cjxxyydm, 'caijiyuanying')
console.log(this.checkedTargets)
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.checkedTargets.length == 0) {
......@@ -596,6 +596,37 @@ export default {
type: 0
}
})
this.ruleForm = {
ysxtAsjxgrybh: "", // 人员编号
jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因
xm: "", // 姓名
bmch: "", // 别名
xbdm: "", // 性别
csrq: "", // 出生日期
gjdm: "", // 国籍
mzdm: "", // 民族
cyzjdm: "", // 证件类型
zjhm: "", // 证件号码
hjdzXzqhdm: "", // 户籍地行政区
hjdzDzmc: "", // 户籍地址
xzzXzqhdm: "", // 现住址行政区
xzzDzmc: "", // 现住址
bz: "", // 备注
nydwGajgjgdm: "", // 捺印单位
nyryXm: "", // 捺印人姓名
nysj: "", // 捺印时间
nyryGmsfhm: "", // 捺印人身份证号
nyryLxdh: "", // 捺印人电话
ifidcard: "是", // 是否采集二代身份证
zwbdxtlxms: "1", // 指纹比对描述
}
this.checkedTargets = ['1']// 选定的目标逻辑库
} else {
this.$message.error("新增失败");
}
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -878,7 +878,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
/**
......@@ -1092,6 +1092,7 @@ const datas1 = [
justify-content: space-between;
align-items: center;
.btn {
font-size: 14px;
height: 32px;
padding: 8px 20px;
border-radius: 4px;
......
src/views/SystemManage/editableLable.vue
<!--
* @Author: your name
* @Date: 2021-12-27 11:19:03
* @LastEditTime: 2021-12-27 21:15:20
* @LastEditTime: 2021-12-27 21:47:12
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\SystemManage\editableLable.vue
......@@ -24,6 +24,7 @@
<script>
export default {
props: {
isSt: { type: Boolean, require: true },
id: {
type: String,
require: false,
......@@ -62,7 +63,7 @@ export default {
textChange(txt) {
this.curTxt = txt;
this.canEdit = false;
this.$emit("change", this.id, this.type, txt);
this.$emit("change", this.id, this.type, txt,this.isSt);
},
enableEdit() {
this.canEdit = true;
......
src/views/drFPTX/Index.vue
......@@ -567,6 +567,9 @@ export default {
expandedLeft: null, // 左边表格展开关闭标志
expandedRight: null, // 左边表格展开关闭标志
NumId: 1
}
},
created () {
......@@ -793,7 +796,8 @@ export default {
let that = this
let newlist = fileList
for (let i = 0; i < fileList.length; i++) {
let fatherId = (i + 1)
let fatherId = that.NumId
that.NumId = that.NumId + 1;
let file = fileList[i].raw
// console.log(file.webkitRelativePath, 999)
// 读取文件
......@@ -1048,7 +1052,6 @@ export default {
}
this.dialogVisible = true
NetUtil.drFptx.upload(formData, this.drlx, (progressEvent) => {
logger.info('11111111111')
that.UploadPercent = Number((((progressEvent.loaded / 10 * 10) / progressEvent.total) * 100).toFixed(2))
}).then(res => {
if (res.code === 0) {
......@@ -1138,6 +1141,13 @@ export default {
// 选中
handelSelect () {
// let self = this
// console.log('重复文件过滤1', this.nowSelectData)
// console.log('重复文件过滤2', this.selectArr)
......@@ -1186,9 +1196,33 @@ export default {
this.nowSelectRightData = []
},
handleConcatArr (selectArr, nowSelectData) {
var out = [];
var flag = true;
for (var i = 0; i < nowSelectData.length; i++) {
flag = true;
for (var j = 0; j < selectArr.length; j++) {
if (nowSelectData[i].name == selectArr[j].name) { // 如果数据能保证id和name一直配对，则可以少一个比较条件
flag = false;
this.$message.success('重复文件已过滤！')
break;
}
}
if (flag) {
out.push(nowSelectData[i]);
}
}
console.log(out, 'out')
let arr = []
arr = arr.concat(selectArr, nowSelectData)
arr = arr.concat(out, selectArr)
return arr
// let arr = []
// arr = arr.concat(selectArr, nowSelectData)
// return arr
},
handleRemoveTabList (isNeedArr, originalArr) {
if (isNeedArr.length && originalArr.length) {
......
src/views/drFPTX/RAList.vue
......@@ -1754,6 +1754,7 @@ export default {
justify-content: space-between;
align-items: center;
.btn {
font-size: 14px;
height: 32px;
padding: 8px 20px;
border-radius: 4px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-28 14:11:26
* @LastEditTime: 2021-12-28 14:48:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -99,8 +99,8 @@ module.exports = {
// }
// },
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://192.168.128.100:8099/", //新系统
target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.108:8091/", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -112,7 +112,7 @@ module.exports = {
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.104:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.102:8099", // 湖南-张呈光
target: "http://192.168.128.119: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