Skip to content

F
founder_vue
Commit afddee55 by 林永鑫
Options

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

parents 042f6c48 892a2e2f
Showing with 239 additions and 115 deletions
src/components/treeCode_components.vue
......@@ -51,6 +51,9 @@
check-strictly
show-checkbox
style="height: 288px;">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}[{{data.id}}]</span>
</span>
</el-tree>
</div>
<div slot="footer"
......@@ -296,23 +299,8 @@ export default {
setTimeout(() => {
self.dialogCodeVisible = true;
}, 10);
if (item.codeTree == 'CODE_AJXZ_MA') {
if (realFormLableAlign["ajlbdm"]) {
self.codeTreeConfig.props = item.codeOptions.slice(0);
self.codeTreeConfig.props.forEach(item => {
if (item.id == realFormLableAlign["ajlbdm"]) {
self.codeTreeConfig.props = item.children;
return false;
}
})
} else {
self.codeTreeConfig.props = [];
return;
}
} else {
self.codeTreeConfig.props = item.codeOptions;
}
}
},
......
src/router/modules/index.js
......@@ -318,4 +318,20 @@ export default [
title: "数据报表"
}
},
{/*嫌疑人*/
path: "/xyrEdit",
name: "xyrEdit",
component: () => import("@/views/magl/xyrEdit.vue"),
meta: {
title: "嫌疑人编辑"
}
},
{/*研判报告*/
path: "/ypbg",
name: "ypbg",
component: () => import("@/views/magl/ypbg.vue"),
meta: {
title: "研判报告"
}
},
]
src/utils/params.js
......@@ -153,6 +153,12 @@ let maglPropLeftMenu = [
index: "4-2",
className: "iconfont iconhecha-xiangxixuanzhong"
},
{
id: "ypbg",
label: "研判报告",
index: "4-3",
className: "iconfont iconhecha-xiangxixuanzhong"
},
]
},
{
......
src/views/magl/index.vue
......@@ -173,7 +173,7 @@ export default {
leftMenu,
msg
},
data() {
data () {
return {
realname: JSON.parse(sessionStorage.getItem("userInfo")).realname,
dialogFormVisible: true,
......@@ -218,7 +218,7 @@ export default {
}
},
methods: {
tabClick(active) {
tabClick (active) {
debugger
var obj1 = {
total: 3,
......@@ -287,11 +287,11 @@ export default {
}
},
closeTzgg() {
closeTzgg () {
this.dialogFormVisible = false;
},
changeName(index) {
changeName (index) {
if (index.indexOf("-") == -1) {
this.name = maglPropLeftMenu[index - 1].label;
} else {//子级的情况有-,如3-1
......@@ -299,16 +299,16 @@ export default {
this.name = maglPropLeftMenu[arr[0] - 1].children[arr[1] - 1].label;
}
},
collapse() {
collapse () {
this.isCollapseP = !this.isCollapseP;
},
toDp() {
toDp () {
let routeData = this.$router.resolve({
path: "/ykgldpIndex"
});
window.open(routeData.href, "_blank");
},
changeSidebarIndex(index, item) {
changeSidebarIndex (index, item) {
debugger
if (index.indexOf("-") == -1) {
if (index == '5') {//数据可视化
......@@ -403,6 +403,11 @@ export default {
path: "/tjbb",
});
window.open(routeUrl.href, '_blank');
} else if (index == "4-3") {
let routeUrl = this.$router.resolve({
path: "/ypbg",
});
window.open(routeUrl.href, '_blank');
}
// else if (index == '4-1') {//统计报表
// window.open(url.tjbh)
......@@ -424,7 +429,7 @@ export default {
this.$router.push({ path: "/dataV" });
}
},
mounted() {
mounted () {
}
......
src/views/magl/xyrEdit.vue 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/magl/ypbg.vue 0 → 100644
<template>
<div>123</div>
</template>
<script>
export default {
name: "ypbg",
}
</script>
<style>
</style>
\ No newline at end of file
src/views/magl/zczjsx.vue
......@@ -343,45 +343,27 @@
<div class="">
<span class="flTtitle"
style="border-bottom: 1px solid rgb(221, 221, 221);width:100%;"><span style="display: inline-block;width: 6px;height: 19px;position: relative;top:-2px; background: #3670ff; vertical-align: middle; margin-right: 16px;"></span>犯罪嫌疑人</span>
<el-table :data="tableData"
style="width: 100%">
<!-- <el-table-column
align="center"
label="操作"
width="100">
<template >
<el-button type="text" size="small" >修改</el-button>
</template>
</el-table-column> -->
<el-table-column prop="xm"
align="center"
label="姓名"
width="180">
</el-table-column>
<el-table-column prop="xb"
align="center"
label="性别"
width="180">
</el-table-column>
<el-table-column prop="sfzh"
align="center"
label="身份证号">
</el-table-column>
<el-table-column prop="hjdqh"
align="center"
label="户籍地区划">
</el-table-column>
<el-table-column prop="xzz"
align="center"
label="现住址">
</el-table-column>
<el-table-column prop="dazt"
align="center"
label="到案状态">
<el-table :data="tableData">
<el-table-column label="操作"
width="100">
<template slot-scope="scope">
<el-button @click="toEdit(scope.row)"
type="text"
size="small">修改</el-button>
</template>
</el-table-column>
<el-table-column prop="dwzy"
align="center"
label="地位作用">
<el-table-column v-for="(columnTitle) in tableList.filter(
(itemsss, index) => {
return index < tableList.length - 1;
}
)"
:key="columnTitle.label"
:label="columnTitle.label"
align="center">
<template slot-scope="scope">
{{ scope.row[columnTitle.prop] }}
</template>
</el-table-column>
</el-table>
<el-pagination background
......@@ -531,7 +513,7 @@ export default {
col: "3",
},
{
name: "侦查终结依据(破案过程)::",
name: "侦查终结依据(破案过程): 备注:需要提供六要素",
id: "zczjZcxwyjms",
type: "textarea",
prop: "checkEmpty",
......@@ -567,7 +549,7 @@ export default {
codeTree: "CODE_AJXZ",
},
{
name: "作案动机:",
name: "发案原因:",
id: "zadjdm",
type: "codeTree",
props: [],//字典弹框需要的字段
......@@ -577,18 +559,35 @@ export default {
codeOptions: [],
codeTree: "CODE_ZADJ",
},
{
name: "作案手段:",
id: "zczjZasddm",
type: "codeTree",
props: [],//字典弹框需要的字段
value: "",
prop: "checkEmpty",
col: "3",
codeOptions: [],
codeTree: "CODE_ZADJ",
},
{
name: "破案手段:",
id: "zczjPasddm",
type: "codeTree",
props: [],//字典弹框需要的字段
value: "",
prop: "checkEmpty",
col: "3",
codeOptions: [],
codeTree: "CODE_ZADJ",
},
]
},
{
title: '',
id: '3',
data: [
{
name: "呈请破案报告书",
id: "050101",
type: 'file',
col: "1",
},
{
name: "侦查终结报告书",
id: "050102",
......@@ -647,6 +646,38 @@ export default {
currentPage1: 1, //表格页码
page_size: 5,
total: 0,
tableList: [
{
label: "性别",
prop: "xb",
},
{
label: "身份证号",
prop: "sfzh",
},
{
label: "户籍地区划",
prop: "hjdqh",
},
{
label: "现住址",
prop: "xzz",
},
{
label: "到案状态",
prop: "dazt",
},
{
label: "地位作用",
prop: "dwzy",
},
{
label: "xxzjbh",
prop: "xxzjbh",
}
],
oldData: {},
rzObj: {}
}
},
created () {
......@@ -658,6 +689,14 @@ export default {
this.getXyrList()
},
methods: {
toEdit (item) {
debugger
let routeData = this.$router.resolve({
path: "/xyrEdit",
query: { xxzjbh: item.xxzjbh }
});
window.open(routeData.href, "_blank");
},
inint () {
var self = this
// this.propFormField[2].data.forEach(item => {
......@@ -778,6 +817,13 @@ export default {
self.propFormField.forEach(val => {
val.data.forEach(val2 => {
if (!val2.childrenAsAdd) {
if (self.oldData[val2.id] != self.formLabelAlign[val2.id]) {
let arr = []
arr.push(self.oldData[val2.id])
arr.push(self.formLabelAlign[val2.id])
self.$set(self.rzObj, val2.id, arr)
}
if (val2.id != '' && val2.id != null && val2.type != 'file') {
let id = val2.id;
if (id.indexOf('-') != -1) {
......@@ -908,6 +954,7 @@ export default {
obj.xm = item.zhfzxyrXm
obj.sfzh = item.zhfzxyrCyzjZjhm
obj.xzz = item.zhfzxyrXzzDzmc
obj.xxzjbh = item.xxzjbh
this.tableData.push(obj)
}).catch((error) => {
console.log(error)
......@@ -927,6 +974,7 @@ export default {
params: { asjbh: asjbh },
headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'blade-auth': sessionStorage.getItem("token"), }
}).then(res => {
self.oldData = res.data.data.asjxx;
self.getData("aj", res);
}).catch(err => {
console.log(err);
......
src/views/magl/zczjsxcj.vue
......@@ -343,45 +343,26 @@
<div class="">
<span class="flTtitle"
style="border-bottom: 1px solid rgb(221, 221, 221);width:100%;"><span style="display: inline-block;width: 6px;height: 19px;position: relative;top:-2px; background: #3670ff; vertical-align: middle; margin-right: 16px;"></span>犯罪嫌疑人</span>
<el-table :data="tableData"
style="width: 100%">
<!-- <el-table-column
align="center"
label="操作"
width="100">
<template >
<el-button type="text" size="small" >修改</el-button>
</template>
</el-table-column> -->
<el-table-column prop="xm"
align="center"
label="姓名"
width="180">
<el-table :data="tableData">
<el-table-column label="操作"
width="100">
<template slot-scope="scope">
<el-button @click="toEdit(scope.row)"
type="text"
size="small">修改</el-button>
</template>
</el-table-column>
<el-table-column prop="xb"
align="center"
label="性别"
width="180">
</el-table-column>
<el-table-column prop="sfzh"
align="center"
label="身份证号">
</el-table-column>
<el-table-column prop="hjdqh"
align="center"
label="户籍地区划">
</el-table-column>
<el-table-column prop="xzz"
align="center"
label="现住址">
</el-table-column>
<el-table-column prop="dazt"
align="center"
label="到案状态">
</el-table-column>
<el-table-column prop="dwzy"
align="center"
label="地位作用">
<el-table-column v-for="(columnTitle) in tableList.filter(
(itemsss, index) => {
return index < tableList.length - 1;
}
)"
:key="columnTitle.label"
:label="columnTitle.label"
align="center">
<template slot-scope="scope">
{{ scope.row[columnTitle.prop] }}
</template>
</el-table-column>
</el-table>
<el-pagination background
......@@ -531,13 +512,35 @@ export default {
col: "3",
},
{
name: "侦查终结依据(破案过程):",
name: "侦查终结依据(破案过程) 备注:需要提供六要素",
id: "zczjZcxwyjms",
type: "textarea",
prop: "checkEmpty",
value: "",
col: "1"
},
{
name: "作案手段:",
id: "zczjZasddm",
type: "codeTree",
props: [],//字典弹框需要的字段
value: "",
prop: "checkEmpty",
col: "3",
codeOptions: [],
codeTree: "CODE_ZADJ",
},
{
name: "破案手段:",
id: "zczjPasddm",
type: "codeTree",
props: [],//字典弹框需要的字段
value: "",
prop: "checkEmpty",
col: "3",
codeOptions: [],
codeTree: "CODE_ZADJ",
},
]
},
{
......@@ -583,12 +586,6 @@ export default {
id: '3',
data: [
{
name: "呈请破案报告书",
id: "050101",
type: 'file',
col: "1",
},
{
name: "侦查终结报告书",
id: "050102",
type: 'file',
......@@ -646,6 +643,38 @@ export default {
currentPage1: 1, //表格页码
page_size: 5,
total: 0,
tableList: [
{
label: "性别",
prop: "xb",
},
{
label: "身份证号",
prop: "sfzh",
},
{
label: "户籍地区划",
prop: "hjdqh",
},
{
label: "现住址",
prop: "xzz",
},
{
label: "到案状态",
prop: "dazt",
},
{
label: "地位作用",
prop: "dwzy",
},
{
label: "xxzjbh",
prop: "xxzjbh",
}
],
oldData: {},
rzObj: {}
}
},
created () {
......@@ -657,6 +686,14 @@ export default {
this.getXyrList()
},
methods: {
toEdit (item) {
debugger
let routeData = this.$router.resolve({
path: "/xyrEdit",
query: { xxzjbh: item.xxzjbh }
});
window.open(routeData.href, "_blank");
},
inint () {
var self = this
// this.propFormField[2].data.forEach(item => {
......@@ -772,11 +809,19 @@ export default {
submits (bllx) {
var self = this;
let ajxxForm = {}
var obj = {}
this.$refs.ajxxForm.validate((valid) => {
if (valid) {
self.propFormField.forEach(val => {
val.data.forEach(val2 => {
if (!val2.childrenAsAdd) {
if (self.oldData[val2.id] != self.formLabelAlign[val2.id]) {
let arr = []
arr.push(self.oldData[val2.id])
arr.push(self.formLabelAlign[val2.id])
self.$set(self.rzObj, val2.id, arr)
}
if (val2.id != '' && val2.id != null && val2.type != 'file') {
let id = val2.id;
if (id.indexOf('-') != -1) {
......@@ -907,6 +952,7 @@ export default {
obj.xm = item.zhfzxyrXm
obj.sfzh = item.zhfzxyrCyzjZjhm
obj.xzz = item.zhfzxyrXzzDzmc
obj.xxzjbh = item.xxzjbh
this.tableData.push(obj)
}).catch((error) => {
console.log(error)
......@@ -926,6 +972,8 @@ export default {
params: { asjbh: asjbh },
headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'blade-auth': sessionStorage.getItem("token"), }
}).then(res => {
self.oldData = res.data.data.asjxx
debugger
self.getData("aj", res);
}).catch(err => {
console.log(err);
......
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