From 69b6b6e33b8458295a731b96c062f6cbdddebe58 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/home/index_1600_900.scss | 698 +++++++++++
vue.config.js | 86
src/router/views/index.js | 152 +-
src/views/workreport/workreply.vue | 2
src/api/system/dept.js | 10
src/views/home/index.scss | 49
src/views/commandQuery/taskDistribution.vue | 57
src/views/workreport/data.js | 339 +---
src/views/qualificationExamination/paymentInquiry.vue | 156 +-
src/views/securityGuardManagement/register.vue | 189 ++
src/views/resource/attachOnce.vue | 5
src/views/securityCompany/companyDetails.vue | 128 +
src/views/securityUnitOperation/operationAnalysis.vue | 345 ++++-
src/views/licenseApproval/branchOffice.vue | 21
src/views/qualificationExamination/scoreInquiry.vue | 56
src/api/system/user.js | 5
src/api/map/people.js | 47
src/views/workreport/workreport.vue | 133 ++
src/views/management/computents/performance.vue | 5
src/views/securityUnitOperation/economicAnalysis.vue | 65
src/styles/element-ui.scss | 4
src/views/securityCompany/dispatch.vue | 4
src/views/securityGuardManagement/dispatchChildoperable.vue | 6
src/views/securityUnitOperation/securityEchart.js | 35
src/api/register/honor.js | 14
src/views/home/index.vue | 16
src/views/home/index_1280_1024.scss | 699 +++++++++++
src/views/licenseApproval/securityTraining.vue | 4
src/views/licenseApproval/securityGuard.vue | 25
src/views/home/indexEchart.js | 182 --
src/views/management/peopleDetails.vue | 162 --
src/views/licenseApproval/crossRegion.vue | 23
src/api/Jurs/jurs.js | 2
src/views/management/computents/train.vue | 4
34 files changed, 2,642 insertions(+), 1,086 deletions(-)
diff --git a/src/api/Jurs/jurs.js b/src/api/Jurs/jurs.js
index fc5be8b..0ae0de8 100644
--- a/src/api/Jurs/jurs.js
+++ b/src/api/Jurs/jurs.js
@@ -71,7 +71,7 @@
export const getDeptLazyTree = (parentId) => {
return request({
- url: '/api/jurisdiction/lazy-tree',
+ url: '/api/jurisdiction/lazy-trees',
method: 'get',
params: {
parentId
diff --git a/src/api/map/people.js b/src/api/map/people.js
index 04d229e..8098bed 100644
--- a/src/api/map/people.js
+++ b/src/api/map/people.js
@@ -1,26 +1,41 @@
import request from '@/router/axios';
export const getPeopleList = (param) => {
- return request({
- url: '/api/blade-user/page-security',
- method: 'get',
- params: param
- })
+ return request({
+ url: '/api/blade-user/page-security',
+ method: 'get',
+ params: param
+ })
}
export const getPosition = (param) => {
- return request({
- url: '/api/liveLocation/detail',
- method: 'get',
- params: param
- })
+ return request({
+ url: '/api/liveLocation/detail',
+ method: 'get',
+ params: param
+ })
+}
+
+
+export const getDirectiveLiveLocationVoList = (param) => {
+ return request({
+ url: '/api/liveLocation/getDirectiveLiveLocationVoList',
+ method: 'get',
+ params: param
+ })
}
export const getTrack = (param) => {
- return request({
- url: '/api/liveLocation/getLocusInfoList',
- method: 'get',
- params: param
- })
+ return request({
+ url: '/api/liveLocation/getLocusInfoList',
+ method: 'get',
+ params: param
+ })
}
-
+export const getDirectiveLocusInfoList = (param) => {
+ return request({
+ url: '/api/liveLocation/getDirectiveLocusInfoList',
+ method: 'get',
+ params: param
+ })
+}
\ No newline at end of file
diff --git a/src/api/register/honor.js b/src/api/register/honor.js
index 1d5b50f..c7c328a 100644
--- a/src/api/register/honor.js
+++ b/src/api/register/honor.js
@@ -2,7 +2,7 @@
export const getListhonor = (current, size, params, cardid) => {
return request({
- url: '/api//honor/list',
+ url: '/api/honor/list',
method: 'get',
params: {
...params,
@@ -15,14 +15,14 @@
export const addhonor = (row) => {
return request({
- url: '/api//honor/save',
+ url: '/api/honor/save',
method: 'post',
data: row
})
}
-export const getLisperformance = (current, size, params, cardid) => {
+export const getLisperformance = (current, size, params, securityid) => {
return request({
url: '/api/performance/page',
method: 'get',
@@ -30,7 +30,7 @@
...params,
current,
size,
- cardid
+ securityid
}
})
}
@@ -47,7 +47,7 @@
}
})
}
-export const getLispertrain = (current, size, params, idCardNo) => {
+export const getLispertrain = (current, size, params, userId) => {
return request({
url: '/api/trainingRegistration/page',
method: 'get',
@@ -55,7 +55,7 @@
...params,
current,
size,
- idCardNo
+ userId
}
})
}
@@ -74,7 +74,7 @@
export const getER = (securityNumber) => {
return request({
- url: '/api//qrCode/getQrCodeBase64',
+ url: '/api/qrCode/getQrCodeBase64',
method: 'get',
params: {
securityNumber
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 9db2511..9f5f21a 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -87,4 +87,14 @@
parentId
}
})
+}
+
+export const getDeptLazyTreeUsers = (type) => {
+ return request({
+ url: '/api/blade-system/dept/lazy-tree-users',
+ method: 'get',
+ params: {
+ type
+ }
+ })
}
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 5272d5a..c4c3643 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -13,15 +13,14 @@
})
}
-export const getListSecurity = (current, size, params, deptId) => {
+export const getListSecurity = (current, size, params) => {
return request({
url: '/api/blade-user/page-security',
method: 'get',
params: {
...params,
current,
- size,
- deptId,
+ size
}
})
}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index ebdd3aa..4fc5d60 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -28,27 +28,27 @@
{
path: '/wel',
component: () =>
- import('@/views/home/index')
- // component: Layout,
- // redirect: '/wel/index',
- // children: [{
- // path: 'index',
- // name: '首页',
- // meta: {
- // i18n: 'dashboard'
- // },
- // component: () =>
- // import( /* webpackChunkName: "views" */ '@/views/wel/index')
- // }, {
- // path: 'dashboard',
- // name: '控制台',
- // meta: {
- // i18n: 'dashboard',
- // menu: false,
- // },
- // component: () =>
- // import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
- // }]
+ import ('@/views/home/index')
+ // component: Layout,
+ // redirect: '/wel/index',
+ // children: [{
+ // path: 'index',
+ // name: '首页',
+ // meta: {
+ // i18n: 'dashboard'
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/wel/index')
+ // }, {
+ // path: 'dashboard',
+ // name: '控制台',
+ // meta: {
+ // i18n: 'dashboard',
+ // menu: false,
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ // }]
},
@@ -64,7 +64,7 @@
i18n: 'test'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/test')
+ import ( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -77,7 +77,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -90,7 +90,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -103,7 +103,7 @@
i18n: 'info'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
}, {
path: '/work/process/leave',
@@ -116,7 +116,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -124,7 +124,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -132,7 +132,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
path: '/attach',
@@ -145,7 +145,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/resource/attach')
+ import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
},
// {
@@ -173,7 +173,7 @@
i18n: 'register',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/register')
+ import ( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/register')
}]
},
{
@@ -187,7 +187,7 @@
i18n: 'registerOnce',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/registerOnce')
+ import ( /* webpackChunkName: "views" */ '@/views/securityGuardManagement/registerOnce')
}]
},
{
@@ -201,7 +201,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
}]
},
{
@@ -215,36 +215,38 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
- }]
- }, {
- path: '/workreport',
- component: Layout,
- redirect: '/workreport/workreport',
- children: [{
- path: 'workreport',
- name: '发起的汇报',
- meta: {
- i18n: 'dict'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
+ import ( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
}]
},
+ // {
+ // path: '/workreport',
+ // component: Layout,
+ // redirect: '/workreport/workreport',
+ // children: [{
+ // path: 'workreport',
+ // name: '发起的汇报',
+ // meta: {
+ // i18n: 'dict'
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
+ // }]
+ // },
+ // {
+ // path: '/workreport',
+ // component: Layout,
+ // redirect: '/workreport/workreply',
+ // children: [{
+ // path: 'workreply',
+ // name: '接收的汇报',
+ // meta: {
+ // i18n: 'dict'
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
+ // }]
+ // },
{
- path: '/workreport',
- component: Layout,
- redirect: '/workreport/workreply',
- children: [{
- path: 'workreply',
- name: '接收的汇报',
- meta: {
- i18n: 'dict'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
- }]
- }, {
path: '/management',
redirect: '/management/index',
component: Layout,
@@ -255,7 +257,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
}]
}, {
path: '/management',
@@ -268,7 +270,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/management/idinformation')
+ import ( /* webpackChunkName: "views" */ '@/views/management/idinformation')
}]
}, {
path: '/securityCompany',
@@ -281,12 +283,12 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
}]
}, {
path: '/map',
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/mapHome/index')
+ import ( /* webpackChunkName: "views" */ '@/views/mapHome/index')
}, {
path: '/regulatoryInformation',
redirect: '/regulatoryInformation/index',
@@ -298,7 +300,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
+ import ( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
}]
}, {
path: '/commandQuery',
@@ -311,7 +313,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/commandQuery/taskDistribution')
+ import ( /* webpackChunkName: "views" */ '@/views/commandQuery/taskDistribution')
}]
},
{
@@ -325,10 +327,10 @@
i18n: 'registrationTrainingQuery',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/qualificationExamination/registrationTrainingQuery')
+ import ( /* webpackChunkName: "views" */ '@/views/qualificationExamination/registrationTrainingQuery')
}]
},
- { //报错 到不到vue文件
+ { //报错 到不到vue文件
path: '/securityUnitOperation/operationTable',
redirect: '/securityUnitOperation/operationTable/index',
component: Layout,
@@ -339,7 +341,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/operationTable')
+ import ( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/operationTable')
}]
},
// {
@@ -367,7 +369,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
}]
},
// {
@@ -395,7 +397,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/companyDetails')
}]
},
{
@@ -409,7 +411,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/economicTable')
+ import ( /* webpackChunkName: "views" */ '@/views/securityUnitOperation/economicTable')
}]
},
{
@@ -423,7 +425,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/businessStatisticsDetail')
+ import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/businessStatisticsDetail')
}]
},
{
@@ -437,7 +439,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/securityGuardDetail')
+ import ( /* webpackChunkName: "views" */ '@/views/statisticalQueryManagement/securityGuardDetail')
}]
}, {
path: '/attachOnce',
@@ -450,7 +452,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/resource/attachOnce')
+ import ( /* webpackChunkName: "views" */ '@/views/resource/attachOnce')
}]
}, {
path: '/talk',
@@ -463,7 +465,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/talk/talk')
+ import ( /* webpackChunkName: "views" */ '@/views/talk/talk')
}]
}
]
\ No newline at end of file
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index d2f42f9..7294edb 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -616,3 +616,7 @@
.avue-empty__desc {
color: #fff !important;
}
+
+.company-box .avue-form__menu--center {
+ width: 300px;
+}
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index f182406..2737550 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -84,7 +84,7 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
-import { getPosition, getTrack } from "@/api/map/people";
+import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList } from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
export default {
@@ -170,9 +170,9 @@
{
label: "接收指令人",
prop: "receiveName",
- search: true,
+ // search: true,
+ // searchSpan: 4,
searchLabelWidth: 90,
- searchSpan: 4,
},
{
label: "发送指令时间",
@@ -184,6 +184,8 @@
{
label: "指令内容",
prop: "content",
+ search: true,
+ searchSpan: 4,
},
{
label: "图片",
@@ -377,20 +379,23 @@
this.seeLocationFlag = true
- getPosition({ type: 1, workerId: row.receiveDirectiveIds }).then((result) => {
+ getDirectiveLiveLocationVoList({ type: 1, userIds: row.receiveDirectiveIds }).then((result) => {
var res = result.data.data;
- if (JSON.stringify(res) != "{}") {
- this.$refs.locationForm.addEntitys(
- {
- LGTD: res.longitude,
- LTTD: res.latitude,
- name: "人员位置",
- },
- peoplePng,
- 0.5,
- "peoplelayer",
- "peopleAddlayer"
- );
+ if (JSON.stringify(res) != "[]") {
+ res.forEach((data)=>{
+ this.$refs.locationForm.addEntitys(
+ {
+ LGTD: data.longitude,
+ LTTD: data.latitude,
+ name: "人员位置",
+ },
+ peoplePng,
+ 0.5,
+ "peoplelayer",
+ "peopleAddlayer"
+ );
+ })
+
}
});
},
@@ -438,21 +443,25 @@
":" +
this.disposeTime(endTime.getSeconds());
- getTrack({
- workerId: this.rowData.receiveDirectiveIds,
+ getDirectiveLocusInfoList({
+ userIds: this.rowData.receiveDirectiveIds,
type: 1,
startTime: start,
endTime: end,
}).then((res) => {
var result = res.data.data;
- if (result.length > 1) {
- let arr = [];
-
+ if (JSON.stringify(res) != "[]") {
result.forEach((item) => {
- arr.push([Number(item.longitude), Number(item.latitude)]);
- });
+ if (item.length > 1) {
+ let arr = [];
- this.$refs.tarckForm.addLines(arr);
+ item.forEach((data) => {
+ arr.push([Number(data.longitude), Number(data.latitude)]);
+ });
+
+ this.$refs.tarckForm.addLines(arr);
+ }
+ })
}
});
},
diff --git a/src/views/home/index.scss b/src/views/home/index.scss
index ee94929..b3f7c47 100644
--- a/src/views/home/index.scss
+++ b/src/views/home/index.scss
@@ -1,8 +1,6 @@
.bajgxt-home {
height: 100%;
width: 100%;
- // width: 1920px;
- // height: 1080px;
background: url("../../../public/img/bajgxt/backimg.png") no-repeat;
background-size: 100% 100%;
@@ -20,16 +18,6 @@
text-align: center;
line-height: 77px;
}
- // span:nth-child(2) {
- // position: absolute;
- // margin-top: 22px;
- // margin-left: 26%;
- // font-size: 22px;
- // cursor: pointer;
- // &:hover {
- // color: #90cef0;
- // }
- // }
img {
position: absolute;
margin-top: 22px;
@@ -47,20 +35,15 @@
color: #90cef0;
}
}
- .side {
- width: 27%;
- height: 100%;
- }
.content {
margin: 5px 20px 20px 20px;
- // height: calc(100% - 77px);
- // width: 100%;
height: calc(100% - 102px);
width: calc(100% - 40px);
display: flex;
.left,
.right {
- @extend .side;
+ width: 27%;
+ height: 100%;
}
.middle {
width: calc(46% - 50px);
@@ -75,7 +58,7 @@
width: 100%;
height: 260px;
}
- .echartClass {
+ .echartClass_1920 {
// height: 100%;
width: 100%;
height: calc(100% - 70px);
@@ -88,7 +71,7 @@
background-size: 100% 100%;
position: relative;
#left1Echart {
- @extend .echartClass;
+ @extend .echartClass_1920;
height: calc(100% - 140px) !important;
margin-top: 68px;
}
@@ -101,7 +84,7 @@
margin-top: 25px;
position: relative;
#left2Echart {
- @extend .echartClass;
+ @extend .echartClass_1920;
}
}
}
@@ -113,7 +96,7 @@
height: 28%;
position: relative;
#right1Echart {
- @extend .echartClass;
+ @extend .echartClass_1920;
}
}
.right2 {
@@ -124,7 +107,7 @@
margin-top: 30px;
position: relative;
#right2Echart {
- @extend .echartClass;
+ @extend .echartClass_1920;
}
}
.right3 {
@@ -134,7 +117,7 @@
background-size: 100% 100%;
margin-top: 25px;
#right3Echart {
- @extend .echartClass;
+ @extend .echartClass_1920;
}
}
}
@@ -424,7 +407,7 @@
}
/deep/ .el-table__body-wrapper {
overflow: auto;
- height: 100%;
+ height: calc(100% - 50px);
}
}
.left2-btn {
@@ -628,10 +611,11 @@
right: 47px;
margin-top: 76px;
.block1 {
- width: 30px;
- height: 15px;
+ width: 10px;
+ height: 10px;
background: #008dec;
- margin-top: 7px;
+ margin-top: 10px;
+ border-radius: 100%;
}
span:nth-child(2) {
color: #fff;
@@ -650,10 +634,11 @@
right: 47px;
margin-top: 135px;
.block1 {
- width: 30px;
- height: 15px;
+ width: 10px;
+ height: 10px;
background: #886eff;
- margin-top: 7px;
+ margin-top: 10px;
+ border-radius: 100%;
}
span:nth-child(2) {
color: #fff;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index bc6c395..900e26b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -880,6 +880,7 @@
}
});
selectFj().then((res) => {
+ // debugger;
if (res.data.code === 200) {
if (!this.echarts.right3Echart) {
this.echarts.right3Echart = echarts.init(
@@ -1380,7 +1381,20 @@
</script>
<style lang="scss" scoped>
-@import "./index.scss";
+// 适配分辨率1280*1024
+@media screen and (max-width: 1280px) {
+ @import "./index_1280_1024.scss";
+}
+// 适配分辨率1600*900
+@media screen and (min-width: 1281px) and (max-width: 1600px) {
+ @import "./index_1600_900.scss";
+}
+// 适配分辨率1920*1080
+@media screen and (min-width: 1601px) and (max-width: 1920px) {
+ @import "./index.scss";
+}
+
+// @import "./index.scss";
/deep/ .el-select-dropdown {
border: 1px solid #9199ab;
background-color: #022c53;
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index a57fda2..85434ae 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -199,7 +199,7 @@
type: "category",
axisLabel: {
color: "#fff",
- rotate: 40
+ rotate: 40,
},
data: nameArr
},
@@ -465,162 +465,6 @@
// sumValue += Number(item.Count)
data.push(obj);
});
- // let arrName = getArrayValue(data, "name");
- // let arrValue = getArrayValue(data, "value");
- // let sumValue = 1000;
- // let objData = array2obj(data, "name");
- // let optionData = getData(data);
-
- // function getArrayValue(array, key) {
- // var key = key || "value";
- // var res = [];
- // if (array) {
- // array.forEach(function (t) {
- // res.push(t[key]);
- // });
- // }
- // return res;
- // }
-
- // function array2obj(array, key) {
- // var resObj = {};
- // for (var i = 0; i < array.length; i++) {
- // resObj[array[i][key]] = array[i];
- // }
- // return resObj;
- // }
-
- // function getData(data) {
- // var res = {
- // series: [],
- // yAxis: []
- // };
- // for (let i = 0; i < data.length; i++) {
- // res.series.push({
- // name: "分局预警占比",
- // type: "pie",
- // clockwise: true,
- // z: 2,
- // emphasis: {
- // scale: false
- // },
- // // hoverAnimation: false,
- // radius: [83 - i * 12 + '%', 78 - i * 12 + '%'],
- // center: ["30%", "50%"],
- // labelLine: {
- // show: false
- // },
- // label: {
- // show: false
- // },
- // data: [
- // {
- // value: data[i].value,
- // name: data[i].name
- // },
- // {
- // value: sumValue - data[i].value,
- // name: "",
- // itemStyle: {
- // color: "rgba(0,0,0,0)",
- // borderWidth: 0
- // },
- // tooltip: {
- // show: false
- // },
- // label: {
- // show: false
- // },
- // emphasis: {
- // scale: false
- // }
- // // hoverAnimation: false
- // }
- // ]
- // });
- // res.yAxis.push(data[i].name);
- // }
- // return res;
- // }
-
- // let option = {
- // tooltip: {
- // show: true,
- // trigger: "item",
- // formatter: "{a}<br>{b}:{c}({d}%)",
- // backgroundColor: "#031952", //设置背景图片 rgba格式
- // color: "#fff",
- // borderWidth: "0", //边框宽度设置1
- // // borderColor: "gray", //设置边框颜色
- // textStyle: {
- // color: "#fff" //设置文字颜色
- // },
- // },
- // color: [
- // "#91cc75",
- // "#fac858",
- // "#73c0de",
- // "#3ba272",
- // "#fc8452",
- // "#9a60b4",
- // "#3fb1e3",
- // "#6be6c1",
- // '#626c91',
- // '#a0a7e6',
- // '#c4ebad',
- // '#96dee8'
- // ],
-
- // legend: {
- // right: "2%",
- // top: "3%",
- // // icon: "circle",
- // itemHeight: 10,
- // show: true,
- // data: legendData,
- // selectedMode: false,
- // textStyle: {
- // color: "#fff"
- // },
- // orient: "vertical"
- // },
- // grid: {
- // top: "5%",
- // bottom: "50%",
- // left: "30%",
- // containLabel: false
- // },
- // yAxis: [
- // {
- // type: "category",
- // inverse: true,
- // z: 3,
- // axisLine: {
- // show: false
- // },
- // axisTick: {
- // show: false
- // },
- // axisLabel: {
- // interval: 0,
- // inside: false,
- // color: "#fff",
- // fontSize: 8,
- // // textStyle: {
-
- // // },
- // show: true
- // },
- // data: optionData.yAxis
- // }
- // ],
- // xAxis: [
- // {
- // show: false
- // }
- // ],
- // series: optionData.series
- // };
let option = {
tooltip: {
show: true,
@@ -635,6 +479,7 @@
}
},
legend: {
+ type: "scroll",
right: "5%",
top: "5%",
itemHeight: 10,
@@ -666,19 +511,22 @@
{
name: "分局预警占比",
type: "pie",
- radius: "75%",
+ radius: ["40%", "70%"],
center: ["35%", "55%"],
- roseType: "radius",
- itemStyle: {
- borderRadius: 0
- },
+ avoidLabelOverlap: false,
label: {
- show: false
+ show: false,
+ position: "center"
},
- emphasis: {
- label: {
- show: false
- }
+ // emphasis: {
+ // label: {
+ // show: true,
+ // fontSize: "12",
+ // fontWeight: "bold"
+ // }
+ // },
+ labelLine: {
+ show: false
},
data: data
}
diff --git a/src/views/home/index_1280_1024.scss b/src/views/home/index_1280_1024.scss
new file mode 100644
index 0000000..85157b8
--- /dev/null
+++ b/src/views/home/index_1280_1024.scss
@@ -0,0 +1,699 @@
+.bajgxt-home {
+ height: 100%;
+ width: 100%;
+ background: url("../../../public/img/bajgxt/backimg.png") no-repeat;
+ background-size: 100% 100%;
+
+ .head-title {
+ background: url("../../../public/img/bajgxt/title2.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 77px;
+ text-align: center;
+ // position: relative;
+ span {
+ font-family: "Arial Normal", "Arial", sans-serif;
+ font-size: 36px;
+ color: #ffffff;
+ text-align: center;
+ line-height: 77px;
+ }
+ img {
+ position: absolute;
+ margin-top: 22px;
+ margin-left: 29%;
+ }
+ }
+ .sub-title {
+ float: right;
+ color: #fff;
+ margin-right: 52px;
+ font-size: 18px;
+ margin-top: -35px;
+ cursor: pointer;
+ &:hover {
+ color: #90cef0;
+ }
+ }
+ .content {
+ margin: 5px 20px 20px 20px;
+ height: calc(100% - 102px);
+ width: calc(100% - 40px);
+ display: flex;
+ .left,
+ .right {
+ width: 27%;
+ height: 100%;
+ }
+ .middle {
+ width: calc(46% - 50px);
+ height: 100%;
+ margin: 0px 25px;
+ position: relative;
+ }
+ }
+ .leftimg {
+ background: url("../../../public/img/bajgxt/left1.png") no-repeat;
+ background-size: contain;
+ width: 100%;
+ height: 260px;
+ }
+ .echartClass_1280 {
+ // height: 100%;
+ width: 100%;
+ height: calc(100% - 70px);
+ }
+ .left {
+ .left1 {
+ background: url("../../../public/img/bajgxt/left1.png") no-repeat;
+ height: 60%;
+ width: 100%;
+ background-size: 100% 100%;
+ position: relative;
+ #left1Echart {
+ @extend .echartClass_1280;
+ height: calc(100% - 140px) !important;
+ margin-top: 68px;
+ }
+ }
+ .left2 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ height: calc(40% - 25px);
+ width: 100%;
+ background-size: 100% 100%;
+ margin-top: 25px;
+ position: relative;
+ #left2Echart {
+ @extend .echartClass_1280;
+ }
+ }
+ }
+ .right {
+ .right1 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 28%;
+ position: relative;
+ #right1Echart {
+ @extend .echartClass_1280;
+ }
+ }
+ .right2 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 28%;
+ margin-top: 30px;
+ position: relative;
+ #right2Echart {
+ @extend .echartClass_1280;
+ }
+ }
+ .right3 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ height: calc(40% - 25px);
+ width: 100%;
+ background-size: 100% 100%;
+ margin-top: 25px;
+ #right3Echart {
+ @extend .echartClass_1280;
+ }
+ }
+ }
+ .title-pane {
+ display: inline-flex;
+ height: 55px;
+ img {
+ width: 25px;
+ height: 25px;
+ margin: 19px 10px 0px 10px;
+ }
+ span {
+ line-height: 68px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+ .title-pane1 {
+ display: inline-flex;
+ height: 41px;
+ img {
+ width: 25px;
+ height: 25px;
+ margin: 8.5px 10px 0px 10px;
+ }
+ span {
+ line-height: 46px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+ .title-pane2 {
+ display: inline-flex;
+ height: 53px;
+ img {
+ width: 25px;
+ height: 25px;
+ margin: 13.5px 10px 0px 10px;
+ }
+ span {
+ line-height: 59px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+
+ .middle {
+ .mapimg {
+ background: url("../../../public/img/bajgxt/u3.png") no-repeat;
+ background-size: 100% 100%;
+ height: 60%;
+ width: 100%;
+ #map {
+ width: calc(100% - 40px);
+ height: calc(100% - 40px);
+ margin: 0px 20px;
+ top: 20px;
+ position: relative;
+ }
+ }
+
+ .table {
+ margin-top: 25px;
+ height: calc(40% - 25px);
+ width: 100%;
+ background: url("../../../public/img/bajgxt/table.png") no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+ .table-title {
+ background: url("../../../public/img/bajgxt/tabletitle.png") no-repeat;
+ background-size: 100% 100%;
+ position: absolute;
+ width: 267px;
+ margin-top: -13px;
+ height: 50px;
+ margin-left: calc(50% - 135.5px);
+ color: #fff;
+ font-size: 20px;
+ text-align: center;
+ line-height: 54px;
+ }
+ .lefttop {
+ background: url("../../../public/img/bajgxt/lefttop.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: -7px;
+ top: -9px;
+ }
+ .leftbottom {
+ background: url("../../../public/img/bajgxt/leftbottom.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: -7px;
+ bottom: -7px;
+ }
+ .righttop {
+ background: url("../../../public/img/bajgxt/righttop.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: calc(100% - 37px);
+ top: -9px;
+ }
+ .rightbottom {
+ background: url("../../../public/img/bajgxt/rightbottom.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: calc(100% - 37px);
+ bottom: -7px;
+ }
+ }
+ }
+ .middle {
+ .el-table {
+ width: calc(100% - 40px);
+ height: calc(100% - 65px);
+ margin: 0px 20px 15px;
+ top: 50px;
+ }
+ /deep/ .el-table--striped .el-table__body tr.el-table__row--striped td {
+ background: #031d4b !important;
+ }
+ /deep/ .el-table--enable-row-transition .el-table__body td,
+ /deep/ .el-table th,
+ .el-table tr {
+ background: #03225b !important;
+ }
+ /deep/ .el-table .cell {
+ color: #fff;
+ text-align: center;
+ }
+ /deep/ .el-table td,
+ .el-table th.is-leaf {
+ border-bottom-color: transparent;
+ }
+ /deep/ .el-table__header th {
+ border-bottom: 1px solid #031a38 !important;
+ }
+ /deep/.el-table--enable-row-hover .el-table__body tr:hover > td {
+ background-color: #b0caf3;
+ }
+ }
+
+ /deep/ .el-input__inner {
+ height: 27px;
+ color: #fff !important;
+ font-size: 14px;
+ background-color: transparent !important;
+ border-color: transparent !important;
+ border-radius: 2px;
+ }
+ /deep/ .el-input {
+ width: 138px;
+ }
+ /deep/ .el-select {
+ line-height: 52px;
+ position: absolute;
+ right: 14px;
+ }
+ /deep/ .el-input__icon {
+ line-height: 53px;
+ }
+ /deep/ .el-select:hover .el-input__inner,
+ /deep/ .el-select .el-input.is-focus .el-input__inner {
+ border: none;
+ }
+ /deep/ .el-table,
+ /deep/ .el-table__expanded-cell,
+ /deep/ .el-table--border::after,
+ /deep/ .el-table--group::after,
+ /deep/ .el-table::before {
+ background-color: transparent !important;
+ }
+ .card-text {
+ height: 30px;
+ padding: 8px 10px;
+ color: #fff;
+ font-size: 14px;
+ text-align: center;
+ span:nth-child(2) {
+ color: red;
+ font-size: 21px;
+ margin: 0px 10px;
+ font-weight: bold;
+ }
+ span:nth-child(4) {
+ margin-left: 15px;
+ }
+ span:nth-child(5) {
+ margin: 0px 10px;
+ color: red;
+ font-size: 20px;
+ }
+ }
+ .right-content {
+ height: calc(100% - 71px);
+ width: calc(100% - 30px);
+ padding: 15px;
+ }
+ .card-list {
+ margin-top: 10px !important;
+ margin: 10px 60px 15px 5px;
+ display: flex;
+ height: 50px;
+ line-height: 50px;
+ img:first-child {
+ height: 50px;
+ z-index: 22;
+ }
+ img:nth-child(2) {
+ position: absolute;
+ margin-left: 13px;
+ width: 30px;
+ height: 30px;
+ margin-top: 10px;
+ z-index: 22;
+ }
+ img:nth-child(3) {
+ margin-left: -20px;
+ height: 50px;
+ }
+ span:nth-child(4) {
+ color: red;
+ font-size: 26px;
+ display: block;
+ width: 71px;
+ margin-left: -74px;
+ text-align: center;
+ }
+ span:nth-child(5) {
+ color: #7ff3f4;
+ font-size: 15px;
+ display: block;
+ width: 129px;
+ margin-left: 22px;
+ }
+ }
+ .mapBtn,
+ .mapBtn:nth-child(2),
+ .mapBtn:nth-child(3) {
+ position: absolute;
+ z-index: 99;
+ color: #fff;
+ background: #014e84;
+ margin-top: 38px;
+ margin-left: calc(100% - 140px);
+ border-radius: 11px;
+ height: 43px;
+ display: inline-flex;
+ width: 107px;
+ cursor: pointer;
+ img {
+ margin: 8px 3px 8px 5px;
+ height: 28px;
+ width: 30px;
+ }
+ .text {
+ width: 100px;
+ text-align: center;
+ margin: 3px;
+ span:nth-child(1) {
+ width: 100%;
+ display: block;
+ font-size: 10px;
+ }
+ span:nth-child(2) {
+ width: 100%;
+ display: block;
+ color: red;
+ font-size: 17px;
+ font-weight: bold;
+ }
+ }
+ &:hover {
+ box-shadow: 0px 0px 10px #7ff3f4;
+ }
+ }
+ .mapBtn:nth-child(2) {
+ margin-top: 100px;
+ }
+ .mapBtn:nth-child(3) {
+ margin-top: 160px;
+ }
+ /deep/ .el-table__body-wrapper {
+ overflow: auto;
+ height: calc(100% - 50px);
+ }
+}
+.left2-btn {
+ height: 19px;
+ width: 60px;
+ background-color: #4478d0;
+ color: #fff;
+ font-size: 0.1rem !important;
+ font-weight: 700;
+
+ line-height: 19px !important;
+ text-align: center;
+ position: absolute;
+ cursor: pointer;
+}
+.left2-btn.btn1 {
+ right: 78px;
+ margin-top: 22px;
+}
+.left2-btn.btn2 {
+ right: 12px;
+ margin-top: 22px;
+}
+.left2-btn.date {
+ right: 22px;
+ margin-top: 12px;
+}
+.left2-btn.mounce {
+ right: 22px;
+ margin-top: 57px;
+}
+.left2-btn.all {
+ right: 22px;
+ margin-top: 101px;
+}
+
+.rightData {
+ position: relative;
+ color: #fff;
+ background: #010945;
+ border-radius: 11px;
+ height: 50px;
+ display: inline-flex;
+ width: 125px;
+ cursor: pointer;
+ font-weight: 700;
+ img {
+ margin: 12px;
+ height: 20px;
+ width: 22px;
+ }
+ .text {
+ width: 100px;
+ text-align: center;
+ // margin: 3px;
+ line-height: 21px;
+ span:nth-child(1) {
+ width: 100%;
+ display: block;
+ font-size: 13px;
+ }
+ span:nth-child(2) {
+ width: 100%;
+ display: block;
+ color: #00ccff;
+ font-size: 14px;
+ }
+ }
+}
+.rightData1 {
+ margin-left: 9px;
+ margin-top: 10px;
+}
+.rightData2 {
+ margin-left: 35px;
+ margin-top: 10px;
+}
+.rightData3 {
+ margin-top: 17px;
+ margin-left: 9px;
+}
+.rightData4 {
+ margin-top: 17px;
+ margin-left: 35px;
+}
+.rightData5 {
+ margin-top: 8px;
+ margin-left: 42px;
+}
+
+.textBox {
+ width: 70%;
+ height: 58px;
+ // margin: 0 auto;
+ overflow: hidden;
+ position: absolute;
+ text-align: left;
+ color: #09b560;
+ left: 20px;
+ top: 20px;
+ font-size: 15px;
+ .text {
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ }
+ .slide-enter-active,
+ .slide-leave-active {
+ transition: all 0.5s linear;
+ }
+ .slide-enter {
+ transform: translateY(20px) scale(1);
+ opacity: 1;
+ }
+ .slide-leave-to {
+ transform: translateY(-20px) scale(0.8);
+ opacity: 0;
+ }
+}
+.leftEchartTitle {
+ height: 30px;
+ display: flex;
+ line-height: 30px;
+ margin-top: 10px;
+ margin-left: 15px;
+ position: absolute;
+ .block1 {
+ width: 17px;
+ height: 8px;
+ background: #2ec7c9;
+ border-radius: 3px;
+ margin-top: 11px;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ margin: 0px 3px 0px 3px;
+ }
+ span:nth-child(3) {
+ color: #2ec7c9;
+ font-size: 14px;
+ font-weight: 700;
+ display: block;
+ width: 41px;
+ text-align: center;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #2ec7c9;
+ }
+}
+.leftEchartTitle2 {
+ right: 18px;
+ .block1 {
+ background: #b6a2de;
+ }
+ span:nth-child(3) {
+ color: #b6a2de;
+ // font-size: 15px;
+ }
+}
+.leftEchartTitle3 {
+ margin-top: 37px;
+ .block1 {
+ background: #5ab1ef;
+ }
+ span:nth-child(3) {
+ color: #5ab1ef;
+ // font-size: 15px;
+ }
+}
+.leftEchartTitle4 {
+ margin-top: 37px;
+ right: 15px;
+ .block1 {
+ background: #ffb980;
+ }
+ span:nth-child(2) {
+ width: 77px;
+ }
+ span:nth-child(3) {
+ color: #ffb980;
+ // font-size: 15px;
+ }
+}
+.leftEchartTitle5 {
+ margin-top: 64px;
+ .block1 {
+ background: #fc8452;
+ }
+ span:nth-child(3) {
+ color: #fc8452;
+ font-size: 15px;
+ }
+}
+.bayHover {
+ background-color: #0445b5;
+ color: #fff !important;
+}
+.leftEchartTitle.xbNan {
+ right: 20px;
+ margin-top: 76px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #008dec;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ }
+ span:nth-child(3) {
+ color: #008dec;
+ font-size: 15px;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #008dec;
+ }
+}
+.leftEchartTitle.xbNv {
+ right: 20px;
+ margin-top: 135px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #886eff;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ }
+ span:nth-child(3) {
+ color: #886eff;
+ font-size: 15px;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #886eff;
+ }
+}
+.showDialog:hover {
+ cursor: pointer;
+}
+.bajgxt-home {
+ /deep/.dialog {
+ z-index: 10000000 !important;
+ .el-table {
+ top: 0px !important;
+ margin: 0px !important;
+ width: 100% !important;
+ height: calc(100% - 50px) !important;
+ .el-table__header {
+ background-color: #2d5cc8 !important;
+ }
+ .el-table__body-wrapper {
+ height: calc(100% - 50px);
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
+ }
+ .el-pagination {
+ color: #a2a5a5;
+ }
+ .btn-prev,
+ .btn-next {
+ background: transparent !important;
+ }
+ .el-dialog__body {
+ padding: 10px 20px;
+ height: calc(100% - 60px);
+ .el-input {
+ width: 50px !important;
+ border-bottom: 1px solid #8a7b7b !important;
+ }
+ }
+ }
+ /deep/ .el-dialog {
+ width: 80% !important;
+ height: 77%;
+ }
+}
diff --git a/src/views/home/index_1600_900.scss b/src/views/home/index_1600_900.scss
new file mode 100644
index 0000000..90cc048
--- /dev/null
+++ b/src/views/home/index_1600_900.scss
@@ -0,0 +1,698 @@
+.bajgxt-home {
+ height: 100%;
+ width: 100%;
+ background: url("../../../public/img/bajgxt/backimg.png") no-repeat;
+ background-size: 100% 100%;
+
+ .head-title {
+ background: url("../../../public/img/bajgxt/title2.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 77px;
+ text-align: center;
+ // position: relative;
+ span {
+ font-family: "Arial Normal", "Arial", sans-serif;
+ font-size: 36px;
+ color: #ffffff;
+ text-align: center;
+ line-height: 77px;
+ }
+ img {
+ position: absolute;
+ margin-top: 22px;
+ margin-left: 29%;
+ }
+ }
+ .sub-title {
+ float: right;
+ color: #fff;
+ margin-right: 52px;
+ font-size: 18px;
+ margin-top: -35px;
+ cursor: pointer;
+ &:hover {
+ color: #90cef0;
+ }
+ }
+ .content {
+ margin: 5px 20px 20px 20px;
+ height: calc(100% - 102px);
+ width: calc(100% - 40px);
+ display: flex;
+ .left,
+ .right {
+ width: 27%;
+ height: 100%;
+ }
+ .middle {
+ width: calc(46% - 50px);
+ height: 100%;
+ margin: 0px 25px;
+ position: relative;
+ }
+ }
+ .leftimg {
+ background: url("../../../public/img/bajgxt/left1.png") no-repeat;
+ background-size: contain;
+ width: 100%;
+ height: 260px;
+ }
+ .echartClass_1600_900 {
+ // height: 100%;
+ width: 100%;
+ height: calc(100% - 70px);
+ }
+ .left {
+ .left1 {
+ background: url("../../../public/img/bajgxt/left1.png") no-repeat;
+ height: 60%;
+ width: 100%;
+ background-size: 100% 100%;
+ position: relative;
+ #left1Echart {
+ @extend .echartClass_1600_900;
+ height: calc(100% - 140px) !important;
+ margin-top: 68px;
+ }
+ }
+ .left2 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ height: calc(40% - 25px);
+ width: 100%;
+ background-size: 100% 100%;
+ margin-top: 25px;
+ position: relative;
+ #left2Echart {
+ @extend .echartClass_1600_900;
+ }
+ }
+ }
+ .right {
+ .right1 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 28%;
+ position: relative;
+ #right1Echart {
+ @extend .echartClass_1600_900;
+ }
+ }
+ .right2 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 28%;
+ margin-top: 30px;
+ position: relative;
+ #right2Echart {
+ @extend .echartClass_1600_900;
+ }
+ }
+ .right3 {
+ background: url("../../../public/img/bajgxt/rightImg.png") no-repeat;
+ height: calc(40% - 25px);
+ width: 100%;
+ background-size: 100% 100%;
+ margin-top: 25px;
+ #right3Echart {
+ @extend .echartClass_1600_900;
+ }
+ }
+ }
+ .title-pane {
+ display: inline-flex;
+ height: 44px;
+ img {
+ width: 26px;
+ height: 26px;
+ margin: 12px 10px 0px 10px;
+ }
+ span {
+ line-height: 54px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+ .title-pane1 {
+ display: inline-flex;
+ height: 33px;
+ img {
+ width: 26px;
+ height: 26px;
+ margin: 3.5px 10px 0px 10px;
+ }
+ span {
+ line-height: 33px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+ .title-pane2 {
+ display: inline-flex;
+ height: 41px;
+ img {
+ width: 26px;
+ height: 26px;
+ margin: 8.5px 10px 0px 10px;
+ }
+ span {
+ line-height: 50px;
+ color: #fff;
+ font-size: 17px;
+ }
+ }
+
+ .middle {
+ .mapimg {
+ background: url("../../../public/img/bajgxt/u3.png") no-repeat;
+ background-size: 100% 100%;
+ height: 60%;
+ width: 100%;
+ #map {
+ width: calc(100% - 40px);
+ height: calc(100% - 40px);
+ margin: 0px 20px;
+ top: 20px;
+ position: relative;
+ }
+ }
+
+ .table {
+ margin-top: 25px;
+ height: calc(40% - 25px);
+ width: 100%;
+ background: url("../../../public/img/bajgxt/table.png") no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+ .table-title {
+ background: url("../../../public/img/bajgxt/tabletitle.png") no-repeat;
+ background-size: 100% 100%;
+ position: absolute;
+ width: 267px;
+ margin-top: -13px;
+ height: 50px;
+ margin-left: calc(50% - 135.5px);
+ color: #fff;
+ font-size: 20px;
+ text-align: center;
+ line-height: 54px;
+ }
+ .lefttop {
+ background: url("../../../public/img/bajgxt/lefttop.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: -7px;
+ top: -9px;
+ }
+ .leftbottom {
+ background: url("../../../public/img/bajgxt/leftbottom.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: -7px;
+ bottom: -7px;
+ }
+ .righttop {
+ background: url("../../../public/img/bajgxt/righttop.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: calc(100% - 37px);
+ top: -9px;
+ }
+ .rightbottom {
+ background: url("../../../public/img/bajgxt/rightbottom.png") no-repeat;
+ background-size: 100% 100%;
+ width: 44px;
+ height: 56px;
+ position: absolute;
+ left: calc(100% - 37px);
+ bottom: -7px;
+ }
+ }
+ }
+ .middle {
+ .el-table {
+ width: calc(100% - 40px);
+ height: calc(100% - 65px);
+ margin: 0px 20px 15px;
+ top: 50px;
+ }
+ /deep/ .el-table--striped .el-table__body tr.el-table__row--striped td {
+ background: #031d4b !important;
+ }
+ /deep/ .el-table--enable-row-transition .el-table__body td,
+ /deep/ .el-table th,
+ .el-table tr {
+ background: #03225b !important;
+ }
+ /deep/ .el-table .cell {
+ color: #fff;
+ text-align: center;
+ }
+ /deep/ .el-table td,
+ .el-table th.is-leaf {
+ border-bottom-color: transparent;
+ }
+ /deep/ .el-table__header th {
+ border-bottom: 1px solid #031a38 !important;
+ }
+ /deep/.el-table--enable-row-hover .el-table__body tr:hover > td {
+ background-color: #b0caf3;
+ }
+ }
+
+ /deep/ .el-input__inner {
+ height: 27px;
+ color: #fff !important;
+ font-size: 14px;
+ background-color: transparent !important;
+ border-color: transparent !important;
+ border-radius: 2px;
+ }
+ /deep/ .el-input {
+ width: 138px;
+ }
+ /deep/ .el-select {
+ line-height: 42px;
+ position: absolute;
+ right: 14px;
+ }
+ /deep/ .el-input__icon {
+ line-height: 43px;
+ }
+ /deep/ .el-select:hover .el-input__inner,
+ /deep/ .el-select .el-input.is-focus .el-input__inner {
+ border: none;
+ }
+ /deep/ .el-table,
+ /deep/ .el-table__expanded-cell,
+ /deep/ .el-table--border::after,
+ /deep/ .el-table--group::after,
+ /deep/ .el-table::before {
+ background-color: transparent !important;
+ }
+ .card-text {
+ height: 30px;
+ padding: 8px 10px;
+ color: #fff;
+ font-size: 14px;
+ text-align: center;
+ span:nth-child(2) {
+ color: red;
+ font-size: 21px;
+ margin: 0px 10px;
+ font-weight: bold;
+ }
+ span:nth-child(4) {
+ margin-left: 15px;
+ }
+ span:nth-child(5) {
+ margin: 0px 10px;
+ color: red;
+ font-size: 20px;
+ }
+ }
+ .right-content {
+ height: calc(100% - 71px);
+ width: calc(100% - 30px);
+ padding: 15px;
+ }
+ .card-list {
+ margin-top: 0px !important;
+ margin: 0px 60px 12px 10px;
+ display: flex;
+ height: 50px;
+ line-height: 50px;
+ img:first-child {
+ height: 50px;
+ z-index: 22;
+ }
+ img:nth-child(2) {
+ position: absolute;
+ margin-left: 13px;
+ width: 30px;
+ height: 30px;
+ margin-top: 9px;
+ z-index: 22;
+ }
+ img:nth-child(3) {
+ margin-left: -20px;
+ }
+ span:nth-child(4) {
+ color: red;
+ font-size: 26px;
+ display: block;
+ width: 71px;
+ margin-left: -78px;
+ text-align: center;
+ }
+ span:nth-child(5) {
+ color: #7ff3f4;
+ font-size: 17px;
+ display: block;
+ width: 129px;
+ margin-left: 16px;
+ }
+ }
+ .mapBtn,
+ .mapBtn:nth-child(2),
+ .mapBtn:nth-child(3) {
+ position: absolute;
+ z-index: 99;
+ color: #fff;
+ background: #014e84;
+ margin-top: 38px;
+ margin-left: calc(100% - 140px);
+ border-radius: 11px;
+ height: 43px;
+ display: inline-flex;
+ width: 107px;
+ cursor: pointer;
+ img {
+ margin: 8px 3px 8px 5px;
+ height: 28px;
+ width: 30px;
+ }
+ .text {
+ width: 100px;
+ text-align: center;
+ margin: 3px;
+ span:nth-child(1) {
+ width: 100%;
+ display: block;
+ font-size: 10px;
+ }
+ span:nth-child(2) {
+ width: 100%;
+ display: block;
+ color: red;
+ font-size: 17px;
+ font-weight: bold;
+ }
+ }
+ &:hover {
+ box-shadow: 0px 0px 10px #7ff3f4;
+ }
+ }
+ .mapBtn:nth-child(2) {
+ margin-top: 100px;
+ }
+ .mapBtn:nth-child(3) {
+ margin-top: 160px;
+ }
+ /deep/ .el-table__body-wrapper {
+ overflow: auto;
+ height: calc(100% - 50px);
+ }
+}
+.left2-btn {
+ height: 21px;
+ width: 69px;
+ background-color: #4478d0;
+ color: #fff;
+ font-size: 13px !important;
+ font-weight: 700;
+
+ line-height: 21px !important;
+ text-align: center;
+ position: absolute;
+ cursor: pointer;
+}
+.left2-btn.btn1 {
+ right: 106px;
+ margin-top: 16px;
+}
+.left2-btn.btn2 {
+ right: 25px;
+ margin-top: 16px;
+}
+.left2-btn.date {
+ right: 35px;
+ margin-top: 0px;
+}
+.left2-btn.mounce {
+ right: 35px;
+ margin-top: 44px;
+}
+.left2-btn.all {
+ right: 35px;
+ margin-top: 87px;
+}
+
+.rightData {
+ position: relative;
+ color: #fff;
+ background: #010945;
+ border-radius: 11px;
+ height: 50px;
+ display: inline-flex;
+ width: 142px;
+ cursor: pointer;
+ font-weight: 700;
+ img {
+ margin: 12px;
+ height: 25px;
+ width: 27px;
+ }
+ .text {
+ width: 100px;
+ text-align: center;
+ // margin: 3px;
+ line-height: 25px;
+ span:nth-child(1) {
+ width: 100%;
+ display: block;
+ font-size: 14px;
+ }
+ span:nth-child(2) {
+ width: 100%;
+ display: block;
+ color: #00ccff;
+ font-size: 15px;
+ }
+ }
+}
+.rightData1 {
+ margin-left: 29px;
+ margin-top: 0px;
+}
+.rightData2 {
+ margin-left: 58px;
+ margin-top: 0px;
+}
+.rightData3 {
+ margin-top: 10px;
+ margin-left: 29px;
+}
+.rightData4 {
+ margin-top: 10px;
+ margin-left: 58px;
+}
+.rightData5 {
+ margin-top: 8px;
+ margin-left: 42px;
+}
+
+.textBox {
+ width: 70%;
+ height: 58px;
+ // margin: 0 auto;
+ overflow: hidden;
+ position: absolute;
+ text-align: left;
+ color: #09b560;
+ left: 20px;
+ top: 20px;
+ font-size: 15px;
+ .text {
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ }
+ .slide-enter-active,
+ .slide-leave-active {
+ transition: all 0.5s linear;
+ }
+ .slide-enter {
+ transform: translateY(20px) scale(1);
+ opacity: 1;
+ }
+ .slide-leave-to {
+ transform: translateY(-20px) scale(0.8);
+ opacity: 0;
+ }
+}
+.leftEchartTitle {
+ height: 30px;
+ display: flex;
+ line-height: 30px;
+ margin-top: 10px;
+ margin-left: 18px;
+ position: absolute;
+ .block1 {
+ width: 18px;
+ height: 9px;
+ background: #2ec7c9;
+ border-radius: 3px;
+ margin-top: 11px;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ margin: 0px 10px 0px 3px;
+ }
+ span:nth-child(3) {
+ color: #2ec7c9;
+ font-size: 17px;
+ font-weight: 700;
+ display: block;
+ width: 65px;
+ text-align: center;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #2ec7c9;
+ }
+}
+.leftEchartTitle2 {
+ right: 18px;
+ .block1 {
+ background: #b6a2de;
+ }
+ span:nth-child(3) {
+ color: #b6a2de;
+ font-size: 15px;
+ }
+}
+.leftEchartTitle3 {
+ margin-top: 37px;
+ .block1 {
+ background: #5ab1ef;
+ }
+ span:nth-child(3) {
+ color: #5ab1ef;
+ font-size: 15px;
+ }
+}
+.leftEchartTitle4 {
+ margin-top: 37px;
+ right: 18px;
+ .block1 {
+ background: #ffb980;
+ }
+ span:nth-child(2) {
+ width: 77px;
+ }
+ span:nth-child(3) {
+ color: #ffb980;
+ font-size: 15px;
+ }
+}
+.leftEchartTitle5 {
+ margin-top: 64px;
+ .block1 {
+ background: #fc8452;
+ }
+ span:nth-child(3) {
+ color: #fc8452;
+ font-size: 15px;
+ }
+}
+.bayHover {
+ background-color: #0445b5;
+ color: #fff !important;
+}
+.leftEchartTitle.xbNan {
+ right: 47px;
+ margin-top: 76px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #008dec;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #008dec;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #008dec;
+ }
+}
+.leftEchartTitle.xbNv {
+ right: 47px;
+ margin-top: 135px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #886eff;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #886eff;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #886eff;
+ }
+}
+.showDialog:hover {
+ cursor: pointer;
+}
+.bajgxt-home {
+ /deep/.dialog {
+ z-index: 10000000 !important;
+ .el-table {
+ top: 0px !important;
+ margin: 0px !important;
+ width: 100% !important;
+ height: calc(100% - 50px) !important;
+ .el-table__header {
+ background-color: #2d5cc8 !important;
+ }
+ .el-table__body-wrapper {
+ height: calc(100% - 50px);
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
+ }
+ .el-pagination {
+ color: #a2a5a5;
+ }
+ .btn-prev,
+ .btn-next {
+ background: transparent !important;
+ }
+ .el-dialog__body {
+ padding: 10px 20px;
+ height: calc(100% - 60px);
+ .el-input {
+ width: 50px !important;
+ border-bottom: 1px solid #8a7b7b !important;
+ }
+ }
+ }
+ /deep/ .el-dialog {
+ width: 80% !important;
+ height: 77%;
+ }
+}
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 4169ac7..dfe930e 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 17:00:55
* @Last Modified by: liu
- * @Last Modified time: 2021-08-28 10:28:39
+ * @Last Modified time: 2021-09-06 09:20:45
*/
@@ -91,9 +91,9 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
@@ -109,9 +109,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -636,14 +636,17 @@
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "设立分公司备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 29b43ca..e52f5b3 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -2,7 +2,7 @@
* @Author:liu
* @Date: 2021-08-26 16:59:35
* @Last Modified by: liu
- * @Last Modified time: 2021-08-28 10:28:50
+ * @Last Modified time: 2021-09-06 09:21:39
*/
@@ -90,13 +90,13 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
- 号
+ <!-- 号 -->
</div>
<div class="licence-main">
<div
@@ -108,9 +108,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -625,14 +625,17 @@
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "跨区域经营备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index e66fbe1..5513824 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:57:58
* @Last Modified by: liu
- * @Last Modified time: 2021-08-28 10:42:08
+ * @Last Modified time: 2021-09-07 17:44:35
*/
@@ -98,13 +98,13 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">备案证</div>
+ <div class="licence-head">备案回执</div>
<div class="head-tid">
- 洪公保服务
+ 编号
<span class="fontStyle">{{
licenceData.row.organizationcode
}}</span>
- 号
+ <!-- 号 -->
</div>
<div class="licence-main">
<div
@@ -116,9 +116,9 @@
<span class="l-m-r-once">{{ item }}</span>
</div>
</div>
- <div class="licence-bottom">发证机关（南昌市公安局）</div>
+ <div class="licence-bottom">（公安机关印章）</div>
<div class="l-bottom">
- 发证日期
+ <!-- 发证日期 -->
<span class="l-b-t">{{
licenceData.row.permitime.slice(0, 4)
}}</span
@@ -148,7 +148,7 @@
<div
id="licence_box"
:class="classStyle == 'print' ? 'printstyle' : ''"
- ref="licencelicencehuizhi"
+ ref="licencehuizhi"
>
<div
class="licencehuizhi exam-box"
@@ -688,14 +688,17 @@
},
viewLicense(row) {
//查看许可证
+ console.log(row, 34);
this.licenceData.row = row;
this.licenceData.chiden = {};
this.licenceData.chiden["名称"] = row.enterprisename;
- this.licenceData.chiden["住所"] = row.address;
+ this.licenceData.chiden["地址"] = row.address;
+ this.licenceData.chiden["服务区域"] = row.industry;
this.licenceData.chiden["法定代表人"] = row.representative;
- this.licenceData.chiden["服务范围"] = row.industry;
- this.licenceData.chiden["注册资本"] = row.registeredcapital;
- this.licenceData.chiden["批准文号"] = row.registrationnumber;
+ this.licenceData.chiden["备案时间"] = row.officetime;
+ this.licenceData.chiden["备案内容"] = "自招保安单位备案";
+ // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+ // this.licenceData.chiden["批准文号"] = row.registrationnumber;
console.log(this.licenceData);
this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 822dea1..d0efda7 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:55:25
* @Last Modified by: liu
- * @Last Modified time: 2021-08-28 10:29:12
+ * @Last Modified time: 2021-09-06 09:27:37
*/
@@ -142,7 +142,7 @@
ref="licence"
>
<div class="licence" id="licence" v-if="dialogVisible">
- <div class="licence-head">保安服务许可证</div>
+ <div class="licence-head">保安培训许可证</div>
<div class="head-tid">
洪公保服务
<span class="fontStyle">{{
diff --git a/src/views/management/computents/performance.vue b/src/views/management/computents/performance.vue
index 3dbc5b5..f43a885 100644
--- a/src/views/management/computents/performance.vue
+++ b/src/views/management/computents/performance.vue
@@ -277,12 +277,13 @@
},
methods: {
staffOnLoad(page, params = {}) {
+ console.log(this.form,111);
this.staffLoading = true;
getLisperformance(
page.currentPage,
page.pageSize,
Object.assign(params, this.staffQuery),
- this.form.cardid
+ this.form.id
).then((res) => {
const data = res.data.data;
@@ -291,7 +292,7 @@
for (var k in this.staffData) {
this.staffData[k]["name"] = this.form.realName;
}
- console.log(this.staffData);
+ console.log(this.staffData,'staffData');
this.staffLoading = false;
this.$refs.staffCrud.refreshTable();
this.$refs.staffCrud.doLayout();
diff --git a/src/views/management/computents/train.vue b/src/views/management/computents/train.vue
index 864f826..4f2d8c8 100644
--- a/src/views/management/computents/train.vue
+++ b/src/views/management/computents/train.vue
@@ -128,7 +128,7 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.serviceQuery),
- this.form.cardid
+ this.form.id
).then((res) => {
const data = res.data.data;
@@ -137,7 +137,7 @@
for (var k in this.serviceData) {
this.serviceData[k]["name"] = this.form.realName;
}
- console.log(this.serviceData, "serviceData");
+ // console.log(this.serviceData, "serviceData");
this.serviceLoading = false;
this.$refs.serviceCrud.refreshTable();
this.$refs.serviceCrud.doLayout();
diff --git a/src/views/management/peopleDetails.vue b/src/views/management/peopleDetails.vue
index 4a429ad..6a94116 100644
--- a/src/views/management/peopleDetails.vue
+++ b/src/views/management/peopleDetails.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:16:26
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-10 16:56:14
* menu-name 保安详细资料
*/
<template>
@@ -168,174 +168,18 @@
</el-tab-pane>
<el-tab-pane label="现实表现" name="second">
<performance :form="form"></performance>
- <!-- <el-table :data="manifestationData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column
- prop="securityid"
- label="身份证号"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="workingattitude"
- align="center"
- label="工作态度"
- >
- </el-table-column>
-
- <el-table-column
- prop="workingability"
- align="center"
- label="工作能力"
- >
- </el-table-column>
-
- <el-table-column
- prop="achievements"
- align="center"
- label="工作成效"
- >
- </el-table-column>
-
- <el-table-column prop="score" align="center" label="评分">
- </el-table-column>
-
- <el-table-column prop="time" align="center" label="时间">
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="派遣记录" name="third">
<dispatch :form="form"></dispatch>
- <!-- <el-table :data="dispatchData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column
- prop="dispatcher"
- align="center"
- label="派遣人"
- >
- </el-table-column>
-
- <el-table-column
- prop="dispatchertime"
- align="center"
- label="派遣时间"
- >
- </el-table-column>
-
- <el-table-column
- prop="dispatcheraddress"
- align="center"
- label="派遣地址"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="获取荣誉" name="fourth">
<honor :form="form"></honor>
- <!-- <el-table :data="honorchData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column prop="honor" align="center" label="荣誉">
- </el-table-column>
-
- <el-table-column
- prop="honortime"
- align="center"
- label="获取时间"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="培训相关" name="fifth">
<train :form="form"></train>
- <!-- <el-table :data="trainData" style="width: 100%">
- <el-table-column prop="rname" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="sex" label="性别" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column prop="train" align="center" label="培训单位">
- </el-table-column>
-
- <el-table-column
- prop="traincontent"
- align="center"
- label="培训内容"
- >
- </el-table-column>
-
- <el-table-column
- prop="traintime"
- align="center"
- label="培训时间"
- >
- </el-table-column>
-
- <el-table-column
- prop="trainaddrss"
- align="center"
- label="培训地址"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="成绩相关" name="sixth">
<achievement :form="form"></achievement>
- <!-- <el-table :data="examinationData" style="width: 100%">
- <el-table-column prop="rname" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column
- prop="examinationbegintime"
- label="考试开始时间"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationendtime"
- label="开始结束时间"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationtype"
- align="center"
- label="考试类别"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationc"
- align="center"
- label="考试成绩"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationaddress"
- align="center"
- label="考试地点"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
</el-tabs>
</div>
@@ -383,7 +227,7 @@
ind = null;
this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "保安详细资料") {
+ if (item.label == "保安详细信息") {
if (flag == false) {
ind = index;
flag = true;
diff --git a/src/views/qualificationExamination/paymentInquiry.vue b/src/views/qualificationExamination/paymentInquiry.vue
index fab2b04..14747de 100644
--- a/src/views/qualificationExamination/paymentInquiry.vue
+++ b/src/views/qualificationExamination/paymentInquiry.vue
@@ -36,6 +36,12 @@
</template>
+
+ <template slot-scope="{ row }"
+ slot="sex">
+ {{row.sex==1?'男':row.sex==2?'女':''}}
+ </template>
+
<template class="tdtype"
slot-scope="{ row }"
slot="paymentStatus">
@@ -125,23 +131,88 @@
column: [
// {
- // label: "姓名",
- // prop: "securityName",
- // // slot: true,
- // // display: false,
+ // label: "缴费类型",
+ // prop: "type",
+ // dicData:[
+ // {
+ // label:"公司缴费",
+ // value: 1
+ // },
+ // {
+ // label:"个人缴费",
+ // value: 2
+ // }
+ // ],
+ // searchSpan: 4,
+ // search: true,
+ // type: "select",
// },
{
- label: "缴费类型",
- prop: "type",
- dicData: dic1,
- searchSpan: 4,
- search: true,
- type: "select",
- // slot: true,
- // display: false,
+ label: "缴费人",
+ prop: "realName",
+ search:true,
+ searchSpan:4,
},
{
- // label: "考试开始时间",
+ label: "身份证号",
+ prop: "idCardNo",
+ search:true,
+ searchSpan:4,
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ slot:true,
+ dicData: [
+ {
+ label:"男",
+ value:1
+ },
+ {
+ label:"女",
+ value:2
+ }
+ ],
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ },
+ {
+ label: "所在单位",
+ prop: "deptName",
+ search:true,
+ searchSpan:6,
+ },
+ {
+ label: "缴费状态",
+ prop: "paymentStatus",
+ searchSpan: 4,
+ search: true,
+ dicData: [
+ {
+ label:"已缴费",
+ value:1
+ },
+ {
+ label:"未缴费",
+ value:2
+ },
+ {
+ label:"部分缴费",
+ value:3
+ },
+ ],
+ type: "select",
+ },
+ {
+ label: "缴费凭证",
+ prop: "certificateUrl",
+ overHidden: true,
+ type: "upload",
+ listType: "picture-img",
+ },
+ {
label: "缴费时间",
prop: "paymentTime",
type: "date",
@@ -158,65 +229,6 @@
trigger: "click",
},
],
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "%");
- // },
- },
- // {
- // label: "考试结束时间",
- // prop: "examEndTime",
- // type: "date",
- // format: "yyyy-MM-dd",
- // valueFormat: "yyyy-MM-dd",
- // labelWidth: 120,
- // searchSpan: 4,
- // search: true,
- // overHidden: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入时间",
- // trigger: "click",
- // },
- // ],
- // // slot: true,
- // // display: false,
- // // formatter: function (row, value) {
- // // return (value = value + "万元");
- // // },
- // },
- // {
- // label: "考试类型",
- // prop: "examinationaddress",
- // // slot: true,
- // // display: false,
- // },
- {
- label: "缴费人",
- prop: "deptName",
- searchSpan: 4,
- search: true,
- // slot: true,
- // display: false,
- },
- {
- label: "缴费状态",
- prop: "paymentStatus",
- searchSpan: 4,
- search: true,
- dicData: dic2,
- type: "select",
- // slot: true,
- // display: false,
- },
- {
- label: "报名编号",
- prop: "applyCode",
- overHidden: true,
- // slot: true,
- // display: false,
},
],
},
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
index ca61b96..c233482 100644
--- a/src/views/qualificationExamination/scoreInquiry.vue
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -62,9 +62,7 @@
addBtn: false,
selection: true,
menu: false,
-
searchShowBtn: false,
-
align: "center",
height: "auto",
calcHeight: 30,
@@ -79,12 +77,14 @@
{
label: "姓名",
prop: "securityName",
- // slot: true,
- // display: false,
+ searchSpan: 4,
+ search: true,
},
{
label: "考试名称",
prop: "examName",
+ search:true,
+ searchSpan:6,
// slot: true,
// display: false,
},
@@ -96,8 +96,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
- searchSpan: 4,
- search: true,
+
overHidden: true,
rules: [
{
@@ -160,8 +159,25 @@
// display: false,
},
{
- label: "是否通过",
+ label: "是否合格",
prop: "qualified",
+ searchSpan: 4,
+ search: true,
+ type:"select",
+ dicData:[
+ {
+ label:"合格",
+ value: 0
+ },
+ {
+ label:"不合格",
+ value: 1
+ },
+ {
+ label:"实操成绩暂未录入",
+ value: 3
+ },
+ ]
// slot: true,
// display: false,
},
@@ -292,20 +308,20 @@
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
- var d = data.records;
-
- for (var k in d) {
- if (d[k].qualified == 0) {
- d[k].qualified = "通过";
- } else if (d[k].qualified == 1) {
- d[k].qualified = "不通过";
- } else if (d[k].qualified == 2) {
- d[k].qualified = "暂未录入实操成绩";
- }
- }
- this.data = d;
- console.log(this.data);
+ this.data = data.records;
this.loading = false;
+ // for (var k in d) {
+ // if (d[k].qualified == 0) {
+ // d[k].qualified = "通过";
+ // } else if (d[k].qualified == 1) {
+ // d[k].qualified = "不通过";
+ // } else if (d[k].qualified == 2) {
+ // d[k].qualified = "暂未录入实操成绩";
+ // }
+ // }
+ // this.data = d;
+ // console.log(this.data);
+
// this.selectionClear();
});
},
diff --git a/src/views/resource/attachOnce.vue b/src/views/resource/attachOnce.vue
index 23a9051..8e41e86 100644
--- a/src/views/resource/attachOnce.vue
+++ b/src/views/resource/attachOnce.vue
@@ -414,5 +414,8 @@
};
</script>
-<style>
+<style scoped>
+.img {
+ height: 100%;
+}
</style>
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index 25352b1..7183416 100644
--- a/src/views/securityCompany/companyDetails.vue
+++ b/src/views/securityCompany/companyDetails.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-08-31 14:52:13
+ * @Last Modified time: 2021-09-06 10:21:32
* menu-name 保安公司详细资料
*/
<template>
@@ -39,7 +39,7 @@
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col span="12">
<el-col span="12">
<el-form-item label="注册时间">
@@ -60,9 +60,9 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
- <el-row>
+ <!-- <el-row>
<el-col span="12">
<el-form-item label="实缴资金">
<el-input
@@ -81,10 +81,10 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row>
- <el-col span="12">
+ <!-- <el-col span="12">
<el-form-item label="工商注册号">
<el-input
disabled="true"
@@ -92,12 +92,12 @@
autocomplete="off"
></el-input>
</el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="公司类型">
+ </el-col> -->
+ <el-col span="24">
+ <el-form-item label="注册地址">
<el-input
disabled="true"
- v-model="form.enterprises"
+ v-model="form.address"
autocomplete="off"
></el-input>
</el-form-item>
@@ -136,10 +136,10 @@
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="注册地址">
+ <el-form-item label="公司类型">
<el-input
disabled="true"
- v-model="form.address"
+ v-model="form.enterprises"
autocomplete="off"
></el-input>
</el-form-item>
@@ -161,7 +161,93 @@
</el-row>
</el-form>
</el-tab-pane>
- <el-tab-pane label="投资人信息" name="second">
+ <el-tab-pane label="工商信息" name="second">
+ <el-form
+ :model="form"
+ label-position="right"
+ size="mini"
+ label-width="100px"
+ >
+ <!-- <el-row>
+ <el-col span="12">
+ <el-form-item label="公司名称">
+ <el-input
+ disabled="true"
+ v-model="form.enterprisename"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="法定代表人">
+ <el-input
+ disabled="true"
+ v-model="form.representative"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row> -->
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="组织机构代码">
+ <el-input
+ disabled="true"
+ v-model="form.organizationcode"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col span="12">
+ <el-form-item label="注册资金">
+ <el-input
+ disabled="true"
+ v-model="form.registeredcapital"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="实缴资金">
+ <el-input
+ disabled="true"
+ v-model="form.capital"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-col span="12">
+ <el-form-item label="注册时间">
+ <el-input
+ disabled="true"
+ v-model="form.establishtime"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="工商注册号">
+ <el-input
+ disabled="true"
+ v-model="form.registrationnumber"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-tab-pane>
+ <el-tab-pane label="投资人信息" name="third">
<avue-crud
class="company-box"
:option="investorOption"
@@ -179,7 +265,7 @@
>
</avue-crud>
</el-tab-pane>
- <el-tab-pane label="管理人信息" name="third">
+ <el-tab-pane label="管理人信息" name="fourth">
<avue-crud
class="company-box"
:option="manageOption"
@@ -197,22 +283,22 @@
>
</avue-crud>
</el-tab-pane>
- <el-tab-pane label="装备信息" name="fourth">
+ <el-tab-pane label="装备信息" name="fifth">
<equipment :form="form"></equipment>
</el-tab-pane>
- <el-tab-pane label="保安员信息" name="fifth">
+ <el-tab-pane label="保安员信息" name="sixth">
<staff :form="form"></staff>
</el-tab-pane>
- <el-tab-pane label="处罚信息" name="sixth">
+ <el-tab-pane label="处罚信息" name="seventh">
<punish :form="form"></punish>
</el-tab-pane>
- <el-tab-pane label="服务对象" name="seventh">
+ <el-tab-pane label="服务对象" name="eighth">
<service :form="form"></service>
</el-tab-pane>
<!-- <el-tab-pane label="其他附件" name="eighth">
<enclosure :form="form"></enclosure>
</el-tab-pane> -->
- <el-tab-pane label="营业执照" name="eighth">
+ <el-tab-pane label="营业执照" name="ninth">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -229,7 +315,7 @@
</el-container>
</div>
</el-tab-pane>
- <el-tab-pane label="许可证" name="ninth">
+ <el-tab-pane label="许可证" name="tenth">
<div class="businessLicenses">
<el-container>
<el-main>
@@ -433,7 +519,7 @@
that = this;
this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "保安公司详细信息") {
+ if (item.label == "保安公司详细资料") {
if (flag == false) {
ind = index;
flag = true;
diff --git a/src/views/securityCompany/dispatch.vue b/src/views/securityCompany/dispatch.vue
index 105dbe2..6d7f22d 100644
--- a/src/views/securityCompany/dispatch.vue
+++ b/src/views/securityCompany/dispatch.vue
@@ -88,6 +88,8 @@
prop: "linkman",
display: false,
width: 120,
+ search: true,
+ searchSpan: 4,
},
{
@@ -106,8 +108,6 @@
type: "datetime",
format: "yyyy-MM-dd",
},
- search: true,
- searchSpan: 4,
display: false,
width: 180,
},
diff --git a/src/views/securityGuardManagement/dispatchChildoperable.vue b/src/views/securityGuardManagement/dispatchChildoperable.vue
index 98cb4e4..dfa2ab1 100644
--- a/src/views/securityGuardManagement/dispatchChildoperable.vue
+++ b/src/views/securityGuardManagement/dispatchChildoperable.vue
@@ -143,7 +143,7 @@
},
search: true,
overHidden: true,
- type: "select",
+ type: "tree",
rules: [
{
required: true,
@@ -183,7 +183,7 @@
},
{
label: "保安人名称",
- prop: "name",
+ prop: "securityName",
search: true,
searchSpan: 4,
labelWidth: 120,
@@ -199,7 +199,7 @@
},
{
label: "身份证",
- prop: "cardid",
+ prop: "idCardNo",
labelWidth: 120,
overHidden: true,
rules: [
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index 39c6757..a90f75f 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-08-31 11:26:49
+ * @Last Modified time: 2021-09-10 16:47:56
* menu-name 保安员注册查询
*/
<template>
@@ -54,11 +54,21 @@
<template slot-scope="{row}"
slot="deptName">
<el-tag>{{row.deptName}}</el-tag>
- </template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
</template> -->
+ <template slot-scope="{ row }" slot="age">
+ {{ row.age == -1 ? "" : row.age }}
+ </template>
+ <template slot-scope="{ row }" slot="sex">
+ {{
+ row.sex == -1
+ ? ""
+ : row.sex == 1
+ ? "男"
+ : row.sex == 2
+ ? "女"
+ : ""
+ }}
+ </template>
<template slot-scope="{ row }" slot="deptId">
<el-tag
class="rowClickSelf"
@@ -86,6 +96,8 @@
:size="size"
:type="type"
class="zhengJian-icon"
+ :disabled="row.hold != 1"
+ :title="row.hold != 1 ? '暂无证件或已吊销' : ''"
@click.stop="handleViewCredentials(row)"
>打印证件</el-button
>
@@ -95,6 +107,8 @@
:size="size"
:type="type"
class="zhengJian-icon"
+ :disabled="row.hold != 1"
+ :title="row.hold != 1 ? '暂无证件或已吊销' : ''"
@click.stop="handleCredentials(row)"
>证件吊销</el-button
>
@@ -356,16 +370,64 @@
lazy: true,
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then((res) => {
- resolve(
- res.data.data.map((item) => {
- return {
- ...item,
- leaf: !item.hasChildren,
- };
- })
- );
- });
+
+
+
+ if (parentId == 0) {
+ getDeptLazyTree(parentId).then((res) => {
+
+ resolve(
+
+ res.data.data.map((item) => {
+
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+
+ })
+
+ );
+
+ });
+ } else if (parentId == '1372091709474910209') {
+
+ getDeptLazyTree(parentId).then((res) => {
+
+ resolve(
+
+ res.data.data[0].children.map((item) => {
+
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+
+ })
+
+ );
+
+ });
+ } else {
+ getDeptLazyTree(parentId).then((res) => {
+ res.data.data = [];
+ resolve(
+
+ res.data.data.map((item) => {
+
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
+
+ })
+
+ );
+
+ });
+ }
+
+
},
addBtn: false,
menu: false,
@@ -430,6 +492,7 @@
label: "性别",
prop: "sex",
width: 55,
+ slot: true,
type: "select",
dicData: [
{
@@ -485,6 +548,7 @@
label: "年龄",
prop: "age",
width: 55,
+ slot: true,
display: false,
},
{
@@ -576,11 +640,25 @@
searchSpan: 3,
width: 72,
display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
+ dicData: [
+ {
+ label: "是",
+ value: "1",
+ },
+ {
+ label: "否",
+ value: "2",
+ },
+ {
+ label: "已吊销",
+ value: "3",
+ },
+ ],
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
type: "select",
rules: [
{
@@ -752,9 +830,21 @@
submitf(form, done) {
console.log(form);
// this.$message.success(JSON.stringify(form));
- addhonor(form).then((res) => {
- console.log(res);
- });
+ addhonor(form).then(
+ (res) => {
+ // console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ },
+ (error) => {
+ this.$message({
+ type: "info",
+ message: "操作失败",
+ });
+ }
+ );
this.objf = {};
this.dialogVisible = false;
done();
@@ -834,11 +924,11 @@
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
- var deptId;
+ // var deptId;
if (params.deptId) {
- deptId = params.deptId;
+ this.query["deptId"] = params.deptId;
}
- this.onLoad(this.page, params, deptId);
+ this.onLoad(this.page, params);
done();
},
selectionChange(list) {
@@ -889,27 +979,27 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
- onLoad(page, params = {}, deptId) {
+ onLoad(page, params = {}) {
this.loading = true;
params["jurisdiction"] = this.jurisdiction;
+ console.log(params, 1, this.query, 2);
getListSecurity(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query),
- deptId
+ Object.assign(params, this.query)
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
- var d = data.records;
- var date = new Date();
- var datayear = date.getFullYear();
- for (const key in d) {
- var year = d[key].cardid.slice(6, 10);
- d[key]["age"] = +datayear - +year;
- // d[key].securitynumber = "赣洪202100009";
- }
+ // var d = data.records;
+ // var date = new Date();
+ // var datayear = date.getFullYear();
+ // for (const key in d) {
+ // var year = d[key].cardid.slice(6, 10);
+ // d[key]["age"] = +datayear - +year;
+ // // d[key].securitynumber = "赣洪202100009";
+ // }
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
@@ -961,43 +1051,46 @@
// this.$Print("#certificatess");
this.objVisiblecertificates = obj;
console.log(this.objVisiblecertificates);
- getER(this.obj.securitynumber).then((res) => {
+ getER(this.objVisiblecertificates.securitynumber).then((res) => {
this.erweima = res.data;
// console.log(res.data);
});
},
// 证件吊销事件
handleCredentials(row) {
- if (row.hold == 1) {
+ console.log(row);
+ // return;
+ if (row.hold == 2) {
this.$message({
type: "info",
message: "证件未拥有!",
});
- } else if (row.hold == 2) {
+ } else if (row.hold == 3) {
this.$message({
type: "info",
message: "证件已吊销!",
});
- } else {
+ } else if (row.hold == 1) {
this.$confirm("是否吊销该人员的证件?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
type: "warning",
})
.then(() => {
- updateHold(2, row.cardid).then((res) => {
+ updateHold(3, row.cardid).then((res) => {
console.log(res);
this.$message({
type: "success",
- message: "删除成功!",
+ message: "吊销成功!",
});
+ this.refreshChange();
});
})
.catch(() => {
- this.$message({
- type: "info",
- message: "已取消删除",
- });
+ // this.$message({
+ // type: "info",
+ // message: "已取消删除",
+ // });
});
}
},
diff --git a/src/views/securityUnitOperation/economicAnalysis.vue b/src/views/securityUnitOperation/economicAnalysis.vue
index be41faf..94707c8 100644
--- a/src/views/securityUnitOperation/economicAnalysis.vue
+++ b/src/views/securityUnitOperation/economicAnalysis.vue
@@ -325,6 +325,57 @@
};
</script>
<style lang="scss" scoped>
+@media screen and (max-width: 1280px) {
+ .box-card {
+ font-size: 15px;
+ width: 128px;
+ background: #00aaf1;
+ height: 117px;
+ text-align: center;
+ margin-right: 28px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 36px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 31px;
+ }
+ }
+ .col-content {
+ margin-top: 39px !important;
+ }
+}
+// 适配分辨率1600*900
+@media screen and (min-width: 1281px) and (max-width: 1600px) {
+ .box-card {
+ font-size: 15px;
+ width: 128px;
+ background: #00aaf1;
+ height: 117px;
+ text-align: center;
+ margin-right: 66px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 36px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 31px;
+ }
+ }
+}
+@media screen and(min-width:1601px) and (max-width: 1920px) {
+ .box-card {
+ width: 150px;
+ background: #00aaf1;
+ height: 135px;
+ text-align: center;
+ margin-right: 66px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 40px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 34px;
+ }
+ }
+}
.page1 {
height: 100%;
width: 100%;
@@ -362,23 +413,11 @@
font-weight: 600;
}
}
-.box-card {
- width: 150px;
- background: #00aaf1;
- height: 135px;
- text-align: center;
- margin-right: 66px;
- box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
- line-height: 40px;
-}
+
.box-card span {
display: block;
width: 100%;
color: #fff;
-}
-.box-card span:nth-child(2) {
- color: #06ffff;
- font-size: 34px;
}
.rowTitle {
height: 40px;
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index 3da4c0b..defe937 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -414,6 +414,271 @@
};
</script>
<style lang="scss" scoped>
+@media screen and (max-width: 1280px) {
+ .box-card {
+ font-size: 15px;
+ width: 128px;
+ background: #00aaf1;
+ height: 117px;
+ text-align: center;
+ margin-right: 28px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 36px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 31px;
+ }
+ }
+ .col-content {
+ margin-top: 39px !important;
+ }
+ .leftEchartTitle.qing {
+ right: 10px;
+ margin-top: 42px;
+ .block1 {
+ background: #73c0de;
+ margin-top: 11px;
+ width: 10px;
+ height: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ margin: 0px 3px 0px 3px;
+ }
+ span:nth-child(3) {
+ color: #73c0de;
+ font-size: 15px;
+ width: 45px;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #73c0de;
+ }
+ }
+ .leftEchartTitle.zhong {
+ right: 10px;
+ margin-top: 83px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ border-radius: 100%;
+ background: #fac858;
+ margin-top: 11px;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ margin: 0px 3px 0px 3px;
+ }
+ span:nth-child(3) {
+ color: #fac858;
+ font-size: 15px;
+ width: 45px;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #fac858;
+ }
+ }
+ .leftEchartTitle.lao {
+ right: 10px;
+ margin-top: 125px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ border-radius: 100%;
+ background: #91cc75;
+ margin-top: 11px;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 12px;
+ margin: 0px 3px 0px 3px;
+ }
+ span:nth-child(3) {
+ color: #91cc75;
+ font-size: 15px;
+ width: 45px;
+ }
+ span:nth-child(4) {
+ font-size: 12px;
+ color: #91cc75;
+ }
+ }
+}
+// 适配分辨率1600*900
+@media screen and (min-width: 1281px)and (max-width: 1600px) {
+ .box-card {
+ font-size: 15px;
+ width: 128px;
+ background: #00aaf1;
+ height: 117px;
+ text-align: center;
+ margin-right: 66px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 36px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 31px;
+ }
+ }
+ .leftEchartTitle.qing {
+ right: 37px;
+ margin-top: 42px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #73c0de;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #73c0de;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #73c0de;
+ }
+ }
+ .leftEchartTitle.zhong {
+ right: 37px;
+ margin-top: 83px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #fac858;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #fac858;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #fac858;
+ }
+ }
+ .leftEchartTitle.lao {
+ right: 37px;
+ margin-top: 125px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #91cc75;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #91cc75;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #91cc75;
+ }
+ }
+}
+@media screen and (min-width: 1601px)and (max-width: 1920px) {
+ .box-card {
+ width: 150px;
+ background: #00aaf1;
+ height: 135px;
+ text-align: center;
+ margin-right: 66px;
+ box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
+ line-height: 40px;
+ span:nth-child(2) {
+ color: #06ffff;
+ font-size: 34px;
+ }
+ }
+ .leftEchartTitle.qing {
+ right: 37px;
+ margin-top: 42px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #73c0de;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #73c0de;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #73c0de;
+ }
+ }
+ .leftEchartTitle.zhong {
+ right: 37px;
+ margin-top: 83px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #fac858;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #fac858;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #fac858;
+ }
+ }
+ .leftEchartTitle.lao {
+ right: 37px;
+ margin-top: 125px;
+ .block1 {
+ width: 10px;
+ height: 10px;
+ background: #91cc75;
+ margin-top: 10px;
+ border-radius: 100%;
+ }
+ span:nth-child(2) {
+ color: #fff;
+ font-size: 13px;
+ }
+ span:nth-child(3) {
+ color: #91cc75;
+ font-size: 17px;
+ }
+ span:nth-child(4) {
+ font-size: 13px;
+ color: #91cc75;
+ }
+ }
+}
+
.page1 {
height: 100%;
width: 100%;
@@ -452,23 +717,11 @@
font-weight: 600;
}
}
-.box-card {
- width: 150px;
- background: #00aaf1;
- height: 135px;
- text-align: center;
- margin-right: 66px;
- box-shadow: 5px 5px 5px rgba($color: #000, $alpha: 0.35);
- line-height: 40px;
-}
+
.box-card span {
display: block;
width: 100%;
color: #fff;
-}
-.box-card span:nth-child(2) {
- color: #06ffff;
- font-size: 34px;
}
.rowTitle {
height: 40px;
@@ -540,72 +793,6 @@
span:nth-child(4) {
font-size: 13px;
color: #2ec7c9;
- }
-}
-.leftEchartTitle.qing {
- right: 37px;
- margin-top: 42px;
- .block1 {
- width: 30px;
- height: 15px;
- background: #73c0de;
- margin-top: 7px;
- }
- span:nth-child(2) {
- color: #fff;
- font-size: 13px;
- }
- span:nth-child(3) {
- color: #73c0de;
- font-size: 17px;
- }
- span:nth-child(4) {
- font-size: 13px;
- color: #73c0de;
- }
-}
-.leftEchartTitle.zhong {
- right: 37px;
- margin-top: 83px;
- .block1 {
- width: 30px;
- height: 15px;
- background: #fac858;
- margin-top: 7px;
- }
- span:nth-child(2) {
- color: #fff;
- font-size: 13px;
- }
- span:nth-child(3) {
- color: #fac858;
- font-size: 17px;
- }
- span:nth-child(4) {
- font-size: 13px;
- color: #fac858;
- }
-}
-.leftEchartTitle.lao {
- right: 37px;
- margin-top: 125px;
- .block1 {
- width: 30px;
- height: 15px;
- background: #91cc75;
- margin-top: 7px;
- }
- span:nth-child(2) {
- color: #fff;
- font-size: 13px;
- }
- span:nth-child(3) {
- color: #91cc75;
- font-size: 17px;
- }
- span:nth-child(4) {
- font-size: 13px;
- color: #91cc75;
}
}
</style>
diff --git a/src/views/securityUnitOperation/securityEchart.js b/src/views/securityUnitOperation/securityEchart.js
index 9184b69..3dfa3e3 100644
--- a/src/views/securityUnitOperation/securityEchart.js
+++ b/src/views/securityUnitOperation/securityEchart.js
@@ -396,7 +396,7 @@
top: "10%",
left: "10%",
right: "2%",
- bottom: "22%",
+ bottom: "25%",
containLabel: false
},
xAxis: {
@@ -404,7 +404,8 @@
boundaryGap: true,
axisLabel: {
color: "#fff",
- interval: 0
+ interval: 0,
+ rotate: 40
},
data: [
"一月",
@@ -440,27 +441,13 @@
}
function bottomOption2(alldata) {
let data = [];
- for (var key in alldata) {
- let obj = null;
- if (key === "lcount") {
- obj = {
- name: "老年",
- value: alldata[key]
- };
- } else if (key === "zcount") {
- obj = {
- name: "中年",
- value: alldata[key]
- };
- }
- else if (key === "qcount") {
- obj = {
- name: "青年",
- value: alldata[key]
- };
- }
- data.push(obj);
- }
+ let qcount = alldata["qcount"] || 0;
+ data.push({ name: "青年", value: qcount });
+ let zcount = alldata["zcount"] || 0;
+ data.push({ name: "中年", value: zcount });
+ let lcount = alldata["lcount"] || 0;
+ data.push({ name: "老年", value: lcount });
+
let option = {
tooltip: {
trigger: "item",
@@ -511,7 +498,7 @@
type: "pie",
center: ["33%", "50%"],
radius: "70%",
- data:data,
+ data: data,
label: {
color: "#fff"
}
diff --git a/src/views/workreport/data.js b/src/views/workreport/data.js
index 3584230..549245a 100644
--- a/src/views/workreport/data.js
+++ b/src/views/workreport/data.js
@@ -1,242 +1,115 @@
//已发送列表信息
-export var workreportColumn = [{
- label: "汇报时间",
- prop: "reportTime",
- type: "datetime",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- searchRange: true,
- searchSpan: 6,
- hide: false,
- addDisplay: false,
- editDisplay: false,
- // viewDisplay: false,
- search: false,
- rules: [{
- required: true,
- message: "请输入时间",
- trigger: "blur"
- }]
-},
-// {
-// label: "汇报类别",
-// prop: "category",
-// type: "select",
-// dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
-// props: {
-// label: "dictValue",
-// value: "dictKey"
-// },
-// dataType: "number",
-// // searchSpan: 4,
-// // search: true,
-// hide: true,
-// addDisplay: false,
-// editDisplay: false,
-// viewDisplay: false,
-// rules: [{
-// required: true,
-// message: "请选择汇报类别",
-// trigger: "blur"
-// }]
-// },
-{
- label: "汇报类型",
- prop: "type",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- searchSpan: 4,
- search: true,
- rules: [{
- required: true,
- message: "请选择汇报类型",
- trigger: "blur"
- }]
-},
-{
- label: "接收人",
- prop: "receivedIds",
- // span: 12,
- type: "tree",
- dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3&deptId=" + this.deptId,
- hide: true,
- leafOnly: true,
- props: {
- label: "title",
- value: "id",
- },
- multiple: true,
- // dataType: "number",
- rules: [{
- required: true,
- message: "请选择接收人",
- trigger: "blur"
- }]
-},
-{
- label: "汇报人身份证号",
- prop: "idCardNo",
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
-},
-{
- label: "汇报内容",
- prop: "content",
- type: "textarea",
- span: 24,
- rules: [{
- required: true,
- message: "请输入汇报内容",
- trigger: "blur"
- }]
-},
-
-{
- label: "接收人",
- prop: "replyRealName",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
-},
-{
- label: "接收人单位",
- prop: "replyDeptName",
- addDisplay: false,
- editDisplay: false,
- // viewDisplay: false,
-},
-{
- label: "回复内容",
- prop: "replyContent",
- type: "textarea",
- span: 24,
- addDisplay: false,
- editDisplay: false,
- rules: [{
- required: true,
- message: "请输入回复内容",
- trigger: "blur"
- }]
-}
-]
//接收人列信息
export var workreplyColumn = [{
- label: "汇报人",
- prop: "realName",
- disabled: true,
- span: 24,
- rules: [{
- required: true,
- message: "请选择接收人",
- trigger: "blur"
- }]
-},
-{
- label: "汇报人单位",
- prop: "deptName",
- addDisplay: false,
- editDisplay: false,
- // viewDisplay: false,
-}, {
- label: "汇报时间",
- prop: "reportTime",
- type: "datetime",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- searchRange: true,
- searchSpan: 6,
- hide: false,
- addDisplay: false,
- editDisplay: false,
- // viewDisplay: false,
- search: false,
- rules: [{
- required: true,
- message: "请输入时间",
- trigger: "blur"
- }]
-},
-{
- label: "汇报类别",
- prop: "category",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
- props: {
- label: "dictValue",
- value: "dictKey"
+ label: "汇报人",
+ prop: "realName",
+ disabled: true,
+ span: 24,
+ rules: [{
+ required: true,
+ message: "请选择接收人",
+ trigger: "blur"
+ }]
},
- dataType: "number",
- // searchSpan: 4,
- // search: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- rules: [{
- required: true,
- message: "请选择汇报类别",
- trigger: "blur"
- }]
-},
-{
- label: "汇报类型",
- prop: "type",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "汇报人单位",
+ prop: "deptName",
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ }, {
+ label: "汇报时间",
+ prop: "reportTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ searchRange: true,
+ searchSpan: 6,
+ hide: false,
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ search: false,
+ rules: [{
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }]
},
- dataType: "number",
- searchSpan: 4,
- search: true,
- disabled: true,
- rules: [{
- required: true,
- message: "请选择汇报类型",
- trigger: "blur"
- }]
-},
-// {
-// label: "汇报人身份证号",
-// prop: "idCardNo",
-// hide: true,
-// addDisplay: false,
-// editDisplay: false,
-// viewDisplay: false,
-// },
-{
- label: "汇报内容",
- prop: "content",
- type: "textarea",
- // editDisplay: false,
- disabled: true,
- span: 24,
- rules: [{
- required: true,
- message: "请输入汇报内容",
- trigger: "blur"
- }]
-},
-{
- label: "回复内容",
- prop: "replyContent",
- type: "textarea",
- span: 24,
- rules: [{
- required: true,
- message: "请输入回复内容",
- trigger: "blur"
- }]
-}
+ {
+ label: "汇报类别",
+ prop: "category",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ // searchSpan: 4,
+ // search: true,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [{
+ required: true,
+ message: "请选择汇报类别",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "汇报类型",
+ prop: "type",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ searchSpan: 4,
+ search: true,
+ disabled: true,
+ rules: [{
+ required: true,
+ message: "请选择汇报类型",
+ trigger: "blur"
+ }]
+ },
+ // {
+ // label: "汇报人身份证号",
+ // prop: "idCardNo",
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // },
+ {
+ label: "汇报内容",
+ prop: "content",
+ type: "textarea",
+ // editDisplay: false,
+ disabled: true,
+ span: 24,
+ rules: [{
+ required: true,
+ message: "请输入汇报内容",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "回复内容",
+ prop: "replyContent",
+ type: "textarea",
+ span: 24,
+ rules: [{
+ required: true,
+ message: "请输入回复内容",
+ trigger: "blur"
+ }]
+ }
]
\ No newline at end of file
diff --git a/src/views/workreport/workreply.vue b/src/views/workreport/workreply.vue
index f102e64..192df09 100644
--- a/src/views/workreport/workreply.vue
+++ b/src/views/workreport/workreply.vue
@@ -77,7 +77,7 @@
dialogWidth: 1000,
tip: false,
searchShow: true,
- searchBtn: false,
+ searchBtn: true,
searchMenuSpan: 6,
editBtnText: "回复",
searchShowBtn: false,
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index 09342f1..bc05bc0 100644
--- a/src/views/workreport/workreport.vue
+++ b/src/views/workreport/workreport.vue
@@ -52,7 +52,6 @@
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
import { mapState } from "vuex";
-import { workreportColumn } from "./data";
export default {
data() {
@@ -78,7 +77,7 @@
calcHeight: 30,
dialogWidth: 1000,
tip: false,
- searchBtn: false,
+ searchBtn: true,
searchShow: true,
searchShowBtn: false,
searchMenuSpan: 6,
@@ -91,7 +90,133 @@
excelBtn: false,
menuWidth: 320,
dialogClickModal: false,
- column:workreportColumn,
+ column:[{
+ label: "汇报时间",
+ prop: "reportTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ searchRange: true,
+ searchSpan: 6,
+ hide: false,
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ search: false,
+ rules: [{
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }]
+ },
+ // {
+ // label: "汇报类别",
+ // prop: "category",
+ // type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // dataType: "number",
+ // // searchSpan: 4,
+ // // search: true,
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // rules: [{
+ // required: true,
+ // message: "请选择汇报类别",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "汇报类型",
+ prop: "type",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择汇报类型",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "接收人",
+ prop: "receivedIds",
+ // span: 12,
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3",
+ hide: true,
+ leafOnly: true,
+ props: {
+ label: "title",
+ value: "id",
+ },
+ multiple: true,
+ // dataType: "number",
+ rules: [{
+ required: true,
+ message: "请选择接收人",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "汇报人身份证号",
+ prop: "idCardNo",
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ label: "汇报内容",
+ prop: "content",
+ type: "textarea",
+ span: 24,
+ rules: [{
+ required: true,
+ message: "请输入汇报内容",
+ trigger: "blur"
+ }]
+ },
+
+ {
+ label: "接收人",
+ prop: "replyRealName",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ {
+ label: "接收人单位",
+ prop: "replyDeptName",
+ addDisplay: false,
+ editDisplay: false,
+ // viewDisplay: false,
+ },
+ {
+ label: "回复内容",
+ prop: "replyContent",
+ type: "textarea",
+ span: 24,
+ addDisplay: false,
+ editDisplay: false,
+ rules: [{
+ required: true,
+ message: "请输入回复内容",
+ trigger: "blur"
+ }]
+ }
+ ],
},
data: [],
};
@@ -245,8 +370,6 @@
var that = this;
getDept(this.deptId).then(() => {
- const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
- columnReceivedIds.dicUrl = "/api/blade-system/dept/lazy-tree-users?type=3&deptId="+that.deptId;
params["deptId"] = that.deptId;
params["userId"] = that.userId;
diff --git a/vue.config.js b/vue.config.js
index 5ca4185..06503e4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,46 +1,46 @@
module.exports = {
- //路径前缀
- publicPath: "/",
- lintOnSave: true,
- productionSourceMap: false,
- chainWebpack: (config) => {
- //忽略的打包文件
- config.externals({
- 'vue': 'Vue',
- 'vue-router': 'VueRouter',
- 'vuex': 'Vuex',
- 'axios': 'axios',
- 'element-ui': 'ELEMENT',
- });
- const entry = config.entry('app');
- entry.add('babel-polyfill').end();
- entry.add('classlist-polyfill').end();
- entry.add('@/mock').end();
- },
- css: {
- extract: { ignoreOrder: true }
- },
- //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
- devServer: {
- port: 1888,
- disableHostCheck: true,
- proxy: {
- '/api': {
- //本地服务接口地址
- // target: 'http://192.168.0.109:1',
- //远程演示服务地址,可用于直接启动项目
- // target: 'http://2h3f861221.wicp.vip:58646',
- // target: 'http://s16s652780.51mypc.cn/api',
- // target: 'http://192.168.0.114:82',
- target: 'http://192.168.0.108:82',
- // target: 'http://s16s652780.51mypc.cn/api',
- // 服务器使用
- // target: 'http://localhost:82',
- ws: true,
- pathRewrite: {
- '^/api': '/'
+ //路径前缀
+ publicPath: "/",
+ lintOnSave: true,
+ productionSourceMap: false,
+ chainWebpack: (config) => {
+ //忽略的打包文件
+ config.externals({
+ 'vue': 'Vue',
+ 'vue-router': 'VueRouter',
+ 'vuex': 'Vuex',
+ 'axios': 'axios',
+ 'element-ui': 'ELEMENT',
+ });
+ const entry = config.entry('app');
+ entry.add('babel-polyfill').end();
+ entry.add('classlist-polyfill').end();
+ entry.add('@/mock').end();
+ },
+ css: {
+ extract: { ignoreOrder: true }
+ },
+ //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
+ devServer: {
+ port: 1888,
+ disableHostCheck: true,
+ proxy: {
+ '/api': {
+ //本地服务接口地址
+ // target: 'http://192.168.0.109:1',
+ //远程演示服务地址,可用于直接启动项目
+ // target: 'http://2h3f861221.wicp.vip:58646',
+ // target: 'http://s16s652780.51mypc.cn/api',
+ // target: 'http://192.168.0.114:82',
+ // target: 'http://192.168.0.108:82',
+ // target: 'http://s16s652780.51mypc.cn/api',
+ // 服务器使用
+ target: 'http://localhost:82',
+ ws: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ }
}
- }
}
- }
-};
+};
\ No newline at end of file
--
Gitblit v1.9.3