Skip to content

F
founder_vue
Commit cd3767f1 by 张超军
Options

正查调接口

parent ec5581fe
Showing with 300 additions and 124 deletions
package-lock.json
......@@ -1875,37 +1875,6 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1915,35 +1884,11 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz",
"integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -12983,6 +12928,11 @@
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1600441210971&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
"integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
},
"vue-bus": {
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/vue-bus/download/vue-bus-1.2.1.tgz",
"integrity": "sha1-UFd7C3P8GvnNqKR1/vL38P2tcEU="
},
"vue-cli-plugin-axios": {
"version": "0.0.4",
"resolved": "https://registry.npm.taobao.org/vue-cli-plugin-axios/download/vue-cli-plugin-axios-0.0.4.tgz",
......@@ -13061,6 +13011,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.7.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.7.0.tgz",
"integrity": "sha1-7hYbL2wnsLRZJkw8I9NAaLRx1XQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
package.json
......@@ -23,6 +23,7 @@
"serve": "^12.0.0",
"tui-image-editor": "^3.15.0",
"vue": "^2.6.11",
"vue-bus": "^1.2.1",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.2.0",
"vue-wechat-title": "^2.0.7",
......
src/main.js
/*
* @Author: your name
* @Date: 2021-09-07 14:39:52
* @LastEditTime: 2021-09-22 15:58:14
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\main.js
*/
import Vue from "vue";
import "./plugins/axios";
import App from "./App.vue";
......@@ -12,6 +20,7 @@ import "driver.js/dist/driver.min.css";
import "./assets/css/global.css";
import "./assets/css/el-table-style.css";
import VueClipboard from "vue-clipboard2";
import VueBus from 'vue-bus';
Vue.prototype.$driver = new Driver({
className: "scoped-class", // className to wrap driver.js popover
......@@ -35,6 +44,7 @@ Vue.prototype.$util = Util;
window.util = Util;
Vue.use(VueWechatTitle);
Vue.use(VueClipboard);
Vue.use(VueBus);
Vue.directive("nsLoading", {
bind(el, binding) {
......
src/views/cxyrd/LT.vue
......@@ -12,9 +12,10 @@
<l-t-src :src-data="srcDataList"></l-t-src>
</div>
<div class="lt_main_middle">
<div class="lt_main_header">顶部工具</div>
<!-- <div class="lt_main_header">顶部工具</div>
<div class="lt_middle_main">中部指纹编辑</div>
<div class="lt_main_footer">底部工具</div>
<div class="lt_main_footer">底部工具</div> -->
<ImageEd></ImageEd>
</div>
<div class="lt_main_right">
<l-t-candidate></l-t-candidate>
......@@ -26,26 +27,29 @@
<script>
import LTSrc from "./modules/LTSrc.vue";
import LTCandidate from "./modules/LTCandidate.vue";
import ImageEd from "../../components/ImageEd.vue"
export default {
// 正查 倒查 查重
name: "LT",
components: {
LTSrc,
LTCandidate
LTCandidate,
ImageEd
},
data() {
data () {
return {
srcDataList: null
};
},
created() {
created () {
this.srcDataList = this.$route.query.rowData;
console.info("源数据src====>", this.srcDataList);
console.log("源数据src====>", this.srcDataList);
console.log(this.srcDataList.barcode);
}
};
</script>
<style scoped>
<style scoped lang="scss">
div {
margin: 0;
padding: 0;
......@@ -85,12 +89,13 @@ div {
.lt_main_left {
width: 352px;
border: none;
margin-right: 16px;
/* margin-right: 16px; */
}
.lt_main_middle {
width: 1120px;
display: flex;
flex-direction: column;
margin-top: -59px;
}
.lt_main_middle .lt_main_header {
height: 70px;
......@@ -113,4 +118,10 @@ div {
.lt_main_footer {
border: 1px saddlebrown solid;
}
/deep/ .current-row {
td {
background: #F5F5F7 !important;
}
}
</style>
src/views/cxyrd/LTz.scss
......@@ -246,7 +246,7 @@ div {
.line_center_right_icon {
width: 20px;
height: 20px;
background: #ffaa00;
background: #000;
border-radius: 50%;
}
.line_center_right_name {
......@@ -316,6 +316,40 @@ div {
}
}
}
.history_mix {
margin-right: 8px;
position: relative;
.icon_history {
width: 64px;
height: 32px;
background: rgba(5, 95, 231, 0.05);
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
img {
width: 20px;
height: 20px;
object-fit: contain;
margin-right: 0;
}
}
.historyOptions {
padding: 14px 24px;
z-index: 1;
position: absolute;
top: 35px;
left: 0;
width: 120px;
height: 160px;
overflow: auto;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #e6e6e8;
}
}
.clearConfirm {
z-index: 10;
position: absolute;
......@@ -883,7 +917,11 @@ div {
-4px -4px 4px 0px #ffffff;
color: #ffffff;
}
.remove-white, .color-filter, .multiply, .blend, .brightness {
.remove-white,
.color-filter,
.multiply,
.blend,
.brightness {
box-sizing: border-box;
position: absolute;
top: -84px;
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -17,7 +17,7 @@
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
<div class="lt_candidate_number">
<el-table class="lt_candidate_table" height="800" :data="tableData">
<el-table highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" height="800" :data="tableData">
<el-table-column label="排名" type="index" width="50">
</el-table-column>
<!-- <el-table-column label="排名" width="50"></el-table-column>-->
......@@ -28,13 +28,13 @@
width="50"
></el-table-column>
<el-table-column
prop="barcode"
prop="destbarcode"
label="源条码号"
width="200"
></el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<b>3条</b>数据</span>
<span>共计<b>{{total}}条</b>数据</span>
</div>
</div>
</div>
......@@ -46,15 +46,40 @@ export default {
data() {
return {
checked: true,
tableData: candidates,
tableData: null,
input: "",
select: 1,
input3: ""
input3: "",
total: 0
};
},
created () {
let self = this
self.$bus.on('initCandidate', (tableData) => {
self.tableData = tableData
self.total = self.tableData.length
// console.log(tableData);
});
},
methods: {
search() {
console.info(this.select);
},
/**
* @description: 选中切换方法
* @param {*} val
* @param {*} old
* @return {*}
*/
handleCurrentChange (val, old) {
let self = this
console.log(val);
this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
// this.$axios.get(`/api/api/org/plainByBarcode/${val.R1100002487002018050034}/${}/`)
.then(response => {
console.log(response);
self.$bus.emit('changImageEditTarget', response.data.ret.image)
})
}
}
};
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -7,59 +7,31 @@
<div class="lt_middle">
<!-- 源数据区 -->
<div class="lt_middle_src_data">
<el-table
class="lt_candidate_table border_radius"
height="368"
@row-click="getFirgerPrintDetail"
>
<el-table-column
prop="qqid"
label="查询ID"
width="80"
></el-table-column>
<el-table-column
prop="barcode"
label="源条码号"
width="190"
></el-table-column>
<el-table-column
prop="enumerate"
label="枚数"
width="80"
></el-table-column>
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" :data="dataList" class="lt_candidate_table border_radius" :height="tableHeight" @row-click="getFirgerPrintDetail">
<el-table-column prop="qqid" label="查询ID" width="80"></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="190"></el-table-column>
<el-table-column prop="maxcandidatecnt" label="枚数" width="80"></el-table-column>
</el-table>
<div class="lt_middle_bottom">
<span>该任务共计<b>321</b>条查询</span>
<el-button type="text" @click="changeTableHeight">展开</el-button>
<span>该任务共计<b>{{total}}</b>条查询</span>
<el-button type="text" @click="changeTableHeight">{{options}}</el-button>
</div>
</div>
<!-- 源指纹区 -->
<div class="lt_middle_finger_print">
<div class="lt_middle_finger_print" v-show="isShowPrint">
<!--指纹图-->
<div class="lt_middle_finger_prints">
<div
class="finger_print"
:class="{ finger_print_active: index === isActive }"
v-for="(item, index) of enumerate"
@click="changeStyle(index)"
:key="index"
>
<div
class="finger_print_number"
:class="{ finger_print_number_active: index === isActive }"
>
{{ item }}
<div class="finger_print" :class="{ finger_print_active: index === isActive }" v-for="(item, index) in enumerate" @click="changeStyle(index, item)" :key="index">
<div class="finger_print_number" :class="{ finger_print_number_active: index === isActive }">
{{ Number(index+1) < 9 ? ('0'+Number(index+1)) : Number(index+1) }}
</div>
<br />
<img
:src="fingerSrc"
style="width: 66px;height: 20px;margin: 0;border: 1px solid saddlebrown"
/>
<img :src="'data:image/jpeg;base64,'+item.image" style="width: 106px;height: 106px;" />
</div>
</div>
<!--指纹个数提示-->
<div class="lt_middle_bottom">
<span>该查询ID共计<b>321</b>枚指纹</span>
<span>该查询ID共计<b>{{fingerTotal}}</b>枚指纹</span>
</div>
</div>
</div>
......@@ -73,38 +45,120 @@ export default {
watch: {
srcData: {
immediate: true,
handler(val) {
handler (val) {
console.info("源数据传入组件的值为===>", val);
this.tableData = val;
}
}
},
data() {
data () {
return {
checked: true,
enumerate: 8,
enumerate: null,
tableData: null,
isActive: "",
fingerSrc: require("../../../assets/img/img.png")
fingerSrc: require("../../../assets/img/img.png"),
isShowPrint: true,
tableHeight: 368,
dataList: [],
total: 0,
fingerTotal: 0,
currentRow: null,
options: '展开',
qqid: null
};
},
methods: {
/**
* @description: 选择切换
* @param {*} val
* @param {*} old
* @return {*}
*/
handleCurrentChange (val, old) {
this.currentRow = val;
console.log(val);
let self = this
self.qqid = val.qqid
let barcode = val.barcode
console.log(barcode);
this.$axios
.get(`/api/api/png/caseBybarcode/${barcode}`)
.then(response => {
console.log(response);
self.enumerate = response.data.ret
self.fingerTotal = response.data.ret.length
// 默认选中第一个指纹预览图片
self.changeStyle(0, self.enumerate[0])
})
this.isActive = "";
},
/**
* @description: 获取列表数据
* @param {*}
* @return {*}
*/
getDetailData () {
let self = this
this.$axios
.post("/api/api/queryque/standardAll", {})
.then(response => {
console.log(response);
self.dataList = response.data.ret
self.total = response.data.ret.length
console.log(self.dataList);
// 默认选中第一行
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
});
},
// 获取选择的任务详情
getFirgerPrintDetail(row) {
this.enumerate = row.enumerate;
getFirgerPrintDetail (row) {
// this.enumerate = row.enumerate;
// 选择新的指纹数据时 清空前一个指纹样式
this.isActive = "";
// let self = this
// let barcode = row.barcode
// console.log(barcode);
// this.$axios
// .get(`/api/api/png/caseBybarcode/${barcode}`)
// .then(response => {
// console.log(response);
// self.enumerate = response.data.ret
// self.fingerTotal = response.data.ret.length
// })
// this.isActive = "";
},
// 指纹部分 增加边框
changeStyle(index) {
changeStyle (index, imageInfo) {
let self = this
this.isActive = index;
console.log(this.isActive);
this.$bus.emit('changImageEdit', imageInfo.image)
this.$axios.post(`/api/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, {})
.then(response => {
// console.log(response);
self.$bus.emit('initCandidate', response.data.ret)
})
},
changeTableHeight() {}
/**
* @description: 展开收缩切换
* @param {*}
* @return {*}
*/
changeTableHeight () {
this.isShowPrint = !this.isShowPrint
if (!this.isShowPrint) {
this.tableHeight = 810
this.options = '收缩'
} else {
this.tableHeight = 368
this.options = '展开'
}
}
},
mounted() {
mounted () {
// 初始状态下 展示当前任务的第一条指纹信息（指纹个数）
// this.enumerate = datas[0].enumerate;
this.getDetailData()
}
};
// 某任务下查询的所有信息
......@@ -130,7 +184,7 @@ const datas = [
];
</script>
<style scoped>
<style scoped lang="scss">
div {
display: inline-block;
}
......@@ -193,29 +247,50 @@ label {
}
/* 单个指纹*/
.finger_print {
position: relative;
width: 106px;
height: 106px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #cccccc;
margin: 8px 4px 8px 4px;
img {
position: absolute;
top: 0;
left: 0;
}
}
.finger_print_active {
position: relative;
width: 106px;
height: 106px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #055fe7;
.finger_print_number {
color: #ffffff;
font-size: 12px;
}
}
/* 单个指纹 左上角的序号*/
.finger_print .finger_print_number {
font-size: 12px;
width: 24px;
height: 24px;
background: #ddebff;
border-radius: 0px 0px 7px 0px;
z-index: 20;
position: absolute;
top: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
}
.finger_print .finger_print_number_active {
position: absolute;
top: 0;
left: 0;
width: 24px;
height: 24px;
background: #055fe7;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-09-22 10:08:37
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
*/
const path = require("path");
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
......@@ -50,17 +58,18 @@ module.exports = {
},
proxy: {
"/api": {
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://172.18.108.213:8099/", // 张 认定
ws: true,
changeOrigin: true,
pathRewrite: {
'^/api': '/'
}
}
},
},
css: {
sourceMap: process.env.NODE_ENV === "development" ?true:false // 在开发环境下开启 CSS sourcemaps
sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
}
};
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