Skip to content

F
founder_vue
Commit 8388b47f by liyuhang19990520
Options

解决冲突

parents e4fbab5e 3cb17c57
Showing with 371 additions and 113 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -123,6 +123,7 @@
style="width: 100%"
:class="{delSelection: !selectBoo}"
@selection-change="handleSelectionChange"
@row-click="handle"
>
<el-table-column
type="selection"
......@@ -216,11 +217,10 @@
content="编辑"
placement="top"
:open-delay="500"
@click="handleClick(scope.row)"
>
<div
class="icon bj"
@click="handleClick(scope.row)"
@click.stop="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bj.svg"
......@@ -238,6 +238,7 @@
<div
v-if="scope.row.collectstatus == 1"
class="icon sc"
@click.stop
>
<el-popconfirm
placement="top-start"
......@@ -261,7 +262,7 @@
>
<div
class="icon sc"
@click="isShowGzBtn1(scope.row)"
@click.stop="isShowGzBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/sc.svg"
......@@ -279,7 +280,7 @@
>
<div
class="icon gx"
@click="isShowGgrytmBtn(scope.row)"
@click.stop="isShowGgrytmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/gx.svg"
......@@ -296,7 +297,7 @@
>
<div
class="icon look"
@click="isShowFcxBtn1(scope.row)"
@click.stop="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
......@@ -313,7 +314,7 @@
>
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
@click.stop="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
......@@ -330,7 +331,7 @@
>
<div
class="icon print"
@click="handleClick(scope.row)"
@click.stop="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/print.svg"
......@@ -345,21 +346,26 @@
placement="top"
:open-delay="500"
>
<el-popconfirm
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
<div
@click.stop
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
<div slot="reference">
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
<el-popconfirm
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="delOne(scope.row.id)"
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
<div slot="reference">
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
</div>
</el-tooltip>
</div>
</template>
......@@ -431,6 +437,17 @@
:isShowXzry="isShowXzry"
@closeXzry="closeXzry"
> </xzry>
<!-- <el-drawer
title="我是标题"
:visible.sync="drawer"
:direction="direction"
:before-close="handleClose"
:with-header="false"
:modal='false'
>
<span>我来啦!</span>
</el-drawer> -->
</div>
</el-container>
</template>
......@@ -457,7 +474,6 @@ export default {
created () {
let w1 = 1920;
let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1;
......@@ -520,6 +536,19 @@ export default {
};
},
methods: {
// 单击行抽屉
handle (row, event, column) {
console.log(row, event, column)
this.drawer = true
this.$bus.emit('isBlur', true)
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => { });
},
cellClass (row) {
if (row.columnIndex === 0) {
return 'disableheadselection'
......@@ -733,7 +762,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log("关注关闭", val);
this.isShowGz = val;
this.search();
if (val == false) {
this.search();
}
},
// 取消关注
qxgz (val) {
......@@ -759,7 +790,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log("更改条码关闭", val);
this.isShowGgrytm = val;
this.search();
if (val == false) {
this.search();
}
},
//复制条码列表操作
......@@ -772,7 +805,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
this.search();
if (val == false) {
this.search();
}
},
//发查询操作(多行)
......
src/views/AllPersonnelBase/dclb.vue
......@@ -307,19 +307,19 @@
<el-table-column
prop="barcode"
label="案事件编号"
:width="width1"
:width="width4"
>
</el-table-column>
<el-table-column
prop="fingerPlamNumber"
label="指掌纹个数"
:width="width3"
:width="width1"
>
</el-table-column>
<el-table-column
prop="exportName"
label="导出模式"
:width="width3"
:width="width1"
>
</el-table-column>
<el-table-column width="auto">
......@@ -370,8 +370,9 @@ export default {
data () {
return {
width3: 100,
width2: 210,
width2: 240,
width1: 220,
width4: 400,
height: 500,
dataType: null, // 导入类型
barcode: "", // 条码号
......@@ -812,7 +813,7 @@ export default {
this.$message.error("请选择需要复制条码号的数据！");
} else {
self.multipleSelection.forEach((item) => {
self.ysxtAsjxgrybh.push(item.ysxtAsjxgrybh);
self.ysxtAsjxgrybh.push(item.barcode);
});
this.ysxtAsjxgrybh = this.ysxtAsjxgrybh.join(",");
}
......@@ -845,6 +846,7 @@ export default {
*/
batch () {
this.isSelected = !this.isSelected;
this.isShowTip = !this.isShowTip;
this.toggleSelection();
},
cancel () {
......@@ -866,11 +868,11 @@ export default {
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
if (this.multipleSelection.length) {
this.isShowTip = true;
} else {
this.isShowTip = false;
}
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
// this.isShowTip = false;
// }
},
/**
* @description: pageSize 改变时会触发
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -117,7 +117,7 @@ let targtOptions = [];
export default {
name: "dcftpx",
props: {
isShowDcfptx: {
isShowDcfptx1: {
type: [Number, String, Boolean],
default: false
},
......@@ -146,10 +146,10 @@ export default {
};
},
mounted () {
this.dialogVisible = this.isShowDcfptx;
this.dialogVisible = this.isShowDcfptx1;
},
watch: {
isShowDcfptx (newVal, oldVal) {
isShowDcfptx1 (newVal, oldVal) {
this.dialogVisible = newVal;
if (newVal == true) {
this.getHpseqno()
......@@ -157,33 +157,51 @@ export default {
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
this.$emit('closeDcfptx', this.dialogVisible);
targtOptions = [];
this.targts = targtOptions
this.$emit('closeDcfptx1', this.dialogVisible);
},
},
methods: {
focus () {
let reqParam = {
barcode: '', //条码号
imgNo: '',// 指纹序号
dataType: '',// 数据类型（原图）
baseMsg: null, // 基本信息 1导出 0不导出
isFeatures: null // 导出特征 1导出 0不导出
}
reqParam.barcode = this.rowData[0].ysxtAsjbh
reqParam.imgNo = this.checkedTargets.toString()
reqParam.dataType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
reqParam.isFeatures = this.tz == true ? 1 : 0
this.$axios
.post("/api/export/case/" + this.rowData[0].ysxtAsjbh)
.get("/api/export/case", { params: reqParam })
.then((response) => {
console.log(response)
console.log(response.data)
// var elink = document.createElement('a');
// elink.download = "案件.fptx";
// elink.style.display = 'none';
// var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
// elink.href = URL.createObjectURL(blob);
// document.body.appendChild(elink);
// elink.click();
// document.body.removeChild(elink);
if (response.status === 200) {
if (response.data.code) {
this.$message.error(response.data.message);
} else {
// 创建隐藏的可下载链接
let eleLink = document.createElement('a')
// let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh
let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh
eleLink.download = this.filenameexport
eleLink.style.display = 'none'
eleLink.href = url
// 触发点击
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
var elink = document.createElement('a');
elink.download = "案件.fptx";
elink.style.display = 'none';
var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
document.body.removeChild(elink);
this.dialogVisible = false;
// this.$router.push('/dclb')
this.$router.push({
......@@ -196,6 +214,37 @@ export default {
} else {
this.$message.error(response.data.message);
}
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// // let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh
// let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 2
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
});
......@@ -248,7 +297,6 @@ export default {
targtOptions = [];
this.targts = targtOptions
this.dialogVisible = false;
},
handleCheckAllChange (val) {
this.checkedTargets = val ? targtOptions : [];
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -369,7 +369,7 @@ export default {
gdzwyscheckAll: true,// 滚动指纹右手全选
checkedGdyss: ['拇', '食', '中', '环', '小'],
gdyss: gdysOptions,
// 滚动指纹右手
// 滚动指纹左手
gdzwzsisIndeterminate: false,//滚动指纹左手状态
gdzwzscheckAll: true,// 滚动指纹左手全选
checkedGdzss: ['拇', '食', '中', '环', '小'],
......@@ -377,12 +377,12 @@ export default {
// 平面指纹
pmzwisIndeterminate: false, // 滚动指纹状态
pmzwCheckAll: true, // 滚动指纹全选
// 滚动指纹右手
// 平面指纹右手
pmzwysisIndeterminate: false,//滚动指纹右手状态
pmzwyscheckAll: true,// 滚动指纹右手全选
checkedPmyss: ['拇', '食', '中', '环', '小'],
pmyss: pmysOptions,
// 滚动指纹右手
// 平面指纹左手
pmzwzsisIndeterminate: false,//滚动指纹左手状态
pmzwzscheckAll: true,// 滚动指纹左手全选
checkedPmzss: ['拇', '食', '中', '环', '小'],
......@@ -548,26 +548,103 @@ export default {
},
methods: {
focus () {
let barcode = null;
if (this.rowData[0].ysxtAsjxgrybh) {
barcode = this.rowData[0].ysxtAsjxgrybh
} else {
barcode = this.rowData[0].followPerson.barcode
}
let reqParam = {
barcode: '', //条码号
imgNo: '',// 指纹序号
dataType: '',// 数据类型（原图）
baseMsg: null, // 基本信息 1导出 0不导出
isFeatures: null // 导出特征 1导出 0不导出
}
let arr = []
for (let i = 0; i < this.checkedGdyss.length; i++) {
// console.log(this.checkedGdyss[i])
if (this.checkedGdyss[i] == '拇') {
arr.push(1)
} else if (this.checkedGdyss[i] == '食') {
arr.push(2)
} else if (this.checkedGdyss[i] == '中') {
arr.push(3)
} else if (this.checkedGdyss[i] == '环') {
arr.push(4)
} else if (this.checkedGdyss[i] == '小') {
arr.push(5)
}
}
for (let i = 0; i < this.checkedGdzss.length; i++) {
// console.log(this.checkedGdzss[i])
if (this.checkedGdzss[i] == '拇') {
arr.push(6)
} else if (this.checkedGdzss[i] == '食') {
arr.push(7)
} else if (this.checkedGdzss[i] == '中') {
arr.push(8)
} else if (this.checkedGdzss[i] == '环') {
arr.push(9)
} else if (this.checkedGdzss[i] == '小') {
arr.push(10)
}
}
for (let i = 0; i < this.checkedPmyss.length; i++) {
// console.log(this.checkedPmyss[i])
if (this.checkedPmyss[i] == '拇') {
arr.push(11)
} else if (this.checkedPmyss[i] == '食') {
arr.push(12)
} else if (this.checkedPmyss[i] == '中') {
arr.push(13)
} else if (this.checkedPmyss[i] == '环') {
arr.push(14)
} else if (this.checkedPmyss[i] == '小') {
arr.push(15)
}
}
for (let i = 0; i < this.checkedPmzss.length; i++) {
// console.log(this.checkedPmzss[i])
if (this.checkedPmzss[i] == '拇') {
arr.push(16)
} else if (this.checkedPmzss[i] == '食') {
arr.push(17)
} else if (this.checkedPmzss[i] == '中') {
arr.push(18)
} else if (this.checkedPmzss[i] == '环') {
arr.push(19)
} else if (this.checkedPmzss[i] == '小') {
arr.push(20)
}
}
console.log('导出序号', arr)
reqParam.barcode = barcode
reqParam.imgNo = arr.toString()
reqParam.dataType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
reqParam.isFeatures = this.tz == true ? 1 : 0
this.$axios
.post("/api/export/person/" + this.rowData[0].ysxtAsjxgrybh)
.get("/api/export/person/", { params: reqParam })
.then((response) => {
console.log(response)
if (response.status === 200) {
if (response.data.code) {
this.$message.error(response.data.message);
} else {
// 创建隐藏的可下载链接
let eleLink = document.createElement('a')
// let url = 'http://www.meetfood.cn:2390/api/export/person/' + this.rowData[0].ysxtAsjxgrybh
let url = 'http://192.168.128.110:8099/api/export/person/' + this.rowData[0].ysxtAsjxgrybh
eleLink.download = this.filenameexport
eleLink.style.display = 'none'
eleLink.href = url
// 触发点击
document.body.appendChild(eleLink)
eleLink.click()
// 然后移除
document.body.removeChild(eleLink)
var elink = document.createElement('a');
elink.download = "人员.fptx";
elink.style.display = 'none';
var blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
document.body.removeChild(elink);
this.dialogVisible = false;
// this.$router.push('/dclb')
this.$router.push({
......@@ -580,6 +657,35 @@ export default {
} else {
this.$message.error(response.data.message);
}
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://www.meetfood.cn:2390/api/export/person/' + barcode
// let url = 'http://192.168.128.166:8099/api/export/person/' + barcode
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 1
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
});
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -581,8 +581,8 @@ export default {
},
mounted () {
this.dialogVisible = this.isShowFcx;
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
// this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
// this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
},
created () {
},
......@@ -590,6 +590,8 @@ export default {
isShowFcx (newVal, oldVal) {
this.dialogVisible = newVal;
if (newVal == true) {
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.type == 'ry' ? this.ruleForm.cxlx.querytype = '1' : this.ruleForm.cxlx.querytype = '2'
this.searchZTS()
this.searchsytsArr()
this.bcxh = this.rowData.length;
......@@ -997,7 +999,7 @@ export default {
});
cityOptions = []
this.dialogVisible = false;
this.$store.commit('layout/delcachePageName','cxyrd');
this.$store.commit('layout/delcachePageName', 'cxyrd');
setTimeout(() => {
this.$router.push('/cxyrd')
}, 20);
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -123,23 +123,28 @@ export default {
if (valid) {
// alert('submit!');
let reqUrl = '';
let newReqParams = {};
if (this.type == 'ry') {
reqUrl = '/api/personstore/copy'
Object.assign(this.reqParam, this.rowData);
delete this.reqParam.id;
this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
console.log(this.reqParam, '人员复制数据')
reqUrl = '/api/personstore/copyall/'
// Object.assign(this.reqParam, this.rowData);
// delete this.reqParam.id;
// this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
// console.log(this.reqParam, '人员复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.ruleForm.barcode
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/copyBarcode'
let caseBase = {}
Object.assign(caseBase, this.rowData);
delete caseBase.id;
caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
this.reqParam.caseBase = caseBase
console.log(this.reqParam, '案件复制数据')
reqUrl = '/api/casestore/copyall/'
// let caseBase = {}
// Object.assign(caseBase, this.rowData);
// delete caseBase.id;
// caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
// this.reqParam.caseBase = caseBase
// console.log(this.reqParam, '案件复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.ruleForm.barcode
}
this.$axios
.put(reqUrl, this.reqParam)
.post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => {
if (response.data.code === 0) {
this.$message.success("复制成功");
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -132,18 +132,15 @@ export default {
if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.ysxtAsjxgrybh = 'R' + this.reqParam.barcode
newReqParams.barcode = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') {
reqUrl = 'api/casestore/updateBarcode'
let caseBase = {}
caseBase.id = this.rowData.id
caseBase.ysxtAsjbh = 'A' + this.reqParam.barcode
newReqParams.caseBase = caseBase
reqUrl = '/api/casestore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.reqParam.barcode
}
// 确认提示
this.$axios
.put(reqUrl, newReqParams)
.post(reqUrl + '?' + 'id' + '=' + newReqParams.id + '&' + 'barcode' + '=' + newReqParams.barcode)
.then(response => {
if (response.data.code === 0) {
this.$message.success("更改成功");
......
src/views/AllPersonnelBase/modules/ryxxk.vue 0 → 100644
<template>
<div>
<el-drawer
title="标题"
:visible.sync="drawer"
:direction="direction"
:before-close="handleClose"
:with-header="false"
:modal='false'
>
<span>我来啦!</span>
</el-drawer>
</div>
</template>
<script>
export default {
name: "gz",
props: {
isShowGz: {
type: [Number, String, Boolean],
default: false
},
rowData: {
default: false
}
},
data () {
return {
drawer: false,
direction: 'rtl',
};
},
mounted () {
this.dialogVisible = this.isShowGz;
},
watch: {
isShowGz (newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
this.$emit('closeGz', this.dialogVisible);
}
},
methods: {
}
};
</script>
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -160,11 +160,14 @@ export default {
mounted () {
this.dialogVisible = this.isShowTjddl;
// console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
// this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
},
watch: {
isShowTjddl (newVal, oldVal) {
this.dialogVisible = newVal;
// console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
console.log('数据数据', this.rowData)
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
......@@ -193,8 +196,8 @@ export default {
ysxtAsjxgrybh: '',
id: ''
}
arr.ysxtAsjxgrybh = this.rowData[i].ysxtAsjxgrybh;
arr.id = this.rowData[i].id;
arr.ysxtAsjxgrybh = this.rowData[i].ysxtAsjxgrybh || this.rowData[i].barcode || this.rowData[i].followPerson.barcode;
arr.id = this.rowData[i].id || this.rowData[i].followPerson.personId;
newReqParams.personDoList.push(arr)
this.reqParam = newReqParams
}
......@@ -219,8 +222,8 @@ export default {
ysxtAsjbh: '',
id: ''
}
arr.ysxtAsjbh = this.rowData[i].ysxtAsjbh;
arr.id = this.rowData[i].id;
arr.ysxtAsjbh = this.rowData[i].ysxtAsjbh || this.rowData[i].barcode || this.rowData[i].followCase.barcode;
arr.id = this.rowData[i].id || this.rowData[i].followCase.caseId;
newReqParams.caseBaseList.push(arr)
this.reqParam = newReqParams
}
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -364,9 +364,9 @@
></gz>
<!-- 导出FPTX弹窗 -->
<dcfptxAj
:isShowDcfptx="isShowDcfptx"
:isShowDcfptx1="isShowDcfptx1"
:rowData="rowData"
@closeDcfptx="closeDcfptx"
@closeDcfptx1="closeDcfptx1"
></dcfptxAj>
<!-- 更改条码弹窗 -->
<ggrytm
......@@ -443,7 +443,7 @@ export default {
disabled: false, // 新增案件按钮状态
isShowTjddl: false,// 添加到队列
isShowGz: false,// 关注
isShowDcfptx: false,// 导出FPTX
isShowDcfptx1: false,// 导出FPTX
isShowGgrytm: false,// 更改条码
isShowFztm: false, //复制条码
isShowFcx: false, //发查询
......@@ -592,15 +592,15 @@ export default {
this.selectBoo = true
} else if (this.multipleSelection.length === 1) {
this.rowData = this.multipleSelection;
this.isShowDcfptx = true;
this.isShowDcfptx1 = true;
} else {
this.$message.error("只能导出单条数据的FPTX！");
}
},
closeDcfptx (val) {
closeDcfptx1 (val) {
this.$bus.emit('isBlur', val)
console.log('导出FPTX关闭', val)
this.isShowDcfptx = val
this.isShowDcfptx1 = val
},
// 复制成功时的回调函数
onCopy (e) {
......@@ -669,7 +669,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log('关注关闭', val)
this.isShowGz = val
this.search()
if (val == false) {
this.search();
}
},
// 取消关注
qxgz (val) {
......@@ -696,7 +698,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log('更改条码关闭', val)
this.isShowGgrytm = val
this.search()
if (val == false) {
this.search();
}
},
//复制条码列表操作
isShowFztmBtn (val) {
......@@ -708,7 +712,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log('closeFztm复制条码关闭', val)
this.isShowFztm = val
this.search()
if (val == false) {
this.search();
}
},
//发查询操作(多行)
isShowFcxBtn () {
......@@ -731,7 +737,7 @@ export default {
this.$bus.emit('isBlur', val)
console.log('发查询关闭', val)
this.isShowFcx = val
this.search()
// this.search()
},
// 新增案件操作
isShowXzajBtn () {
......@@ -741,7 +747,9 @@ export default {
this.$bus.emit('isBlur', val)
console.log('新增案件关闭', val)
this.isShowXzaj = val
this.search()
if (val == false) {
this.search();
}
},
/**
* @description: 是否是批量操作
......@@ -817,7 +825,7 @@ export default {
// console.log(this.$route);
this.search();
// 从门户中进来，直接打开新增案件弹出框
if(this.$route.query.xzaj === 'true') {
if (this.$route.query.xzaj === 'true') {
this.isShowXzaj = true
}
},
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-24 16:40:30
* @LastEditTime: 2021-11-24 18:33:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -94,10 +94,11 @@ module.exports = {
// target: "http://192.168.128.166:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116: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",
target: "http://www.meetfood.cn:2390/", // 湖南-线上
// target: "http://www.meetfood.cn:2390/", // 湖南-线上
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