Skip to content

F
founder_vue
Commit c57990e1 by 米嘉伟
Options

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

parents 92c798fe 6481763e
Showing with 227 additions and 114 deletions
dist.zip
No preview for this file type
package-lock.json
...@@ -7945,8 +7945,8 @@ ...@@ -7945,8 +7945,8 @@
}, },
"jwt-decode": { "jwt-decode": {
"version": "3.1.2", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", "resolved": "https://registry.npm.taobao.org/jwt-decode/download/jwt-decode-3.1.2.tgz",
"integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" "integrity": "sha1-P7MZ82daLfDCiVyPXp+ktnsE7Vk="
}, },
"keycode": { "keycode": {
"version": "2.2.1", "version": "2.2.1",
......
src/views/Editor/modules/ajzwbjLeft.scss
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
.left-right-hand { .left-right-hand {
margin-top: 5px; margin-top: 5px;
.lr-hand { .lr-hand {
width: 100%; // width: 100%;
width: 268px;
height: 640px; height: 640px;
overflow: auto; overflow: auto;
:nth-child(even) { :nth-child(even) {
...@@ -119,8 +120,8 @@ ...@@ -119,8 +120,8 @@
float: left; float: left;
.fingerPic { .fingerPic {
position: relative; position: relative;
width: 122px; width: 125px;
height: 122px; height: 125px;
background: #ffffff; background: #ffffff;
border-radius: 2px; border-radius: 2px;
border: 1px solid #cccccc; border: 1px solid #cccccc;
...@@ -181,6 +182,23 @@ ...@@ -181,6 +182,23 @@
color: #666666; color: #666666;
} }
} }
.handDom {
margin-left: 0;
.handPic {
width: 260px;
height: 260px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
margin: 0;
}
.hand-number {
width: 48px !important;
height: 24px !important;
background: #055fe7;
border-radius: 0px 0px 7px 0px;
}
}
.defaultfingerPic { .defaultfingerPic {
position: relative; position: relative;
width: 122px; width: 122px;
......
src/views/Editor/modules/ajzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-07 11:27:35 * @LastEditTime: 2021-12-09 13:26:04
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -45,11 +45,10 @@ ...@@ -45,11 +45,10 @@
</div> </div>
<div class="left-right-hand" v-else-if="zwSelect==='掌纹'"> <div class="left-right-hand" v-else-if="zwSelect==='掌纹'">
<div class="lr-hand" v-if="hands.length>0"> <div class="lr-hand" v-if="hands.length>0">
<div class="fingerDom" v-for="(item,index) in hands" :key="index" @click="HandChange(item.code)"> <div class="fingerDom handDom" v-for="(item,index) in hands" :key="index" @click="HandChange(item)">
<div class="fingerPic" :class="{fingerPicActive: activeHand===index}"> <div class="fingerPic handPic" :class="{fingerPicActive: activeHand===item.seq}">
<div class="finger-number">{{(item.code) &lt; 10 ? ('0'+(item.code)) : (item.code)}}</div> <div class="finger-number hand-number">{{item.seq}}</div>
<div class="finger-pic"> <div class="finger-pic">
<!-- <img src="../../../assets/img/zhangwen.png" /> -->
<img :src="'data:image/jpeg;base64,'+item.image" alt=""> <img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div> </div>
</div> </div>
...@@ -62,7 +61,7 @@ ...@@ -62,7 +61,7 @@
</div> </div>
</div> </div>
<div class="finger-total"> <div class="finger-total">
共计<span>4枚</span>掌纹 共计<span>{{hands.length}}枚</span>掌纹
</div> </div>
</div> </div>
</div> </div>
...@@ -113,35 +112,37 @@ export default { ...@@ -113,35 +112,37 @@ export default {
// }, // },
], ],
hands: [ hands: [
{ // {
code: '16', // code: '16',
name: '拇', // name: '拇',
image: null // image: null
}, // },
{ // {
code: '17', // code: '17',
name: '食', // name: '食',
image: null // image: null
}, // },
{ // {
code: '18', // code: '18',
name: '中', // name: '中',
image: null // image: null
}, // },
{ // {
code: '19', // code: '19',
name: '环', // name: '环',
image: null // image: null
}, // },
{ // {
code: '20', // code: '20',
name: '小', // name: '小',
image: null // image: null
} // }
], ],
// 加载动画 // 加载动画
loading: null, loading: null,
timer: null timer: null,
// 是否请求过掌纹
isHandRequest: false,
} }
}, },
computed: { computed: {
...@@ -183,6 +184,45 @@ export default { ...@@ -183,6 +184,45 @@ export default {
}, },
methods: { methods: {
/** /**
* 切换掌纹
*/
HandChange(hand) {
this.activeHand = hand.seq
this.$store.commit('zwbj/setSeq', hand.seq)
// 指纹编辑区域发送指纹数据，替换指纹图片
console.log(hand);
this.$bus.emit('ajzwbjImage', { finger_image: hand.image, finger_dealFlag: hand.dealFlag, finger_position: hand.fingerPosition })
this.$bus.emit('ajzwbjTDZ')
},
/**
* 获取掌纹数据
*/
async getHandsData () {
let self = this
if (self.isHandRequest) return;
let res = await this.$axios({
method: 'post',
url: '/api/org/case/palm/barcode',
loading: true,
data: {
barcode: 'A9999999777778888888888'
// barcode: self.barcode
}
})
console.log(res);
// 初始化图片
self.hands = []
// 赋值
if (res.data.code === 0) {
self.hands = res.data.ret
this.activeHand = this.hands[0].seq
this.HandChange(this.hands[0])
} else {
self.$bus.emit('ryzwbjImage', 'xxx')
}
self.isHandRequest = true
},
/**
* 打开档案信息 * 打开档案信息
*/ */
daxxChange () { daxxChange () {
...@@ -295,43 +335,6 @@ export default { ...@@ -295,43 +335,6 @@ export default {
//console.log(fingerIndex); //console.log(fingerIndex);
this.activeFinger = fingerIndex this.activeFinger = fingerIndex
let self = this
if (this.preSeq) {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
//console.log(this.preSeq);
//console.log(self.preTzdArr);
if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall))
self.$store.commit('zwbj/setTzdall', null)
}
// self.$store.commit('zwbj/setTzdall', null)
// self.$store.commit('zwbj/setAutoTzdall', null)
// 重要区域的特征保存
//console.log(self.zyhz);
if (self.zyhz && self.zyhz.length >= 0) {
sessionStorage.setItem(`zyhz_${this.preSeq}`, JSON.stringify(self.zyhz))
self.$store.commit('zwbj/setZyhz', null)
}
//console.log(self.yxhz);
if (self.yxhz && self.yxhz.length >= 0) {
//console.log(self.yxhz);
sessionStorage.setItem(`yxhz_${this.preSeq}`, JSON.stringify(self.yxhz))
self.$store.commit('zwbj/setYxhz', null)
}
if (self.autoyxhz && self.autoyxhz.length >= 0) {
//console.log(self.autoyxhz);
sessionStorage.setItem(`auto_yxhz_${this.preSeq}`, JSON.stringify(self.autoyxhz))
self.$store.commit('zwbj/setAutoYxhz', null)
}
if (self.autozyhz && self.autozyhz.length >= 0) {
//console.log(self.autozyhz);
sessionStorage.setItem(`auto_zyhz_${this.preSeq}`, JSON.stringify(self.autozyhz))
self.$store.commit('zwbj/setAutoZyhz', null)
}
}
this.preSeq = finger.code this.preSeq = finger.code
// 调取获取原图接口 // 调取获取原图接口
...@@ -348,6 +351,13 @@ export default { ...@@ -348,6 +351,13 @@ export default {
zzwChange (event) { zzwChange (event) {
this.zwSelect = event.target.innerText this.zwSelect = event.target.innerText
this.$bus.emit('zwType', this.zwSelect) this.$bus.emit('zwType', this.zwSelect)
if(this.zwSelect == '掌纹') {
// 请求掌纹数据
this.getHandsData()
if(this.hands && this.hands.length>0) {
this.activeHand = this.hands[0].seq
}
}
}, },
}, },
beforeDestroy () { beforeDestroy () {
......
src/views/Editor/modules/imageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-07 10:42:23 * @LastEditTime: 2021-12-09 13:23:08
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -1301,13 +1301,16 @@ export default { ...@@ -1301,13 +1301,16 @@ export default {
// 特征点图层恢复默认 // 特征点图层恢复默认
$('.tzdDrawing').css('transform', 'rotate(0deg)') $('.tzdDrawing').css('transform', 'rotate(0deg)')
$('.tzdDrawing_2').css('transform', 'rotate(0deg)')
// 获取自动提取特征 // 获取自动提取特征
self.getAutoTzd(false); self.getAutoTzd(false);
// 一开始记录特征点，还未操作过 // 一开始记录特征点，还未操作过
sessionStorage.setItem('isOption_' + self.seq, false) if (!sessionStorage.getItem('isOption_' + self.seq)) {
self.judgeJumpRoute() sessionStorage.setItem('isOption_' + self.seq, false)
self.judgeJumpRoute()
}
// 如果之前保留了特征点，则展示出来 // 如果之前保留了特征点，则展示出来
console.log(sessionStorage.getItem(self.seq)); console.log(sessionStorage.getItem(self.seq));
...@@ -1347,6 +1350,8 @@ export default { ...@@ -1347,6 +1350,8 @@ export default {
$("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
// 特征点数量
self.tzdnumber++
}); });
} }
} else { } else {
...@@ -1431,7 +1436,7 @@ export default { ...@@ -1431,7 +1436,7 @@ export default {
x: e.pageX - $(".tzdDrawing").offset().left - 4, x: e.pageX - $(".tzdDrawing").offset().left - 4,
y: e.pageY - $(".tzdDrawing").offset().top - 4 y: e.pageY - $(".tzdDrawing").offset().top - 4
}); });
self.tzdnumber = self.tzdArr.length; // self.tzdnumber++;
$( $(
`<div id="tzd${self.tzdId}" class="tzdDom"><div class="head"></div><div class="direction"></div></div>` `<div id="tzd${self.tzdId}" class="tzdDom"><div class="head"></div><div class="direction"></div></div>`
).appendTo(".tzdDrawing"); ).appendTo(".tzdDrawing");
...@@ -1520,9 +1525,11 @@ export default { ...@@ -1520,9 +1525,11 @@ export default {
// $(e.target.parentNode).css('transition', 'all 1.5s'); // $(e.target.parentNode).css('transition', 'all 1.5s');
setTimeout(() => { setTimeout(() => {
$(e.target.parentNode).remove(); $(e.target.parentNode).remove();
// 特征点数量
self.tzdnumber--
}, 1000); }, 1000);
} }
self.tzdnumber = self.tzdArr.length;
// //console.log(self.tzdArr); // //console.log(self.tzdArr);
// 全部数据保存 // 全部数据保存
var tzdall_shou = []; var tzdall_shou = [];
...@@ -1534,8 +1541,9 @@ export default { ...@@ -1534,8 +1541,9 @@ export default {
zwtzd_tzyzb: item.y zwtzd_tzyzb: item.y
}); });
}); });
self.$store.commit("zwbj/setTzdall", tzdall_shou); self.$store.commit("zwbj/setTzdall", tzdall_shou);
sessionStorage.setItem(`${self.seq}`, JSON.stringify(self.tzdall_shou)) sessionStorage.setItem(`${self.seq}`, JSON.stringify(tzdall_shou))
// 删除自动提取的特征点 // 删除自动提取的特征点
//console.log(self.autoTzdArr); //console.log(self.autoTzdArr);
...@@ -1549,6 +1557,8 @@ export default { ...@@ -1549,6 +1557,8 @@ export default {
$(e.target.parentNode).css("border", "2px solid red"); $(e.target.parentNode).css("border", "2px solid red");
setTimeout(() => { setTimeout(() => {
$(e.target.parentNode).remove(); $(e.target.parentNode).remove();
// 特征点数量
self.tzdnumber--
}, 1000); }, 1000);
// 更新vuex数据 // 更新vuex数据
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
...@@ -1564,6 +1574,8 @@ export default { ...@@ -1564,6 +1574,8 @@ export default {
$(e.target.parentNode).css("border", "2px solid red"); $(e.target.parentNode).css("border", "2px solid red");
setTimeout(() => { setTimeout(() => {
$(e.target.parentNode).remove(); $(e.target.parentNode).remove();
// 特征点数量
self.tzdnumber--
}, 1000); }, 1000);
// 更新vuex数据 // 更新vuex数据
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
...@@ -1710,7 +1722,7 @@ export default { ...@@ -1710,7 +1722,7 @@ export default {
$(".tzdDrawing").css("transform", `rotate(${canvasImage.angle}deg) translate(${Number(canvasImage.left)}px,${Number(canvasImage.top)}px) scale(${self.zoomLevel})`); $(".tzdDrawing").css("transform", `rotate(${canvasImage.angle}deg) translate(${Number(canvasImage.left)}px,${Number(canvasImage.top)}px) scale(${self.zoomLevel})`);
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel}) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px)`); $(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel}) translate(${Number(canvasImage.left)}px,${Number(canvasImage.top)}px)`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px"; // document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
// //console.log(`${originPointer.y}px,${originPointer.x}px`); // //console.log(`${originPointer.y}px,${originPointer.x}px`);
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.y}px ${originPointer.x}px`; // document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.y}px ${originPointer.x}px`;
...@@ -1893,7 +1905,7 @@ export default { ...@@ -1893,7 +1905,7 @@ export default {
// self.$set(self.tzdArr[objindex], 'angle', 0) // self.$set(self.tzdArr[objindex], 'angle', 0)
self.tzdArr[objindex].angle = 0; self.tzdArr[objindex].angle = 0;
} }
self.tzdnumber = self.tzdArr.length; self.tzdnumber++
self.tzdFlag = false; self.tzdFlag = false;
self.tzdId++; self.tzdId++;
ins.setEnd(); ins.setEnd();
...@@ -2031,6 +2043,24 @@ export default { ...@@ -2031,6 +2043,24 @@ export default {
}, },
methods: { methods: {
/** /**
* 清除所有
*/
clearALL () {
let self = this
self.tzdnumber = 0
this.$store.commit('zwbj/setTzdall', null);
this.$store.commit('zwbj/setAutoTzdall', null);
sessionStorage.removeItem(self.seq)
// 特征点
self.autoTzdArr = []
self.tzdall = []
self.tzdArr = []
$('.auto_tzdDom').remove()
$('.tzdDom').remove()
},
/**
* 人像双击事件 * 人像双击事件
*/ */
faceDoubleChange (face) { faceDoubleChange (face) {
...@@ -2083,6 +2113,7 @@ export default { ...@@ -2083,6 +2113,7 @@ export default {
// 从数据库中获取数据 // 从数据库中获取数据
if (flag) { if (flag) {
this.isAutoTzd = true this.isAutoTzd = true
this.clearALL()
if (self.seq <= 20) { if (self.seq <= 20) {
// 指纹特征点提取 // 指纹特征点提取
...@@ -2090,7 +2121,6 @@ export default { ...@@ -2090,7 +2121,6 @@ export default {
method: "get", method: "get",
url: "/api/export/trait/xml/person/" + this.barcode + "/" + this.seq, url: "/api/export/trait/xml/person/" + this.barcode + "/" + this.seq,
loading: false loading: false
// url: 'http://www.meetfood.cn:2390/traint/export/xml/trait/' + this.barcode + '/' + this.seq
}); });
//console.log(res); //console.log(res);
...@@ -2121,6 +2151,8 @@ export default { ...@@ -2121,6 +2151,8 @@ export default {
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box"); $(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
// 特征点数量
self.tzdnumber++
}); });
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
...@@ -2131,6 +2163,7 @@ export default { ...@@ -2131,6 +2163,7 @@ export default {
// sessionStorage.setItem('greenDeg_' + self.seq, self.greenDeg) // sessionStorage.setItem('greenDeg_' + self.seq, self.greenDeg)
// document.getElementsByTagName("body")[0].style.setProperty("--directionRotate", self.greenDeg + "deg"); // document.getElementsByTagName("body")[0].style.setProperty("--directionRotate", self.greenDeg + "deg");
} else if (res.data.code == 4) { } else if (res.data.code == 4) {
self.$store.commit("zwbj/setAutoTzdall", []); self.$store.commit("zwbj/setAutoTzdall", []);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify([])); sessionStorage.setItem(`auto${self.seq}`, JSON.stringify([]));
...@@ -2178,6 +2211,8 @@ export default { ...@@ -2178,6 +2211,8 @@ export default {
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box"); $(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${-item.zwtzd_tzfx}deg)`);
self.tzdId++; self.tzdId++;
// 特征点数量
self.tzdnumber++
}); });
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
...@@ -2201,7 +2236,7 @@ export default { ...@@ -2201,7 +2236,7 @@ export default {
if (self.autoTzdArr && self.autoTzdArr.length >= 0) { if (self.autoTzdArr && self.autoTzdArr.length >= 0) {
self.autoTzdArr.forEach((item, index) => { self.autoTzdArr.forEach((item, index) => {
$( $(
`<div id="${item.id}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>` `<div id="auto_tzdDom${self.tzdId}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>`
).appendTo(".tzdDrawing"); ).appendTo(".tzdDrawing");
$(".auto_tzdDom").css("display", "flex"); $(".auto_tzdDom").css("display", "flex");
$(".auto_tzdDom").css("align-items", "center"); $(".auto_tzdDom").css("align-items", "center");
...@@ -2217,10 +2252,13 @@ export default { ...@@ -2217,10 +2252,13 @@ export default {
$(".auto_tzdDom .direction").css("height", "2px"); $(".auto_tzdDom .direction").css("height", "2px");
$(".auto_tzdDom .direction").css("background-color", "#FFFD0F"); $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
$(`#${item.id}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("left", (item.zwtzd_tzxzb - 4) / self.zoomLevel + "px");
$(`#${item.id}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("top", (item.zwtzd_tzyzb - 4) / self.zoomLevel + "px");
$(`#${item.id}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$("#" + item.id).css("transform", `rotate(${item.zwtzd_tzfx}deg)`); $("#" + item.id).css("transform", `rotate(${item.zwtzd_tzfx}deg)`);
self.tzdId++;
// 特征点数量
self.tzdnumber++
}); });
self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr); self.$store.commit("zwbj/setAutoTzdall", self.autoTzdArr);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -1063,6 +1063,7 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -1063,6 +1063,7 @@ $canvasWidth: var(--canvasWidth, 640px);
} }
.positions { .positions {
z-index: 999999;
.head { .head {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1108,6 +1109,39 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -1108,6 +1109,39 @@ $canvasWidth: var(--canvasWidth, 640px);
} }
} }
} }
.positons-hand {
display: flex;
flex-wrap: wrap;
padding: 16px 14px;
.hand-item {
/deep/.el-checkbox__label {
padding-left: 5px;
}
// 修改多选框样式
/deep/ .el-checkbox.is-checked {
.el-checkbox__label {
color: #333333;
}
.el-checkbox__input.is-checked {
.el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
.el-checkbox {
margin-right: 10px;
}
&:nth-child(even) {
.el-checkbox {
margin-right: 0;
}
}
}
}
/deep/ .el-radio { /deep/ .el-radio {
color: #666; color: #666;
......
src/views/SystemManage/UserManage.vue
...@@ -335,6 +335,7 @@ ...@@ -335,6 +335,7 @@
<el-form-item class="info-item" label="密码:" prop="password"> <el-form-item class="info-item" label="密码:" prop="password">
<el-input <el-input
placeholder="请输入密码" placeholder="请输入密码"
type="password"
class="input-info" class="input-info"
maxlength="8" maxlength="8"
v-model="addFormParams.password" v-model="addFormParams.password"
...@@ -563,7 +564,7 @@ export default { ...@@ -563,7 +564,7 @@ export default {
}; };
// 单位代码校验 // 单位代码校验
var validateUnitcode = (rule, value, callback) => { var validateUnitcode = (rule, value, callback) => {
if (value.trim() === "") { if (value === "") {
callback(new Error("请选择单位代码！")); callback(new Error("请选择单位代码！"));
} else { } else {
callback(); callback();
...@@ -571,7 +572,7 @@ export default { ...@@ -571,7 +572,7 @@ export default {
}; };
// 单位名称校验 // 单位名称校验
var validateUnitname = (rule, value, callback) => { var validateUnitname = (rule, value, callback) => {
if (value.trim() === "") { if (value === "") {
callback(new Error("请选择单位名称！")); callback(new Error("请选择单位名称！"));
} else { } else {
callback(); callback();
......
src/views/bzxxgl/bzxxfh.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-01 15:25:22 * @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-08 11:52:21 * @LastEditTime: 2021-12-09 10:20:00
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue * @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
<div class="plcz btn" @click="batch">批量操作</div> <div class="plcz btn" @click="batch">批量操作</div>
</div> </div>
<div class="bzxxfh-content-top-right"> <div class="bzxxfh-content-top-right">
<div class="jcbzgx btn" @click="cxbzgxChange">解除比中关系</div> <!-- <div class="jcbzgx btn" @click="cxbzgxChange">解除比中关系</div>
<div class="cxfh btn" @click="cxfhChange2">撤销复核</div> <div class="cxfh btn" @click="cxfhChange2">撤销复核</div> -->
<div class="fztm btn" v-clipboard:copy="fztm_ytmh" @click="fztmChange" v-clipboard:success="onCopy" v-clipboard:error="onError">复制条码</div> <div class="fztm btn" v-clipboard:copy="fztm_ytmh" @click="fztmChange" v-clipboard:success="onCopy" v-clipboard:error="onError">复制条码</div>
</div> </div>
</div> </div>
...@@ -109,18 +109,18 @@ ...@@ -109,18 +109,18 @@
</el-table-column> </el-table-column>
<el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="dateTimeFormat"> <el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="dateTimeFormat">
</el-table-column> </el-table-column>
<el-table-column prop="affirmStatus" label="复核状态" :width="width3"> <el-table-column prop="reviewStatus" label="复核状态" :width="width3">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="fhzt"> <div class="fhzt">
<div :class="{wfh: scope.row.affirmStatus==='0', fhyx: scope.row.affirmStatus==='2', fhwx: scope.row.affirmStatus==='1'}"></div> <div :class="{wfh: scope.row.reviewStatus==='0', fhyx: scope.row.reviewStatus==='2', fhwx: scope.row.reviewStatus==='1'}"></div>
{{scope.row.affirmStatus=='0' ? '未复核' : (scope.row.affirmStatus=='2' ? '复核有效' : '复核无效')}} {{scope.row.reviewStatus=='0' ? '未复核' : (scope.row.reviewStatus=='2' ? '复核有效' : '复核无效')}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="nydwGajgmc" label="操作" width="auto"> <el-table-column prop="nydwGajgmc" label="操作" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="dfh(scope.row)" v-show="scope.row.affirmStatus==='0'" :class="{dfh: scope.row.affirmStatus==='0'}">待复核</div> <div @click="dfh(scope.row)" v-show="scope.row.reviewStatus==='0'" :class="{dfh: scope.row.reviewStatus==='0'}">待复核</div>
<div @click="cxfhChange($event,scope.row)" v-show="scope.row.affirmStatus!='0'" :class="{cxfh: scope.row.affirmStatus!='0'}">撤销复核</div> <div @click="cxfhChange($event,scope.row)" v-show="scope.row.reviewStatus!='0'" :class="{cxfh: scope.row.reviewStatus!='0'}">撤销复核</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -332,14 +332,20 @@ export default { ...@@ -332,14 +332,20 @@ export default {
let fhjssj = '' let fhjssj = ''
// 存在比中时间 // 存在比中时间
if (this.ruleForm.bzsj && this.ruleForm.bzsj.length > 0) { if (this.ruleForm.bzsj && this.ruleForm.bzsj.length == 2) {
bzkssj = this.$moment(new Date(this.ruleForm.bzsj[0])).format("YYYY-MM-DD") bzkssj = this.$moment(new Date(this.ruleForm.bzsj[0])).format("YYYY-MM-DD")
bzjssj = this.$moment(new Date(this.ruleForm.bzsj[1])).format("YYYY-MM-DD") bzjssj = this.$moment(new Date(this.ruleForm.bzsj[1])).format("YYYY-MM-DD")
} else {
bzkssj = ''
bzjssj = ''
} }
// 存在比中时间 // 存在比中时间
if (this.ruleForm.fhsj && this.ruleForm.fhsj.length > 0) { if (this.ruleForm.fhsj && this.ruleForm.fhsj.length == 2) {
fhkssj = this.$moment(new Date(this.ruleForm.fhsj[0])).format("YYYY-MM-DD") fhkssj = this.$moment(new Date(this.ruleForm.fhsj[0])).format("YYYY-MM-DD")
fhjssj = this.$moment(new Date(this.ruleForm.fhsj[1])).format("YYYY-MM-DD") fhjssj = this.$moment(new Date(this.ruleForm.fhsj[1])).format("YYYY-MM-DD")
} else {
fhkssj = ''
fhjssj = ''
} }
let searchForm = this.ruleForm let searchForm = this.ruleForm
searchForm.page = page searchForm.page = page
...@@ -519,6 +525,8 @@ export default { ...@@ -519,6 +525,8 @@ export default {
}, },
resetForm (formName) { resetForm (formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
console.log(this.ruleForm);
this.getData()
} }
}, },
computed: { computed: {
......
src/views/cxyrd/LT.vue
...@@ -237,13 +237,15 @@ export default { ...@@ -237,13 +237,15 @@ export default {
querytype querytype
} }
}).then(response => { }).then(response => {
// 跟新列表数据 if(response.data.code === 0) {
self.$bus.emit("updateFinderSource"); // 跟新列表数据
//console.log(response); self.$bus.emit("updateFinderSource");
this.$message.success("认定完成！"); //console.log(response);
if (type == "son") { this.$message.success("认定完成！");
window.close();
} }
// if (type == "son") {
// window.close();
// }
}); });
}, },
/** /**
......
src/views/cxyrd/TL.vue
...@@ -215,13 +215,15 @@ export default { ...@@ -215,13 +215,15 @@ export default {
querytype querytype
} }
}).then(response => { }).then(response => {
// 跟新列表数据 if(response.data.code === 0) {
self.$bus.emit("updateTLSourceData"); // 跟新列表数据
//console.log(response); self.$bus.emit("updateTLSourceData");
this.$message.success("认定完成！"); //console.log(response);
if (type == "son") { this.$message.success("认定完成！");
window.close();
} }
// if (type == "son") {
// window.close();
// }
}); });
}, },
/** /**
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-08 17:22:44 * @LastEditTime: 2021-12-08 18:09:43
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -92,13 +92,13 @@ module.exports = { ...@@ -92,13 +92,13 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // 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.166:8099/", // 张 认定
// target: "http://192.168.128.108:8099", // 湖南-张 // target: "http://192.168.128.108:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马 target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王 // target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光 // target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
// target: "http://192.168.128.115:8099", // 江 // target: "http://192.168.128.115:8099", // 江
ws: true, ws: 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