Skip to content

F
founder_vue
Commit 74afe10a by xue_wengang
Options

Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

parents 6bdf9fed 7a4db624
Showing with 208 additions and 111 deletions
src/components/ajbz/bshChildrenQuery.vue
......@@ -432,7 +432,6 @@
v-else-if="columnTitle.prop == 'xszmc'"
style="
cursor: pointer;
color: #096cc9;
font-size: 13px !important;
white-space: nowrap;
overflow: hidden;
......@@ -476,7 +475,7 @@
style="cursor: pointer; color: #096cc9"
@click="turnToEdit(scope.row, 'add')"
>
<i class="el-icon-edit-outline"></i> 登记为串并案
<i class="el-icon-edit-outline"></i> 确认串并线索
</span>
<span
style="cursor: pointer; color: #096cc9; margin-left: 20px"
......
src/components/ajbz/rgcb_wdxl/ptCxForm_components.vue
......@@ -579,7 +579,6 @@
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100"
align="center"
......@@ -686,7 +685,11 @@ export default {
tableDataLength: 0, //表格总数
talbeBhgCount: "", // 不合格
talbehgCount: "", // 合格
tableData: [], //表格数据
tableData: [
// {
// asjbh: '111111111111'
// }
], //表格数据
propdefaultFormThead: utils.deepClone(this.cxDefaultFormThead), //表格表头
excelHeader: "案件标注",
tableSelectItem: [],
......
src/layout/menuLayouts.vue
......@@ -54,7 +54,11 @@
>
<!-- 判断二级菜单（有三级菜单）-->
<el-submenu :index="items.index" v-if="items.hasChildren" style="padding-left:18px !important">
<el-submenu
:index="items.index"
v-if="items.hasChildren"
style="padding-left: 18px !important"
>
<template slot="title">{{ items.label }}</template>
<el-menu-item
@click="goDetail(j)"
......@@ -177,8 +181,11 @@ export default {
console.log(path);
window.open(path, "_blank");
} else if (item.id == "cbypTxxxfx") {
let obj = JSON.parse(sessionStorage.getItem("userInfo"));
let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${obj.identitycard}`;
let rxtoken = sessionStorage.getItem("rxtoken")
? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
: "";
let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?token=${rxtoken}&path=/queryHdfx`;
window.open(path, "_blank");
} else if (item.id == "brainDzajSP") {
// let obj = JSON.parse(sessionStorage.getItem("userInfo"));
......@@ -194,21 +201,17 @@ export default {
item.id == "zcajfl" ||
item.id == "zczbgctj"
) {
let userToken = sessionStorage.getItem('userToken')
let appToken = sessionStorage.getItem('appToken')
let path = `${this.$baseUrl.alyIP10}?zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
let userToken = sessionStorage.getItem("userToken");
let appToken = sessionStorage.getItem("appToken");
let path = `${this.$baseUrl.alyIP10}?zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
window.open(path, "_blank");
} else if (item.id == "zdryGl") {
this.$router.pushToTab({
path: "zdryGl",
});
} else if (item.id == "queryHd") {
// let obj = JSON.parse(sessionStorage.getItem("userInfo"));
// let account = Base64.encode(obj.identitycard);
// debugger;
// let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${account}`;
// window.open(path, "_blank");
this.$router.push({
path: "/queryHd",
});
......
src/router/modules/ajbz.js
......@@ -39,7 +39,7 @@ const menuLayouts = [
path: "/bshcb",
name: "bshcb",
meta: {
title: '标识号串并'
title: '综合串并线索汇集'
},
component: () => import("@/views/cbyp/bshcb.vue")
},
......@@ -116,7 +116,7 @@ const menuLayouts = [
path: "/cbaAdd",
name: "cbaAdd",
meta: {
title: "登记为串并案",
title: "确认串并线索",
auth: 5
},
component: () => import("@/views/cbyp/cbaAdd.vue")
......
src/router/modules/index.js
......@@ -202,7 +202,7 @@ export default [
name: "djwzba",
redirect: '/djwzba/xgaj',
meta: {
title: "登记为串并案",
title: "确认串并线索",
auth: 5
},
component: () => import("@/views/cbyp/cba/djwzba.vue"),
......
src/utils/util.js
export default {
dateToStr(from) {
let date = new Date();
date.setTime(from);
let y = date.getFullYear();
let m = date.getMonth() + 1;
m = m < 10 ? "0" + m : m;
let d = date.getDate();
d = d < 10 ? "0" + d : d;
return y + '-' + m + '-' + d;
},
/**
* 时间戳转日期格式
* @param {Object} timeStamp
......
src/views/cbyp/bshcb.vue
......@@ -290,7 +290,7 @@ export default {
Menu: [
{
id: "bshcb",
label: "标识号串并",
label: "综合串并线索汇集",
index: "bshcb",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -309,7 +309,7 @@ export default {
children: [
{
id: "bshcb",
label: "标识号串并",
label: "综合串并线索汇集",
index: "bshcb",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -317,7 +317,7 @@ export default {
},
{
id: "rgcb",
label: "人工串并",
label: "扩串研判",
index: "rgcb",
auth: "M0101",
className: "iconfont iconrizhi",
......
src/views/cbyp/rgcb.vue
......@@ -214,7 +214,7 @@ export default {
Menu: [
{
id: "rgcb",
label: "人工串并",
label: "扩串研判",
index: "rgcb",
auth: "M0101",
className: "iconfont iconrizhi",
......
src/views/cbyp/xzrgcb.vue
......@@ -232,6 +232,22 @@ export default {
placeholder: "请输入",
col: "15",
},
{
name: "痕迹物证",
id: "jyaq",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
{
name: "人员轨迹",
id: "jyaq",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
],
cxDefaultFormThead: [
{
......
src/views/xnpgbg/dwxnfx.vue
......@@ -267,20 +267,20 @@ export default {
this.initDate(this.unitList[index]);
},
goDetail(row, type) {
console.log(row)
console.log(type)
if (type == "unitName") {
this.formData.unitCode = row.unitCode;
this.initDate();
// this.initDate(row.unitCode);
// this.unitList.push(row.unitCode)
this.$router.pushToTab({
path: '/queryDwcztj',
query: {
unitCode: row.unitCode,
yymcdm: row.yymcdm ?? '',
djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
}
})
// this.$router.pushToTab({
// path: '/queryDwcztj',
// query: {
// unitCode: row.unitCode,
// yymcdm: row.yymcdm ?? '',
// djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
// djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
// }
// })
} else {
let yymcdm = '';
for (let i in this.queryTypeList) {
......
src/views/ztyp/queryQt.vue
......@@ -43,10 +43,7 @@
<el-button slot="trigger" size="mini" type="primary" v-if="show"
>选取文件</el-button
>
<el-button
size="mini"
v-if="show"
@click="submitUpload(scope.scope)"
<el-button size="mini" v-if="show" @click="submitUpload(scope.scope)"
>上传</el-button
>
<el-button
......@@ -145,7 +142,7 @@ export default {
pageBs: "queryZj",
pageASs: "queryZjQt",
cxFormData: {
username: JSON.parse(window.sessionStorage.getItem("userInfo"))
username: JSON.parse(window.sessionStorage.getItem("userInfo"))
.userName,
endTime: "",
startTime: "",
......@@ -294,10 +291,44 @@ export default {
hasChildren: false,
},
{
id: "kjdzxxbd",
id: "kjdzxxbdNew",
label: "空间电子信息比对",
newAuth: "M01",
index: "kjdzxxbd",
index: "kjdzxxbdNew",
className: "iconfont icongongnengfuwu",
hasChildren: true,
children: [
{
id: "tqajdzkjxx",
label: "提取案件电子空间信息",
index: "tqajdzkjxx",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
{
id: "sckjdzxx",
label: "上传空间电子信息",
index: "sckjdzxx",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
{
id: "kjdzxxbd",
label: "空间电子信息比对",
index: "kjdzxxbd",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
},
{
id: "zhcbfx",
label: "综合串并分析",
newAuth: "M01",
index: "zhcbfx",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
......
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