Skip to content

F
founder_vue
Commit eee90b3c by liupeng
Options

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

parents be9d3ab2 9ab19e7d
Showing with 63 additions and 76 deletions
src/api/dswtz/bzxx.js
......@@ -34,3 +34,7 @@ export const saveZwbzrw = params =>
postform(`${base.alyIP}/Zwbzrw/saveZwbzrw`, params);
export const deleteZjcbrwById = params =>
post(`${base.alyIP}/Zwbzrw/deleteZjcbrwById`, params);
export const updateZwbdById = params =>
post(`${base.alyIP}/Zwbzrw/updateZwbdById`, params);
export const selectRyJglist = params =>
post(`${base.alyIP}/Zwbzrw/selectRyJglist`, params);
src/router/modules/brainPhoto.js
......@@ -92,7 +92,7 @@ const menuLayouts = [
path: "/brainAsjzc",
name: "brainAsjzc",
meta: {
title: '案事件侦察'
title: '案事件侦查'
},
component: () => import("@/views/brainPhoto/brainAsjzc.vue")
},
......
src/views/brainPhoto/brainAsjzc.vue
......@@ -33,7 +33,7 @@ export default {
Menu: [
{
id: "brainAsjzc",
label: "案事件侦察",
label: "案事件侦查",
index: "brainAsjzc",
auth: "M0101",
className: "iconfont iconrizhi",
......
src/views/brainPhoto/brainDzaj.vue
......@@ -444,7 +444,7 @@ export default {
},
{
id: "brainAsjzc",
label: "案事件侦察",
label: "案事件侦查",
newAuth: "M01",
index: "brainAsjzc",
className: "iconfont icongongnengfuwu",
......
src/views/dswtz/dnaxx/DNAlist.vue
......@@ -56,6 +56,7 @@
{
label: "DNA编号",
prop: "rydnabh",
width:'300'
},
{
label: "样本类型",
......
src/views/dswtz/swxx/addSwxx.vue
......@@ -73,6 +73,7 @@
value: "",
placeholder: "请输入",
col: "22",
acceptType:'.wav'
},
],
......
src/views/dswtzxx/bdjg/addRx.vue
......@@ -32,7 +32,7 @@
return {
loading: true,
fileBase64:{},
title: "添加人像比中",
title: "添加人像比中信息",
propFormField: [
{
title: "",
......@@ -99,7 +99,7 @@
{
name: "比中时间:",
id: "bzsjStr",
type: "datas",
type: "DateVal",
value: "",
placeholder: "请输入",
col: "2",
......@@ -195,7 +195,7 @@
},
created() {
if (this.$route.query.xxzjbh) {
this.title = "添加人像比中";
this.title = "修改人像比中信息";
this.xxzjbh = this.$route.query.xxzjbh;
this.getshuju();
}
......
src/views/dswtzxx/bdjg/zw.vue
......@@ -11,10 +11,7 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@edit="edit"
@dele="dele"
@add="add"
@toInfor="toInfor"
ref="rightContent"
:transformFormTable="transformFormTable"
......@@ -25,7 +22,7 @@
</template>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="rxbd(scope.scope)" type="text">人像比对</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
......@@ -42,13 +39,9 @@
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Rxbzrw/selectJglist"
@edit="edit"
@dele="dele"
cxUrl="/Zwbzrw/selectRyJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
>
<template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
......@@ -62,7 +55,7 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import {leftMenus} from "@p/dswtzxx/index.js";
import { updateRxbdById,selectJglist,deleteRxbz,deleteZjcbrwById } from "@/api/dswtz/bzxx";
import { updateZwbdById,deleteZwbzjgById,deleteZjcbrwById } from "@/api/dswtz/bzxx";
import { deleteRyzpById } from "@/api/dswtz/rxxx.js";
import {bdzt} from "@/assets/js/transformFormTable.js";
export default {
......@@ -87,7 +80,7 @@
limit:'10'
},
cxFormData1: {
xxzjbh:'142302000000202111290031709643',
xxzjbh:'',
page:'1',
limit:'10'
},
......@@ -105,7 +98,6 @@
cxDefaultFormThead: [
{label: "图片名称", prop: "zpDzwjbt"},
{label: "建立时间", prop: "zpJlsj"},
{label: "图片描述", prop: "xxlyms"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
],
......@@ -209,7 +201,7 @@
type: "warning",
})
.then(() => {
deleteRxbz({
deleteZwbzjgById({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
......@@ -228,33 +220,13 @@
});
});
},
toInfor(scope) {
this.table = true
let bdzt = scope.bdzt
let xxzjbh = scope.xxzjbh
if(bdzt =="1"){
selectJglist({xxzjbh}).then(res=>{
if(res.code ===200){
this.gridData = res.data.rows
}
})
}
},
bjjg(scope){
let row = scope.row
console.log(row);
this.table = true
let bdzt = row.bdzt
let xxzjbh = row.xxzjbh
this.cxFormData1.xxzjbh = xxzjbh
this.xxzjbh = xxzjbh
if(bdzt =="比对结果"){
selectJglist({xxzjbh}).then(res=>{
if(res.code ===200){
this.gridData = res.data.rows
}
})
}
},
toSwtzxxgl(i){
this.$router.push({
......@@ -262,7 +234,7 @@
query:{rybh:i}
})
},
rxbd(scope){
zwbd(scope){
let self = this
let xxzjbh = scope.row.xxzjbh;
let loading = this.$loading({
......@@ -271,11 +243,12 @@
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
updateRxbdById({xxzjbh}).then(res=>{
updateZwbdById({xxzjbh}).then(res=>{
if(res.code === 200){
setTimeout(function () {
self.$message.success(res.message)
loading.close()
self.$refs.rightContent.doQuery("yes");
},3e3)
}
else {
......
src/views/dswtzxx/bzxx/rx.vue
......@@ -19,10 +19,6 @@
:transformFormTable="transformFormTable"
>
<template #customize="scope">
<el-button v-if="scope.scope.row.bdzt=='1'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<el-button v-else type="text" disabled>未比对</el-button>
</template>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="rxbd(scope.scope)" type="text">人像比对</el-button>
......@@ -35,9 +31,10 @@
:visible.sync="table"
direction="rtl"
size="90%">
<div v-if="table">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="tableOperationWidth"
:tableOperationWidth="300"
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData1"
......@@ -53,8 +50,10 @@
<template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template>
</right-content>
</div>
</el-drawer>
</div>
</template>
......@@ -87,7 +86,7 @@
limit:'10'
},
cxFormData1: {
xxzjbh:'142302000000202111290031709643',
xxzjbh:'',
page:'1',
limit:'10'
},
......@@ -105,7 +104,6 @@
cxDefaultFormThead: [
{label: "图片名称", prop: "zpDzwjbt"},
{label: "建立时间", prop: "zpJlsj"},
{label: "图片描述", prop: "xxlyms"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
],
......@@ -243,23 +241,16 @@
},
bjjg(scope){
let row = scope.row
console.log(row);
this.table = true
let bdzt = row.bdzt
let xxzjbh = row.xxzjbh
this.cxFormData1.xxzjbh = xxzjbh
this.xxzjbh = xxzjbh
if(bdzt =="比对结果"){
selectJglist({xxzjbh}).then(res=>{
if(res.code ===200){
this.gridData = res.data.rows
}
})
}
},
toSwtzxxgl(i){
alert(JSON.stringify(i.row.asjxgrybh))
this.$router.push({
path:'/swtzxxgl',
query:{rybh:i}
query:{rybh:i.row.asjxgrybh}
})
},
rxbd(scope){
......@@ -276,6 +267,7 @@
setTimeout(function () {
self.$message.success(res.message)
loading.close()
self.$refs.rightContent.doQuery("yes");
},3e3)
}
else {
......
src/views/sf/dwxnpgbg.vue
<!--
* @Author: your name
* @Date: 2021-11-24 10:16:47
* @LastEditTime: 2021-11-30 10:59:11
* @LastEditTime: 2021-11-30 13:39:55
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \刑侦二期(1)\founder_vue\src\views\sf\xnpgbg.vue
-->
<template>
<div style=" width: 1200px; margin:0 auto;">
<div style=" width: 1200px; margin:0 auto;margin-bottom:70px;">
<div class="min">
<el-form :inline="true"
:model="cxFormData"
......@@ -52,7 +52,7 @@
<el-button icon="el-icon-download" @click="print">导出报告</el-button>
</div>
</div>
<div style="padding: 0 40px;">
<div style="padding: 0 40px;margin-bottom:10px;">
<div class="title">单位效能评估报告</div>
<!-- 柱状图 -->
<div class="htitle">
......@@ -60,7 +60,7 @@
</div>
<div class="Info">{{ headerInfo1 }}</div>
<div class="echars">
<div id="barMain" style="width: 100%; height: 400px"></div>
<div id="barMain" style="width: 100%; height: 500px"></div>
</div>
<div style="margin-top: 20px">
<el-table
......@@ -92,7 +92,7 @@
</div>
<div class="Info"> {{ headerInfo2 }} </div>
<div class="echars">
<div id="lineMain" style="width: 100%; height: 400px"></div>
<div id="lineMain" style="width: 100%; height: 500px"></div>
</div>
<div style="margin-top: 20px">
<el-table
......@@ -274,6 +274,10 @@ export default {
type: "shadow",
},
},
grid: {
bottom: "0.5%",
containLabel: true,
},
xAxis: [
{
type: "category",
......@@ -329,7 +333,7 @@ export default {
type: "bar",
barWidth: "60%",
data: zData,
// barWidth: 30, //柱图宽度
barWidth: 24, //柱图宽度
},
],
});
......@@ -342,6 +346,10 @@ export default {
text: "系统使用情况分析",
},
color: ["#0061F7"],
grid: {
bottom: "0.5%",
containLabel: true,
},
xAxis: {
type: "category",
data: hData,
......@@ -440,7 +448,7 @@ export default {
self.headerInfo2 =
`${self.cxFormData.kssj}至${self.cxFormData.jssj}，
${res.data.rows[0].name}单位刑嫌调控${res.data.rows[0].xxtk}次，工作指令${res.data.rows[0].gzzl}次、
人力情报${res.data.rows[0].rlqb}起，阵地管控${res.data.rows[0].zdgk}起、处理组织犯罪${res.data.rows[0].zzfz}起、发起次数${res.data.rows[0].fqcs}`
人力情报${res.data.rows[0].rlqb}起，阵地管控${res.data.rows[0].zdgk}起、处理组织犯罪${res.data.rows[0].zzfz}起、发起次数${res.data.rows[0].fqcs}次。`
}
......@@ -603,7 +611,7 @@ export default {
margin: 20px;
}
.echars {
height: 400px;
height: 500px;
// background: pink;
}
.demo-form-inline{
......
src/views/sf/grxnpgbg.vue
<!--
* @Author: your name
* @Date: 2021-11-29 17:12:15
* @LastEditTime: 2021-11-30 11:07:44
* @LastEditTime: 2021-11-30 13:55:36
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\sf\grxnpgbg.vue
-->
<template>
<div style=" width: 1200px; margin:0 auto;">
<div style=" width: 1200px; margin:0 auto;margin-bottom:70px;">
<div class="min">
<el-form :inline="true"
:model="cxFormData"
......@@ -61,7 +61,7 @@
</div>
<div class="Info">{{ headerInfo1 }}</div>
<div class="echars">
<div id="barMain" style="width: 100%; height: 400px"></div>
<div id="barMain" style="width: 100%; height: 500px"></div>
</div>
<div style="margin-top: 20px">
<el-table
......@@ -93,7 +93,7 @@
</div>
<div class="Info"> {{ headerInfo2 }} </div>
<div class="echars">
<div id="lineMain" style="width: 100%; height: 400px"></div>
<div id="lineMain" style="width: 100%; height: 500px"></div>
</div>
<div style="margin-top: 20px">
<el-table
......@@ -305,6 +305,10 @@ export default {
type: "shadow",
},
},
grid: {
bottom: "0.5%",
containLabel: true,
},
xAxis: [
{
type: "category",
......@@ -360,7 +364,7 @@ export default {
type: "bar",
barWidth: "60%",
data: zData,
barWidth: 30, //柱图宽度
barWidth: 24, //柱图宽度
},
],
});
......@@ -373,6 +377,10 @@ export default {
text: "系统使用情况分析",
},
color: ["#0061F7"],
grid: {
bottom: "0.5%",
containLabel: true,
},
xAxis: {
type: "category",
data: hData,
......@@ -471,14 +479,14 @@ export default {
this.startMyEcharts2(hData1,zData1)
self.headerInfo2 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，
${res.data.rows[0].sfhm}刑嫌调控${res.data.rows[0].xxtk}次，工作指令${res.data.rows[0].gzzl}次、
人力情报${res.data.rows[0].rlqb}起，阵地管控${res.data.rows[0].zdgk}起、处理组织犯罪${res.data.rows[0].zzfz}起、发起次数${res.data.rows[0].fqcs}`
人力情报${res.data.rows[0].rlqb}起，阵地管控${res.data.rows[0].zdgk}起、处理组织犯罪${res.data.rows[0].zzfz}起、发起次数${res.data.rows[0].fqcs}次。`
}
self.tableLineData = res.data.rows
}
})
},
/**
* @descript 身份证失去焦点查询
* @description 身份证失去焦点查询
*
*/
sfBlur(value){
......@@ -650,7 +658,7 @@ export default {
margin: 20px;
}
.echars {
height: 400px;
height: 500px;
// background: pink;
}
.demo-form-inline{
......
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