Skip to content

F
founder_vue
Commit 424b96b4 by 李萌萌
Options

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

parents dd04c715 6cd5ebc7
Showing with 492 additions and 118 deletions
dist.zip
No preview for this file type
src/utils/LogcatUtil.js 0 → 100644
export default function PrintLog(title, content, tag) {
if (!title && !content) {
return
}
if (!tag) {
tag = '^_^'
}
// console.log('')
console.log('----------------------------' + tag + '----------------------------')
if (title && content) {
console.log(' 标题：', title)
console.log(' 内容：', content)
} else if (title) {
console.log(' ', title)
} else if (content) {
console.log(' ', content)
}
console.log('----------------------------' + tag + '----------------------------')
console.log('')
}
src/views/Editor/modules/ajzwbjLeft.scss
......@@ -156,7 +156,8 @@
display: flex;
justify-content: center;
img {
object-fit: contain;
// object-fit: contain;
height: 100%;
}
margin-left: 0;
}
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-11 11:40:07
* @LastEditTime: 2021-12-11 14:39:23
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -183,7 +183,6 @@ export default {
self.hands = []
// 赋值
if (res.data.code === 0) {
debugger
self.hands = res.data.ret
this.activeHand = this.hands[0].seq
this.HandChange(this.hands[0])
......@@ -191,7 +190,6 @@ export default {
self.$bus.emit('ryzwbjImage', 'xxx')
}
} else {
debugger
self.$bus.emit('ryzwbjImage', 'xxx')
}
self.isHandRequest = true
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-11 18:43:35
* @LastEditTime: 2021-12-13 11:02:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -882,6 +882,7 @@ export default {
if (!$(this).hasClass("disabled")) {
imageEditor.discardSelection();
imageEditor.undo();
self.resetTzdDrawing()
}
});
......@@ -892,6 +893,7 @@ export default {
if (!$(this).hasClass("disabled")) {
imageEditor.discardSelection();
imageEditor.redo();
self.resetTzdDrawing()
}
});
......@@ -1780,6 +1782,7 @@ export default {
// 判断指纹类型
this.$bus.on("zwType", (zwType) => {
self.zwType = zwType;
console.log(self.zwType);
});
// 更改指纹编辑区域标题
......@@ -3093,7 +3096,7 @@ export default {
});
}
});
console.log(allTZDataHand);
console.log(allTZData);
......@@ -3121,21 +3124,23 @@ export default {
}
});
this.$axios({
method: "post",
url: "/api/upload/trait/allperson/palm?barcode=" + self.barcode,
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
data: JSON.stringify(allTZDataHand),
}).then((res) => {
if (res.data.code === 0) {
self.$message.success("保存成功！");
// 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length);
self.judgeJumpRoute();
}
});
if(allTZDataHand.length > 0) {
this.$axios({
method: "post",
url: "/api/upload/trait/allperson/palm?barcode=" + self.barcode,
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
data: JSON.stringify(allTZDataHand),
}).then((res) => {
if (res.data.code === 0) {
self.$message.success("保存成功！");
// 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length);
self.judgeJumpRoute();
}
});
}
}
},
/**
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -942,8 +942,8 @@ $canvasWidth: var(--canvasWidth, 640px);
background: #ffffff;
display: flex;
filter: "FlipV";
// justify-content: center;
// align-items: center;
justify-content: center;
align-items: center;
.tui-image-editor {
width: 640px !important;
height: 640px !important;
......@@ -958,9 +958,9 @@ $canvasWidth: var(--canvasWidth, 640px);
width: $canvasWidth !important;
// height: auto !important;
// width: auto !important;
// display: flex !important;
// justify-content: center !important;
// align-items: center !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
}
/deep/ .lower-canvas {
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-11 11:04:26
* @LastEditTime: 2021-12-11 14:46:20
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -6357,21 +6357,23 @@ export default {
});
// 掌纹特征点数据保存
this.$axios({
method: 'post',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
url: '/api/upload/trait/allcase/palm?barcode=' + self.barcode,
data: JSON.stringify(hand_tjsj)
}).then(res => {
if (res.data.code === 0) {
self.$message.success('保存成功！')
// 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length);
self.judgeJumpRoute()
}
})
if (hand_tjsj.length > 0) {
this.$axios({
method: 'post',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
url: '/api/upload/trait/allcase/palm?barcode=' + self.barcode,
data: JSON.stringify(hand_tjsj)
}).then(res => {
if (res.data.code === 0) {
self.$message.success('保存成功！')
// 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length);
self.judgeJumpRoute()
}
})
}
}
else if (this.saveType === "当前特征和图片") {
// 处理特征点---保存前需要处理数据
......@@ -6619,6 +6621,9 @@ export default {
});
tj_lr_finger = lr_finger.join(",");
console.log(tj_lr_finger);
if (tj_lr_finger != '') {
tj_lr_finger = JSON.parse(tj_lr_finger)
}
this.$axios({
method: 'post',
headers: {
......@@ -6627,7 +6632,7 @@ export default {
url:
"/api/upload/trait/case?barcode=" +
self.barcode +
"&fingerPosition=" + JSON.parse(tj_lr_finger) +
"&fingerPosition=" + tj_lr_finger +
"&seq=" +
self.seq,
data: JSON.stringify(handFpt5)
......@@ -6639,6 +6644,19 @@ export default {
self.judgeJumpRoute()
}
})
let angle = self.imageEditor._graphics.getCanvasImage().angle
// 保存掌纹图片
this.$axios({
method: 'post',
url: `/api/upload/trait/case/palm/image?angle=${angle}&barcode=${self.barcode}&hpseqno=${self.seq}&bmpHeight=${self.newHeight}&bmpWidth=${self.newWidth}`
}).then(res => {
if (res.data.code === 0) {
self.$message.success("图片保存成功！");
} else {
self.$message.error("图片保存失败！");
}
})
} else {
// 指纹
// 处理指位信息
......@@ -6656,6 +6674,9 @@ export default {
});
tj_lr_finger = lr_finger.join(",");
console.log(tj_lr_finger);
if (tj_lr_finger != '') {
tj_lr_finger = JSON.parse(tj_lr_finger)
}
this.$axios({
method: "post",
headers: {
......@@ -6664,7 +6685,7 @@ export default {
url:
"/api/upload/trait/case?barcode=" +
self.barcode +
"&fingerPosition=" + JSON.parse(tj_lr_finger) +
"&fingerPosition=" + tj_lr_finger +
"&seq=" +
self.seq,
data: JSON.stringify(fpt5TraitMinutiaList),
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-10 18:17:44
* @LastEditTime: 2021-12-11 15:54:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -934,11 +934,13 @@ export default {
this.$store.commit('ryzwbj/setIsFace', true)
// 获取人脸数据
this.getFaceData()
this.$bus.emit('zwType', '人像')
} else {
// 指纹列表
// 传入判断，为指纹则开启图像编辑的功能
// this.$bus.emit('isFace', false)
this.$store.commit('ryzwbj/setIsFace', false)
this.$bus.emit('zwType', '指纹')
// 找到第一个有图片的指纹
this.findFinger()
if (self.finger && self.finger.code) {
......
src/views/bzxxgl/BzxxsfOpt.vue 0 → 100644
<template>
<div class="root-div">
<div ref="selectDiv" class="opt-select-all" @click="selectClick">
<div class="opt-select-left">
<div>{{selValue}}</div>
</div>
<div :class="isShowing?'opt-select-right-select':'opt-select-right'">
<svg class="icon opt-select-right-svg" aria-hidden="true" :transform="getRotate()">
<use xlink:href="#icon-shenhe-xiala" />
</svg>
</div>
</div>
<div ref="content" class="opt-select-list-all">
<div v-for="item in curOpt" class="opt-select-list-item" @click="clictItem(item)">
<svg class="icon opt-select-right-svg" aria-hidden="true"
style="margin-right: 8px;width: 20px;height: 20px;">
<use :xlink:href="item.icon" />
</svg>
{{item.name}}
</div>
</div>
<!-- <div class="select-btn-left">撤销审核</div>-->
<!-- <span class="select-btn-right">-->
<!-- <svg class="icon" aria-hidden="true">-->
<!-- <use xlink:href="#icon-shenhe-xiala" />-->
<!-- </svg>-->
<!-- </span>-->
<!-- <div v-if="params.reviewStatus === 0" class="btn-sh" @click="test(params)">-->
<!-- 待审核-->
<!-- </div>-->
<!-- <el-select-->
<!-- v-else-->
<!-- v-model="params.kk"-->
<!-- placeholder="请选择"-->
<!-- clearable-->
<!-- @change="refresh"-->
<!-- >-->
<!-- <el-option v-for="item in curOpt" :label="item.name" :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
</div>
</template>
<script>
export default {
name: 'BzxxsfOpt',
props: {
params: {
type: Object
}
},
data() {
return {
CHEXSH: {
name: '撤销审核',
value: '0',
icon: '#icon-chexiaoshenhe'
},
CXSH: {
name: '重新审核',
value: '1',
icon: '#icon-zhongxinshenhe'
},
JRZG: {
name: '计入战果',
value: '2',
icon: '#icon-jiruzhanguo'
},
BJZG: {
name: '不计战果',
value: '3',
icon: '#icon-bujizhanguo'
},
curOpt: [],
isSelf: false,
isShowing: false,
selValue: '请选择'
}
},
created() {
//TODO...根据类型进行插座初始化
var _that = this
switch (_that.params.reviewStatus) {
case 0:
_that.curOpt.push(_that.CHEXSH)
_that.curOpt.push(_that.CXSH)
_that.curOpt.push(_that.BJZG)
break
case 1:
_that.curOpt.push(_that.CHEXSH)
_that.curOpt.push(_that.CXSH)
_that.curOpt.push(_that.JRZG)
_that.curOpt.push(_that.BJZG)
break
case 2:
_that.curOpt.push(_that.CHEXSH)
_that.curOpt.push(_that.CXSH)
break
case 3:
_that.curOpt.push(_that.CHEXSH)
_that.curOpt.push(_that.CXSH)
_that.curOpt.push(_that.JRZG)
break
}
document.addEventListener('click', function (e) {
if (_that.isSelf) {
_that.isSelf = false
return
}
_that.closePop()
})
},
methods: {
clictItem(item) {
var _that = this
_that.selValue = item.name
_that.closePop()
//TODO... 业务逻辑
},
getRotate() {
var _that = this
if (_that.isShowing) {
return 'rotate(0)'
} else {
return 'rotate(180)'
}
},
selectClick() {
var _that = this
_that.isShowing = !_that.isShowing
_that.isSelf = true
},
refresh(e) {
var _that = this
//TODO.. 进行业务处理
_that.$emit('refresh', _that.params)
},
closePop() {
var _that = this
_that.isShowing = false
_that.$refs.content.style.display = 'none'
},
showPop() {
var _that = this
_that.isShowing = true
_that.$refs.content.style.display = 'block'
},
},
watch: {
isShowing: function (val) {
var _that = this
if (val) {
_that.showPop()
} else {
_that.closePop()
}
}
}
}
</script>
<style scoped>
@import "../../../public/iconfont/iconfont.css";
.root-div {
/*position: relative;*/
display: inline-block;
}
.opt-select-all {
width: 126px;
height: 32px;
background: #FFFFFF;
border-radius: 4px 4px 0px 0px;
border: 1px solid #D5E5FC;
}
.opt-select-left {
position: relative;
width: 94px;
height: 100%;
float: left;
}
.opt-select-right {
float: left;
width: 30px;
height: 100%;
/*background: #D5E5FC;*/
/*box-shadow: 2px 2px 2px 0px rgba(2, 122, 255, 0.41);*/
/*border-radius: 0px 3px 0px 0px;*/
background: #E1EDFF;
border-radius: 0px 3px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.opt-select-right-select {
float: left;
width: 30px;
height: 100%;
background: #D5E5FC;
box-shadow: 2px 2px 2px 0px rgba(2, 122, 255, 0.41);
border-radius: 0px 3px 0px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.opt-select-left div {
width: 100%;
height: 100%;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 14px;
display: flex;
align-items: center;
justify-content: center;
}
.opt-select-right-svg {
width: 16px;
height: 16px;
}
.opt-select-list-all {
width: 126px;
display: none;
padding-top: 10px;
z-index: 9999;
background: #FFFFFF;
border-radius: 4px 4px 0px 0px;
border: 1px solid #D5E5FC;
position: fixed;
}
.opt-select-list-item {
width: 126px;
height: 32px;
/*display: block;*/
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 19px;
}
.opt-select-list-item:hover {
background: #F5F5F7;
}
.btn-sh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #fe0000;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #fe0000;
display: flex;
align-items: center;
justify-content: center;
}
</style>
src/views/cxyrd/LT.vue
......@@ -181,17 +181,19 @@ export default {
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
console.log(this.userInfo);
this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
if(this.userInfo) {
this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
},
mounted () {
let self = this
this.$bus.on('bzJudge', (val) => {
self.bzData = val
console.log(self.bzData);
})
},
watch: {
phone (newValue, oldValue) {
......@@ -389,6 +391,7 @@ export default {
* @return {*}
*/
async Bz () {
if(this.bzData == null) return;
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3'){
return
}
......@@ -513,8 +516,9 @@ export default {
}),
},
beforeDestroy () {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
// 组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource");
this.$bus.off("bzJudge");
}
};
</script>
......
src/views/cxyrd/QueryConfirm.vue
......@@ -1646,7 +1646,6 @@ b {
}
/*有子节点 且未展开*/
.el-table /deep/ .el-icon-arrow-right:before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
......@@ -1657,7 +1656,6 @@ b {
/*有子节点 且已展开*/
.el-table /deep/ .el-table__expand-icon--expanded {
.el-icon-arrow-right:before {
// background: url("../../icons/tree_c.svg") no-repeat 0 3px;
content: "";
display: block;
width: 15px;
......@@ -1673,7 +1671,6 @@ b {
.el-table
/deep/
.el-table__placeholder::before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
......
src/views/cxyrd/TL.vue
......@@ -171,20 +171,26 @@ export default {
};
},
created () {
let self = this
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
console.log(this.userInfo);
this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
if(this.userInfo) {
this.bzr = this.userInfo.name
this.bzdw = this.userInfo.unitName
this.dwdm = this.userInfo.unitCode
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
},
mounted () {
let self = this
this.$bus.on('bzJudgeTL', (val) => {
self.bzData = val
console.log(self.bzData);
})
},
beforeDestroy () {
this.$bus.off('bzJudgeTL')
},
watch: {
phone (newValue, oldValue) {
if (newValue.length < 7) {
......@@ -353,7 +359,7 @@ export default {
* @return {*}
*/
async Bz () {
console.log(this.bzData);
if(this.bzData == null) return;
if(this.bzData.affirmstatus == '2' || this.bzData.affirmstatus == '3') {
return
}
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -328,11 +328,13 @@ export default {
self.$refs.singleTable.setCurrentRow(self.tableData[0]);
})
} else {
self.$bus.emit('bzJudge', null)
}
});
},
beforeDestroy () {
this.$bus.off('deleteMessage')
this.$bus.off('initCandidate')
},
methods: {
/**
......@@ -1231,6 +1233,10 @@ export default {
}
} else {
this.$bus.emit("changImageEditTarget", 'xxx');
// 存储目标条码号 --- 置空
sessionStorage.setItem("destbarcode", "");
// 存储目的数据序号 --- 置空
sessionStorage.setItem("destseqno", "");
}
}
},
......@@ -1336,6 +1342,9 @@ const candidates = [
line-height: 34px;
color: #ffffff;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
}
.checked {
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -313,14 +313,16 @@ export default {
},
}).then(response => {
//console.log(response);
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
if(response.data.code === 0) {
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
}
})
} else {
this.$axios({
......@@ -331,14 +333,16 @@ export default {
},
}).then(response => {
//console.log(response);
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
if(response.data.code === 0) {
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
}
})
}
......@@ -1038,6 +1042,17 @@ $tableHeight: var(--tableHeight, 320px);
height: $tableHeight;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
border-radius: 3px;
}
/* 设置滚动条的样式 */
::-webkit-scrollbar {
width: 6px;
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -60,21 +60,20 @@ export default {
})
this.$bus.on("initTLCandidate", (tableData) => {
console.log(tableData);
self.tableData = tableData;
if (self.tableData) {
self.total = self.tableData.length;
}
self.sourceTableData = tableData;
//console.log(self.tableData);
// 默认选中第一条数据
if (self.tableData && self.tableData.length > 0) {
// setTimeout(() => {
// self.$refs.singleTable.setCurrentRow(self.tableData[0]);
// }, 20000);
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.tableData[0]);
if (self.tableData.length > 0) {
self.$refs.singleTable.setCurrentRow(this.tableData[0])
}
});
} else {
self.$bus.emit('bzJudgeTL', null)
}
});
// 比中，认定完成之后更新列表数据
......@@ -97,9 +96,8 @@ export default {
this.$axios.post(`/api/query/matchcand/dest/${qqid}/${dcseq}`, {
srcbarcode: sessionStorage.getItem("srcbarcode"),
destbarcode: self.input3.trim()
}, { loading: false })
}, { loading: true })
.then(response => {
//console.log(response);
if (response.data.code === 0) {
self.tableData = response.data.ret;
self.total = self.tableData.total;
......@@ -107,10 +105,6 @@ export default {
self.tableData = []
self.total = 0
}
clearTimeout(self.timer)
self.timer = setTimeout(() => {
self.$store.commit('loading/setLoadingSd', false)
}, 500);
});
},
/**
......@@ -119,7 +113,9 @@ export default {
* @param old
*/
handleCurrentChange (val, old) {
debugger
let self = this;
console.log(val);
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val)
if (this.isDelete) {
......@@ -173,6 +169,12 @@ export default {
}
else {
self.$bus.emit("changImageEditTarget", 'xxx');
// 存储目标条码号 --- 置空
sessionStorage.setItem("destbarcode", "");
// 存储目的数据序号 --- 置空
sessionStorage.setItem("destseqno", "");
// 存储倒查序号 --- 置空
sessionStorage.setItem("backcheckXh", "");
}
},
tableRowClassName ({ row, column, rowIndex, columnIndex }) {
......@@ -200,7 +202,12 @@ export default {
}
this.total = this.tableData.length;
}
}
},
beforeDestroy () {
this.$bus.off('initTLCandidate')
this.$bus.off('deleteMessage')
this.$bus.off('updateTLSourceData')
},
};
</script>
......@@ -251,6 +258,9 @@ export default {
line-height: 32px;
color: #ffffff;
text-align: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
}
}
.checked {
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -1709,10 +1709,9 @@ label {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #DADDE0;
background-color: #dadde0;
border-radius: 3px;
}
......
src/views/drFPTX/Index.vue
......@@ -1073,17 +1073,19 @@ export default {
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.logicList = [] // 目标逻辑库
this.UploadPercent = 0
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.UploadPercent = 0
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
......@@ -1091,7 +1093,9 @@ export default {
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
this.dialogVisible = false// 进度条弹窗
this.UploadPercent = 0
}
});
......@@ -1270,7 +1274,6 @@ export default {
}
/*有子节点 且未展开*/
.el-table /deep/ .el-icon-arrow-right:before {
background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
......@@ -1281,7 +1284,6 @@ export default {
/*有子节点 且已展开*/
.el-table /deep/ .el-table__expand-icon--expanded {
.el-icon-arrow-right:before {
background: url("../../icons/tree_c.svg") no-repeat 0 3px;
content: "";
display: block;
width: 15px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-11 18:05:11
* @LastEditTime: 2021-12-13 11:02:04
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -108,18 +108,18 @@ module.exports = {
"^/api": "/api"
}
},
"/login": {
// target: "http://www.meetfood.cn:2390/", // 登录
target: "http://zwpt.xzclub.top:9333",
// target: "http://192.168.128.124:8765/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马
ws: true,
changeOrigin: true,
pathRewrite: {
// "^/login": "" //本地
"^/login": "/login" //线上
}
},
// "/login": {
// // target: "http://www.meetfood.cn:2390/", // 登录
// target: "http://zwpt.xzclub.top:9333",
// // target: "http://192.168.128.124:8764/", // 登录
// // target: "http://192.168.128.114:8099", // 登录-马
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// // "^/login": "" //本地
// "^/login": "/login" //线上
// }
// },
// "/system": {
// target: "http://192.168.128.106:8765/security", // 湖南-王
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
......@@ -132,10 +132,9 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.124:8765", // 湖南-张
// target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.124:8764", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
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