Skip to content

F
founder_vue
Commit 1d5af0b9 by 李萌萌
Options

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

parents fda9abfc 62a32dba
Showing with 348 additions and 115 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-15 18:27:32
* @LastEditTime: 2021-12-16 10:24:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,7 +14,7 @@
<script>
export default {
created () {
created() {
// console.log(document.body.scrollHeight)
var lett = this;
document.onkeydown = function (e) {
......@@ -130,6 +130,15 @@ export default {
color: #2e3846;
}
}
.screenSave {
margin-right: 0 !important;
// background: #ffffff!important;
// border-radius: 4px!important;
// border: 1px solid #aeb5c2!important;
// font-size: 14px!important;
// font-family: MicrosoftYaHei!important;
// color: #2e3846!important;
}
.el-message-box {
position: relative;
display: inline-block;
......@@ -160,6 +169,7 @@ export default {
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
......
src/assets/img/Home/bzxxgl.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="22px" viewBox="0 0 20 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状结合</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="门户-改动" transform="translate(-1380.000000, -555.000000)" fill="#FFFFFF">
<path d="M1400,555 L1400,577 L1380,577 L1380,555 L1400,555 Z M1397.57926,566.264757 L1393.20235,570.64165 L1390.42074,567.860056 L1389.37355,568.907243 L1393.20237,572.735243 L1398.62646,567.311944 L1397.57926,566.264757 Z M1388,570 L1383,570 L1383,571.5 L1388,571.5 L1388,570 Z M1393.5,565 L1383,565 L1383,566.5 L1393.5,566.5 L1393.5,565 Z M1397,560 L1383,560 L1383,561.5 L1397,561.5 L1397,560 Z" id="形状结合"></path>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/Home/zljc.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="22px" viewBox="0 0 20 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>安全检查1备份</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="门户-改动" transform="translate(-1484.000000, -448.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="安全检查1备份" transform="translate(1484.000000, 448.000000)">
<path d="M10.0511155,0 L10.5467382,0.374324988 C12.4317989,1.79945999 15.3637391,2.71575847 19.2603784,3.09891998 L19.2603784,3.09891998 L20,3.17231222 L20,13.2366225 C20,16.5697104 16.7466817,19.4739813 10.3292855,21.8703976 L10.3292855,21.8703976 L9.9816436,22 L9.64077944,21.8588611 C3.15334651,19.1661757 0,16.3458517 0,13.2366225 L0,13.2366225 L0,3.09474718 L0.833380401,3.09474718 C3.64021463,3.09474718 6.56142333,2.16543937 9.51595594,0.331860579 L9.51595594,0.331860579 L10.0511155,0 Z M14.366319,7.64053442 L9.034616,13.0011044 L5.60670742,9.89186652 C5.21875762,9.54717982 4.54784537,9.51443317 4.10848054,9.81959806 C3.66947525,10.1241983 3.62776795,10.6509677 4.0160773,10.9956544 L7.44434543,14.1051746 C7.86249706,14.476115 8.44496108,14.6666667 9.03245873,14.6666667 C9.6706711,14.6661771 10.2751435,14.4415609 10.6802566,14.0543608 L16.0119596,8.69266166 C16.3815726,8.33583611 16.3132589,7.81104283 15.8591527,7.52055748 C15.4046869,7.22978982 14.7366511,7.28370887 14.366319,7.64053442 Z" id="形状"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/ImageEd.scss
......@@ -1430,6 +1430,7 @@ div {
justify-content: center;
position: relative;
.body-container {
position: relative;
z-index: 99;
width: 540px;
height: 540px;
......@@ -1442,6 +1443,7 @@ div {
height: 540px !important;
position: relative;
overflow: hidden;
box-sizing: content-box;
}
.tui-image-editor2 {
box-sizing: content-box;
......@@ -1456,6 +1458,12 @@ div {
}
/deep/.lower-canvas,
/deep/.upper-canvas {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
max-height: 540px !important;
max-width: 540px !important;
height: 100%;
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-15 18:33:41
* @LastEditTime: 2021-12-16 10:18:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -77,14 +77,16 @@ _axios.interceptors.response.use(
MessageBox.confirm(response.data.message == '未登录' ? '登陆超时,请重新登录!' : response.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
showCancelButton: true,
confirmButtonClass: 'screenSave',
closeOnPressEscape: false,
closeOnClickModal: false,
showCancelButton: false,
showClose: false,
type: 'warning'
}).then(() => {
localStorage.removeItem('token')
router.replace("/Login");
}).catch(() => {
localStorage.removeItem('token')
router.replace("/Login");
});
}, 500);
return;
......
src/utils/UserUtil.js
export default function stRole() {
let userInfo = JSON.parse(localStorage.getItem('userInfo'))
// console.log('用户信息：', userInfo)
let username = userInfo.username
......
src/views/Editor/modules/ajdaxx.vue
......@@ -41,6 +41,16 @@
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="发案日期：" prop="occurdate">
<el-date-picker type="date" placeholder="请输入发案日期" v-model="ruleForm.occurdate" :picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
</el-form-item>
<el-form-item label="案件类别：" prop="ajlbdm">
<Cascader :form="ruleForm" id="ajlbdm" codeName="CODE_AJLB"></Cascader>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="损失价值（人民币元）：" prop="ssjzrmby">
<el-input placeholder="根据代码自动匹配" v-model="ruleForm.ssjzrmby" maxlength="11" show-word-limit></el-input>
</el-form-item>
......@@ -51,11 +61,6 @@
</el-radio-group>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="案件类别：" prop="ajlbdm">
<Cascader :form="ruleForm" id="ajlbdm" codeName="CODE_AJLB"></Cascader>
</el-form-item>
</div>
<div class="ayzzwjbxx-item ayzzwjbxx-item2">
<el-form-item label="简要案情：" prop="jyaq" class="input3">
<el-input type="textarea" :rows="2" placeholder="请输入简要案情" v-model="ruleForm.jyaq" maxlength="4000" show-word-limit></el-input>
......@@ -171,6 +176,7 @@ export default {
asjbh: '',
asjfsddXzqhdm: '',
xczzhwkbh: '',
occurdate: '',
ssjzrmby: '',
asjfsddDzmc: '',
sfmaPdbz: '0',
......@@ -313,6 +319,7 @@ export default {
this.ruleForm.asjbh = this.ajInfo.asjbh
this.ruleForm.asjfsddXzqhdm = this.ajInfo.asjfsddXzqhdm
this.ruleForm.xczzhwkbh = this.ajInfo.xczzhwkbh
this.ruleForm.occurdate = this.ajInfo.occurdate
this.ruleForm.ssjzrmby = this.ajInfo.ssjzrmby
this.ruleForm.asjfsddDzmc = this.ajInfo.asjfsddDzmc
this.ruleForm.sfmaPdbz = this.ajInfo.sfmaPdbz
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 20:37:53
* @LastEditTime: 2021-12-16 11:20:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -183,7 +183,9 @@ export default {
loading: true,
data: {
// barcode: 'A9999999777778888888888'
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
}
})
console.log(res);
......@@ -237,11 +239,13 @@ export default {
this.$store.commit('zwbj/setSeq', seq)
this.$axios({
method: 'post',
url: `/api/org/caseBybarcode/barcode/seq`,
url: `/api/org/case/barcode/seqNo`,
// url: `/api/org/case/${self.id}/${seq}?mnt=1`,
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token
......@@ -268,9 +272,11 @@ export default {
this.$axios({
method: 'post',
// url: '/api/org/case/' + self.id + '?mnt=1'
url: `/api/org/caseBybarcode/barcode`,
url: `/api/org/case/barcode`,
data: {
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
},
}).then(res => {
console.log(res);
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-15 16:29:42
* @LastEditTime: 2021-12-17 01:07:40
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -629,7 +629,7 @@ export default {
};
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
...mapState({
......@@ -1424,8 +1424,41 @@ export default {
const [x, y] = reverse(point.x, point.y, det.x, det.y, -angle);
//console.log(x, y);
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", y - 4 + "px");
// canvasBox_height
if (self.imageEditor._graphics.getCanvasImage().flipX && !self.imageEditor._graphics.getCanvasImage().flipY) {
$(`#tzd${self.tzdId}`).css("left", self.canvasBox_width - (x + 4) + "px");
$(`#tzd${self.tzdId}`).css("top", (y - 4) + "px");
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = y - 4
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && !self.imageEditor._graphics.getCanvasImage().flipX) {
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.x = x - 4
item.y = self.canvasBox_height - (y + 4)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$(`#tzd${self.tzdId}`).css("left", self.canvasBox_width - (x + 4) + "px");
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = self.canvasBox_height - (y + 4)
}
})
} else {
$(`#tzd${self.tzdId}`).css("left", x - 4 + "px");
$(`#tzd${self.tzdId}`).css("top", y - 4 + "px");
}
// console.log(self.imageEditor._graphics.getCanvasImage());
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
}
}
......@@ -1657,14 +1690,53 @@ export default {
}
if (self.deg) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg - self.startPlace}deg)`
);
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace}deg)`
);
if (!self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg + self.startPlace + 180}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace + 180)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && !self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${self.deg + self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.angle = -(self.deg + self.startPlace)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace - 180}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace - 180)
}
})
} else {
$("#tzd" + self.tzdId).css(
"transform",
`rotate(${-self.deg - self.startPlace}deg)`
);
self.tzdArr.forEach(item => {
if(item.id == self.tzdId) {
item.angle = -(-self.deg - self.startPlace)
}
})
}
// $("#tzd" + self.tzdId).css(
// "transform",
// `rotate(${self.deg - self.startPlace}deg)`
// );
} else {
}
}
......@@ -1692,18 +1764,18 @@ export default {
// //console.log(e);
if (self.isHandTZD) {
if (e.which === 1) {
if (self.deg) {
let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId;
});
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = self.deg;
} else {
let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId;
});
self.tzdArr[objindex].angle = 0;
}
// if (self.deg) {
// let objindex = self.tzdArr.findIndex((item) => {
// return item.id == self.tzdId;
// });
// // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
// self.tzdArr[objindex].angle = self.deg;
// } else {
// let objindex = self.tzdArr.findIndex((item) => {
// return item.id == self.tzdId;
// });
// self.tzdArr[objindex].angle = 0;
// }
self.tzdnumber++;
self.tzdFlag = false;
self.tzdId++;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -1092,8 +1092,8 @@ $canvasWidth: var(--canvasWidth, 670px);
/deep/ .canvas-container {
position: absolute !important;
width: 670px !important;
height: 670px !important;
width: 670px;
height: 670px;
z-index: 9;
}
}
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-14 19:27:45
* @LastEditTime: 2021-12-16 11:30:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -459,7 +459,9 @@ export default {
loading: true,
data: {
// barcode: 'R4308214500002021100049'
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
}
})
// 初始化图片
......@@ -539,10 +541,12 @@ export default {
this.$axios({
method: 'post',
// url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
url: '/api/org/rollByBarcode/barcode/seq',
url: '/api/org/roll/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token,
......@@ -575,10 +579,12 @@ export default {
this.$axios({
method: 'post',
// url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
url: '/api/org/plainByBarcode/barcode/seq',
url: '/api/org/plain/barcode/seq',
data: {
barcode: self.barcode,
seqno: self.seq
seqno: self.seq,
dealFlag: 1,
fingerPosition: 1
},
loading: false,
cancelToken: source.token,
......@@ -613,9 +619,11 @@ export default {
let res = await this.$axios({
method: 'post',
// url: '/api/org/roll/'+self.id+'?mnt=1',
url: '/api/png/rollEByBarcode/barcode',
url: '/api/png/roll/barcode',
data: {
barcode: self.barcode
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
},
loading: false
// url: '/api/png/roll/1?mnt=1'
......@@ -660,7 +668,7 @@ export default {
let res = await this.$axios({
method: 'post',
// url: '/api/org/plain/'+self.id+'?mnt=1',
url: '/api/png/plainEByBarcode/barcode',
url: '/api/png/plain/barcode',
data: {
barcode: self.barcode
},
......
src/views/SystemManage/UserManage.vue
......@@ -120,7 +120,7 @@
<el-table-column
prop="name"
label="姓名"
:width="width1"
align="center"
show-overflow-tooltip
>
</el-table-column>
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-14 20:29:09
* @LastEditTime: 2021-12-16 23:52:00
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
......@@ -83,7 +83,7 @@
<div class="bzxxfh-content-content">
<el-tag v-show="isShowTip">
<span v-html="'&nbsp;&nbsp;'"></span>
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"></i>
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span class="clearCheck" @click="toggleSelection()">清空</span>
......@@ -121,10 +121,10 @@
</el-tooltip>
</div>
<div class="fhyx" v-show="scope.row.reviewStatus==='2'">
<img src="@/assets/img/bzxxgl/fhyx.png" alt="">
<img src="@/assets/img/bzxxgl/fhyx.svg" alt="">
</div>
<div class="fhwx" v-show="scope.row.reviewStatus==='1'">
<img src="@/assets/img/bzxxgl/fhwx.png" alt="">
<img src="@/assets/img/bzxxgl/fhwx.svg" alt="">
</div>
</div>
</template>
......
src/views/bzxxgl/fhxxTT.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/cxyrd/LT.vue
......@@ -179,7 +179,7 @@ export default {
let self = this
this.qid = this.$route.query.rowData;
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......
src/views/cxyrd/QueryConfirm.vue
......@@ -152,9 +152,9 @@
</div>
</div>
<div class="display_style">
<el-checkbox
><span>显示"{{ account }}"发查询用户查询</span></el-checkbox
>
<!-- <el-checkbox
><span>显示系统自发查询</span></el-checkbox
> -->
</div>
</div>
<div class="width100 margin_top24_bottom24 display_style">
......
src/views/cxyrd/TL.vue
......@@ -171,7 +171,10 @@ export default {
};
},
created () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
},
mounted () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......@@ -180,8 +183,6 @@ export default {
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
},
mounted () {
let self = this
this.$bus.on('bzJudgeTL', (val) => {
self.bzData = val
......
src/views/cxyrd/TT.vue
......@@ -1320,7 +1320,7 @@ export default {
this.loadingIndex++;
// 平面
this.$axios
.post("/api/png/plainByBarcode/barcode", {
.post("/api/png/plain/barcode", {
barcode: this.sourcebarcode,
})
.then(function (response) {
......@@ -1358,7 +1358,7 @@ export default {
let self = this;
// 滚动 源数据
this.$axios
.post("/api/png/rollByBarcode/barcode", { barcode: barcode })
.post("/api/png/roll/barcode", { barcode: barcode })
.then(function (response) {
self.loadingIndex--;
if (response.data.code == 0) {
......@@ -1393,7 +1393,7 @@ export default {
this.loadingIndex++;
// 平面 目标
this.$axios
.post("/api/png/plainByBarcode/barcode", {
.post("/api/png/roll/barcode", {
barcode: this.destbarcode,
})
.then(function (response) {
......@@ -1431,7 +1431,7 @@ export default {
this.loadingIndex++;
// 滚动 目标数据
this.$axios
.post("/api/png/rollByBarcode/barcode", { barcode: this.destbarcode })
.post("/api/png/plain/barcode", { barcode: this.destbarcode })
.then(function (response) {
self.loadingIndex--;
if (response.data.code == 0) {
......
src/views/cxyrd/modules/LLCandidate.vue
......@@ -1093,7 +1093,7 @@ export default {
} else {
// 滚动 --- 换压缩图
this.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid,
......@@ -1101,7 +1101,7 @@ export default {
.then((response) => {
self.$bus.emit(
"changImageEditTarget",
response.data.ret[0].image
response.data.ret.image
);
});
}
......
src/views/cxyrd/modules/LLSrc.vue
......@@ -356,7 +356,7 @@ export default {
self.fingerTotal = 0;
// 请求该条码号的案件指纹图片
self.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/barcode", {
querytype: "3",
barcode: val.barcode,
qqid: self.qqid,
......@@ -404,7 +404,7 @@ export default {
sessionStorage.setItem("srcbarcode", barcode);
//console.log(barcode);
self.$axios
.post("/api/org/caseBybarcode/barcode", {
.post("/api/org/case/barcode", {
querytype: "3",
barcode: barcode,
qqid: self.qqid,
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -131,7 +131,7 @@
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<!-- 被删除 -->
<span v-if="scope.row.removeFlag===1">
<del>{{ scope.row.destbarcode }}</del>
</span>
......@@ -329,6 +329,7 @@ export default {
})
} else {
self.$bus.emit('bzJudge', null)
this.$bus.emit("changImageEditTarget", 'xxx');
}
});
},
......@@ -1185,12 +1186,23 @@ export default {
let self = this;
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudge', val)
if(val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
if (self.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
// this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return;
} else {
//console.log(val);
......@@ -1203,10 +1215,10 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
// self.$store.commit('loading/setLoading', true)
// 平面 --- 换压缩图
if (val.destseqno > 10) {
if (val.destseqno > 10 && val.destseqno <= 20) {
this.$axios({
method: 'post',
url: '/api/png/plainByBarcode/barcode/seq',
url: '/api/png/plain/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1216,11 +1228,11 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
} else if(val.destseqno >= 1 && val.destseqno <= 10) {
// 滚动 --- 换压缩图
this.$axios({
method: 'post',
url: '/api/png/rollByBarcode/barcode/seq',
url: '/api/png/roll/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1230,6 +1242,19 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
// 掌纹
this.$axios({
method: 'post',
url: '/api/png/palm/barcode/seq',
data: {
barcode: val.destbarcode,
hpseqno: val.destseqno,
},
loading: true
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
}
} else {
this.$bus.emit("changImageEditTarget", 'xxx');
......
src/views/cxyrd/modules/TLCandidate.vue
<template>
<div class="tl-candidate">
<div class="tl-search">
<div class="label">手纹</div>
<div class="label">{{searchType}}</div>
<el-input class="input" v-model="input3" placeholder="请输入条码号/指位" @keydown.enter="search"></el-input>
<div class="btn" @click="search">筛选</div>
</div>
......@@ -9,10 +9,41 @@
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"></el-table-column>
<el-table-column prop="score" label="得分" :width="width1"></el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')"></el-table-column>
<el-table-column label="排名" type="index" :width="width1">
</el-table-column>
<el-table-column prop="score" label="得分" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.score}}</del>
</span>
<span v-else>
{{scope.row.score}}
</span>
</template>
</el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destseqno}}</del>
</span>
<span v-else>
{{scope.row.destseqno}}
</span>
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destbarcode}}</del>
</span>
<span v-else>
{{scope.row.destbarcode}}
</span>
</template>
</el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
......@@ -39,7 +70,8 @@ export default {
loading: null,
timer: null,
// 是否被删除
isDelete: false
isDelete: false,
searchType: '手纹'
};
},
created () {
......@@ -50,6 +82,10 @@ export default {
},
mounted () {
let self = this;
// 监听掌纹/手纹
self.$bus.on('searchType', (searchType) => {
self.searchType = searchType
})
// 监听是否被删除
self.$bus.on('deleteMessage', (obj) => {
if (obj.delTime != null) {
......@@ -74,6 +110,11 @@ export default {
});
} else {
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
});
// 比中，认定完成之后更新列表数据
......@@ -117,12 +158,23 @@ export default {
console.log(val);
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val)
if (val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
if (this.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
......@@ -137,28 +189,51 @@ export default {
sessionStorage.setItem("backcheckXh", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
if (!self.isFirstMounted) {
self.$store.commit('loading/setLoadingSd', true)
// self.$store.commit('loading/setLoadingSd', true)
}
this.$axios
.post("/api/org/caseBybarcode/barcode/seq", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
self.$store.commit('loading/setLoadingSd', false)
}, 500);
if (val.destseqno < 100) {
// 获取案件指纹
this.$axios
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
} else {
// 获取案件掌纹
// TODO
this.$axios
.post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode,
hpseqno: val.destseqno,
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
});
}
}
else {
self.$bus.emit("changImageEditTarget", 'xxx');
......@@ -197,7 +272,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
}
},
......
src/views/zljc/jcxq.vue
......@@ -356,7 +356,6 @@ export default {
this.$store.commit('layout/delcachePageName', 'zljc');
this.$store.commit('layout/delcachePageName', 'jcxq');
this.$router.push('/zljc')
}
}
}
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-15 18:35:21
* @LastEditTime: 2021-12-16 23:00:27
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,7 +91,6 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.121:8099/", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
......@@ -99,8 +98,8 @@ module.exports = {
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.115:8099", // 江
target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -124,16 +123,16 @@ module.exports = {
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// pathRewrite: {++++
// "^/system": ""
// }
// },
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.121:8765", // 湖南-张
// target: "http://192.168.128.121:8765", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333",
target: "http://zwpt.xzclub.top:9333",
ws: true,
changeOrigin: true,
pathRewrite: {
......
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