Commit 4a7e195e by 李萌萌

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

parents 6982225c cca13487
...@@ -875,11 +875,17 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -875,11 +875,17 @@ $canvasWidth: var(--canvasWidth, 640px);
align-items: center; align-items: center;
// justify-content: center; // justify-content: center;
.small-drawing2 { .small-drawing2 {
position: absolute;
width: 180px; width: 180px;
height: 180px; height: 180px;
position: relative;
} }
img { img {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
width: $canvasWidth; width: $canvasWidth;
height: $canvasHeight; height: $canvasHeight;
} }
...@@ -937,23 +943,38 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -937,23 +943,38 @@ $canvasWidth: var(--canvasWidth, 640px);
.body-container { .body-container {
position: relative; position: relative;
width: 640px; width: 670px;
height: 640px; height: 670px;
background: #ffffff; background: #ffffff;
display: flex; display: flex;
filter: "FlipV"; filter: "FlipV";
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.tui-image-editor { .tui-image-editor {
width: 640px !important; width: 670px !important;
height: 640px !important; height: 670px !important;
position: relative;
border: 1px solid #055FE7;
border-top: 1px solid #E02020;
} }
/deep/ .tui-image-editor-canvas-container, /deep/ .tui-image-editor-canvas-container {
height: 100% !important;
width: 100% !important;
max-height: 670px !important;
max-width: 670px !important;
position: relative;
}
/deep/ .lower-canvas, /deep/ .lower-canvas,
/deep/ .upper-canvas { /deep/ .upper-canvas {
max-height: 640px !important; position: absolute;
max-width: 640px !important; left: 0;
right: 0;
bottom: 0;
top:0;
margin: auto;
max-height: 670px !important;
max-width: 670px !important;
height: $canvasHeight !important; height: $canvasHeight !important;
width: $canvasWidth !important; width: $canvasWidth !important;
// height: auto !important; // height: auto !important;
...@@ -1034,8 +1055,8 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -1034,8 +1055,8 @@ $canvasWidth: var(--canvasWidth, 640px);
} }
.tzdDrawing { .tzdDrawing {
width: 640px; width: 670px;
height: 640px; height: 670px;
position: absolute; position: absolute;
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
...@@ -1046,16 +1067,16 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -1046,16 +1067,16 @@ $canvasWidth: var(--canvasWidth, 640px);
} }
.tzdDrawing_2 { .tzdDrawing_2 {
width: 640px; width: 670px;
height: 640px; height: 670px;
position: absolute; position: absolute;
background: transparent; background: transparent;
transform-origin: 320px 320px; transform-origin: 320px 320px;
} }
.irregular { .irregular {
width: 640px; width: 670px;
height: 640px; height: 670px;
position: absolute; position: absolute;
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
...@@ -1063,15 +1084,15 @@ $canvasWidth: var(--canvasWidth, 640px); ...@@ -1063,15 +1084,15 @@ $canvasWidth: var(--canvasWidth, 640px);
} }
.rule_line { .rule_line {
width: 640px; width: 670px;
height: 640px; height: 670px;
position: absolute; position: absolute;
} }
/deep/ .canvas-container { /deep/ .canvas-container {
position: absolute !important; position: absolute !important;
width: 640px !important; width: 670px !important;
height: 640px !important; height: 670px !important;
z-index: 9; z-index: 9;
} }
} }
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 16:07:03 * @LastEditTime: 2021-12-13 17:01:56
* @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
...@@ -499,7 +499,8 @@ ...@@ -499,7 +499,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mask" v-show="startEditImage"></div> <!-- <div class="mask" v-show="startEditImage"></div> -->
<div class="mask" v-show="isHideImageExport"></div>
<!-- <div class="mask" v-show="false"></div>--> <!-- <div class="mask" v-show="false"></div>-->
</div> </div>
<div class="options-bottom"> <div class="options-bottom">
...@@ -583,8 +584,6 @@ ...@@ -583,8 +584,6 @@
<div class="brightness"> <div class="brightness">
<div class="title">亮度</div> <div class="title">亮度</div>
<div class="content"> <div class="content">
<!-- <input class="range-narrow" id="input-range-brightness-value" type="range" min="-255"
:value="inputBrightnessRange" max="255" />-->
<el-slider v-model.number="inputBrightnessRange" id="input-range-brightness-value" :min="-255" :max="255"></el-slider> <el-slider v-model.number="inputBrightnessRange" id="input-range-brightness-value" :min="-255" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputBrightnessRange" /> <input class="qb_v" type="text" v-model.number="inputBrightnessRange" />
</div> </div>
...@@ -593,14 +592,12 @@ ...@@ -593,14 +592,12 @@
<div class="contrast-ratio"> <div class="contrast-ratio">
<div class="title">对比度</div> <div class="title">对比度</div>
<div class="content"> <div class="content">
<!-- <input class="range-narrow" id="input-range-contrast-value" type="range" min="0"
:value="inputContrastRange" max="255" />-->
<el-slider v-model.number="inputContrastRange" id="input-range-contrast-value" :min="-255" :max="255"></el-slider> <el-slider v-model.number="inputContrastRange" id="input-range-contrast-value" :min="-255" :max="255"></el-slider>
<input class="qb_v" type="text" v-model.number="inputContrastRange" /> <input class="qb_v" type="text" v-model.number="inputContrastRange" />
</div> </div>
</div> </div>
<div class="mask" v-show="startEditImage"></div> <!-- <div class="mask" v-show="startEditImage"></div> -->
<!-- <div class="mask" v-show="false"></div>--> <div class="mask" v-show="isHideImageExport"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -685,8 +682,8 @@ export default { ...@@ -685,8 +682,8 @@ export default {
isTpdr_flag: false, isTpdr_flag: false,
// 小操作区的图片路径 // 小操作区的图片路径
smallSrc: null, smallSrc: null,
canvasWidth: 640, canvasWidth: 670,
canvasHeight: 640, canvasHeight: 670,
// 宽/高取最长边 // 宽/高取最长边
maxCanvasHeightOrWidth: 0, maxCanvasHeightOrWidth: 0,
ylbw_flag: true, ylbw_flag: true,
...@@ -936,8 +933,8 @@ export default { ...@@ -936,8 +933,8 @@ export default {
autoTzdArr: [], autoTzdArr: [],
// 是否显示旋转绿线 // 是否显示旋转绿线
isdirection: false, isdirection: false,
newHeight: 640, newHeight: 670,
newWidth: 640, newWidth: 670,
// tzdDrawing 的移动距离 // tzdDrawing 的移动距离
tzdDrawingLeft: 0, tzdDrawingLeft: 0,
tzdDrawingTop: 0, tzdDrawingTop: 0,
...@@ -1794,7 +1791,7 @@ export default { ...@@ -1794,7 +1791,7 @@ export default {
}) })
console.log(fingerPosition); console.log(fingerPosition);
console.log(sessionStorage.getItem('fingerPosition_' + self.seq)); console.log(sessionStorage.getItem('fingerPosition_' + self.seq));
if (sessionStorage.getItem('fingerPosition_' + self.seq) != null && sessionStorage.getItem('fingerPosition_' + self.seq) != '') { if (sessionStorage.getItem('fingerPosition_' + self.seq) != null && sessionStorage.getItem('fingerPosition_' + self.seq) != '' && sessionStorage.getItem('fingerPosition_' + self.seq) != '""') {
if (JSON.parse(sessionStorage.getItem('fingerPosition_' + self.seq)) != '') { if (JSON.parse(sessionStorage.getItem('fingerPosition_' + self.seq)) != '') {
let fingerPostions = JSON.parse(sessionStorage.getItem('fingerPosition_' + self.seq)).split(',') let fingerPostions = JSON.parse(sessionStorage.getItem('fingerPosition_' + self.seq)).split(',')
fingerPostions.forEach(item => { fingerPostions.forEach(item => {
...@@ -2101,7 +2098,7 @@ export default { ...@@ -2101,7 +2098,7 @@ export default {
console.log(result); console.log(result);
self.newHeight = result.newHeight; self.newHeight = result.newHeight;
self.newWidth = result.newWidth; self.newWidth = result.newWidth;
console.log((512 * 640) / self.newHeight); console.log((512 * 670) / self.newHeight);
if (self.newHeight >= self.newWidth) { if (self.newHeight >= self.newWidth) {
console.log($(".upper-canvas")[0]); console.log($(".upper-canvas")[0]);
document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight', '100%'); document.getElementsByTagName('body')[0].style.setProperty('--canvasHeight', '100%');
...@@ -2138,11 +2135,11 @@ export default { ...@@ -2138,11 +2135,11 @@ export default {
$(".blc_small").css( $(".blc_small").css(
"width", "width",
(((512 * self.canvasHeight) / self.newHeight) * 180) / 640 + "px" (((512 * self.canvasHeight) / self.newHeight) * 180) / 670 + "px"
); );
$(".blc_small").css( $(".blc_small").css(
"height", "height",
(((512 * self.canvasHeight) / self.newHeight) * 180) / 640 + "px" (((512 * self.canvasHeight) / self.newHeight) * 180) / 670 + "px"
); );
self.isTpdr_flag = true self.isTpdr_flag = true
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
...@@ -2163,17 +2160,17 @@ export default { ...@@ -2163,17 +2160,17 @@ export default {
}, true) }, true)
self.changeTzdDrawing() self.changeTzdDrawing()
Fcanvas.absolutePan({ // Fcanvas.absolutePan({
x: 0, // x: 0,
y: 0 // y: 0
}); // });
//计算缩放中心 //计算缩放中心
let zoomPoint = new fabric_irregular.Point( let zoomPoint = new fabric_irregular.Point(
Fcanvas.width / 2, Fcanvas.width / 2,
Fcanvas.height / 2 Fcanvas.height / 2
); );
//开始缩放 //开始缩放
Fcanvas.zoomToPoint(zoomPoint, 1); // Fcanvas.zoomToPoint(zoomPoint, 1);
$(".small-drawing-img").css("transform", "rotate(0deg)") $(".small-drawing-img").css("transform", "rotate(0deg)")
}).catch(err => { }).catch(err => {
...@@ -2597,16 +2594,16 @@ export default { ...@@ -2597,16 +2594,16 @@ export default {
((y2 - y1) * self.newHeight) / self.canvasHeight / self.zoomLevel; ((y2 - y1) * self.newHeight) / self.canvasHeight / self.zoomLevel;
// 平移 // 平移
Fcanvas.absolutePan({ // Fcanvas.absolutePan({
x: -( // x: -(
originleft + // originleft +
((x2 - x1) * self.newWidth) / self.canvasWidth / self.zoomLevel // ((x2 - x1) * self.newWidth) / self.canvasWidth / self.zoomLevel
), // ),
y: -( // y: -(
origintop + // origintop +
((y2 - y1) * self.newHeight) / self.canvasHeight / self.zoomLevel // ((y2 - y1) * self.newHeight) / self.canvasHeight / self.zoomLevel
) // )
}); // });
// console.log(imageEditor._graphics.getImageProperties()); // console.log(imageEditor._graphics.getImageProperties());
// console.log(imageEditor._graphics.getCanvasImage()); // console.log(imageEditor._graphics.getCanvasImage());
...@@ -2648,7 +2645,7 @@ export default { ...@@ -2648,7 +2645,7 @@ export default {
Fcanvas.height / 2 Fcanvas.height / 2
); );
//开始缩放 //开始缩放
Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel); // Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel);
console.log(Fcanvas); console.log(Fcanvas);
// $(".canvas-container").css('transform', `scale(${self.zoomLevel})`) // $(".canvas-container").css('transform', `scale(${self.zoomLevel})`)
// Fcanvas.setZoom(self.zoomLevel); // Fcanvas.setZoom(self.zoomLevel);
...@@ -2698,7 +2695,7 @@ export default { ...@@ -2698,7 +2695,7 @@ export default {
Fcanvas.height / 2 Fcanvas.height / 2
); );
//开始缩放 //开始缩放
Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel); // Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel);
// $(".canvas-container").css('transform', `scale(${self.zoomLevel})`) // $(".canvas-container").css('transform', `scale(${self.zoomLevel})`)
// Fcanvas.setZoom(self.zoomLevel); // Fcanvas.setZoom(self.zoomLevel);
...@@ -3899,11 +3896,11 @@ export default { ...@@ -3899,11 +3896,11 @@ export default {
// 修改小框的尺寸 // 修改小框的尺寸
$(".blc_small").css( $(".blc_small").css(
"width", "width",
((3 / 5) * this.canvasHeight * 180) / 640 + "px" ((3 / 5) * this.canvasHeight * 180) / 670 + "px"
); );
$(".blc_small").css( $(".blc_small").css(
"height", "height",
((3 / 5) * this.canvasHeight * 180) / 640 + "px" ((3 / 5) * this.canvasHeight * 180) / 670 + "px"
); );
self.imageEditor._graphics.setImageProperties( self.imageEditor._graphics.setImageProperties(
{ {
...@@ -4087,11 +4084,11 @@ export default { ...@@ -4087,11 +4084,11 @@ export default {
// 修改小框的尺寸 // 修改小框的尺寸
$(".blc_small").css( $(".blc_small").css(
"width", "width",
((3 / 5) * this.canvasHeight * 180) / 640 + "px" ((3 / 5) * this.canvasHeight * 180) / 670 + "px"
); );
$(".blc_small").css( $(".blc_small").css(
"height", "height",
((3 / 5) * this.canvasHeight * 180) / 640 + "px" ((3 / 5) * this.canvasHeight * 180) / 670 + "px"
); );
self.imageEditor._graphics.setImageProperties( self.imageEditor._graphics.setImageProperties(
{ {
...@@ -4181,11 +4178,11 @@ export default { ...@@ -4181,11 +4178,11 @@ export default {
$(".blc_small").css( $(".blc_small").css(
"width", "width",
((3 / 5) * this.canvasHeight * 180) / 640 / this.bb + "px" ((3 / 5) * this.canvasHeight * 180) / 670 / this.bb + "px"
); );
$(".blc_small").css( $(".blc_small").css(
"height", "height",
((3 / 5) * this.canvasHeight * 180) / 640 / this.bb + "px" ((3 / 5) * this.canvasHeight * 180) / 670 / this.bb + "px"
); );
} else { } else {
// 掌纹 // 掌纹
...@@ -4218,11 +4215,11 @@ export default { ...@@ -4218,11 +4215,11 @@ export default {
$(".blc_small").css( $(".blc_small").css(
"width", "width",
(this.canvasHeight * 180) / 640 / this.frame_max_bb + "px" (this.canvasHeight * 180) / 670 / this.frame_max_bb + "px"
); );
$(".blc_small").css( $(".blc_small").css(
"height", "height",
(this.canvasHeight * 180) / 640 / this.frame_max_bb + "px" (this.canvasHeight * 180) / 670 / this.frame_max_bb + "px"
); );
} }
...@@ -4508,8 +4505,8 @@ export default { ...@@ -4508,8 +4505,8 @@ export default {
} }
// 同步改变小指纹框的大小 // 同步改变小指纹框的大小
let originalWidth = (self.canvasHeight * 180) / 640 / self.frame_max_bb let originalWidth = (self.canvasHeight * 180) / 670 / self.frame_max_bb
let originalHeight = (self.canvasHeight * 180) / 640 / self.frame_max_bb let originalHeight = (self.canvasHeight * 180) / 670 / self.frame_max_bb
let changeWidth = Number($("#blc").css("width").substring(0, $("#blc").css("width").length - 2)) let changeWidth = Number($("#blc").css("width").substring(0, $("#blc").css("width").length - 2))
let changeHeight = Number($("#blc").css("height").substring(0, $("#blc").css("height").length - 2)) let changeHeight = Number($("#blc").css("height").substring(0, $("#blc").css("height").length - 2))
// console.log(originalWidth*changeWidth / this.canvasWidth); // console.log(originalWidth*changeWidth / this.canvasWidth);
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-01 15:25:22 * @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-11 10:28:19 * @LastEditTime: 2021-12-13 14:35:24
* @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
...@@ -411,6 +411,9 @@ export default { ...@@ -411,6 +411,9 @@ export default {
// 正查 // 正查
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
path: "fhxxLT/"+rowData.id, path: "fhxxLT/"+rowData.id,
query: {
rowData: JSON.stringify(rowData)
}
}); });
window.open(routeUrl.href, "_blank"); window.open(routeUrl.href, "_blank");
} else if (rowData.querytype == '3') { } else if (rowData.querytype == '3') {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-13 10:55:58 * @LastEditTime: 2021-12-13 15:03:49
* @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\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -33,34 +33,34 @@ ...@@ -33,34 +33,34 @@
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案发地点:</div> <div class="label-name">案发地点:</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div> <div class="label-value">{{allData.asjfsddDzmc}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">发案日期:</div> <div class="label-name">发案日期:</div>
<div class="label-value">2021-12-24</div> <div class="label-value">{{allData.farq?$moment(allData.farq).format('YYYY-MM-DD'):''}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">现场指纹枚数:</div> <div class="label-name">现场指纹枚数:</div>
<div class="label-value">1</div> <div class="label-value">{{allData.lathpcount}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案件名称:</div> <div class="label-name">案件名称:</div>
<div class="label-value">杀人未遂案</div> <div class="label-value">{{allData.ajmc}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案件类别:</div> <div class="label-name">案件类别:</div>
<div class="label-value">刑事案件</div> <div class="label-value">{{allData.ajlb}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">源逻辑库:</div> <div class="label-name">源逻辑库:</div>
<div class="label-value">本地案件库</div> <div class="label-value">{{allData.srcLogicDatabaseName}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案件级别:</div> <div class="label-name">案件级别:</div>
<div class="label-value">特大刑事案件</div> <div class="label-value">{{allData.ajjb}}</div>
</div> </div>
<div class="content-area"> <div class="content-area">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea1" disabled> <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.jyaq" disabled>
</el-input> </el-input>
</div> </div>
</div> </div>
...@@ -78,45 +78,45 @@ ...@@ -78,45 +78,45 @@
<div class="content-item content-item2"> <div class="content-item content-item2">
<div class="label-name">姓名:</div> <div class="label-name">姓名:</div>
<div class="label-value"> <div class="label-value">
<span>张三</span> <span>{{allData.xm}}</span>
<div class="label-name2">别名/绰号:</div> <div class="label-name2">别名/绰号:</div>
<div class="label-value2">张小三</div> <div class="label-value2">{{allData.bmch}}</div>
</div> </div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">性别:</div> <div class="label-name">性别:</div>
<div class="label-value"></div> <div class="label-value">{{allData.xb}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">民族:</div> <div class="label-name">民族:</div>
<div class="label-value">汉族</div> <div class="label-value">{{allData.mz}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">籍贯:</div> <div class="label-name">籍贯:</div>
<div class="label-value">湖南省</div> <div class="label-value">{{allData.jgmc}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">出生日期:</div> <div class="label-name">出生日期:</div>
<div class="label-value">1980-12-12</div> <div class="label-value">{{$moment(allData.csrq).format('YYYY-MM-DD')}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">案件类别:</div> <div class="label-name">案件类别:</div>
<div class="label-value">杀人未遂案</div> <div class="label-value">{{allData.personAjlb}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">目标逻辑库:</div> <div class="label-name">目标逻辑库:</div>
<div class="label-value">基本人员库</div> <div class="label-value">{{allData.destLogicDatabaseName}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">现住址详情:</div> <div class="label-name">现住址详情:</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div> <div class="label-value">{{allData.xzzDzmc}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">户籍地详址:</div> <div class="label-name">户籍地详址:</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div> <div class="label-value">{{allData.hjdzDzmc}}</div>
</div> </div>
<div class="content-area2"> <div class="content-area2">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea2" disabled> <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.personBz" disabled>
</el-input> </el-input>
</div> </div>
</div> </div>
...@@ -132,42 +132,42 @@ ...@@ -132,42 +132,42 @@
<div class="fhxx-top-bottom-left"> <div class="fhxx-top-bottom-left">
<div class="content-item"> <div class="content-item">
<div class="label-name red">序号:</div> <div class="label-name red">序号:</div>
<div class="label-value red">01</div> <div class="label-value red">{{allData.bzxxXh}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">比中单位:</div> <div class="label-name">比中单位:</div>
<div class="label-value">杀人未遂案</div> <div class="label-value" :title="allData.bzdwGajgmc">{{allData.bzdwGajgmc}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">单位代码:</div> <div class="label-name">单位代码:</div>
<div class="label-value">23746728764284</div> <div class="label-value">{{allData.bzdwGajgjgdm}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">比中时间:</div> <div class="label-name">比中时间:</div>
<div class="label-value">2020-12-14 12:34</div> <div class="label-value">{{$moment(allData.bzsj).format('YYYY-MM-DD HH:mm')}}</div>
</div> </div>
</div> </div>
<div class="fhxx-top-bottom-right"> <div class="fhxx-top-bottom-right">
<div class="content-item"> <div class="content-item">
<div class="label-name red">指位:</div> <div class="label-name red">指位:</div>
<div class="label-value red">滚动-右拇</div> <div class="label-value red">{{allData.bzxxZw}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">比中人:</div> <div class="label-name">比中人:</div>
<div class="label-value">张三</div> <div class="label-value">{{allData.bzrXm}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">比中人身份证号:</div> <div class="label-name">比中人身份证号:</div>
<div class="label-value">472748377829873738</div> <div class="label-value">{{allData.bzrGmsfhm}}</div>
</div> </div>
<div class="content-item"> <div class="content-item">
<div class="label-name">比中人联系电话:</div> <div class="label-name">比中人联系电话:</div>
<div class="label-value">13083748372</div> <div class="label-value">{{allData.bzrLxdh}}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="bzxx-textarea"> <div class="bzxx-textarea">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea3" disabled> <el-input type="textarea" :rows="3" placeholder="暂无内容" v-model="allData.bzbz" disabled>
</el-input> </el-input>
</div> </div>
</div> </div>
...@@ -181,9 +181,9 @@ ...@@ -181,9 +181,9 @@
</div> </div>
</div> </div>
<div class="fhxx-btns"> <div class="fhxx-btns">
<div class="pass">通过</div> <div class="pass" @click="passChange">通过</div>
<div class="no-pass">未通过</div> <div class="no-pass" @click="noPassChange">未通过</div>
<div class="relieve">解除比中关系</div> <div class="relieve" @click="relieveChange">解除比中关系</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -196,14 +196,39 @@ export default { ...@@ -196,14 +196,39 @@ export default {
data () { data () {
return { return {
id: '', id: '',
textarea1: '2021年8月5日晚21点时分,北京市昌平区东小口镇天通苑二区疫情通报,现确诊4人;',
textarea2: '暂无犯罪描述;',
textarea3: '2021年8月5日晚21点时分,北京市昌平区东小口镇天通苑二区疫情通报,现确诊4人;',
fhyj: '', fhyj: '',
allData: { allData: {
ysxtAsjbh: '', ysxtAsjbh: '',
ysxtAsjxgrybh: '', ysxtAsjxgrybh: '',
xckybh: '' xckybh: '',
asjfsddDzmc: '',
farq: '',
lathpcount: '',
ajmc: '',
ajlb: '',
srcLogicDatabaseName: '',
ajjb: '',
jyaq: '',
xm: '',
bmch: '',
xb: '',
mz: '',
jgmc: '',
csrq: '',
personAjlb: '',
destLogicDatabaseName: '',
xzzDzmc: '',
hjdzDzmc: '',
personBz: '',
bzxxXh: '',
bzdwGajgmc: '',
bzdwGajgjgdm: '',
bzsj: '',
bzxxZw: '',
bzrXm: '',
bzrGmsfhm: '',
bzrLxdh: '',
bzbz: ''
} }
} }
}, },
...@@ -213,16 +238,73 @@ export default { ...@@ -213,16 +238,73 @@ export default {
created () { created () {
console.log(this.$route); console.log(this.$route);
this.id = this.$route.params.id this.id = this.$route.params.id
console.log(JSON.parse(this.$route.query.rowData));
this.getData() this.getData()
}, },
methods: { methods: {
/**
* 解除比中关系
*/
relieveChange() {
let self = this
this.$axios({
method: 'post',
url: '/api/hit/delete',
data: {
querytype: 2,
ids: Number(self.id),
}
}).then(res => {
console.log(res);
})
},
/**
* 未通过
*/
noPassChange() {
let self = this
this.$axios({
method: 'post',
url: '/api/hit/update',
data: {
querytype: 2,
id: Number(self.id),
reviewStatus: 1,
fhyj: self.fhyj
}
}).then(res => {
console.log(res);
})
},
/**
* 通过
*/
passChange() {
let self = this
this.$axios({
method: 'post',
url: '/api/hit/update',
data: {
querytype: 2,
id: Number(self.id),
reviewStatus: 2,
fhyj: self.fhyj
}
}).then(res => {
console.log(res);
})
},
/**
* 获取右侧详情
*/
getData() { getData() {
let self = this let self = this
this.$axios({ this.$axios({
method: 'post', method: 'post',
url: '/api/hit/lthit/info', url: '/api/hit/lthit/info',
data: { data: {
id: self.id id: self.id,
queryType: 2
}, },
loading: true loading: true
}).then(res => { }).then(res => {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-08 11:31:16 * @LastEditTime: 2021-12-13 12:02:39
* @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\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -204,6 +204,28 @@ export default { ...@@ -204,6 +204,28 @@ export default {
components: { components: {
ImageEd, ImageEd,
}, },
methods: {
getData() {
let self = this
this.$axios({
method: 'post',
url: '/api/hit/lthit/info',
data: {
id: self.id,
queryType: 1
},
loading: true
}).then(res => {
console.log(res);
if(res.data.code === 0) {
this.allData = res.data.ret
console.log(this.allData);
}
}).catch(err => {
console.log(err);
})
}
},
} }
</script> </script>
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-13 11:03:46 * @LastEditTime: 2021-12-13 14:51:11
* @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,7 +92,7 @@ module.exports = { ...@@ -92,7 +92,7 @@ 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.124:8099/", // 湖南-张 // target: "http://192.168.128.124: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
...@@ -100,7 +100,7 @@ module.exports = { ...@@ -100,7 +100,7 @@ module.exports = {
// 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://zwpt.xzclub.top:9333/", // target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.115:8099", // 江 target: "http://192.168.128.115:8099", // 江
ws: true, ws: true,
changeOrigin: true, changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment