From 0e4d44c2f5a7511d2eee72deecb76b5ba67358cd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 04 Jan 2022 17:39:41 +0800
Subject: [PATCH] 智能分析查询明细样式调整
---
src/views/wel/index.vue | 10 ----
src/views/securityAnalysis/child/situation.vue | 9 ++--
src/views/securityAnalysis/child/socialSecurity.vue | 2
src/views/securityAnalysis/child/dispatch.vue | 6 +-
src/views/securityAnalysis/child/examination.vue | 1
src/views/securityAnalysis/index.vue | 43 ++++++++++++---------
src/views/securityAnalysis/child/assignment.vue | 2
7 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/views/securityAnalysis/child/assignment.vue b/src/views/securityAnalysis/child/assignment.vue
index ac18771..4a2bfb7 100644
--- a/src/views/securityAnalysis/child/assignment.vue
+++ b/src/views/securityAnalysis/child/assignment.vue
@@ -121,7 +121,7 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 4,
+ searchSpan: 5,
},
{
label: "年龄",
diff --git a/src/views/securityAnalysis/child/dispatch.vue b/src/views/securityAnalysis/child/dispatch.vue
index c6f9e4b..2ad7f87 100644
--- a/src/views/securityAnalysis/child/dispatch.vue
+++ b/src/views/securityAnalysis/child/dispatch.vue
@@ -75,7 +75,7 @@
search: true,
searchLabelWidth: 110,
overHidden: true,
- searchSpan: 4,
+ searchSpan: 5,
width: 210,
// span: 12,
labelWidth: 118,
@@ -117,7 +117,7 @@
width: 230,
searchLabelWidth: 80,
search: search,
- searchSpan: 4,
+ searchSpan: 5,
// editDisplay: false,
// addDisplay: false,
// hide: true,
@@ -176,7 +176,7 @@
valueFormat: "yyyy-MM-dd",
searchValue: [this.getStartTime(), this.getEndTime()],
searchRange: true,
- searchSpan: 5,
+ searchSpan: 6,
searchLabelWidth: 110,
hide: true,
addDisplay: false,
diff --git a/src/views/securityAnalysis/child/examination.vue b/src/views/securityAnalysis/child/examination.vue
index cc01283..bd5a11f 100644
--- a/src/views/securityAnalysis/child/examination.vue
+++ b/src/views/securityAnalysis/child/examination.vue
@@ -64,6 +64,7 @@
prop: "securityName",
disabled: true,
search: true,
+ searchSpan:4
},
{
label: "学校名称",
diff --git a/src/views/securityAnalysis/child/situation.vue b/src/views/securityAnalysis/child/situation.vue
index 4a7fc9f..365666c 100644
--- a/src/views/securityAnalysis/child/situation.vue
+++ b/src/views/securityAnalysis/child/situation.vue
@@ -76,12 +76,11 @@
searchLabelWidth: "50",
width: 80,
overHidden: true,
- searchSpan: 4,
+ searchSpan: 3,
search: true,
},
{
label: "企业名称",
- searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
type: "tree",
@@ -92,7 +91,7 @@
},
// hide: true,
// slot: true,
- searchSpan: 4,
+ searchSpan: 5,
display: false,
search: search,
minWidth: 220,
@@ -123,7 +122,7 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 4,
+ searchSpan: 5,
minWidth: 140,
display: false,
},
@@ -159,7 +158,7 @@
search: true,
disabled: false,
type: "select",
- searchSpan: 3,
+ searchSpan: 4,
// searchValue: "1",
dicData: [
{
diff --git a/src/views/securityAnalysis/child/socialSecurity.vue b/src/views/securityAnalysis/child/socialSecurity.vue
index fa1c022..eccad1b 100644
--- a/src/views/securityAnalysis/child/socialSecurity.vue
+++ b/src/views/securityAnalysis/child/socialSecurity.vue
@@ -121,7 +121,7 @@
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 4,
+ searchSpan: 5,
},
{
label: "学历",
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index e5f70bf..51d9507 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -50,12 +50,13 @@
</div>
<div>
<el-dialog
- width="90%"
+ width="80%"
:title="titles"
append-to-body
:visible.sync="dialogVisible"
- top="8vh"
- height="70%"
+ lock-scroll="false"
+ top="1vh"
+ center
>
<situation
:card="{ deptId: deptid, jurisdiction: jurisdiction }"
@@ -617,6 +618,12 @@
// },
//后改，考试数据统计
setEC3(data) {
+ //获取年份
+ // let year = new Date().getFullYear();
+ // var timeData = [];
+ // for (let index = 1; index < 13; index++) {
+ // timeData.push(year+"-"+ index );
+ // }
const seriesdata = [];
data.forEach((item) => {
if (item.type == 1) {
@@ -642,6 +649,20 @@
});
}
});
+ var datetime = [
+ "1月",
+ "2月",
+ "3月",
+ "4月",
+ "5月",
+ "6月",
+ "7月",
+ "8月",
+ "9月",
+ "10月",
+ "11月",
+ "12月",
+ ]
//echarts 图表数据
var option = {
title: {
@@ -673,20 +694,7 @@
xAxis: [
{
type: "category",
- data: [
- "1月",
- "2月",
- "3月",
- "4月",
- "5月",
- "6月",
- "7月",
- "8月",
- "9月",
- "10月",
- "11月",
- "12月",
- ],
+ data: datetime
},
],
yAxis: [
@@ -783,7 +791,6 @@
},
series: [
{
- // data: dd,
data: data,
type: "bar",
},
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 20b976a..30e36da 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -67,15 +67,7 @@
},
created(){
//获取二维码图片
- // if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "administrator"){
- // this.isImg = true;
- // //查询图片
- // getDetails(10).then((res) => {
- // const att = res.data.data;
- // this.img = att.link;
- // });
- // }
- if(this.userInfo.role_name == "administrator"){
+ if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "administrator"){
this.isImg = true;
//查询图片
getDetails(10).then((res) => {
--
Gitblit v1.9.3