Skip to content

F
founder_vue
Commit 656cfbfb by xue_wengang
Options

bug修改

parent cbd6d8d1
Showing with 210 additions and 87 deletions
src/assets/styles/main.scss
......@@ -445,7 +445,7 @@ img {
.zdyInputCol2 {
.el-input {
width: calc((100% - 23px)/2) !important;
width: calc((100% - 25px)/2) !important;
}
}
......
src/components/bshChildrenQuery.vue
......@@ -424,7 +424,7 @@
"
>
{{ scope.row[columnTitle.prop] }}
<span
<!-- <span
style="
margin-left: 10px;
padding: 3px 5px;
......@@ -434,7 +434,7 @@
v-if="scope.row['cbypSfcbqgaj'] == 1"
@click="goDetail(scope.row, 'qg')"
>全国</span
>
> -->
<span
style="
margin-left: 10px;
......@@ -688,15 +688,20 @@ export default {
})
post(this.cxUrl, formDatas).then(res => {
if (res.code === 200) {
res.data.data.forEach(item => {
item.xszmc = `${item.cbajAjmc}(组号:${item.xszajbh})`
item.cbajAjmc = `${item.cbajAjmc}(组号:${item.xszajbh})`
})
require.ensure([], () => {
const { export_json_to_excel } = require('../utils/Export2Excel')
const list = res.data
const list = res.data.data
const data = self.formatJson(filterVal, list)
debugger
export_json_to_excel(tHeader, data, self.excelHeader)
})
// loading.close();
loading.close();
} else {
// loading.close();
loading.close();
self.$message({
type: 'error',
message: '查询失败'
......
src/components/ptCxForm_components.vue
......@@ -43,7 +43,7 @@
v-model="formData[item.id]"
>
</el-input>
—
至
<el-input
:placeholder="item.placeholder2"
v-model="formData[item.id2]"
......@@ -434,12 +434,11 @@ export default {
filterVal.push(val.prop);
});
esAsjQuery(json).then((res) => {
if (res.status === 200) {
if (res.code === 200) {
require.ensure([], () => {
const { export_json_to_excel } = require("../utils/Export2Excel");
const list = res.data;
const list = res.data.rows;
const data = self.formatJson(filterVal, list);
debugger;
export_json_to_excel(tHeader, data, self.excelHeader);
});
loading.close();
......
src/utils/params.js
......@@ -450,7 +450,7 @@ let jccxAjxxDefaultFormField = {
},
{
name: '立案单位',
id: 'ladwGajgjgdm',
id: 'ladwPcs',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
......@@ -1295,7 +1295,7 @@ let jccxAjxxFormField = {
},
{
name: '立案单位',
id: 'ladwGajgjgdm',
id: 'ladwPcs',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
......@@ -3404,7 +3404,7 @@ let jccxFlxxDefaultFormField = {
},
{
name: '立案单位',
id: 'ladwfl'
id: 'ladwflGab'
},
{
name: '案发日期',
......@@ -3466,7 +3466,7 @@ let jccxFlxxFormField = {
},
{
name: '立案单位',
id: 'ladwfl'
id: 'ladwflGab'
},
{
name: '案发日期',
......@@ -7221,7 +7221,7 @@ let dwcxFlxxDefaultFormField = {
},
{
name: '立案单位',
id: 'ladwfl'
id: 'ladwflGab'
},
{
name: '案发日期',
......@@ -7287,7 +7287,7 @@ let dwcxFlxxFormField = {
},
{
name: '立案单位',
id: 'ladwfl'
id: 'ladwflGab'
},
{
name: '案发日期',
......
src/views/ajbzDetail.vue
......@@ -316,7 +316,7 @@
style="width: 90%; display: flex"
@click="shrHighlight(data.gjc)"
><i
:class="data.rylx == '01' ? 'shrtype' : 'xyrtype'"
:class="data.rylx == '01' ? 'shrtype' : data.rylx == '02' ? 'xyrtype' : ''"
></i
><i
:class="
......
src/views/cbyp/bshcb.vue
......@@ -153,13 +153,15 @@ export default {
value: "",
col: "3",
},
{
name: "案件类别代码",
{
name: "案件类别",
id: "ajlbdm",
type: "text",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
placeholder: "请输入",
col: "3",
codeOptions: [],
codeTree: "CODE_Ajlb",
},
{
name: "简要案情",
......@@ -169,18 +171,18 @@ export default {
placeholder: "简要案情,多个案情之间用逗号分隔",
col: "3",
},
{
name: "案件线索来源",
id: "cbxsly",
type: "radio",
value: "",
placeholder: "",
col: "3",
radioData: [
{ label: "本辖区", val: "bxq" },
{ label: "全省 ", val: "qs" },
],
},
// {
// name: "案件线索来源",
// id: "cbxsly",
// type: "radio",
// value: "",
// placeholder: "",
// col: "3",
// radioData: [
// { label: "本辖区", val: "bxq" },
// { label: "全省 ", val: "qs" },
// ],
// },
{
name: "标识号",
id: "cbxgfwbzh",
......@@ -189,19 +191,19 @@ export default {
placeholder: "请输入",
col: "3",
},
{
name: "是否为全国线索",
id: "qgxs",
type: "radio",
value: "",
placeholder: "",
col: "3",
radioData: [
{ label: "所有", val: "" },
{ label: "否", val: "0" },
{ label: "是", val: "1" },
],
},
// {
// name: "是否为全国线索",
// id: "qgxs",
// type: "radio",
// value: "",
// placeholder: "",
// col: "3",
// radioData: [
// { label: "所有", val: "" },
// { label: "否", val: "0" },
// { label: "是", val: "1" },
// ],
// },
// {
// name: "案件类别",
// id: "ajlbdm",
......
src/views/cbyp/toAddXlaj.vue
......@@ -695,7 +695,7 @@ export default {
{
name: "抓获单位",
id: "zhdwGajgjgdm",
type: "lazyCodeTreeDialog", //字典弹框
type: "codeTreeDialog", //字典弹框
codeTree: "CODE_QGUNIT",
props: [], //字典弹框需要的字段
codeOptions: [],
......
src/views/dwcx/index.vue
......@@ -45,6 +45,7 @@
:flxxGroup="flxxGroup"
:xzFlxxGroup="xzFlxxGroup"
:xzSFlxxGroup="xzSFlxxGroup"
:xzSSFlxxGroup="xzSSFlxxGroup"
:yjFlE="yjFlE"
:radioZt="radioZt"
:radioFZt="radioFZt"
......@@ -140,6 +141,7 @@ export default {
bhrHjdzXzqhdmMc: "" /*户籍地分类*/,
zhfzxyrMzdmMc: "" /*民族分类*/,
bhrMzdmMc: "" /*民族分类*/,
ladwGab: "" /*立案单位省级分类*/,
ladwSj: "" /*立案单位市局分类*/,
ladwFj: "" /*立案单位分局分类*/
},
......@@ -181,6 +183,7 @@ export default {
flxxGroup: [] /*查询回来得分类信息*/,
xzFlxxGroup: [],
xzSFlxxGroup: [],
xzSSFlxxGroup:[],
excelHeader: "" /*下载文件的名字*/,
loading: false,
text: "正在保存...",
......@@ -253,7 +256,7 @@ export default {
//分类查询结果有一级和二级的情况，点击一级和二级的单选按钮回调whichOne（yjRadio，ejRadio）(larqYear asjfssjAsjfskssjYear )特殊处理
let self = this;
self.openLoading(); //table加载loading
debugger
if (whichOne && whichOne == "yjRadio") {
self.yjFlE[type] = radio;
self.formData["page"] = "1";
......@@ -280,6 +283,7 @@ export default {
type != "shrage" &&
type != "ladwSj" &&
type != "ladwFj" &&
type != "ladwGab" &&
type != "ajSsjzrmby"
) {
//点击年份和年龄段时候传值需要单独处理，其他情况直接type：val，
......@@ -383,27 +387,28 @@ export default {
self.formData[type + "Max"] = "";
}
}
} else if (type == "ladwSj" || type == "ladwFj") {
} else if (type == "ladwSj" || type == "ladwFj" || type == "ladwGab") {
self.radioSZt = "全部";
for (let y = self.formData.flxx.length - 1; y >= 0; y--) {
if (
self.formData.flxx[y] == "ladwflFj" ||
self.formData.flxx[y] == "ladwflPcs"
self.formData.flxx[y] == "ladwflPcs" ||
self.formData.flxx[y] == "ladwflSj"
) {
self.formData.flxx.splice(y, 1);
}
}
if (type == "ladwSj") {
if (type == "ladwGab") {
//ladwPcs,ladwFj
if (val != "all") {
self.$set(
self.formData["flxx"],
self.formData["flxx"].length,
"ladwflFj"
"ladwflSj"
);
} else {
var index3 = self.formData["flxx"].indexOf("ladwflFj");
var index3 = self.formData["flxx"].indexOf("ladwflSj");
if (index > -1) {
//大于0 代表存在，
self.formData["flxx"].splice(index3, 1); //存在就删除
......@@ -411,6 +416,26 @@ export default {
}
for (let i in self.formData) {
if (i == "ladwPcs" || i == "ladwFj" || i == 'ladwSj') {
self.formData[i] = "";
}
}
}else if (type == "ladwSj") {
if (val != "all") {
self.$set(
self.formData["flxx"],
self.formData["flxx"].length,
"ladwflFj"
);
} else {
var index5 = self.formData["flxx"].indexOf("ladwflFj");
if (index > -1) {
//大于0 代表存在，
self.formData["flxx"].splice(index5, 1); //存在就删除
}
}
for (let i in self.formData) {
if (i == "ladwPcs" || i == "ladwFj") {
self.formData[i] = "";
}
......@@ -570,6 +595,7 @@ export default {
i == "zhfzxyrXbdmMc" ||
i == "bhrXbdmMc" ||
i == "zhfzxyrGjdmMc" ||
i == "ladwGab" ||
i == "ladwSj" ||
i == "ladwFj" ||
i == "ladwPcs"
......@@ -580,6 +606,7 @@ export default {
self.flxxGroup = [];
self.xzFlxxGroup = [];
self.xzSFlxxGroup = [];
self.xzSSFlxxGroup = []
for (let i in self.yjFlE) {
self.yjFlE[i] = "全部";
}
......@@ -588,6 +615,8 @@ export default {
self.formData.flxx[y] == "lasjflMonth" ||
self.formData.flxx[y] == "afrqflMonth" ||
self.formData.flxx[y] == "ladwflFj" ||
self.formData.flxx[y] == 'ladwflSj' ||
self.formData.flxx[y] == "ladwSj" ||
self.formData.flxx[y] == "ladwflPcs"
) {
self.formData["flxx"].splice(y, 1);
......@@ -647,8 +676,15 @@ export default {
} else if (flag == "currentPage") {
self.doQueryRequst(data, handleForm, "currentPage");
} else if (flag == "flxx") {
debugger
//点击分类查询结果的时候
let num = 0;
if (Object.prototype.hasOwnProperty.call(self.formData, "ladwGab")) {
//获取二级立案单位
if (self.formData["ladwGab"] != "") {
num++;
}
}
if (Object.prototype.hasOwnProperty.call(self.formData, "ladwSj")) {
//获取二级立案单位
if (self.formData["ladwSj"] != "") {
......@@ -676,6 +712,9 @@ export default {
} else if (num == 3) {
self.doQueryRequst(data, handleForm, "SetFlxx");
return;
} else if (num == 4) {
self.doQueryRequst(data, handleForm, 'SetFlxx4')
return
}
if (Object.prototype.hasOwnProperty.call(self.formData, "larqMonth")) {
if (self.formData["larqMonth"] != "") {
......@@ -857,6 +896,11 @@ export default {
item => !self.flxxGroup.some(ele => ele.type === item.type)
);
self.xzSFlxxGroup = arr;
} else if (noSet == 'SetFlxx') {
let arr = res.data.flxx.filter(
item => !self.flxxGroup.some(ele => ele.type === item.type)
)
self.xzSSFlxxGroup = arr
}
self.closeTableLoading(); //table关闭loading
self.resultLoading=false;
......@@ -886,6 +930,11 @@ export default {
item => !self.flxxGroup.some(ele => ele.type === item.type)
);
self.xzSFlxxGroup = arr;
} else if (noSet == 'SetFlxx') {
let arr = res.data.flxx.filter(
item => !self.flxxGroup.some(ele => ele.type === item.type)
)
self.xzSSFlxxGroup = arr
}
self.closeTableLoading(); //table关闭loading
self.resultLoading=false;
......@@ -915,6 +964,11 @@ export default {
item => !self.flxxGroup.some(ele => ele.type === item.type)
);
self.xzSFlxxGroup = arr;
} else if (noSet == 'SetFlxx') {
let arr = res.data.flxx.filter(
item => !self.flxxGroup.some(ele => ele.type === item.type)
)
self.xzSSFlxxGroup = arr
}
self.closeTableLoading(); //table关闭loading
self.resultLoading=false;
......
src/views/index/home.vue
......@@ -12,11 +12,11 @@
<div class="header-admin">
<span class="img-span"></span>
<span>欢迎您：</span>
<span>{{username}}</span>
<span>{{ username }}</span>
<span>系统管理员：</span>
</div>
<div class="header-nav">
<span @click="down" style="margin-right:10px">操作手册</span>
<span @click="down" style="margin-right: 10px">操作手册</span>
<span class="big-tv-nav">
<img
src="../../assets/img/bigTvNav.png"
......@@ -32,7 +32,8 @@
</div>
<div class="nav">
<div class="navList" v-for="item in navList" :key="item.id">
<img :src="item.url" @click="goDetail(item.id)" />
<img :src="item.url" @click="goDetail(item)" />
<i class="el-icon-lock" v-if="item.isClock && !isInclude"></i>
</div>
</div>
</div>
......@@ -72,28 +73,34 @@ export default {
{
id: "/zdgl",
url: require("../../assets/img/nav7.png"), //字典管理
isClock:true
},
{
id: "/ypbg",
url: require("../../assets/img/nav8.png"), //字典管理
},
],
username:JSON.parse(sessionStorage.getItem("userInfo")).realname
username: JSON.parse(sessionStorage.getItem("userInfo")).realname,
identitycard: JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
isInclude:false
};
},
methods: {
down(){
window.open('file/cz.docx')
down() {
window.open("file/cz.docx");
},
goDetail(id) {
if (id == "/zdry") {
goDetail(item) {
debugger
if (item.id == "/zdry") {
zdryLogin({
zjhm: "34222419830726005X",
}).then((result) => {
window.open("http://26.3.13.120:8088/zdGzry/index", "_blank");
});
} else {
this.$router.pushToTab(id);
} else if (item.isClock && !this.isInclude){
return
}else{
this.$router.pushToTab(item.id);
}
},
/**
......@@ -107,6 +114,11 @@ export default {
});
},
},
created(){
let arr = ['34222419830726005X','350628197501115019','33020197911103615']
debugger
this.isInclude = arr.some(item=>item == this.identitycard)
},
};
</script>
......@@ -156,5 +168,15 @@ export default {
.title {
margin-top: 45px;
}
.navList {
position: relative;
i {
position: absolute;
left: 277px;
top: 46px;
font-size: 30px;
color: #fff;
}
}
}
</style>
\ No newline at end of file
src/views/index/ypbg.vue
......@@ -761,7 +761,7 @@ export default {
formatter: function (params) {
var newParamsName = ""; // 最终拼接成的字符串
var paramsNameNumber = params.length; // 实际标签的个数
var provideNumber = 4; // 每行能显示的字的个数
var provideNumber = 2; // 每行能显示的字的个数
var rowNumber = Math.ceil(paramsNameNumber / provideNumber); // 换行的话，需要显示几行，向上取整
/**
* 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
......@@ -1162,7 +1162,7 @@ export default {
formatter: function (params) {
var newParamsName = ""; // 最终拼接成的字符串
var paramsNameNumber = params.length; // 实际标签的个数
var provideNumber = 4; // 每行能显示的字的个数
var provideNumber = 2; // 每行能显示的字的个数
var rowNumber = Math.ceil(paramsNameNumber / provideNumber); // 换行的话，需要显示几行，向上取整
/**
* 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
......@@ -1493,7 +1493,40 @@ export default {
},
axisLabel: {
color: "#666",
width: 100,
clickable: true,
interval: 0,
formatter: function (params) {
var newParamsName = ""; // 最终拼接成的字符串
var paramsNameNumber = params.length; // 实际标签的个数
var provideNumber = 2; // 每行能显示的字的个数
var rowNumber = Math.ceil(paramsNameNumber / provideNumber); // 换行的话，需要显示几行，向上取整
/**
* 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
*/
// 条件等同于rowNumber>1
if (paramsNameNumber > provideNumber) {
/** 循环每一行,p表示行 */
for (var p = 0; p < rowNumber; p++) {
var tempStr = ""; // 表示每一次截取的字符串
var start = p * provideNumber; // 开始截取的位置
var end = start + provideNumber; // 结束截取的位置
// 此处特殊处理最后一行的索引值
if (p == rowNumber - 1) {
// 最后一次不换行
tempStr = params.substring(start, paramsNameNumber);
} else {
// 每一次拼接字符串并换行
tempStr = params.substring(start, end) + "\n";
}
newParamsName += tempStr; // 最终拼成的字符串
}
} else {
// 将旧标签的值赋给新标签
newParamsName = params;
}
//将最终的字符串返回
return newParamsName;
},
},
splitLine: {
show: false,
......@@ -1680,7 +1713,7 @@ export default {
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
this.propQueryField.forEach((val) => {
self.propQueryField.forEach((val) => {
if (val.type == "code" || val.type == "codeTreeDialog") {
if (val.codeOptions.length == 0) {
axios
......@@ -1689,21 +1722,29 @@ export default {
let unitcode = JSON.parse(
sessionStorage.getItem("userInfo")
).unitcode.slice(0, 6);
debugger;
let arr1 = res.data.data.rows.filter(
(item) => item.id.slice(0, 2) == unitcode.slice(0, 2)
);
let arr2 = arr1[0].children.filter(
(item) => item.id.slice(0, 4) == unitcode.slice(0, 4)
);
let arr3 = arr2[0].children.filter(
(item) => item.id.slice(0, 6) == unitcode
);
let arr4 =
let arr2 = [];
let arr3 = [];
let arr4 = [];
if (arr1.length > 0) {
arr2 = arr1[0].children.filter(
(item) => item.id.slice(0, 4) == unitcode.slice(0, 4)
);
}
if (arr2.length > 0) {
arr3 = arr2[0].children.filter(
(item) => item.id.slice(0, 6) == unitcode
);
}
arr4 =
unitcode == "010000"
? res.data.data.rows
: arr2.length > 0
: arr1.length > 0
? arr1
: arr3.length > 0
: arr2.length > 0
? arr2
: arr3;
if (arr4.length > 0) {
......@@ -1840,7 +1881,7 @@ export default {
}
}
.yp_contnet {
width: 1056px;
width: 1171px;
.jqzs {
width: 720px;
padding: 23px 36px;
......
src/views/queryAj.vue
......@@ -49,7 +49,7 @@ export default {
{
name: '案(事)件类别',
id: 'ajlbdm',
type: 'lazyCodeTreeDialog',
type: 'codeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
......@@ -59,12 +59,12 @@ export default {
{
name: '立案单位',
id: 'Ladw_gajgjgdms',
type: 'lazyCodeTreeDialog',
type: 'codeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
codeOptions: [],
codeTree: 'CODE_QGUNIT'
codeTree: 'CODE_UNIT'
},
{
name: '主案类别',
......@@ -95,7 +95,7 @@ export default {
col: '3'
},
{
name: '发案事件',
name: '发案时间',
id: 'asjfssjKssj',
id2: 'asjfssjJssj',
type: 'zdyDate',
......@@ -121,14 +121,14 @@ export default {
name: '损失总价值',
id: 'ssjzMin',
id2: 'ssjzMax',
type: 'zdyDate',
type: 'zdyText',
value: '',
col: '3'
},
{
name: '案发地行政区划',
id: 'asjfsdd_xzqhdm',
type: 'lazyCodeTreeDialog',
type: 'codeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
......@@ -145,8 +145,7 @@ export default {
radioData: [
{ label: '全部', val: '' },
{ label: '已标注', val: '1' },
{ label: '未标注', val: '2' },
{ label: '待标注', val: '3' }
{ label: '未标注', val: '2' }
]
},
{
......@@ -162,7 +161,7 @@ export default {
{
label: '案件编号',
prop: 'asjbh',
width: '220'
width: '260'
},
{
label: '案件类别',
......@@ -203,7 +202,7 @@ export default {
},
{
label: '立案单位名称',
prop: 'ladwGajgjgdmMc',
prop: 'ladwPcs',
width: '220'
},
{
......
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